Thanks, applied as 649232b5a82c7ea97ffaeba3b362558d347eda9e. Michael
[sent from post-receive hook] On Sun, 16 Jun 2024 14:39:05 +0200, Christian Melki <[email protected]> wrote: > Significant changes. The major releases did some big changes, > esp. 2.12.0. Changes involves massive cleanups, speedups, > fault handling etc, etc. > Expect some fallout from this, esp. in the global handling. > Globals are quite reworked and stored in thread local storage > if available. > > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.11.8 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.1 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.2 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.3 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.4 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.5 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.6 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.7 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.8 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.13.0 > > * Forward patchset, applies cleanly. Although there > have been fixes to the problem the patch addresses, I have > not tested it. > It is very likely libxml2 can live without the patch now. > For now, it seems to work as is still. > > * License files changed. Rework licenses. It's still MIT and ISC, > but over a different set of files. Remove hash.c, add dict.c and list.c. > Copyright file had some references to copyrighted files removed. > They have been replaced. > > * Rearrange options, remove some and fix others. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/libxml2-2.11.7/0200-xml2-config-is-not-SYSROOT-aware.patch > b/patches/libxml2-2.13.0/0200-xml2-config-is-not-SYSROOT-aware.patch > similarity index 100% > rename from patches/libxml2-2.11.7/0200-xml2-config-is-not-SYSROOT-aware.patch > rename to patches/libxml2-2.13.0/0200-xml2-config-is-not-SYSROOT-aware.patch > diff --git a/patches/libxml2-2.11.7/series b/patches/libxml2-2.13.0/series > similarity index 100% > rename from patches/libxml2-2.11.7/series > rename to patches/libxml2-2.13.0/series > diff --git a/rules/libxml2.in b/rules/libxml2.in > index 54fdde42aa43..c34ab0fcc748 100644 > --- a/rules/libxml2.in > +++ b/rules/libxml2.in > @@ -50,12 +50,6 @@ config LIBXML2_DEBUG > help > Enable debugging support. > > -config LIBXML2_FEXCEPTIONS > - bool > - prompt "C++ Exception Support" > - help > - Add GCC flag -fexceptions for C++ exceptions. > - > config LIBXML2_FTP > bool > default y > @@ -97,12 +91,6 @@ config LIBXML2_LEGACY > help > Add support for deprecated APIs (compatibility) > > -config LIBXML2_MEM_DEBUG > - bool > - prompt "Memory Debugging Module" > - help > - Add the memory debugging support. > - > config LIBXML2_MINIMUM > bool > prompt "Optimize for size" > @@ -151,12 +139,6 @@ config LIBXML2_REGEXPS > > # --with-readline=DIR use readline in DIR > > -config LIBXML2_RUN_DEBUG > - bool > - prompt "Enable Runtime Debugging" > - help > - Enable runtime debugging module. > - > config LIBXML2_SAX1 > bool > default y > diff --git a/rules/libxml2.make b/rules/libxml2.make > index 5237f4b49a09..f9ca2275f55c 100644 > --- a/rules/libxml2.make > +++ b/rules/libxml2.make > @@ -16,17 +16,17 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2 > # > # Paths and names > # > -LIBXML2_VERSION := 2.11.7 > -LIBXML2_MD5 := e22f0dfcbd3e37b8fb09dcd1b3e5e9ce > +LIBXML2_VERSION := 2.13.0 > +LIBXML2_MD5 := 22a4b108240c3f2aeb1354346055b436 > LIBXML2 := libxml2-$(LIBXML2_VERSION) > LIBXML2_SUFFIX := tar.xz > LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX) > LIBXML2_DIR := $(BUILDDIR)/$(LIBXML2) > LIBXML2_LICENSE := MIT AND ISC > -# The file 'COPYING' is just a symlink on the file 'Copyright' > LIBXML2_LICENSE_FILES := \ > - file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \ > - > file://hash.c;startline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879 > + file://Copyright;md5=f437ed9058e8e5135e47c01e973376ba \ > + > file://dict.c;startline=5;endline=16;md5=6bf674402d04fa793fdc1f4d26635d33 \ > + > file://list.c;startline=4;endline=15;md5=3fca05145285fa81f48c16c86a4a70b8 > > LIBXML2_URL := \ > https://download.gnome.org/sources/libxml2/$(basename > $(LIBXML2_VERSION))/$(LIBXML2).$(LIBXML2_SUFFIX) > @@ -47,23 +47,20 @@ LIBXML2_CONF_OPT := \ > --$(call ptx/wwo, PTXCONF_LIBXML2_C14N)-c14n \ > --$(call ptx/wwo, PTXCONF_LIBXML2_CATALOG)-catalog \ > --$(call ptx/wwo, PTXCONF_LIBXML2_DEBUG)-debug \ > - --$(call ptx/wwo, PTXCONF_LIBXML2_FEXCEPTIONS)-fexceptions \ > --$(call ptx/wwo, PTXCONF_LIBXML2_FTP)-ftp \ > --$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \ > --$(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_LEGACY)-legacy \ > - --$(call ptx/wwo, PTXCONF_LIBXML2_MEM_DEBUG)-mem-debug \ > - --$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \ > + --$(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 \ > --$(call ptx/wwo, PTXCONF_LIBXML2_PUSH)-push \ > --without-python \ > --$(call ptx/wwo, PTXCONF_LIBXML2_READER)-reader \ > --$(call ptx/wwo, PTXCONF_LIBXML2_REGEXPS)-regexps \ > - --$(call ptx/wwo, PTXCONF_LIBXML2_RUN_DEBUG)-run-debug \ > --$(call ptx/wwo, PTXCONF_LIBXML2_SAX1)-sax1 \ > --$(call ptx/wwo, PTXCONF_LIBXML2_SCHEMAS)-schemas \ > --$(call ptx/wwo, PTXCONF_LIBXML2_SCHEMATRON)-schematron \ > @@ -75,9 +72,10 @@ LIBXML2_CONF_OPT := \ > --$(call ptx/wwo, PTXCONF_LIBXML2_XINCLUDE)-xinclude \ > --$(call ptx/wwo, PTXCONF_LIBXML2_XPATH)-xpath \ > --$(call ptx/wwo, PTXCONF_LIBXML2_XPTR)-xptr \ > - --$(call ptx/wwo, PTXCONF_LIBXML2_MODULES)-modules \ > - --$(call ptx/wwo, PTXCONF_LIBXML2_LZMA)-lzma \ > - --without-coverage > + --$(call ptx/wwo, PTXCONF_LIBXML2_XPTR)-xptr-locs \ > + --$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \ > + --$(call ptx/wwo, PTXCONF_LIBXML2_LEGACY)-legacy \ > + --with-tls > > ifdef PTXCONF_ICONV > # --with-iconv=yes -> does the right thing for libc-iconv
