commit: 719f8cddede04669939001c30524c53c141f79c4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Nov 10 21:10:54 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Nov 10 21:10:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719f8cdd
dev-libs/libxml2: add 2.12.9 Bug: https://bugs.gentoo.org/943198 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libxml2/files/libxml2-2.12.9-icu-pkgconfig.patch | 20 ++++++++++++++++++++ dev-libs/libxml2/libxml2-2.12.9.ebuild | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dev-libs/libxml2/files/libxml2-2.12.9-icu-pkgconfig.patch b/dev-libs/libxml2/files/libxml2-2.12.9-icu-pkgconfig.patch new file mode 100644 index 000000000000..d00f37bfb681 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.12.9-icu-pkgconfig.patch @@ -0,0 +1,20 @@ +Needed with icu-76.1 at least. Not clear why it worked before. + +/var/tmp/portage/dev-libs/libxml2-2.11.9/work/libxml2-2.11.9-abi_x86_32.x86/.libs/runtest: + symbol lookup error: /var/tmp/portage/dev-libs/libxml2-2.11.9/work/libxml2-2.11.9-abi_x86_32.x86/.libs/libxml2.so.2: undefined symbol: UCNV_FROM_U_CALLBACK_STOP +--- a/configure.ac ++++ b/configure.ac +@@ -1108,10 +1108,10 @@ if test "$with_icu" = "no" || test "$with_icu" = "" ; then + else + # Try pkg-config first so that static linking works. + # If this succeeeds, we ignore the WITH_ICU directory. +- PKG_CHECK_MODULES([ICU], [icu-i18n], [ +- WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-i18n" ++ PKG_CHECK_MODULES([ICU], [icu-uc icu-i18n], [ ++ WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-uc icu-i18n" + m4_ifdef([PKG_CHECK_VAR], +- [PKG_CHECK_VAR([ICU_DEFS], [icu-i18n], [DEFS])]) ++ [PKG_CHECK_VAR([ICU_DEFS], [icu-uc icu-i18n], [DEFS])]) + if test "x$ICU_DEFS" != "x"; then + ICU_CFLAGS="$ICU_CFLAGS $ICU_DEFS" + fi],[:]) diff --git a/dev-libs/libxml2/libxml2-2.12.9.ebuild b/dev-libs/libxml2/libxml2-2.12.9.ebuild index 4b3f77ea7ca8..1f7c6270c0cd 100644 --- a/dev-libs/libxml2/libxml2-2.12.9.ebuild +++ b/dev-libs/libxml2/libxml2-2.12.9.ebuild @@ -61,7 +61,7 @@ MULTILIB_CHOST_TOOLS=( ) PATCHES=( - "${FILESDIR}"/${PN}-2.11.9-icu-pkgconfig.patch + "${FILESDIR}"/${PN}-2.12.9-icu-pkgconfig.patch ) src_unpack() {
