[packages/CEGUI] - use relaxed c++11 to fix build with new xerces-c - rel 3

baggins baggins at pld-linux.org
Wed Nov 22 19:56:39 CET 2017


commit e7e67a51f2060156c70c8b7c0d34bba2648ad961
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Nov 22 19:56:07 2017 +0100

    - use relaxed c++11 to fix build with new xerces-c
    - rel 3

 CEGUI.spec  |  4 +++-
 cxx11.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/CEGUI.spec b/CEGUI.spec
index d5a60a9..8650ad8 100644
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -10,7 +10,7 @@ Summary:	CEGUI - a free library providing windowing and widgets
 Summary(pl.UTF-8):	CEGUI - wolnodostępna biblioteka zapewniającą okienka i widgety
 Name:		CEGUI
 Version:	0.8.7
-Release:	2
+Release:	3
 License:	LGPL v2.1+ (with MIT parts)
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.bz2
@@ -20,6 +20,7 @@ Source1:	http://downloads.sourceforge.net/crayzedsgui/cegui-docs.%{version}.zip
 Patch0:		pthread.patch
 Patch1:		%{name}-glfw3.patch
 Patch3:		x32.patch
+Patch4:		cxx11.patch
 URL:		http://www.cegui.org.uk/
 BuildRequires:	DevIL-devel
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 1.2.0}
@@ -460,6 +461,7 @@ Wiązania Pythona do biblioteki CEGUI OpenGLRenderer.
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 install -d build
diff --git a/cxx11.patch b/cxx11.patch
new file mode 100644
index 0000000..6138960
--- /dev/null
+++ b/cxx11.patch
@@ -0,0 +1,11 @@
+--- cegui-0.8.7/CMakeLists.txt~	2017-11-22 18:34:24.000000000 +0100
++++ cegui-0.8.7/CMakeLists.txt	2017-11-22 18:35:20.404123049 +0100
+@@ -72,7 +72,7 @@
+ 
+ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fpermissive")
+ elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
+     set (CMAKE_C_STANDARD_REQUIRED TRUE)
+     set (CMAKE_C_STANDARD "99")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/CEGUI.git/commitdiff/e7e67a51f2060156c70c8b7c0d34bba2648ad961



More information about the pld-cvs-commit mailing list