diff --git a/gcc_15_fixes.patch b/gcc_15_fixes.patch deleted file mode 100644 index 0d954b0..0000000 --- a/gcc_15_fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: xalan/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp -=================================================================== ---- xalan.orig/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp 2025-10-22 08:05:45.403631397 -0400 -+++ xalan/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp 2025-10-22 08:18:14.821542155 -0400 -@@ -320,13 +320,13 @@ - { - XalanUnicodeChar value = decodeUTF16SurrogatePair(ch, theChars[i+1], getMemoryManager()); - -- if (this->m_isPresentable(value)) -+ if (m_predicate(value)) - { - write(value); - } - else - { -- this->writeNumberedEntityReference(value); -+ writeNumericCharacterReference(value); - } - - ++i; diff --git a/xalan-c-1.12-icu-75.patch b/xalan-c-1.12-icu-75.patch deleted file mode 100644 index 0e27218..0000000 --- a/xalan-c-1.12-icu-75.patch +++ /dev/null @@ -1,15 +0,0 @@ ->= ICU 75 needs C++17, see https://bugs.gentoo.org/934471. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,9 +32,9 @@ if (POLICY CMP0067) - cmake_policy(SET CMP0067 NEW) - endif(POLICY CMP0067) - --# Try C++14, then fall back to C++11 and C++98. Used for feature tests -+# Try C++17, then fall back to C++14, then C++11, and C++98. Used for feature tests - # for optional features. --set(CMAKE_CXX_STANDARD 14) -+set(CMAKE_CXX_STANDARD 17) - - # Use folders (for IDE project grouping) - set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/xalan-c.spec b/xalan-c.spec index 5507f12..f37370d 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -15,7 +15,6 @@ Summary: Xalan XSLT processor for C/C++ # libtiff, but is a build-system file that does not contribute to the licenses # of the binary RPMs. License: Apache-2.0 -SourceLicense: %{license} AND libtiff URL: https://apache.github.io/xalan-c/ %global tag Xalan-C_%{gsub %{version} . _} %global tar_name xalan_c-%(echo %{version} | cut -d . -f -2) @@ -27,21 +26,6 @@ Source2: %{releaseurl}/KEYS # Man page hand-written for Fedora in groff_man(7) format based on Xalan -? Source3: Xalan.1 -# ICU 75 needs C++17 -# https://bugs.gentoo.org/934471 -# -# Fixes: -# -# [FTBFS] with icu-76.1 -# https://bugzilla.redhat.com/show_bug.cgi?id=2332317 -# -# Note that this patch is too trivial for there to be any need to associate a -# license with it; the patch merely adjusts the value of CMAKE_CXX_STANDARD -# from 14 to 17. -Patch: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/xalan-c/files/xalan-c-1.12-icu-75.patch - -Patch: gcc_15_fixes.patch - BuildRequires: gnupg2 BuildRequires: cmake # Either make or ninja is supported. @@ -106,7 +90,7 @@ documentation. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -n %{tar_name} -p 1 +%autosetup -n %{tar_name} # https://github.com/apache/xalan-c/pull/35 chmod -v a-x NOTICE @@ -124,12 +108,8 @@ find docs samples src -type f -exec file '{}' '+' | xargs dos2unix --keepdate -%conf -export CMAKE_POLICY_VERSION_MINIMUM=3.5 -%cmake %{?with_icu:-Dtranscoder=icu} -GNinja - - %build +%cmake %{?with_icu:-Dtranscoder=icu} -GNinja %cmake_build