diff options
Diffstat (limited to 'system/libxml2')
| -rw-r--r-- | system/libxml2/APKBUILD | 10 | ||||
| -rw-r--r-- | system/libxml2/icu-77.patch | 87 |
2 files changed, 93 insertions, 4 deletions
diff --git a/system/libxml2/APKBUILD b/system/libxml2/APKBUILD index 02b24e0ec..3c01c9ae7 100644 --- a/system/libxml2/APKBUILD +++ b/system/libxml2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxml2 -pkgver=2.13.3 +pkgver=2.13.7 pkgrel=0 pkgdesc="XML parsing library" url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" @@ -9,12 +9,12 @@ arch="all" options="!strip" license="MIT" depends="" -depends_dev="zlib-dev icu-dev" checkdepends="perl libarchive" -makedepends="$depends_dev python3-dev" +makedepends="$depends_dev icu-dev python3-dev zlib-dev" subpackages="$pkgname-doc $pkgname-dev py3-libxml2:py" provides="$pkgname-utils=$pkgver-r$pkgrel" source="https://download.gnome.org/sources/libxml2/${pkgver%.*}/libxml2-$pkgver.tar.xz + icu-77.patch python-segfault-fix.patch " @@ -45,6 +45,7 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --with-icu \ + --with-zlib \ --without-iconv \ --with-python=/usr/bin/python3 \ --enable-static @@ -65,5 +66,6 @@ py() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="682da3fc0e15852c3963207edb66aa201cabe9ec16f1fb2ca97d6d1273daa33fff6ed70e91589204cc09bf49961dc163b5e3d9ee38fdedac957453b0fd64b36d libxml2-2.13.3.tar.xz +sha512sums="6e69ed38cdf2aaa5df7e26b654a7aadd2d80131619184380bafc6a22811acb6b7286c819175c3b37edb194019a93ba6085852a0281934d6bb36d0b52ce138541 libxml2-2.13.7.tar.xz +226d72c42db8d9161ed7429869210bccec17e403b83df5525e2c8c7ac22326b7345f15b2072ba6d0467dd786285b02bccc8f2a4d1c4a627f4700f31f08abea9f icu-77.patch 384b3d2031cd8f77528190bbb7652faa9ccb22bc604bcf4927e59046d38830dac38010828fe1568b6514976f725981a6d3ac1aa595d31477a36db2afe491452c python-segfault-fix.patch" diff --git a/system/libxml2/icu-77.patch b/system/libxml2/icu-77.patch new file mode 100644 index 000000000..67040ee59 --- /dev/null +++ b/system/libxml2/icu-77.patch @@ -0,0 +1,87 @@ +--- libxml2-2.13.7/configure.old 2025-03-27 08:37:45.000000000 -0500 ++++ libxml2-2.13.7/configure 2025-05-31 00:21:33.827860625 -0500 +@@ -1711,7 +1711,7 @@ + LZMA_LIBS linker flags for LZMA, overriding pkg-config + ICU_CFLAGS C compiler flags for ICU, overriding pkg-config + ICU_LIBS linker flags for ICU, overriding pkg-config +- ICU_DEFS value of DEFS for icu-i18n, overriding pkg-config ++ ICU_DEFS value of DEFS for icu-uc, overriding pkg-config + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -16281,19 +16281,19 @@ + # If this succeeeds, we ignore the WITH_ICU directory. + + pkg_failed=no +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icu-i18n" >&5 +-printf %s "checking for icu-i18n... " >&6; } ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icu-uc" >&5 ++printf %s "checking for icu-uc... " >&6; } + + if test -n "$ICU_CFLAGS"; then + pkg_cv_ICU_CFLAGS="$ICU_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-uc") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16305,12 +16305,12 @@ + pkg_cv_ICU_LIBS="$ICU_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-uc") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16331,9 +16331,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n" 2>&1` ++ ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-uc" 2>&1` + else +- ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n" 2>&1` ++ ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-uc" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ICU_PKG_ERRORS" >&5 +@@ -16349,18 +16349,18 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "yes" >&6; } + +- WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-i18n" ++ WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-uc" + + if test -n "$ICU_DEFS"; then + pkg_cv_ICU_DEFS="$ICU_DEFS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-uc") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_DEFS=`$PKG_CONFIG --variable="DEFS" "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_DEFS=`$PKG_CONFIG --variable="DEFS" "icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes |