diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
| commit | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch) | |
| tree | cee0a97398040001220ece3cd48c3d568bcddb4a /app-office/libreoffice | |
| parent | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff) | |
gentoo resync : 10.02.2019
Diffstat (limited to 'app-office/libreoffice')
5 files changed, 50 insertions, 13 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index b4a7f2630eb4..c9d0941224d3 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -2,6 +2,7 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083 AUX libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch 4093 BLAKE2B c6f74ef29c055e22f7f58e4962c3036a39ca4cd731abf382576c6ad1954b8d8dd8c5fa90147931ef0bc4bd094c70143726e4a046c57e9a5062875c1ff248caa6 SHA512 df571472de299a3c184348ce48caef937604b9981101b986d8473b7bdfa0ca0244395ab8079cc97dcef23aea9864aff93523582a459c55457fdd4dbba4e4e985 +AUX libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch 1693 BLAKE2B fee5ce93d89458b90465ab6febadb9fd86c8c039d42af8a4beb15aa5167f4cab87737219b11037949c180f4f8e4672f5319e90e1afbf5836c5bc7977814b168c SHA512 ffb7d60d30e84bdccc590e5d6575727f63ffa237b68813ca34106b9dc8112c0033af6eadfde44887da69f35341a3dccd92281c8a40b55889c50cbdad87e0a207 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a @@ -16,8 +17,8 @@ DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1 EBUILD libreoffice-6.1.4.2.ebuild 16800 BLAKE2B 9bd5e46e7e599f9f916d49f5d72aaa0934257a2b46301c74fb61d0e78c7b93eb0297a7bfca5d99b56d8909e5d289d18fc520f290c2f7512962cf940fe774a950 SHA512 df15098dc1693424aee0db6bda394cc001f5370ee0b841befc040f1e1376bc87287f4f507540d5270442c66cdbe2aacf65571039458ab1a426b89037de22c1e8 -EBUILD libreoffice-6.1.5.2.ebuild 16904 BLAKE2B 89933e6355496aba9ffe54df07fab5abdda9e1cadfc4e87abae1019491a682067d809b96eb1b80af0884c5594d58f6b5b3638f76e0e77a44d6760d76031b86c4 SHA512 9806016a449ff7c68f6f996c4689bf402253881d531e47817b1f871546e9ada07a7e4594738f9fd5d94264da164047161e577809c1b062e9af2ccee25980a855 +EBUILD libreoffice-6.1.5.2.ebuild 16967 BLAKE2B 8d9a5c9c4911d59941ed05ecd3c19d6c4db99b0be3d350b81d4bd22dc79e2bd38d281131ea163dfa2b329b11abb5a44c7d7e0e09835ef9ccca31e6e8f301fa3d SHA512 88f136246b17e0f2599163b43131e3a332b265aec9bd6d3afc6d18b95c633dd3b903c8214b66608a14fff6e207f0ac45430b5c37f0d5a28eeae138fda7802789 EBUILD libreoffice-6.2.0.3.ebuild 17063 BLAKE2B 12a93d45b161e4850510d1e38dbc33db6c8585f3bf7de96c8a49ec9841cd879f4594e130cb1d95117681b6052ed039d74e12a5ec2290a2b26e2b597b7cf407cc SHA512 ffe11ba7450d381d530d79d750a21aab3c83e794894fe5fa788b565f9bb07af55cfa93fd48657ac6ef69f9c183ce064e9d905e33a9a514855e2bc6b6346f6cf0 -EBUILD libreoffice-6.2.9999.ebuild 17685 BLAKE2B 11c30e87391082a9176f76aafd0c690daec9c1285c41224f1f54771a5d8451982a549b92ee0934ec8c9a61f370ffecff08199bf8337ef5b7ccdcc303f50652b1 SHA512 7d5d83ef2e7492814f7252f8c53ce1a4b42c554a7f5610eec59edaed7448790c3367e2c3075ebee7ded9693bdb63bd7ec513bb94b94a85e1ee3b9ba22b218237 -EBUILD libreoffice-9999.ebuild 16956 BLAKE2B 094ffcc63b1b6bb7d28945bf93ff1ea20aa604235792f659e062064d282f89bcf7d222f482025f81bfd839dafa76d67a0da68cf8864c8c2d3e460ff8c03ca2d2 SHA512 584a65d9473973dbd99fc0af546c3ed056c839b6102368a899cc75e5d6bd32a18d0c2ae74bce0e93370e6aa824fcefc030af580155f753e4553bd9e7610d662c +EBUILD libreoffice-6.2.9999.ebuild 17198 BLAKE2B 0d35a3be8f943ca128db41c55f2750bdb1acd8e9819ef2d4d6b1123f969ad9ae3b33ef9a55bb71b734b24f9853e03ff8c806fa688df0553390e1714f42294bfe SHA512 006ca2d316a9275a4ec27b7afa6546b54cde941b26adafa44be10063148416b7471f0dacc9b25b0ba72d2529067af449373a225237e00777a44379455594c5be +EBUILD libreoffice-9999.ebuild 16954 BLAKE2B 7398d9b515e4332f33ee70a868252a2a99e94199a84a0186f218e3faad212c8c6bfa7c566ea7df80e2f7facabfa2e4740f534c91f6b914c1eaa89fcc40c4eb33 SHA512 54dfe9063403924f7c93157414730b6b1b7873de7410d86269279272fd0802b42d5412d2a0ea3e15afacb9aa539937e7b07927f19efb1a67cfb437a269909b46 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7 diff --git a/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch new file mode 100644 index 000000000000..69134a8b9922 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch @@ -0,0 +1,42 @@ +From 7b54f3db98e96231fc9f16429f325cdb1f37498c Mon Sep 17 00:00:00 2001 +From: Michael Weghorn <m.weghorn@posteo.de> +Date: Thu, 31 Jan 2019 09:52:51 +0100 +Subject: tdf#123077 gtk3_kde5: Set KFileWidget's custom widget only once + +Since the event filter is only used to set the custom +widget in the KFileWidget, it can and needs to be removed +again once this has been done; which also avoids crashes. + +(s. https://gerrit.libreoffice.org/#/c/67185/ for more +infos, where the same thing is done for kde5) + +Change-Id: I5c719fb17510916b4730ed5c00bb638df2f183e3 +Reviewed-on: https://gerrit.libreoffice.org/67184 +Tested-by: Jenkins +Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> +(cherry picked from commit 30cc54a4532a732a0cf6dfe9943521978ff7292f) +Reviewed-on: https://gerrit.libreoffice.org/67203 +Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> +--- + vcl/unx/gtk3_kde5/kde5_filepicker.cxx | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx +index 33f64ad0..9914869 100644 +--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx ++++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx +@@ -265,7 +265,11 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e) + { + KWindowSystem::setMainWindow(w, _winId); + if (auto* fileWidget = w->findChild<KFileWidget*>({}, Qt::FindDirectChildrenOnly)) ++ { + fileWidget->setCustomWidget(_extraControls); ++ // remove event filter again; the only purpose was to set the custom widget here ++ qApp->removeEventFilter(this); ++ } + } + } + return QObject::eventFilter(o, e); +-- +cgit v1.1 + diff --git a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild index e59e17836c29..5cf93d4642f1 100644 --- a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild @@ -78,8 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="" -# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -252,6 +251,7 @@ PATCHES=( # master branch "${FILESDIR}/${P}-gtk3_kde5-non-native-fpicker-for-non-plasma.patch" + "${FILESDIR}/${P}-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index 0c48e2a46a63..12765a8bb8cd 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) PYTHON_REQ_USE="threads(+),xml" MY_PV="${PV/_alpha/.alpha}" @@ -247,15 +247,9 @@ DEPEND="${COMMON_DEPEND} PATCHES=( # master branch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/009-kde5-allow-multiple-mimetypes-clipboard.patch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/010-kde5-fix-selection-clipboard.patch "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/012-qt5-initialize-glyphcache-for-psp-graphics.patch "${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/014-qt5kde5-use-logicaldotsperinch-to-report-dpi.patch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/015-kde5-no-images-to-clipboard.patch "${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/020-qt5-filemanager-drag-and-drop.patch # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 6536b71f5351..20e311f8d5c6 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) PYTHON_REQ_USE="threads(+),xml" MY_PV="${PV/_alpha/.alpha}" |