[packages/xml-security-c] - added c++ patch (fixes build in C++11 mode)

qboosh qboosh at pld-linux.org
Fri Nov 24 18:43:36 CET 2017


commit c2f49ad68adb996d0dacf285e1d745c9c9c91ddd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Nov 24 18:44:35 2017 +0100

    - added c++ patch (fixes build in C++11 mode)

 xml-security-c-c++.patch | 11 +++++++++++
 xml-security-c.spec      |  3 +++
 2 files changed, 14 insertions(+)
---
diff --git a/xml-security-c.spec b/xml-security-c.spec
index 0916a63..408283c 100644
--- a/xml-security-c.spec
+++ b/xml-security-c.spec
@@ -15,6 +15,7 @@ License:	Apache v2.0
 Group:		Libraries
 Source0:	http://www.apache.org/dist/santuario/c-library/%{name}-%{version}.tar.bz2
 # Source0-md5:	61130e3273bed410e607d9710eef9de2
+Patch0:		%{name}-c++.patch
 URL:		http://santuario.apache.org/cindex.html
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -77,11 +78,13 @@ Statyczna biblioteka xml-security-c.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Remove bogus "-O2" from CXXFLAGS to avoid overriding optflags.
 %{__sed} -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure.ac
 
 %build
+# refresh lt for as-needed to work
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
diff --git a/xml-security-c-c++.patch b/xml-security-c-c++.patch
new file mode 100644
index 0000000..902d8d7
--- /dev/null
+++ b/xml-security-c-c++.patch
@@ -0,0 +1,11 @@
+--- xml-security-c-1.7.3/xsec/tools/checksig/InteropResolver.cpp.orig	2012-07-23 18:56:10.000000000 +0200
++++ xml-security-c-1.7.3/xsec/tools/checksig/InteropResolver.cpp	2017-11-24 18:36:22.001046355 +0100
+@@ -645,7 +645,7 @@
+ 
+ 	}
+ 
+-	return false;
++	return NULL;
+ 
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xml-security-c.git/commitdiff/c2f49ad68adb996d0dacf285e1d745c9c9c91ddd



More information about the pld-cvs-commit mailing list