From e9d43d6a3347e331e7f2167e305f5b12ca4e5a47b8a10408bb57ae145fb0cc70 Mon Sep 17 00:00:00 2001 From: David Anes Date: Wed, 29 May 2024 08:15:10 +0000 Subject: [PATCH] Accepting request 1176766 from home:krop:gcc14 Add upstream build fix for gcc14 failure OBS-URL: https://build.opensuse.org/request/show/1176766 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxslt?expand=0&rev=103 --- 0001-tests-Fix-build-with-older-libxml2.patch | 27 +++++++++++++++++++ libxslt.changes | 6 +++++ libxslt.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 0001-tests-Fix-build-with-older-libxml2.patch diff --git a/0001-tests-Fix-build-with-older-libxml2.patch b/0001-tests-Fix-build-with-older-libxml2.patch new file mode 100644 index 0000000..7e29a0b --- /dev/null +++ b/0001-tests-Fix-build-with-older-libxml2.patch @@ -0,0 +1,27 @@ +From 02a57a01c603462ce8cc65fc64076a107ccf758e Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Fri, 1 Dec 2023 21:05:19 +0100 +Subject: [PATCH] tests: Fix build with older libxml2 + +Fixes #99. +--- + tests/runtest.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/runtest.c b/tests/runtest.c +index ea08824..f61c66a 100644 +--- a/tests/runtest.c ++++ b/tests/runtest.c +@@ -456,7 +456,8 @@ initializeLibxml2(void) { + xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader); + xmlSetGenericErrorFunc(NULL, testErrorHandler); + xsltSetGenericErrorFunc(NULL, testErrorHandler); +- xmlSetStructuredErrorFunc(NULL, testStructuredErrorHandler); ++ xmlSetStructuredErrorFunc(NULL, ++ (xmlStructuredErrorFunc) testStructuredErrorHandler); + exsltRegisterAll(); + xsltRegisterTestModule(); + xsltMaxDepth = 200; +-- +2.45.1 + diff --git a/libxslt.changes b/libxslt.changes index d23b0e3..2583b29 100644 --- a/libxslt.changes +++ b/libxslt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 24 16:14:39 UTC 2024 - Christophe Marin + +- Add upstream build fix: + * 0001-tests-Fix-build-with-older-libxml2.patch + ------------------------------------------------------------------- Sun May 5 16:26:10 UTC 2024 - Bruno Pitrus diff --git a/libxslt.spec b/libxslt.spec index f4777d0..a976a33 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -42,6 +42,8 @@ Patch0: libxslt-1.1.24-no-net-autobuild.patch Patch1: libxslt-random-seed.patch # PATCH-FIX_UPSTREAM -- gcc14-runtest-no-const.patch Patch2: gcc14-runtest-no-const.patch +# PATCH-FIX-UPSTREAM -- 0001-tests-Fix-build-with-older-libxml2.patch +Patch3: 0001-tests-Fix-build-with-older-libxml2.patch # ### SUSE patches starts on 1000 # PATCH-FIX-SUSE