From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A8370158042 for ; Mon, 11 Nov 2024 00:55:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A908EE08B1; Mon, 11 Nov 2024 00:55:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 94473E08B1 for ; Mon, 11 Nov 2024 00:55:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF7CC33BEED for ; Mon, 11 Nov 2024 00:55:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3814618DD for ; Mon, 11 Nov 2024 00:55:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1731286451.896413d538362d1b621eadec054033d6549198b6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/icu-layoutex/, dev-libs/icu-layoutex/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild dev-libs/icu-layoutex/icu-layoutex-76.1.ebuild X-VCS-Directories: dev-libs/icu-layoutex/files/ dev-libs/icu-layoutex/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 896413d538362d1b621eadec054033d6549198b6 X-VCS-Branch: master Date: Mon, 11 Nov 2024 00:55:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ff2ffcd-60d7-4bf2-8681-c7cc411ad8c4 X-Archives-Hash: 07fba586f7f1abb3f1cd77c30c1e95c0 commit: 896413d538362d1b621eadec054033d6549198b6 Author: Sam James gentoo org> AuthorDate: Mon Nov 11 00:54:11 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 11 00:54:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=896413d5 dev-libs/icu-layoutex: undo Requires change in .pc file Like in 5de097998a3ed84e9af43fce547aa143b5e61c14. Signed-off-by: Sam James gentoo.org> ...youtex-76.1-undo-pkgconfig-change-for-now.patch | 30 ++++++++++++++++++++++ ...tex-76.1.ebuild => icu-layoutex-76.1-r1.ebuild} | 8 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) 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 similarity index 93% rename from dev-libs/icu-layoutex/icu-layoutex-76.1.ebuild rename to 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