diff options
-rw-r--r-- | groups.d/251.native_packages_lib.group | 9 | ||||
-rw-r--r-- | patches/libxml2-2.12.6_pre.local.patch | 39 |
2 files changed, 43 insertions, 5 deletions
diff --git a/groups.d/251.native_packages_lib.group b/groups.d/251.native_packages_lib.group index 873deb5c..d26d8a5d 100644 --- a/groups.d/251.native_packages_lib.group +++ b/groups.d/251.native_packages_lib.group @@ -329,15 +329,14 @@ gl_cv_ld_output_def=no"}; : ${PKG_LIBWEBP_VERSION:=1.3.2}; : ${PKG_LIBWEBP_URL:=https://sources.voidlinux.org/libwebp-${PKG_LIBWEBP_VERSION}/libwebp-${PKG_LIBWEBP_VERSION}.tar.gz}; : ${PKG_LIBWEBP_CONFIGURE_ARGS_EXTRA:="--disable-gl --disable-sdl --disable-sse4.1 --enable-libwebpdecoder --enable-libwebpextras --with-pnglibdir=${PREFIX_NATIVE} --with-pngincludedir=${PREFIX_NATIVE}"}; -: ${PKG_LIBXML2_DEPENDS:="libz xz"}; -: ${PKG_LIBXML2_SHA256SUM:=0d676b10cfd13ab966907a3917bd86b17a1c22befdf42144cdc1ad5bb9e65c45}; -: ${PKG_LIBXML2_VERSION:=2.9.13}; -: ${PKG_LIBXML2_URL:=https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${PKG_LIBXML2_VERSION}/libxml2-v${PKG_LIBXML2_VERSION}.tar.gz}; +: ${PKG_LIBXML2_DEPENDS:="libz xz libiconv"}; +: ${PKG_LIBXML2_SHA256SUM:=889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb}; +: ${PKG_LIBXML2_VERSION:=2.12.6}; +: ${PKG_LIBXML2_URL:=https://download.gnome.org/sources/libxml2/${PKG_LIBXML2_VERSION%.*}/libxml2-${PKG_LIBXML2_VERSION}.tar.xz}; : ${PKG_LIBXML2_CONFIGURE_ARGS_EXTRA:="--with-python=no"}; : ${PKG_LIBXML2_INSTALL_FILES_V2:=" +%[_files]/bin/\%[_target]-xml2-config=bin/%[_target]-xml2-config m0755=bin/%[_target]-xml2-config"}; -: ${PKG_LIBXML2_IN_TREE:=1}; : ${PKG_LIBXSLT_DEPENDS:="libxml2 libgcrypt"}; : ${PKG_LIBXSLT_SHA256SUM:=3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4}; : ${PKG_LIBXSLT_VERSION:=1.1.37}; diff --git a/patches/libxml2-2.12.6_pre.local.patch b/patches/libxml2-2.12.6_pre.local.patch new file mode 100644 index 00000000..9dec6353 --- /dev/null +++ b/patches/libxml2-2.12.6_pre.local.patch @@ -0,0 +1,39 @@ +diff -ru libxml2-2.12.6.orig/configure libxml2-2.12.6/configure +--- libxml2-2.12.6.orig/configure 2024-03-15 12:16:45.000000000 +0100 ++++ libxml2-2.12.6/configure 2024-03-18 12:11:55.597105358 +0100 +@@ -15849,7 +15849,7 @@ + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_Z_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null` ++ pkg_cv_Z_CFLAGS=`$PKG_CONFIG --cflags-only-other "zlib" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -15866,7 +15866,7 @@ + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_Z_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null` ++ pkg_cv_Z_LIBS=`$PKG_CONFIG --libs-only-l "zlib" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16013,7 +16013,7 @@ + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LZMA_CFLAGS=`$PKG_CONFIG --cflags "liblzma" 2>/dev/null` ++ pkg_cv_LZMA_CFLAGS=`$PKG_CONFIG --cflags-only-other "liblzma" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16030,7 +16030,7 @@ + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LZMA_LIBS=`$PKG_CONFIG --libs "liblzma" 2>/dev/null` ++ pkg_cv_LZMA_LIBS=`$PKG_CONFIG --libs-only-l "liblzma" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes |