diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-11-11 03:02:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-11 03:02:58 +0000 |
| commit | 0ab98a20dbfb8c64ab93e02280abb4ff18652ae0 (patch) | |
| tree | a5d3bdd0c06f78202d2cbb4feeed80583ee8f5a5 /dev-libs/icu-layoutex | |
| parent | eeb9605e496b284bf379a3b346a40638413e870e (diff) | |
gentoo auto-resync : 11:11:2024 - 03:02:58
Diffstat (limited to 'dev-libs/icu-layoutex')
| -rw-r--r-- | dev-libs/icu-layoutex/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch | 30 | ||||
| -rw-r--r-- | dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild (renamed from dev-libs/icu-layoutex/icu-layoutex-76.1.ebuild) | 8 |
3 files changed, 39 insertions, 2 deletions
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest index 946d5df70822..76ac2324f09d 100644 --- a/dev-libs/icu-layoutex/Manifest +++ b/dev-libs/icu-layoutex/Manifest @@ -1,5 +1,6 @@ AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc AUX icu-layoutex-76.1-remove-bashisms.patch 3382 BLAKE2B fda519c35f7b8d617007fcfa91dd6d36da7eae457f616b437ac32c4de1808d5e7d4b31cb6b560fbf1b2940e69b6fcb8fb51b4c9ad2671aa43aa89cf056934999 SHA512 223ab2e184945ad7039a72dafaf3478bbcab4b4577929e0aac8b508f9cac678a770ff9ce307d373e9ab1d8e42a81740251bb70e2244592cda91ad15a6af1fd2d +AUX icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch 989 BLAKE2B 66348d618956c593b3cca1740ea6805be00c8b5ae94a040a9a37ab928c94e439233c7aa53e8074cb773da89ff42a16d15c3bb1cc597405c1929bb14ba755d61d SHA512 8c4054752e78c89e3b3731f55ba4a96a9f71800ef7734a042343b759f5051d70daec6300b64c1875abc7c012a90010b05ad94c2729cbd8e99c53c8d8b6650790 DIST icu4c-74_2-src.tgz 26529443 BLAKE2B 08790dd3634037177eaec428651afe0da1f71dbad3423bde7ea5a6d49eab5dc011f72b175760fc55f6d8d7d820f7f3dfc369a80a1f7cb2f9f933644beb3d3711 SHA512 e6c7876c0f3d756f3a6969cad9a8909e535eeaac352f3a721338b9cbd56864bf7414469d29ec843462997815d2ca9d0dab06d38c37cdd4d8feb28ad04d8781b0 DIST icu4c-74_2-src.tgz.asc 659 BLAKE2B 0723204ce19d7bd4b1989e00b5ab084cc5b154c214129632a7f7ce31c151c8a4b9e0033d49872db728a3787809dbad2320f1d848561c84f94797c7e006749b94 SHA512 b249a61aba711b34599c3c0fbc113a52a83e59cb7bbda914ca74f534c1f474e6821d663dc7f078608b24393703654a43c2b793ca3d3f3be761393b6a73862ecc DIST icu4c-75_1-src.tgz 26568378 BLAKE2B 2772b52bf59407188511359ec54bea432bc70ba81610015bb51192f7aff33d5e4b08840cf3bfed3de7f9a91b430b6a6efe9dd75fdc53327d4c9f8fbf54d96d18 SHA512 70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45 @@ -8,5 +9,5 @@ DIST icu4c-76_1-src.tgz 27437767 BLAKE2B 67223391123d2d2c75107fc4b87510b1d8d5203 DIST icu4c-76_1-src.tgz.asc 228 BLAKE2B 37a058e22da5ad122e3df6de2cb3979fa734b32e4e81d91201d2095fbf20ef2dbcba4579efab3041193e49c388d09618c965ddf082a8362aa82b694184804fa7 SHA512 c4bd81d4e98d7e37a6ba9540748c4ce1eb740d70bd689a13e2e51da76503b6e0287afd4d1cd3af4540210f37626dec998fcbd7269976cb801f238b789e604489 EBUILD icu-layoutex-74.2.ebuild 3644 BLAKE2B abdb16ba65a5023f701fd74c56fd4efeee9ab188268ff0edcf1d3ff433bede5c060e7ef7164dcc9293ac090d98bdff023e197ea9be4f41eff3062759d8bbc2e9 SHA512 71b8d7b9358a5e83b00237ace55e265b1f0105d1a958e1c11b6438bf849ec21e8ef9cd3b85528b47405097aea23414fe021b41f761d7b4f233648624ed8dd4d4 EBUILD icu-layoutex-75.1.ebuild 3529 BLAKE2B 7c0c4eae5c1436f11974ffafc0e024182967ead8b3f78a4ac7ffe1854ee42f84f637542cef52d45fc0b587bfbfc5a0e22de6ba9f5cc4768fe379c7f12fcb1640 SHA512 9130422963c9b1c8c397a9a7ae0d937e889c04304cdec2416154f7ba83b707a63faa96f8fee322aa26de85e4ca895fe0c3c632217d2e997e7c26ab5688d13db5 -EBUILD icu-layoutex-76.1.ebuild 3653 BLAKE2B 5f2c44f87b65ad68d3e76595ca65a51a17c38652fc32b398db0c1087594304981b813753f9f0f81b861e45c9f8bfda9c9870583a10d7b96556719ff69e71b063 SHA512 5dfe2bbf5de289741c698ddfd3b1a879a6282d7ef0591a1db61b267adbf0366a84896fc237a338c2e3477c671bb51e1eea850042adbb6ac4ba4ce2079d32096c +EBUILD icu-layoutex-76.1-r1.ebuild 3849 BLAKE2B a79aee8d77ed83ca6769a206d7d3da321c0f60e2f7f329f99238dfce4aa44341aeedfef346604dd3acf34170510cc4c8a51b16479557e5bc49e2c8545ce7cd7d SHA512 d6b565f16630a23726abb52c31696c570b2dbba28cf465f8b084c4f313cccb708933c2a661f3b7cdd415971bfc046a86b2c054d3d5134238278ec7e9f202784d MISC metadata.xml 336 BLAKE2B df52385ac9930c85fc8cb8799f5fd083e99bfe1bacd63519001f91b841cacdc50d6b7ed32f3520372cbab48d270bb05fd0896eaec55046ce1eac03af4502365e SHA512 80d8e03229a72e9acd1429f7ed697df59e98899b135bb40367e95d6eed63aa011efd2121601be68e685350b6eadd46e6f39c036f86ff18bc3c85410e88008c7e diff --git a/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch b/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch new file mode 100644 index 000000000000..b99557871bc0 --- /dev/null +++ b/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch @@ -0,0 +1,30 @@ +https://github.com/chimera-linux/cports/blob/master/main/icu/patches/pc.patch + +""" +for some reason enable-shared only emits a requires.private here now and things +underlink icu-uc libs when using other icu libs, even though the deps are correct +this is https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56 , +consumers probably have to be explicit about -i18n -uc use now instead of it +being implicit, but just undo .private for now +""" +--- a/Makefile.in ++++ b/Makefile.in +@@ -290,7 +290,7 @@ + ifeq ($(ENABLE_SHARED),) + @echo "Requires: icu-uc" >> $@ + else +- @echo "Requires.private: icu-uc" >> $@ ++ @echo "Requires: icu-uc" >> $@ + endif + @echo "Libs:" '-L$${libdir}' "${ICULIBS_I18N}" >> $@ + @echo $@ updated. +@@ -302,7 +302,7 @@ + ifeq ($(ENABLE_SHARED),) + @echo "Requires: icu-i18n" >> $@ + else +- @echo "Requires.private: icu-i18n" >> $@ ++ @echo "Requires: icu-i18n" >> $@ + endif + @echo "Libs:" '-L$${libdir}' "${ICULIBS_IO}" >> $@ + @echo $@ updated. + diff --git a/dev-libs/icu-layoutex/icu-layoutex-76.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild index fe8903689de5..386834c67bb3 100644 --- a/dev-libs/icu-layoutex/icu-layoutex-76.1.ebuild +++ b/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild @@ -34,7 +34,13 @@ BDEPEND=" verify-sig? ( >=sec-keys/openpgp-keys-icu-20241110 ) " -PATCHES=( "${FILESDIR}/${PN}-76.1-remove-bashisms.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-76.1-remove-bashisms.patch" + + # Undo change for now which exposes underlinking in consumers; + # revisit when things are a bit quieter and tinderbox its removal. + "${FILESDIR}/${PN}-76.1-undo-pkgconfig-change-for-now.patch" +) src_prepare() { default |