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 384701580FD for ; Sat, 21 Dec 2024 02:54:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48960E0837; Sat, 21 Dec 2024 02:54:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 5560FE0837 for ; Sat, 21 Dec 2024 02:54:56 +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 4B34F33FEF1 for ; Sat, 21 Dec 2024 02:54:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA529AF5 for ; Sat, 21 Dec 2024 02:54:53 +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: <1734749641.723ef79cdb271b6b0e0d90610f3c1ac824d85558.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/cdk/files/, dev-libs/cdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/cdk/cdk-5.0.20240619-r1.ebuild dev-libs/cdk/cdk-5.0.20240619.ebuild dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch dev-libs/cdk/metadata.xml X-VCS-Directories: dev-libs/cdk/files/ dev-libs/cdk/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 723ef79cdb271b6b0e0d90610f3c1ac824d85558 X-VCS-Branch: master Date: Sat, 21 Dec 2024 02:54:53 +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: 84d57d88-ffe6-4b2c-a842-e99020e44b47 X-Archives-Hash: a9644184fc56347e7dbd9cf571de46a7 commit: 723ef79cdb271b6b0e0d90610f3c1ac824d85558 Author: Z. Liu gmail com> AuthorDate: Fri Dec 20 14:36:48 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 21 02:54:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=723ef79c dev-libs/cdk: fix handling of -lcdk or -lcdkw lib name is depend on USE flag 'unicode', but for unknown reason, upstream remove XLIB in release 5.0.20240619 (always -lcdk instead of -lcdkw if unicode is enabled), which cause link failed if USE="unicode". Closes: https://bugs.gentoo.org/831226 Signed-off-by: Z. Liu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/39795 Signed-off-by: Sam James gentoo.org> ....20240619.ebuild => cdk-5.0.20240619-r1.ebuild} | 4 ++++ dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch | 28 ++++++++++++++++++++++ dev-libs/cdk/metadata.xml | 9 ++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dev-libs/cdk/cdk-5.0.20240619.ebuild b/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild similarity index 96% rename from dev-libs/cdk/cdk-5.0.20240619.ebuild rename to dev-libs/cdk/cdk-5.0.20240619-r1.ebuild index a490d9d8bb0e..b2fe41e7d07a 100644 --- a/dev-libs/cdk/cdk-5.0.20240619.ebuild +++ b/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild @@ -26,6 +26,10 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) " +PATCHES=( + "${FILESDIR}/${PN}-5.0.20240619-xlib.patch" +) + src_configure() { if [[ ${CHOST} == *-*-darwin* ]] ; then export ac_cv_prog_LIBTOOL=glibtool diff --git a/dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch b/dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch new file mode 100644 index 000000000000..e346fd8e24f4 --- /dev/null +++ b/dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/831226 + +lib name is depend on USE flag 'unicode', but for unknown reason, +upstream remove XLIB in release 5.0.20240619 (always -lcdk instead +of -lcdkw if unicode is enabled), which cause link failed if +USE="unicode". + +diff --git a/cdk-config.in b/cdk-config.in +index 19b2972..aa0b2c8 100644 +--- a/cdk-config.in ++++ b/cdk-config.in +@@ -41,6 +41,7 @@ same_prefix=yes + same_exec_prefix=yes + + THIS="@PACKAGE@" ++XLIB="@LIB_ROOTNAME@" + + [ $# = 0 ] && exec @SHELL@ "$0" --error + +@@ -66,7 +67,7 @@ while [ $# -gt 0 ]; do + + eval LDFLAGS='"@LDFLAGS@"' + eval LIBS='"@LIBS@"' +- LIBS="-l${THIS} $LIBS" ++ LIBS="-l${XLIB} $LIBS" + + # If the directory given by --libdir is not in the LDFLAGS+LIBS set, + # prepend it to LDFLAGS to help link this application's library. diff --git a/dev-libs/cdk/metadata.xml b/dev-libs/cdk/metadata.xml index f683d1054e8f..69097ea69330 100644 --- a/dev-libs/cdk/metadata.xml +++ b/dev-libs/cdk/metadata.xml @@ -1,7 +1,14 @@ - + + zhixu.liu@gmail.com + Z. Liu + + + proxy-maint@gentoo.org + Proxy Maintainers + https://dickey.his.com/cdk/CHANGES.html ThomasDickey/cdk-snapshots