From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 09 May 2025 09:41:13 +0200 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 1uDIM5-003j2e-2r for lore@lore.pengutronix.de; Fri, 09 May 2025 09:41:13 +0200 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 1uDIM5-0004dB-M7; Fri, 09 May 2025 09:41:13 +0200 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 1uDILx-0004cd-DE; Fri, 09 May 2025 09:41:05 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uDILx-001qyq-0Q; Fri, 09 May 2025 09:41:05 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1uDILx-00BYuF-0H; Fri, 09 May 2025 09:41:05 +0200 Date: Fri, 9 May 2025 09:41:05 +0200 From: Michael Olbrich To: Christian Melki Message-ID: References: <20250404204714.2096268-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250404204714.2096268-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 v2] libxml2: Version bump. 2.13.6 -> 2.14.0 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 Hi, On Fri, Apr 04, 2025 at 10:47:14PM +0200, Christian Melki wrote: > Moving ahead. Deprecating a bunch of stuff, adding new. > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.0 > > * Remove deprecated options. XML (DOM) trees seem to be always enabled. > > * Add relax-ng as a non-default option. Probably soon deprecated anyway. > > * Move patchset, applies cleanly. > > * License hash changed. Contributor list changed. There are some more changes that are needed. "history" seems to need readline now, so I had to add this: diff --git a/rules/libxml2.in b/rules/libxml2.in index ee6a43d69360..716fd72d7905 100644 --- a/rules/libxml2.in +++ b/rules/libxml2.in @@ -5,6 +5,7 @@ menuconfig LIBXML2 prompt "libxml2 " select LIBC_M select LIBC_DL if LIBXML2_MODULES + select READLINE if LIBXML2_HISTORY select ZLIB if LIBXML2_ZLIB select XZ if LIBXML2_LZMA help diff --git a/rules/libxml2.make b/rules/libxml2.make index d033701dacf1..accc916f819d 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -47,6 +47,7 @@ LIBXML2_CONF_OPT := \ --$(call ptx/wwo, PTXCONF_LIBXML2_CATALOG)-catalog \ --$(call ptx/wwo, PTXCONF_LIBXML2_DEBUG)-debug \ --$(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 \ Then it built but my checker complained about a missing libhistory.so.8. At that point I dropped the patches because I was just about to leave on vacation and wanted to merge the rest. Can you take a look at that? I presume that libxml2 will build that library when PTXCONF_LIBXML2_HISTORY is enabled now. And please squash all the followup version bumps into the patch. Michael > Signed-off-by: Christian Melki > --- > ...200-xml2-config-is-not-SYSROOT-aware.patch | 0 > .../{libxml2-2.13.6 => libxml2-2.14.0}/series | 0 > rules/libxml2.in | 21 +++++-------------- > rules/libxml2.make | 11 ++++------ > 4 files changed, 9 insertions(+), 23 deletions(-) > rename patches/{libxml2-2.13.6 => libxml2-2.14.0}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%) > rename patches/{libxml2-2.13.6 => libxml2-2.14.0}/series (100%) > > diff --git a/patches/libxml2-2.13.6/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.14.0/0200-xml2-config-is-not-SYSROOT-aware.patch > similarity index 100% > rename from patches/libxml2-2.13.6/0200-xml2-config-is-not-SYSROOT-aware.patch > rename to patches/libxml2-2.14.0/0200-xml2-config-is-not-SYSROOT-aware.patch > diff --git a/patches/libxml2-2.13.6/series b/patches/libxml2-2.14.0/series > similarity index 100% > rename from patches/libxml2-2.13.6/series > rename to patches/libxml2-2.14.0/series > diff --git a/rules/libxml2.in b/rules/libxml2.in > index c34ab0fcc..ee6a43d69 100644 > --- a/rules/libxml2.in > +++ b/rules/libxml2.in > @@ -50,13 +50,6 @@ config LIBXML2_DEBUG > help > Enable debugging support. > > -config LIBXML2_FTP > - bool > - default y > - prompt "FTP Support" > - help > - Add FTP support. > - > config LIBXML2_HISTORY > bool > prompt "History support for xmlling shell" > @@ -137,7 +130,11 @@ config LIBXML2_REGEXPS > help > Add support for Regular Expressions. > > -# --with-readline=DIR use readline in DIR > +config LIBXML2_RELAXNG > + bool > + prompt "Relax-NG support" > + help > + Add support Relax-NG schema for XML. > > config LIBXML2_SAX1 > bool > @@ -176,14 +173,6 @@ config LIBXML2_THREADS_ALLOC > help > Add per-thread memory. > > -config LIBXML2_DOM > - bool > - default y > - # FIXME: http://bugzilla.gnome.org/show_bug.cgi?id=545581 > - #prompt "DOM API" > - help > - Add the DOM tree manipulation API. > - > config LIBXML2_DTD > bool > default y > diff --git a/rules/libxml2.make b/rules/libxml2.make > index d391bcfd2..d033701da 100644 > --- a/rules/libxml2.make > +++ b/rules/libxml2.make > @@ -16,15 +16,15 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2 > # > # Paths and names > # > -LIBXML2_VERSION := 2.13.6 > -LIBXML2_MD5 := 85dffa2387ff756bdf8b3b247594914a > +LIBXML2_VERSION := 2.14.0 > +LIBXML2_MD5 := 900841340dc0ec0a8e04bad035510bb4 > LIBXML2 := libxml2-$(LIBXML2_VERSION) > LIBXML2_SUFFIX := tar.xz > LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX) > LIBXML2_DIR := $(BUILDDIR)/$(LIBXML2) > LIBXML2_LICENSE := MIT AND ISC > LIBXML2_LICENSE_FILES := \ > - file://Copyright;md5=f437ed9058e8e5135e47c01e973376ba \ > + file://Copyright;md5=5873615e8a9ecbf5c8857c4312ee05d6 \ > file://dict.c;startline=5;endline=16;md5=6bf674402d04fa793fdc1f4d26635d33 \ > file://list.c;startline=4;endline=15;md5=3fca05145285fa81f48c16c86a4a70b8 > > @@ -42,12 +42,10 @@ LIBXML2_CONF_TOOL := autoconf > LIBXML2_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-static \ > - $(GLOBAL_IPV6_OPTION) \ > --oldincludedir=$(SYSROOT)/usr/include \ > --$(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_FTP)-ftp \ > --$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \ > --$(call ptx/wwo, PTXCONF_LIBXML2_HTML)-html \ > --$(call ptx/wwo, PTXCONF_LIBXML2_HTTP)-http \ > @@ -61,18 +59,17 @@ LIBXML2_CONF_OPT := \ > --without-python \ > --$(call ptx/wwo, PTXCONF_LIBXML2_READER)-reader \ > --$(call ptx/wwo, PTXCONF_LIBXML2_REGEXPS)-regexps \ > + --$(call ptx/wwo, PTXCONF_LIBXML2_RELAXNG)-relaxng \ > --$(call ptx/wwo, PTXCONF_LIBXML2_SAX1)-sax1 \ > --$(call ptx/wwo, PTXCONF_LIBXML2_SCHEMAS)-schemas \ > --$(call ptx/wwo, PTXCONF_LIBXML2_SCHEMATRON)-schematron \ > --$(call ptx/wwo, PTXCONF_LIBXML2_THREADS)-threads \ > --$(call ptx/wwo, PTXCONF_LIBXML2_THREADS_ALLOC)-thread-alloc \ > - --$(call ptx/wwo, PTXCONF_LIBXML2_DOM)-tree \ > --$(call ptx/wwo, PTXCONF_LIBXML2_DTD)-valid \ > --$(call ptx/wwo, PTXCONF_LIBXML2_WRITER)-writer \ > --$(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_XPTR)-xptr-locs \ > --$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \ > --$(call ptx/wwo, PTXCONF_LIBXML2_LEGACY)-legacy \ > --with-tls > -- > 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 |