commit 72cd6768d431ed6be4de26d3093a15f3afd128c0
Author: Jan Palus <at...@pld-linux.org>
Date: Tue Jan 21 19:15:36 2025 +0100
unconditionally build with c++17 for icu 76
icu76.patch | 11 +++++++++++
sword.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/sword.spec b/sword.spec
index 42069ff..039a42c 100644
--- a/sword.spec
+++ b/sword.spec
@@ -20,6 +20,7 @@ License: GPL v2
Group: Libraries
Source0:
http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/%{name}-%{version}.tar.gz
# Source0-md5: 7b86ab627993ef295307e3729d8edef2
+Patch0: icu76.patch
URL: http://www.crosswire.org/sword
BuildRequires: autoconf >= 2.52
BuildRequires: automake
@@ -29,7 +30,7 @@ BuildRequires: cppunit-devel >= 1.8.0
#%{?with_icu:BuildRequires: icu}
%{?with_icusword:BuildRequires: icu-sword}
%{?with_icu:BuildRequires: libicu-devel}
-BuildRequires: libstdc++-devel %{?with_cxx11:>= 6:4.7}
+BuildRequires: libstdc++-devel >= 6:8
BuildRequires: libtool >= 2:1.5
BuildRequires: pakchois-devel
BuildRequires: pkgconfig >= 1:0.14
@@ -103,6 +104,7 @@ Biblioteka statyczna do rozwijania aplikacji sword.
%prep
%setup -q
+%patch -P0 -p1
%build
%{__libtoolize}
diff --git a/icu76.patch b/icu76.patch
new file mode 100644
index 0000000..f0cebd0
--- /dev/null
+++ b/icu76.patch
@@ -0,0 +1,11 @@
+--- sword-1.9.0/configure.ac.orig 2020-11-05 01:01:26.000000000 +0100
++++ sword-1.9.0/configure.ac 2025-01-21 19:06:57.504808015 +0100
+@@ -315,6 +315,8 @@
+ AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11TIME -std=c++11"
+ fi
+
++AM_CXXFLAGS="$AM_CXXFLAGS -std=c++17"
++
+ if test x$disable_logdebug = xyes; then
+ AM_CXXFLAGS="$AM_CXXFLAGS -DSTRIPLOGD"
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sword.git/commitdiff/72cd6768d431ed6be4de26d3093a15f3afd128c0
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
