diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-05-27 18:11:12 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-05-28 00:22:59 +0200 |
| commit | 99a91942cec4b0b37559e1b10011168787b18232 (patch) | |
| tree | 75452819c7c13dfea90a551a28893a3d0014106d /app-office/libreoffice | |
| parent | app-admin/calamares: revbump for dropped dep (diff) | |
| download | gentoo-99a91942cec4b0b37559e1b10011168787b18232.tar.gz gentoo-99a91942cec4b0b37559e1b10011168787b18232.tar.bz2 gentoo-99a91942cec4b0b37559e1b10011168787b18232.zip | |
app-office/libreoffice: Use upstream ICU-74 patches, also fixing ICU-75
Bug: https://bugs.gentoo.org/917618
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/Manifest | 1 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-24.2.3.2.ebuild | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 8050b9ea4fc1..b45b0595b3c8 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -19,6 +19,7 @@ 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.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114 DIST libreoffice-24.2.3.2.tar.xz 280246948 BLAKE2B f0694abc23a612e303d694800f6f83a7d307c3fcce40e459a59cce76435cfdd9de57be95910152bbc5a9e124871477e4638f1deef489a19c22fbfbdf1237a91b SHA512 c0313a5f1ea0a860b40debf6bc75bc792ffb152d76fa1372e8e4574eca5c4a8a33748e74636a09e01dab1ae21e08261856c7c11b82080e6e8d6c2dd1a166782b DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6 DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747 diff --git a/app-office/libreoffice/libreoffice-24.2.3.2.ebuild b/app-office/libreoffice/libreoffice-24.2.3.2.ebuild index a59aefabed8a..b97b9926a7b0 100644 --- a/app-office/libreoffice/libreoffice-24.2.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.3.2.ebuild @@ -26,6 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-icu-74.tar.xz" [[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" # Split modules following git/tarballs; Core MUST be first! @@ -316,15 +317,16 @@ PATCHES=( "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-24.2-qtdetect.patch" - # maybe upstreamable - "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch" - # TODO: upstream "${FILESDIR}/${PN}-7.6-unused-qt5network.patch" "${FILESDIR}/${PN}-24.2-unused-qt6network.patch" # git master "${FILESDIR}/${P}-fix-bashism.patch" # bug #928733 + # bug #917618, thx to Debian: + "${WORKDIR}/${P}-icu-74/${P}-icu-74.2-reviewed-breakIterator-customizations.patch" + "${WORKDIR}/${P}-icu-74/${P}-icu-74.2-breakiterator-updates.patch" + "${WORKDIR}/${P}-icu-74/${P}-icu-74-unicode.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" |