[gnome-flashback] modulesets, 3.18: build compiz using -std=c++11



commit 5253dacf2ec6558c6214fb5e38952fe573fa151e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Aug 22 13:06:06 2015 +0300

    modulesets, 3.18: build compiz using -std=c++11

 modulesets/gnome-flashback-3.18.modules            |    1 +
 .../patches/compiz-build-using-std-cpp11.patch     |  104 ++++++++++++++++++++
 2 files changed, 105 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-flashback-3.18.modules b/modulesets/gnome-flashback-3.18.modules
index 2fbb5ba..a197627 100644
--- a/modulesets/gnome-flashback-3.18.modules
+++ b/modulesets/gnome-flashback-3.18.modules
@@ -13,6 +13,7 @@
     <branch repo="launchpad-tar" module="compiz/0.9.12/${version}/+download/compiz-${version}.tar.bz2"
             version="0.9.12.2" hash="sha256:8917ac9e6dfdacc740780e1995e932ed865d293ae87821e7a280da5325daec80"
             size="4537740">
+      <patch file="compiz-build-using-std-cpp11.patch" strip="1" />
     </branch>
     <dependencies>
       <dep package="boost" />
diff --git a/modulesets/patches/compiz-build-using-std-cpp11.patch 
b/modulesets/patches/compiz-build-using-std-cpp11.patch
new file mode 100644
index 0000000..33ef481
--- /dev/null
+++ b/modulesets/patches/compiz-build-using-std-cpp11.patch
@@ -0,0 +1,104 @@
+=== modified file 'cmake/CompizCommon.cmake'
+--- compiz-0.9.12.2.orig/cmake/CompizCommon.cmake      2014-11-04 15:54:44 +0000
++++ compiz-0.9.12.2/cmake/CompizCommon.cmake   2015-08-22 09:14:10 +0000
+@@ -82,7 +82,7 @@
+ endif ()
+ 
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -std=c++11")
+ 
+ set (COMMON_LINKER_FLAGS "-Wl,-zdefs")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${COMMON_LINKER_FLAGS}")
+
+=== modified file 'compizconfig/gsettings/mocks/CMakeLists.txt'
+--- compiz-0.9.12.2.orig/compizconfig/gsettings/mocks/CMakeLists.txt   2012-10-08 13:50:56 +0000
++++ compiz-0.9.12.2/compizconfig/gsettings/mocks/CMakeLists.txt        2015-08-22 09:14:10 +0000
+@@ -8,7 +8,7 @@
+                        ${CMAKE_CURRENT_SOURCE_DIR}/../gsettings_backend_shared
+                        ${GLIB_INCLUDE_DIRS})
+ 
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+     add_library (compizconfig_ccs_gsettings_wrapper_mock STATIC
+                ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.cpp
+
+=== modified file 'compizconfig/gsettings/tests/CMakeLists.txt'
+--- compiz-0.9.12.2.orig/compizconfig/gsettings/tests/CMakeLists.txt   2013-07-17 06:06:08 +0000
++++ compiz-0.9.12.2/compizconfig/gsettings/tests/CMakeLists.txt        2015-08-22 09:14:10 +0000
+@@ -17,7 +17,7 @@
+ 
+ if (COMPIZCONFIG_TEST_GSETTINGS_FOUND)
+ 
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+     link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests)
+     link_directories (${CMAKE_CURRENT_BINARY_DIR}/../testenvironments)
+
+=== modified file 'compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt'
+--- compiz-0.9.12.2.orig/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt 2013-05-13 13:41:19 
+0000
++++ compiz-0.9.12.2/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt      2015-08-22 09:14:10 
+0000
+@@ -11,7 +11,7 @@
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_executable (compizconfig_test_ccs_gnome_gsettings_integrated_setting
+               ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp)
+
+=== modified file 'compizconfig/integration/gnome/tests/CMakeLists.txt'
+--- compiz-0.9.12.2.orig/compizconfig/integration/gnome/tests/CMakeLists.txt   2013-05-13 13:42:28 +0000
++++ compiz-0.9.12.2/compizconfig/integration/gnome/tests/CMakeLists.txt        2015-08-22 09:14:10 +0000
+@@ -8,7 +8,7 @@
+ include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests)
+ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_library (compizconfig_ccs_mock_gnome_integrated_setting_composition
+            ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_gnome_integrated_setting_composition.c)
+
+=== modified file 'compizconfig/integration/mate/gsettings/tests/CMakeLists.txt'
+--- compiz-0.9.12.2.orig/compizconfig/integration/mate/gsettings/tests/CMakeLists.txt  2015-02-04 22:20:18 
+0000
++++ compiz-0.9.12.2/compizconfig/integration/mate/gsettings/tests/CMakeLists.txt       2015-08-22 09:14:10 
+0000
+@@ -11,7 +11,7 @@
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_executable (compizconfig_test_ccs_mate_gsettings_integrated_setting
+               ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_mate_gsettings_integrated_setting.cpp)
+
+=== modified file 'compizconfig/integration/mate/tests/CMakeLists.txt'
+--- compiz-0.9.12.2.orig/compizconfig/integration/mate/tests/CMakeLists.txt    2015-02-04 22:20:18 +0000
++++ compiz-0.9.12.2/compizconfig/integration/mate/tests/CMakeLists.txt 2015-08-22 09:14:10 +0000
+@@ -8,7 +8,7 @@
+ include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests)
+ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_library (compizconfig_ccs_mock_mate_integrated_setting_composition
+            ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_mate_integrated_setting_composition.c)
+
+=== modified file 'compizconfig/libcompizconfig/tests/CMakeLists.txt'
+--- compiz-0.9.12.2.orig/compizconfig/libcompizconfig/tests/CMakeLists.txt     2013-07-17 06:06:08 +0000
++++ compiz-0.9.12.2/compizconfig/libcompizconfig/tests/CMakeLists.txt  2015-08-22 09:14:10 +0000
+@@ -9,7 +9,7 @@
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_definitions (-DSYSCONFDIR=\\\"${COMPIZ_SYSCONFDIR}\\\")
+ 
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]