From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 07 Dec 2023 12:14:05 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rBCKS-006uYg-1R for lore@lore.pengutronix.de; Thu, 07 Dec 2023 12:14:05 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rBCKS-00065B-Rk; Thu, 07 Dec 2023 12:14:04 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rBCKM-000651-Ai; Thu, 07 Dec 2023 12:13:58 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rBCKL-00EAw2-Sz; Thu, 07 Dec 2023 12:13:57 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rBCKL-007JTi-2f; Thu, 07 Dec 2023 12:13:57 +0100 Date: Thu, 7 Dec 2023 12:13:57 +0100 From: Michael Olbrich To: Christian Melki Message-ID: Mail-Followup-To: Christian Melki , ptxdist@pengutronix.de References: <20231204205848.3625237-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231204205848.3625237-1-christian.melki@t2data.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH] libxml2: Version bump. 2.11.6 -> 2.12.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false On Mon, Dec 04, 2023 at 09:58:48PM +0100, Christian Melki wrote: > Major rework, I guess mostly speed related. > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0 > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.1 > > May break stuff, proceed with caution. > Globals are quite reworked and stored in thread local storage > if available. > > * 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. > > * 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. libxslt fails to build with this: In file included from imports.c:22: imports.c: In function 'xsltParseStylesheetImport': xslt.h:54:28: error: 'XML_PARSE_NOENT' undeclared (first use in this function); did you mean 'XML_IO_ENOENT'? imports.c:123:53: note: in expansion of macro 'XSLT_PARSE_OPTIONS' xslt.h:54:28: note: each undeclared identifier is reported only once for each function it appears in imports.c:123:53: note: in expansion of macro 'XSLT_PARSE_OPTIONS' xslt.h:54:46: error: 'XML_PARSE_DTDLOAD' undeclared (first use in this function) imports.c:123:53: note: in expansion of macro 'XSLT_PARSE_OPTIONS' xslt.h:54:66: error: 'XML_PARSE_DTDATTR' undeclared (first use in this function) imports.c:123:53: note: in expansion of macro 'XSLT_PARSE_OPTIONS' xslt.h:54:86: error: 'XML_PARSE_NOCDATA' undeclared (first use in this function) imports.c:123:53: note: in expansion of macro 'XSLT_PARSE_OPTIONS' make[2]: *** [Makefile:592: imports.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... Maybe that needs updating as well? I've not looked into this yet. Michael > Signed-off-by: Christian Melki > --- > .../0200-xml2-config-is-not-SYSROOT-aware.patch | 0 > patches/{libxml2-2.11.6 => libxml2-2.12.1}/series | 0 > rules/libxml2.make | 10 +++++----- > 3 files changed, 5 insertions(+), 5 deletions(-) > rename patches/{libxml2-2.11.6 => libxml2-2.12.1}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%) > rename patches/{libxml2-2.11.6 => libxml2-2.12.1}/series (100%) > > diff --git a/patches/libxml2-2.11.6/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.12.1/0200-xml2-config-is-not-SYSROOT-aware.patch > similarity index 100% > rename from patches/libxml2-2.11.6/0200-xml2-config-is-not-SYSROOT-aware.patch > rename to patches/libxml2-2.12.1/0200-xml2-config-is-not-SYSROOT-aware.patch > diff --git a/patches/libxml2-2.11.6/series b/patches/libxml2-2.12.1/series > similarity index 100% > rename from patches/libxml2-2.11.6/series > rename to patches/libxml2-2.12.1/series > diff --git a/rules/libxml2.make b/rules/libxml2.make > index 080b89aa2..d54f9a8ef 100644 > --- a/rules/libxml2.make > +++ b/rules/libxml2.make > @@ -16,17 +16,17 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2 > # > # Paths and names > # > -LIBXML2_VERSION := 2.11.6 > -LIBXML2_MD5 := 948141d54edae15daaee80ea216645eb > +LIBXML2_VERSION := 2.12.1 > +LIBXML2_MD5 := 98b6b964faef7e76f6afe791f9bca126 > 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=fec7ecfe714722b2bb0aaff7d200c701 \ > + 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) > -- > 2.34.1 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |