mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
opencollada: rebuild for gcc stdc++ dropping gcc4 compat
add patch to fix compilation with pcre-8.42
This commit is contained in:
parent
3cf0e55583
commit
c07e7ff245
2 changed files with 24 additions and 1 deletions
|
@ -0,0 +1,23 @@
|
||||||
|
From 7b4c3ce3407c47619cd4e79052d60db4ce937327 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dennis Schridde <devurandom@gmx.net>
|
||||||
|
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 <pcre.h>
|
||||||
|
|
||||||
|
|
||||||
|
namespace COLLADABU
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'opencollada'
|
# Template file for 'opencollada'
|
||||||
pkgname=opencollada
|
pkgname=opencollada
|
||||||
version=1.6.62
|
version=1.6.62
|
||||||
revision=1
|
revision=2
|
||||||
wrksrc="OpenCOLLADA-${version}"
|
wrksrc="OpenCOLLADA-${version}"
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DUSE_SHARED=TRUE"
|
configure_args="-DUSE_SHARED=TRUE"
|
||||||
|
|
Loading…
Add table
Reference in a new issue