https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.15.0/NEWS
* License files hashes changed. Author name instead of email. * LZMA was removed from code. * Pin down option and disable docs building. * Forward patchset, applies cleanly. Signed-off-by: Christian Melki <[email protected]> --- .../0200-xml2-config-is-not-SYSROOT-aware.patch | 0 patches/{libxml2-2.14.6 => libxml2-2.15.0}/series | 0 rules/libxml2.in | 7 ------- rules/libxml2.make | 10 +++++----- 4 files changed, 5 insertions(+), 12 deletions(-) rename patches/{libxml2-2.14.6 => libxml2-2.15.0}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%) rename patches/{libxml2-2.14.6 => libxml2-2.15.0}/series (100%) diff --git a/patches/libxml2-2.14.6/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.15.0/0200-xml2-config-is-not-SYSROOT-aware.patch similarity index 100% rename from patches/libxml2-2.14.6/0200-xml2-config-is-not-SYSROOT-aware.patch rename to patches/libxml2-2.15.0/0200-xml2-config-is-not-SYSROOT-aware.patch diff --git a/patches/libxml2-2.14.6/series b/patches/libxml2-2.15.0/series similarity index 100% rename from patches/libxml2-2.14.6/series rename to patches/libxml2-2.15.0/series diff --git a/rules/libxml2.in b/rules/libxml2.in index 649b12441..ce08ba163 100644 --- a/rules/libxml2.in +++ b/rules/libxml2.in @@ -7,7 +7,6 @@ menuconfig LIBXML2 select LIBC_DL if LIBXML2_MODULES select READLINE if LIBXML2_HISTORY select ZLIB if LIBXML2_ZLIB - select XZ if LIBXML2_LZMA help Libxml2 is an XML C parser and toolkit. XML itself is a metalanguage to design markup languages, i.e. text @@ -223,12 +222,6 @@ config LIBXML2_ZLIB default y prompt "zlib (compression) support" -config LIBXML2_LZMA - bool - prompt "lzma (compression) support" - help - LZMA (compression) support with liblzma from XZ tools. - config LIBXML2_XMLLINT bool prompt "install xmllint" diff --git a/rules/libxml2.make b/rules/libxml2.make index e8609f4e4..52c2d3026 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2 # # Paths and names # -LIBXML2_VERSION := 2.14.6 -LIBXML2_MD5 := a2bb2b6cb8fc7be1fafa14f500e4f7c5 +LIBXML2_VERSION := 2.15.0 +LIBXML2_MD5 := 4f44fc1e16ed59c91022e4e89864bcdb LIBXML2 := libxml2-$(LIBXML2_VERSION) LIBXML2_SUFFIX := tar.xz LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX) @@ -25,8 +25,8 @@ LIBXML2_DIR := $(BUILDDIR)/$(LIBXML2) LIBXML2_LICENSE := MIT AND ISC LIBXML2_LICENSE_FILES := \ file://Copyright;md5=5873615e8a9ecbf5c8857c4312ee05d6 \ - file://dict.c;startline=5;endline=16;md5=6bf674402d04fa793fdc1f4d26635d33 \ - file://list.c;startline=4;endline=15;md5=3fca05145285fa81f48c16c86a4a70b8 + file://dict.c;startline=5;endline=16;md5=052d1599b0684de2eb1c1e7176aa5006 \ + file://list.c;startline=4;endline=15;md5=2c23bb052c68eec2ead1d4972b7f5bcd LIBXML2_URL := \ https://download.gnome.org/sources/libxml2/$(basename $(LIBXML2_VERSION))/$(LIBXML2).$(LIBXML2_SUFFIX) @@ -46,13 +46,13 @@ LIBXML2_CONF_OPT := \ --$(call ptx/wwo, PTXCONF_LIBXML2_C14N)-c14n \ --$(call ptx/wwo, PTXCONF_LIBXML2_CATALOG)-catalog \ --$(call ptx/wwo, PTXCONF_LIBXML2_DEBUG)-debug \ + --without-docs \ --$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \ --$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-readline \ --$(call ptx/wwo, PTXCONF_LIBXML2_HTML)-html \ --$(call ptx/wwo, PTXCONF_LIBXML2_HTTP)-http \ --without-icu \ --$(call ptx/wwo, PTXCONF_LIBXML2_ISO8859X)-iso8859x \ - --$(call ptx/wwo, PTXCONF_LIBXML2_LZMA)-lzma \ --$(call ptx/wwo, PTXCONF_LIBXML2_MODULES)-modules \ --$(call ptx/wwo, PTXCONF_LIBXML2_OUTPUT)-output \ --$(call ptx/wwo, PTXCONF_LIBXML2_PATTERN)-pattern \ -- 2.43.0
