From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2] libxml2: Version bump. 2.13.6 -> 2.14.0
Date: Fri, 4 Apr 2025 22:47:14 +0200 [thread overview]
Message-ID: <20250404204714.2096268-1-christian.melki@t2data.com> (raw)
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.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...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
reply other threads:[~2025-04-04 20:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250404204714.2096268-1-christian.melki@t2data.com \
--to=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox