Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xmlstarlet for openSUSE:Factory 
checked in at 2025-09-30 17:34:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlstarlet (Old)
 and      /work/SRC/openSUSE:Factory/.xmlstarlet.new.11973 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xmlstarlet"

Tue Sep 30 17:34:56 2025 rev:30 rq:1307766 version:1.6.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlstarlet/xmlstarlet.changes    2023-06-08 
21:41:56.545771915 +0200
+++ /work/SRC/openSUSE:Factory/.xmlstarlet.new.11973/xmlstarlet.changes 
2025-09-30 17:35:28.055808372 +0200
@@ -1,0 +2,9 @@
+Tue Sep 23 11:18:15 UTC 2025 - [email protected]
+
+- fix build with libxml2 2.14
+- modified patches
+  * xmlstarlet-xml_depyx.c.diff (-p1)
+- added patches
+  * xmlstarlet-libxml2-2.14.patch
+
+-------------------------------------------------------------------
@@ -280,2 +288,0 @@
-
--------------------------------------------------------------------

New:
----
  xmlstarlet-libxml2-2.14.patch

----------(New B)----------
  New:- added patches
  * xmlstarlet-libxml2-2.14.patch
----------(New E)----------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xmlstarlet.spec ++++++
--- /var/tmp/diff_new_pack.lnPlGc/_old  2025-09-30 17:35:29.955888533 +0200
+++ /var/tmp/diff_new_pack.lnPlGc/_new  2025-09-30 17:35:29.959888702 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlstarlet
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@
 Source:         
http://prdownloads.sourceforge.net/xmlstar/xmlstarlet-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
 Patch2:         %{name}-xml_depyx.c.diff
+Patch3:         %{name}-libxml2-2.14.patch
 BuildRequires:  libxml2-devel >= 2.6.27
 BuildRequires:  libxslt-devel >= 1.1.9
 BuildRequires:  pkgconfig
@@ -38,7 +39,7 @@
 'grep', 'sed', 'awk', 'tr', 'diff', or 'patch'.
 
 %prep
-%autosetup -p0
+%autosetup -p1
 
 %build
 export CFLAGS="%{optflags} -W -Wall"

++++++ xmlstarlet-libxml2-2.14.patch ++++++
>From 4e94034e9231f5d8312497b7504f21b7a6062bf4 Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected]>
Date: Tue, 27 May 2025 16:12:01 -0700
Subject: [PATCH] Define ATTRIBUTE_UNUSED if its not defined

ATTRIBUTE_UNUSED is not defined in libxml2 2.14+, so check if the define is
not there then define it.

Fixes build errors e.g.
../xmlstarlet-1.6.1/src/xml_pyx.c:203:36: error: expected ')'
  203 | pyxExternalSubsetHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar 
*name,
      |                                    ^

Upstream-Status: Pending
Signed-off-by: Khem Raj <[email protected]>
---
 src/xml_pyx.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/xml_pyx.c b/src/xml_pyx.c
index ab295f1..f1a1884 100644
--- a/src/xml_pyx.c
+++ b/src/xml_pyx.c
@@ -21,6 +21,13 @@
 
 #include "xmlstar.h"
 
+/**
+ * Unbreak build with libxml2 2.14
+ */
+#ifndef ATTRIBUTE_UNUSED
+#define ATTRIBUTE_UNUSED __attribute__((unused))
+#endif
+
 /**
  *  Output newline and tab characters as escapes
  *  Required both for attribute values and character data (#PCDATA)

++++++ xmlstarlet-xml_depyx.c.diff ++++++
--- /var/tmp/diff_new_pack.lnPlGc/_old  2025-09-30 17:35:30.019891234 +0200
+++ /var/tmp/diff_new_pack.lnPlGc/_new  2025-09-30 17:35:30.023891402 +0200
@@ -1,7 +1,7 @@
 Index: src/xml_depyx.c
 ===================================================================
---- src/xml_depyx.c.orig
-+++ src/xml_depyx.c
+--- a/src/xml_depyx.c.orig
++++ b/src/xml_depyx.c
 @@ -105,6 +105,7 @@ pyxDePyx(char *file)
  {
     static char line[INSZ];

Reply via email to