Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages /
libxml2
Commits:
7bc1d289 by Andreas Radke at 2025-02-06T16:51:54+01:00
upgpkg: 2.13.5-4
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + libxml2-2.12.9-icu-pkgconfig.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = libxml2
pkgdesc = XML C parser and toolkit
pkgver = 2.13.5
- pkgrel = 3
+ pkgrel = 4
url = https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home
arch = x86_64
license = MIT
@@ -9,6 +9,7 @@ pkgbase = libxml2
makedepends = python
depends = bash
depends = glibc
+ depends = icu
depends = ncurses
depends = readline
depends = xz
@@ -16,9 +17,11 @@ pkgbase = libxml2
source = git+https://gitlab.gnome.org/GNOME/libxml2.git#tag=v2.13.5
source = https://www.w3.org/XML/Test/xmlts20130923.tar.gz
source = 0001-HACK-Don-t-run-fuzzing-tests.patch
+ source = libxml2-2.12.9-icu-pkgconfig.patch
b2sums =
3cf2c7a553a00ba7878fc9c9c6696db9e20932d0e190966e18c6e2c75406f737c482e5cf5be5302ea882f5d1de8132c5aec7760dbca5ca63ad2b5bade73d5934
b2sums =
63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be
b2sums =
151e84ee17051eeecfa8c62a7376ff269860f3ff6d33fb92209ff5f8dc9576a5648bbe9ffc96317695c069760ccfecaa3e6f19fb7a7c2e9f039a146d7fc8a516
+ b2sums =
a676f25de6c96ec5056b472a4819d65ca944dc5befc40c708a5c0d982d29912fcb3c602573f172abb3e62baeed3ae222dc594dc8d7f69031e86080427d86f98e
pkgname = libxml2
optdepends = python: Python bindings
=====================================
PKGBUILD
=====================================
@@ -10,7 +10,7 @@ pkgname=(
libxml2-docs
)
pkgver=2.13.5
-pkgrel=3
+pkgrel=4
pkgdesc="XML C parser and toolkit"
url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home";
arch=(x86_64)
@@ -18,7 +18,7 @@ license=(MIT)
depends=(
bash
glibc
- # icu
+ icu
ncurses
readline
xz
@@ -32,10 +32,12 @@ source=(
"git+https://gitlab.gnome.org/GNOME/libxml2.git#tag=v$pkgver";
https://www.w3.org/XML/Test/xmlts20130923.tar.gz
0001-HACK-Don-t-run-fuzzing-tests.patch
+ libxml2-2.12.9-icu-pkgconfig.patch
)
b2sums=('3cf2c7a553a00ba7878fc9c9c6696db9e20932d0e190966e18c6e2c75406f737c482e5cf5be5302ea882f5d1de8132c5aec7760dbca5ca63ad2b5bade73d5934'
'63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be'
-
'151e84ee17051eeecfa8c62a7376ff269860f3ff6d33fb92209ff5f8dc9576a5648bbe9ffc96317695c069760ccfecaa3e6f19fb7a7c2e9f039a146d7fc8a516')
+
'151e84ee17051eeecfa8c62a7376ff269860f3ff6d33fb92209ff5f8dc9576a5648bbe9ffc96317695c069760ccfecaa3e6f19fb7a7c2e9f039a146d7fc8a516'
+
'a676f25de6c96ec5056b472a4819d65ca944dc5befc40c708a5c0d982d29912fcb3c602573f172abb3e62baeed3ae222dc594dc8d7f69031e86080427d86f98e')
prepare() {
cd libxml2
@@ -46,6 +48,9 @@ prepare() {
# Do not run fuzzing tests
git apply -3 ../0001-HACK-Don-t-run-fuzzing-tests.patch
+ # fix build with icu 76.1
+ patch -Np1 -i ../libxml2-2.12.9-icu-pkgconfig.patch
+
NOCONFIGURE=1 ./autogen.sh
}
@@ -56,7 +61,7 @@ build() {
--localstatedir=/var
--disable-static
--with-history
- --without-icu
+ --with-icu
--with-legacy
--with-python=/usr/bin/python
--with-threads
=====================================
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],[:])
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/libxml2/-/commit/7bc1d289ed0bc1cf7c63c8b9f109b13cb3523785
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/libxml2/-/commit/7bc1d289ed0bc1cf7c63c8b9f109b13cb3523785
You're receiving this email because of your account on gitlab.archlinux.org.
