diff options
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/Manifest | 8 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch | 13 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch | 61 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-24.2.2.1.ebuild (renamed from app-office/libreoffice/libreoffice-24.2.1.2.ebuild) | 5 |
4 files changed, 3 insertions, 84 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 15f69042f156..291ec11ca88d 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,5 +1,3 @@ -AUX libreoffice-24.2-kf6-buildfix.patch 1432 BLAKE2B c17f4e30d4e789699edba2b906a45664236323f0fd330bfaa241e43ff7511a77ff06aa6df9780285047ae382e9424894cdfa104ac188e119a1ceba1ee4fc15c0 SHA512 c3108ca0fdddc167f7b16bf4905253755e489d366aa6457edb1f092c64aef9cccde43c37f1cfd9b8500c9e215755044e33921773f54a86b9f7be8f65c9d9163a -AUX libreoffice-24.2-kf6-configure.patch 2246 BLAKE2B 71c085ea4743ce065665d31af67b82ce4b1e27f083de697a3845a01a6595c4df463c7f242eb63950a180a4d396c83e602e5bc36b1b29188271f102a7f6b1afb0 SHA512 4c0956e701f60ba2f6c26cfaadb1816012f19ffc7688d89bac00492cc80b8967f1cd98a483083dc119b7b7c8ea152aa3763b260a49ec884ec7a40e5957e641c6 AUX libreoffice-24.2-qtdetect.patch 989 BLAKE2B 01e1c1493293363206cd43ded09b69becd02b0b93c2fcb5fd4387a54424b9fa552ebfa128290a1b0551e6b6fe5de8f57025a2ebf5c75da2ea01bd66f5910f9d6 SHA512 dc00b2afe98f7bf30637c4102e336d6781f76cd7eb6c339c0b369ec2aa50544bc266fd42540fea037c1fcd07ae7e6d1b6503be620db9127084ffe6528f8db4b1 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083 @@ -30,17 +28,17 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e -DIST libreoffice-24.2.1.2.tar.xz 280349652 BLAKE2B 4035f85c8c155e2131e972c94355d360a538a9460c62e6ea416b123b9564bfecc100c8c7ce07f22ecd8f14ba140077da9d8aeaed9ad3be5171d1ffdbede53ce2 SHA512 650a61a56759109a17e65bcd31b9876b19ac7c71996854566ea8f6e8039276bd29173c80b3a2d4466cd2c6fcb63d4b95f3d4c78bd7ad22bdd190b801b5665a56 +DIST libreoffice-24.2.2.1.tar.xz 280628072 BLAKE2B f9b22b25bdd58278de020fa67ec6ab3d7a3986c75d7931ea82b69dc5d330876be1aaf4cd3ef7cde6e9eb2554ee7d156c04bb8729e13a5e622e8e68b4e28cba08 SHA512 62840468733eabb4a4b9784802e1710e2a697ebe6fa3d6246bcc9d08b97a8af189b259fe8af6f2add4d1cf706df40431fc26d92be318dd9b547f05de992368d5 DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6 DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f SHA512 b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-24.2.1.2.tar.xz 167070728 BLAKE2B fd265ddc95b7a7638d0edd61682bc48332bb5ea04a171bfb30a16f2705d28697b7860a5ecaa12491ce57ee74f90cfb4f19de62d83d954e9d7c58ba46b2831113 SHA512 bac54ac89f4c97434c354f3f281602fd8720546f549a687940bd028bedbd2841241429ee11983f805322136a8376453bcbbc6c87b8d032c025a50da95b1ce851 +DIST libreoffice-help-24.2.2.1.tar.xz 167069480 BLAKE2B ca1c551a38b2c4250e2c39216e476fab67d72df4adcf5f3ced2e83b0b2ec6f3ae0596a9c7eeb8bfca27e360bfb2b2d32c90e6c1216f0204bc971fe9ba2277446 SHA512 51daafb453d5bfb296a4985a51cb69c1bc0e8559546061440713c3cb6a8021ff54989c02f9d34bd00734e4d4b32d9533d9cffb80f4bcd3fffbed1b6c48a19cb3 DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859 DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c SHA512 f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3 DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8 -EBUILD libreoffice-24.2.1.2.ebuild 20424 BLAKE2B 6a8c80b10a0a5ffe466f7f4f9cf96f5a1812960f684ec0fa27b4c6100b54662a08dd99f75a4ee0c7f26fa216ceacf29d9e561d1ee80b818fba905c396b4d6cc4 SHA512 0009c741c8af2691e3648cfa75a067caaf8f27b915039b5c80f501aa19bd3190f0d85f2a0235ff9108c7716afe5a903d92923a5760787e617261a9079bb856b5 +EBUILD libreoffice-24.2.2.1.ebuild 20303 BLAKE2B bf000d88de34cb31f8c2d53a5d6560780c960cb53ebb6389ead212e2497b717b5c9fa5c42ab68810d7ac793efa7872c7496ae343bda9a2503b9f3eb7342465d1 SHA512 8e89bc35ee0c8730be05b0aed4fcf6fb9ef5bc9a2740fc68e8ab03c2c9e06846160a099adbf2c42e01d6fd7200f1616bb8aef075387b6e18b56bffd399a130ac EBUILD libreoffice-24.2.9999.ebuild 20222 BLAKE2B fee79a008428c0c47cfbd9f7d331b516250d376793e8cef6e03aa5ac0e6bcee23f912a22d22f6a56ca7aa89a2f1b06fa174644a63ed87fea31053f07cbcfe1ad SHA512 456ab217c5745ee35191e7314d4f231bbef1e456596b0834b10307afa98ba4bac132c85a491a555695aeefe433c406435dd238039e140ae9a082c789184dd713 EBUILD libreoffice-7.6.4.1.ebuild 19678 BLAKE2B 9437af453ccbf75140b39cb37ff2705630a2499295681fa129945ca6ed96b030a832ac997990e80ee3cfb7d7203f5e3a1e4375677e456e1ff11c6a4dce3a3178 SHA512 c8d41e5bbbc9cbf9f2cd1f3d4dd74aca9074287410c4a2e26e789ed939a691385c6d9c3f62c5144ad2f8af15a9be26206f2470e5908ab10f507b423c459873b0 EBUILD libreoffice-7.6.5.2.ebuild 19659 BLAKE2B 81a6b4e532ee828a93e7a586f7ca7765cc3a05500c563e9ead4f739de44f5c3ada7d9025862df5cf2d7d177e59ee091bd7554141df3c5f5a86616e367ddd901c SHA512 ce8574db7ad42413e68775dfe7cbf2ea3d5b3e8a5d27de9a84b9e1c4381a3bcd0c395f64ade36a44b5e6c463670f6c9959073b5634f543fb97c2a7c60c164974 diff --git a/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch b/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch deleted file mode 100644 index 7fefb4a51f7b..000000000000 --- a/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Source: https://raw.githubusercontent.com/OpenMandrivaAssociation/libreoffice/master/libreoffice-24.2-kf6-buildfix.patch - ---- a/configure.ac -+++ b/configure.ac -@@ -13465,7 +13465,7 @@ then - AC_MSG_ERROR([KF6 libraries not found. Please specify the root of your KF6 installation by exporting KF6DIR before running "configure".]) - fi - -- KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING" -+ KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING" - KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network" - KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - diff --git a/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch b/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch deleted file mode 100644 index 2a4952d7e7cc..000000000000 --- a/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ec69b448f4b6296edb6b28ced5ecb710be82438b Mon Sep 17 00:00:00 2001 -From: Michael Weghorn <m.weghorn@posteo.de> -Date: Tue, 13 Feb 2024 16:25:35 +0100 -Subject: [PATCH] scp2: Take ENABLE_{KF,QT}6 into account - -The qt6 and kf6 VCL plugins are also part -of the kde install set, so take -`ENABLE_QT6` and `ENABLE_KF6` into -account when deciding whether to install -it. - -This makes packaging these VCL plugins work -when building with `--enable-qt6` and/or -`--enable-kf6`, but without `--enable-qt5` -and `--enable-kf5`. - -Command that can be used for testing: - - make DESTDIR=/tmp/dummy distro-pack-install -o build -o check - -(Then, check whether the "installation" in /tmp/dummy -contains the VCL plugins as expected.) - -Thanks to Andreas Sturmlechner for reporting -the issue on IRC #libreoffice-dev on 2024-02-12. - -Change-Id: Ieea67468e3388f8b7b66f53221574c6225516b44 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163313 -Tested-by: Jenkins -Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> ---- - scp2/InstallScript_setup_osl.mk | 2 +- - scp2/Module_scp2.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk -index 6f7b58204225e..cf69165c1b60f 100644 ---- a/scp2/InstallScript_setup_osl.mk -+++ b/scp2/InstallScript_setup_osl.mk -@@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ - $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\ - scp2/gnome \ - ) \ -- $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\ -+ $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\ - scp2/kde \ - ) \ - $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\ -diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk -index 25ae8167df561..651413fa2c17e 100644 ---- a/scp2/Module_scp2.mk -+++ b/scp2/Module_scp2.mk -@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ - $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\ - InstallModule_gnome \ - ) \ -- $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\ -+ $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\ - InstallModule_kde \ - ) \ - )) diff --git a/app-office/libreoffice/libreoffice-24.2.1.2.ebuild b/app-office/libreoffice/libreoffice-24.2.2.1.ebuild index a01d614a45dd..6790640974f2 100644 --- a/app-office/libreoffice/libreoffice-24.2.1.2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.2.1.ebuild @@ -318,11 +318,6 @@ PATCHES=( # maybe upstreamable "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch" - - # git master, pending 24.2 - "${FILESDIR}/${PN}-24.2-kf6-configure.patch" - "${FILESDIR}/${PN}-24.2-kf6-buildfix.patch" - ) S="${WORKDIR}/${PN}-${MY_PV}" |