Xisco Fauli
c64f9804ac
With this new version, the build started to fail with error: ‘XML_Size XML_GetCurrentColumnNumber(XML_Parser)’ is deprecated: please use XML_GetCurrentColumnNumber64 instead [-Werror=deprecated-declarations] so we need to check the expat version in case the system expat is older than 2.9 Also add 0001-fix-XML_GE-is-not-defined-evaluates-to-0-Werror-unde.patch to fix error: "XML_GE" is not defined, evaluates to 0 [-Werror=undef] 1087 | # if XML_GE == 1 | ^~~~~~ cc1plus: all warnings being treated as errors Change-Id: If4f1d652941b7766ed94b65a6eaa018f37c89387 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211867 Tested-by: Jenkins Tested-by: René Engelhard <rene@debian.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
26 lines
847 B
Diff
26 lines
847 B
Diff
From 3e3d9091bc3db29901a1507466bf0479ff38de9a Mon Sep 17 00:00:00 2001
|
|
From: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
Date: Tue, 6 Oct 2026 10:50:50 +0200
|
|
Subject: [PATCH] fix XML_GE is not defined, evaluates to 0 [-Werror=undef]
|
|
|
|
---
|
|
expat/lib/expat.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/expat/lib/expat.h b/expat/lib/expat.h
|
|
index 1b2852dd..fea2fd99 100644
|
|
--- a/expat/lib/expat.h
|
|
+++ b/expat/lib/expat.h
|
|
@@ -1084,7 +1084,7 @@ enum XML_Parser_Property {
|
|
# if defined(XML_TESTING)
|
|
XML_PROP_INVALID = 0,
|
|
# endif
|
|
-# if XML_GE == 1
|
|
+# if defined(XML_GE) && XML_GE == 1
|
|
XML_PROP_ALLOC_TRACKER_ACTIVATION_THRESHOLD = 1, // of type `uint64_t`
|
|
XML_PROP_ALLOC_TRACKER_MAXIMUM_AMPLIFICATION = 2, // of type `double`
|
|
XML_PROP_BILLION_LAUGHS_ACTIVATION_THRESHOLD = 3, // of type `uint64_t`
|
|
--
|
|
2.47.3
|
|
|