[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/

["Sam James" <sam@gentoo.org>]

commit:     5de097998a3ed84e9af43fce547aa143b5e61c14
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 21:17:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 21:18:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de09799

dev-libs/icu: undo Requires change in .pc file

Undo change for now which exposes underlinking in consumers;
revisit when things are a bit quieter and tinderbox its removal.

Things are quite hectic atm with slotted Rust and so on, and don't
really have the energy to handle fallout from the change.

Closes: https://bugs.gentoo.org/943201
Closes: https://bugs.gentoo.org/943200
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../icu-76.1-undo-pkgconfig-change-for-now.patch   | 30 ++++++++++++++++++++++
 .../icu/{icu-76.1.ebuild => icu-76.1-r1.ebuild}    |  4 +++
 2 files changed, 34 insertions(+)

diff --git a/dev-libs/icu/files/icu-76.1-undo-pkgconfig-change-for-now.patch b/dev-libs/icu/files/icu-76.1-undo-pkgconfig-change-for-now.patch
new file mode 100644
index 000000000000..b99557871bc0
--- /dev/null
+++ b/dev-libs/icu/files/icu-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/icu-76.1.ebuild b/dev-libs/icu/icu-76.1-r1.ebuild
similarity index 95%
rename from dev-libs/icu/icu-76.1.ebuild
rename to dev-libs/icu/icu-76.1-r1.ebuild
index 077fe8d67d99..c720bcb4b581 100644
--- a/dev-libs/icu/icu-76.1.ebuild
+++ b/dev-libs/icu/icu-76.1-r1.ebuild
@@ -42,6 +42,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-76.1-remove-bashisms.patch"
 	"${FILESDIR}/${PN}-64.2-darwin.patch"
 	"${FILESDIR}/${PN}-68.1-nonunicode.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() {