Compare commits

...
Sign in to create a new pull request.

9 commits

Author SHA1 Message Date
Fedora Release Engineering
aad66176c9 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:59:57 +00:00
Cristian Le
4c6e699188 Allow to build with CMake 4.0 (rhbz#2381639) 2026-06-08 08:23:31 +00:00
František Zatloukal
69abae99b7 Rebuilt for icu 78.3 2026-06-08 09:53:33 +02:00
Fedora Release Engineering
4a34ca4c7b Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:26:25 +00:00
Marcin Juszkiewicz
d090728567 Fix build with GCC 15.
Patch taken from the Debian project.

Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
2025-11-26 10:17:49 +01:00
František Zatloukal
0e6a5472ca Rebuilt for icu 77.1 2025-08-06 09:58:42 +02:00
Fedora Release Engineering
5146b0b2cd Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:36:44 +00:00
Fedora Release Engineering
d75ac1f2c3 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 15:23:42 +00:00
Benjamin A. Beasley
4feb6e480a Build as C++17 instead of C++14
- This is needed for ICU 75 compatibility; it fixes RHBZ#2332317.
2024-12-13 14:14:31 -05:00
3 changed files with 52 additions and 1 deletions

20
gcc_15_fixes.patch Normal file
View file

@ -0,0 +1,20 @@
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;

15
xalan-c-1.12-icu-75.patch Normal file
View file

@ -0,0 +1,15 @@
>= 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)

View file

@ -27,6 +27,21 @@ 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.
@ -91,7 +106,7 @@ documentation.
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -n %{tar_name}
%autosetup -n %{tar_name} -p 1
# https://github.com/apache/xalan-c/pull/35
chmod -v a-x NOTICE
@ -110,6 +125,7 @@ find docs samples src -type f -exec file '{}' '+' |
%conf
export CMAKE_POLICY_VERSION_MINIMUM=3.5
%cmake %{?with_icu:-Dtranscoder=icu} -GNinja