From c07e7ff245e5d650960df78e812a6429594089f2 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Sat, 21 Jul 2018 22:28:20 +0200 Subject: [PATCH] opencollada: rebuild for gcc stdc++ dropping gcc4 compat add patch to fix compilation with pcre-8.42 --- .../patches/004-fix-libpcre-8.42-compat.patch | 23 +++++++++++++++++++ srcpkgs/opencollada/template | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/opencollada/patches/004-fix-libpcre-8.42-compat.patch diff --git a/srcpkgs/opencollada/patches/004-fix-libpcre-8.42-compat.patch b/srcpkgs/opencollada/patches/004-fix-libpcre-8.42-compat.patch new file mode 100644 index 00000000000..964ed60e3a2 --- /dev/null +++ b/srcpkgs/opencollada/patches/004-fix-libpcre-8.42-compat.patch @@ -0,0 +1,23 @@ +From 7b4c3ce3407c47619cd4e79052d60db4ce937327 Mon Sep 17 00:00:00 2001 +From: Dennis Schridde +Date: Thu, 12 Jul 2018 06:52:36 +0200 +Subject: [PATCH] COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h: + Include pcre.h + +This fixes a compilation error with libpcre-8.42: +``` +error: conflicting declaration 'typedef struct real_pcre8_or_16 pcre' +``` + +--- COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h ++++ COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h +@@ -13,8 +13,7 @@ + + #include "COLLADABUPrerequisites.h" + +-struct real_pcre; +-typedef struct real_pcre pcre; ++#include + + + namespace COLLADABU diff --git a/srcpkgs/opencollada/template b/srcpkgs/opencollada/template index 2161d45845e..44e23a30b4d 100644 --- a/srcpkgs/opencollada/template +++ b/srcpkgs/opencollada/template @@ -1,7 +1,7 @@ # Template file for 'opencollada' pkgname=opencollada version=1.6.62 -revision=1 +revision=2 wrksrc="OpenCOLLADA-${version}" build_style=cmake configure_args="-DUSE_SHARED=TRUE"