commit: 723ef79cdb271b6b0e0d90610f3c1ac824d85558 Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Fri Dec 20 14:36:48 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <zhixu.liu <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/39795 Signed-off-by: Sam James <sam <AT> 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 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>[email protected]</email> + <name>Z. Liu</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>[email protected]</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <changelog>https://dickey.his.com/cdk/CHANGES.html</changelog> <remote-id type="github">ThomasDickey/cdk-snapshots</remote-id>
