summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-11-10 21:10:54 +0000
committerSam James <sam@gentoo.org>2024-11-10 21:10:54 +0000
commit719f8cddede04669939001c30524c53c141f79c4 (patch)
tree94c6b9511e9a37cea66797498a32e810d2b00b15 /dev-libs/libxml2
parentdev-libs/libxml2: add 2.12.9 (diff)
downloadgentoo-719f8cddede04669939001c30524c53c141f79c4.tar.gz
gentoo-719f8cddede04669939001c30524c53c141f79c4.tar.bz2
gentoo-719f8cddede04669939001c30524c53c141f79c4.zip
dev-libs/libxml2: add 2.12.9
Bug: https://bugs.gentoo.org/943198 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/libxml2')
-rw-r--r--dev-libs/libxml2/files/libxml2-2.12.9-icu-pkgconfig.patch20
-rw-r--r--dev-libs/libxml2/libxml2-2.12.9.ebuild2
2 files changed, 21 insertions, 1 deletions
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() {