From a747c696f83908126ccf289d235ed06665072708 Mon Sep 17 00:00:00 2001 From: herengui Date: Wed, 13 Mar 2024 09:55:24 +0800 Subject: [PATCH] Adding XML_GE macro to adapt expat-2.6.0 Signed-off-by: herengui --- ...ML_GE-option-to-adapt-to-expat-2.6.0.patch | 26 +++++++++++++++++++ poco.spec | 11 +++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 0003-Add-XML_GE-option-to-adapt-to-expat-2.6.0.patch diff --git a/0003-Add-XML_GE-option-to-adapt-to-expat-2.6.0.patch b/0003-Add-XML_GE-option-to-adapt-to-expat-2.6.0.patch new file mode 100644 index 0000000..0568e14 --- /dev/null +++ b/0003-Add-XML_GE-option-to-adapt-to-expat-2.6.0.patch @@ -0,0 +1,26 @@ +From e0eaf06e748479cc5a2f76df0b020331374db0ad Mon Sep 17 00:00:00 2001 +From: herengui +Date: Wed, 13 Mar 2024 09:24:56 +0800 +Subject: [PATCH] Add XML_GE option to adapt to expat-2.6.0 + +Signed-off-by: herengui +--- + XML/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt +index b99f4f3..b234065 100644 +--- a/XML/CMakeLists.txt ++++ b/XML/CMakeLists.txt +@@ -51,7 +51,7 @@ target_include_directories(XML + + if(POCO_UNBUNDLED) + target_link_libraries(XML PUBLIC EXPAT::EXPAT) +- target_compile_definitions(XML PUBLIC POCO_UNBUNDLED XML_DTD) ++ target_compile_definitions(XML PUBLIC POCO_UNBUNDLED XML_DTD XML_GE) + else() + if(WIN32) + #TODO: Is XML_STATIC only required with Windows? What does it do? +-- +2.44.0 + diff --git a/poco.spec b/poco.spec index cd2a7a7..9777e15 100644 --- a/poco.spec +++ b/poco.spec @@ -19,7 +19,7 @@ Name: poco Version: 1.12.4 -Release: 1 +Release: 2 Summary: C++ class libraries for network-centric applications License: BSL-1.0 @@ -28,9 +28,11 @@ URL: https://pocoproject.org Source: https://github.com/pocoproject/poco/archive/poco-%{version}-release/poco-%{version}.tar.gz # Fix XML compilation due to new methods being guarded by XML_DTD -Patch: 0001-Fix-XML-compilation-due-to-new-methods-being-guarded.patch +Patch0: 0001-Fix-XML-compilation-due-to-new-methods-being-guarded.patch # Disable the tests that will fail under Koji (mostly network) -Patch: 0002-Disable-tests-that-fail-in-koji.patch +Patch1: 0002-Disable-tests-that-fail-in-koji.patch +# expat-2.6.0 requires XML_GE to be defined +Patch2: 0003-Add-XML_GE-option-to-adapt-to-expat-2.6.0.patch BuildRequires: make BuildRequires: cmake @@ -467,4 +469,7 @@ HTML format. %doc README NEWS LICENSE CONTRIBUTORS CHANGELOG doc/* %changelog +* Wed Mar 13 2024 herengui - 1.12.4-2 +- Adding XML_GE macro to adapt expat-2.6.0 + %autochangelog -- Gitee