diff mbox series

[2/3] package/xmlstarlet: Fix build with libxml2-2.12

Message ID 20231204211622.12687-2-bernd@kuhls.net
State Accepted
Headers show
Series [1/3] package/squid: fix build with libxml2-2.12 | expand

Commit Message

Bernd Kuhls Dec. 4, 2023, 9:16 p.m. UTC 
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .../0001-Fix-build-with-libxml2-2.12.patch    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/xmlstarlet/0001-Fix-build-with-libxml2-2.12.patch

Comments

Thomas Petazzoni Dec. 23, 2023, 8:36 p.m. UTC | #1 
On Mon,  4 Dec 2023 22:16:21 +0100
Bernd Kuhls <bernd@kuhls.net> wrote:

> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  .../0001-Fix-build-with-libxml2-2.12.patch    | 33 +++++++++++++++++++
>  1 file changed, 33 insertions(+)
>  create mode 100644 package/xmlstarlet/0001-Fix-build-with-libxml2-2.12.patch

Applied to master, but after taking the improved patch proposed by
upstream on the Sourceforge issue. Note that since you did not convey
this patch yourself, I made myself the Author + SoB of the patch added
in package/xmlstarlet/, but crediting you within the commit log. Thanks
a lot!

Thomas
diff mbox series

Patch

diff --git a/package/xmlstarlet/0001-Fix-build-with-libxml2-2.12.patch b/package/xmlstarlet/0001-Fix-build-with-libxml2-2.12.patch
new file mode 100644
index 0000000000..9f32020d7d
--- /dev/null
+++ b/package/xmlstarlet/0001-Fix-build-with-libxml2-2.12.patch
@@ -0,0 +1,33 @@ 
+From 59395730bc66d97c154f727543e501d6f3c061af Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Sat, 25 Nov 2023 14:03:45 +0100
+Subject: [PATCH] Fix build with libxml2-2.12
+
+Upstream reorganized header includes:
+https://github.com/GNOME/libxml2/blob/master/NEWS
+
+"Several cyclic dependencies in public header files were fixed. As a
+ result, certain headers won't include other headers as before."
+
+Upstream: https://sourceforge.net/p/xmlstar/patches/22/
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ src/xmlstar.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/xmlstar.h b/src/xmlstar.h
+index 3e1eed3..1a12da1 100644
+--- a/src/xmlstar.h
++++ b/src/xmlstar.h
+@@ -15,6 +15,7 @@
+ #include <libxml/xpath.h>
+ #include <libxml/xpathInternals.h>
+ #include <libxml/xmlreader.h>
++#include <libxml/xmlsave.h>
+ 
+ typedef enum { /* EXIT_SUCCESS = 0, EXIT_FAILURE = 1, */
+     EXIT_BAD_ARGS = EXIT_FAILURE+1, EXIT_BAD_FILE,
+-- 
+2.39.2
+