Patched for C++11 compatibility

3 files changed, 19 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d713e72f506c..2e0b60d7a07c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,8 +9,11 @@ pkgbase = xml-security-c
 	depends = xalan-c
 	source = http://www.apache.org/dist/santuario/c-library/xml-security-c-1.7.3.tar.gz
 	source = http://www.apache.org/dist/santuario/c-library/xml-security-c-1.7.3.tar.gz.asc
+	source = xmlsec-1.6.1-cxx11.patch
+	validpgpkeys = DCAA15007BED9DE690CD9523378B845402277962
 	sha256sums = e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583
 	sha256sums = SKIP
+	sha256sums = fd9813d980dae148e4cf5f507381f682a81f08bf6c62f20ceaedd384b13961ec
 
 pkgname = xml-security-c
 
diff --git a/PKGBUILD b/PKGBUILD
index 6a41b9acb96e..ce4a8578c2d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,15 +10,18 @@ url='http://santuario.apache.org/'
 license=('GPL')
 depends=('xalan-c')
 source=("http://www.apache.org/dist/santuario/c-library/$pkgname-$pkgver.tar.gz"
-        "http://www.apache.org/dist/santuario/c-library/$pkgname-$pkgver.tar.gz.asc")
+        "http://www.apache.org/dist/santuario/c-library/$pkgname-$pkgver.tar.gz.asc"
+        "xmlsec-1.6.1-cxx11.patch")
 sha256sums=('e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583'
-            'SKIP')
+            'SKIP'
+            'fd9813d980dae148e4cf5f507381f682a81f08bf6c62f20ceaedd384b13961ec')
 validpgpkeys=('DCAA15007BED9DE690CD9523378B845402277962')
 
 prepare(){
   cd "${srcdir}/${pkgname}-${pkgver}"
   mkdir -p xsec/yes/lib
   sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure
+  patch -p1 -i "${srcdir}/xmlsec-1.6.1-cxx11.patch"
 }
 
 build() {
diff --git a/xmlsec-1.6.1-cxx11.patch b/xmlsec-1.6.1-cxx11.patch
new file mode 100644
index 000000000000..bc87d4c1411e
--- /dev/null
+++ b/xmlsec-1.6.1-cxx11.patch
@@ -0,0 +1,11 @@
+--- xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp.orig	2016-02-02 23:57:26.204655144 +0000
++++ xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp	2016-02-02 23:57:35.796692305 +0000
+@@ -645,7 +645,7 @@
+ 
+ 	}
+ 
+-	return false;
++	return NULL;
+ 
+ }
+