Merge lp:~darkxst/compiz/lp1481541 into lp:compiz/0.9.12

[Tim Lunn]

Remove unused code that causes a build-dep on gnome-control-center-dev (LP: #1481541)

This branch is based off lp:~azzar1/compiz/gcc5/

[lp:~darkxst/compiz/lp1481541]

3959. By Alberts Muktupāvels on 2015-08-05

Change icon size back to 48px in application switcher plugin. Fixes: #1237057
Approved by: Stephen M. Webb, Dmitry Shachnev

3960. By Stephen M. Webb on 2015-08-05

Fixed the Compiz manpage and --help message to agree with the actual command-line options supported. Fixes: #1475508
Approved by: PS Jenkins bot, Marco Trevisan (Treviño)

3961. By Stephen M. Webb on 2015-08-05

Fix a FTBFS when -std=c++11 is used. Fixes: #1477654
Approved by: PS Jenkins bot, Christopher Townsend

3962. By Stephen M. Webb on 2015-08-05

force Compiz to build using C++-11 (required by build dependency libgtkmm-3.0-1). Fixes: #1477978
Approved by: Christopher Townsend

3963. By Martin Wimpress  on 2015-08-05

align MATE profile more closely with Marco
Approved by: Stephen M. Webb

3964. By Eleni Maria Stea on 2015-08-05

It fixes the 3d windows plugin.
Problem:
The 3d clipping is performed in viewing space (modelview transformation) and should be done inside the shader when we use shaders otherwise the viewing space pipeline operations will be ignored. Compiz used to perform the clipping inside the td plugin using pipeline functions, then it was loading a generic shader program (no clipping operations) to render the windows and then it rendered the 3d quads around the windows using the pipeline (so these were clipped correctly).

Fix:
Added a variable that indicates when to load the shaders and when render using the fixed functions pipeline and use the fixed functions pipeline to render between glEnableOutputClipping and glDisableOutputClipping.

+small fix in the legacyRendering (pipeline) Fixes: #1395697
Approved by: PS Jenkins bot, Stephen M. Webb

3965. By Eleni Maria Stea on 2015-08-05

Sometimes the MultipleCubes, Automatic or OneBigCube option might be set although we are not in multimonitor. Modified the 3d windows plugin to check the number of monitors as well.
Approved by: PS Jenkins bot, Stephen M. Webb

3966. By Marco Trevisan (Treviño) on 2015-08-05

Window: compute the correct output using the absolute window position

Window geometry has absolute coordinates that include viewports, but we
need to use viewport relative coordinates when figuring out the window output
or the window will be considered offscreen and thus it will fallback to first monitor.
This is generally applied, but was not done well in addWindowSizeChanges which
was causing Fullscreen and (horizontally) maximized windows to be moved to the
primary monitor when activated. Fixes: #1475721
Approved by: Stephen M. Webb, PS Jenkins bot

3967. By Marco Trevisan (Treviño) on 2015-08-05

Window: add clientFrame(), to get the client-side decoration extents

This only supports GTK at the moment, but it might be adapted to other toolkits. Fixes: #1422768, #1436553
Approved by: MC Return, Christopher Townsend

3968. By Dmitry Shachnev on 2015-08-05

Move window switcher plugins to compiz-plugins-default. Fixes: #971051, #1465647
Approved by: Stephen M. Webb, Dmitry Shachnev

3969. By Dmitry Shachnev on 2015-08-05

debian/compiz-gnome.gsettings-override: Remove unityshell from active plugins, and add switcher. Fixes: #1469086
Approved by: Alberts Muktupāvels, Stephen M. Webb

3970. By CI Train Bot Account on 2015-08-05

Releasing 1:0.9.12.1+15.10.20150805-0ubuntu1

3971. By Tim Lunn on 2015-08-13

Remove unused code, that causes a build-dep on gnome-control-center-dev

Unmerged revisions

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2014-11-04 15:54:44 +0000
+++ cmake/CompizCommon.cmake	2015-08-05 01:35:01 +0000
@@ -17,6 +17,8 @@
 cmake_policy (SET CMP0003 NEW)
 cmake_policy (SET CMP0005 OLD)
 cmake_policy (SET CMP0011 OLD)
+cmake_policy (SET CMP0022 OLD)
+
 
 set (CMAKE_SKIP_RPATH FALSE)
 
@@ -51,11 +53,6 @@
 # Almost everything is a shared library now, so almost everything needs -fPIC
 set (COMMON_FLAGS "-fPIC -Wall")
 
-option (COMPIZ_UNUSED_PRIVATE_FIELD_WARNINGS "Warn unused private fields" OFF)
-if (NOT COMPIZ_UNUSED_PRIVATE_FIELD_WARNINGS)
-    set (COMMON_FLAGS "${COMMON_FLAGS} -Wno-unused-private-field")
-endif ()
-
 option (COMPIZ_UNUSED_LOCAL_TYPEDEFS_WARNINGS "Warn about unused local typedefs" OFF)
 if (NOT COMPIZ_UNUSED_LOCAL_TYPEDEFS_WARNINGS)
     set (COMMON_FLAGS "${COMMON_FLAGS} -Wno-unused-local-typedefs")
@@ -82,7 +79,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}")
@@ -381,7 +378,6 @@
 	add_custom_target (release-upload-component)
 	add_custom_target (release-upload)
 
-	add_dependencies (release-upload-component release-upload-version)
 	add_dependencies (release-upload release-upload-component)
 
 endmacro ()

=== modified file 'compizconfig/CMakeLists.txt'
--- compizconfig/CMakeLists.txt	2014-11-25 13:15:56 +0000
+++ compizconfig/CMakeLists.txt	2015-08-05 01:35:01 +0000
@@ -37,5 +37,3 @@
 endif (COMPIZ_BUILD_TESTING)
 
 add_custom_target (pyclean)
-
-add_dependencies (pyclean pyclean_ccsm pyclean_compizconfig)

=== modified file 'compizconfig/gsettings/mocks/CMakeLists.txt'
--- compizconfig/gsettings/mocks/CMakeLists.txt	2012-10-08 13:50:56 +0000
+++ compizconfig/gsettings/mocks/CMakeLists.txt	2015-08-05 01:35:01 +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'
--- compizconfig/gsettings/tests/CMakeLists.txt	2013-07-17 06:06:08 +0000
+++ compizconfig/gsettings/tests/CMakeLists.txt	2015-08-05 01:35:01 +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'
--- compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt	2013-05-13 13:41:19 +0000
+++ compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt	2015-08-05 01:35:01 +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'
--- compizconfig/integration/gnome/tests/CMakeLists.txt	2013-05-13 13:42:28 +0000
+++ compizconfig/integration/gnome/tests/CMakeLists.txt	2015-08-05 01:35:01 +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'
--- compizconfig/integration/mate/gsettings/tests/CMakeLists.txt	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gsettings/tests/CMakeLists.txt	2015-08-05 01:35:01 +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'
--- compizconfig/integration/mate/tests/CMakeLists.txt	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/tests/CMakeLists.txt	2015-08-05 01:35:01 +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'
--- compizconfig/libcompizconfig/tests/CMakeLists.txt	2013-07-17 06:06:08 +0000
+++ compizconfig/libcompizconfig/tests/CMakeLists.txt	2015-08-05 01:35:01 +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}\\\")
 

=== modified file 'debian/control'
--- debian/control	2015-06-27 04:41:46 +0000
+++ debian/control	2015-08-05 01:35:01 +0000
@@ -53,7 +53,6 @@
                protobuf-compiler,
                python-all-dev,
                python-pyrex,
-               gnome-control-center-dev,
                gsettings-desktop-schemas-dev,
                xserver-xorg-dev (>= 0.7.0),
 Standards-Version: 3.9.6

=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2015-06-12 18:43:05 +0000
+++ gtk/CMakeLists.txt	2015-08-05 01:35:01 +0000
@@ -52,17 +52,6 @@
 	    endif (GNOME_WINDOW_SETTINGS_FOUND)
 	endif (USE_GNOME)
 
-	if (USE_GNOME_KEYBINDINGS)
-	    compiz_pkg_check_modules (GNOME_KEY_BINDINGS gnome-keybindings)
-	    if (GNOME_KEY_BINDINGS_FOUND)
-		exec_program (${PKG_CONFIG_EXECUTABLE}
-		  ARGS "--variable=keysdir gnome-keybindings"
-		  OUTPUT_VARIABLE keybindingsdir
-		)
-	    else (GNOME_KEY_BINDINGS_FOUND)
-		compiz_set (USE_GNOME_KEYBINDINGS 0)
-	    endif (GNOME_KEY_BINDINGS_FOUND)
-        endif (USE_GNOME_KEYBINDINGS)
     else (GTK_WINDOW_DECORATOR_FOUND)
 	compiz_set (USE_GTK 0)
     endif (GTK_WINDOW_DECORATOR_FOUND)

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2013-10-30 18:02:12 +0000
+++ plugins/decor/src/decor.cpp	2015-08-05 01:35:01 +0000
@@ -2537,7 +2537,7 @@
 		{
 		    DECOR_WINDOW (w);
 
-		    if (dw->isSwitcher && !event->xproperty.state == PropertyDelete)
+		    if (dw->isSwitcher && event->xproperty.state != PropertyDelete)
 			dw->updateSwitcher ();
 		}
 	    }

=== modified file 'plugins/opengl/src/programcache.cpp'
--- plugins/opengl/src/programcache.cpp	2013-01-10 08:19:56 +0000
+++ plugins/opengl/src/programcache.cpp	2015-08-05 01:35:01 +0000
@@ -159,7 +159,7 @@
     // update most recently used GLProgram
     access_history_t::iterator it = access_history.insert (access_history.end (), name);
 
-    cache.insert (std::make_pair (name, std::make_pair (program, it)));
+    cache.insert (std::make_pair (name, std::make_pair (boost::shared_ptr<GLProgram>(program), it)));
 }
 
 void PrivateProgramCache::evict ()

=== modified file 'plugins/splash/src/splash.cpp'
--- plugins/splash/src/splash.cpp	2013-05-09 13:43:07 +0000
+++ plugins/splash/src/splash.cpp	2015-08-05 01:35:01 +0000
@@ -233,7 +233,7 @@
 	{
 	    tex->enable (GLTexture::Good);
 
-	    if (!screen->outputDevs ().size () > 1)
+	    if (screen->outputDevs ().size () <= 1)
 	    {
 	        CompRect headOutputRect = 
 			splashGetCurrentOutputRect ();

=== modified file 'src/privatescreen/tests/test-privatescreen.cpp'
--- src/privatescreen/tests/test-privatescreen.cpp	2014-12-02 18:08:41 +0000
+++ src/privatescreen/tests/test-privatescreen.cpp	2015-08-05 01:35:01 +0000
@@ -352,7 +352,7 @@
 // tell GLib not to use the slice-allocator implementation
 // and avoid spurious valgrind reporting
 void glib_nice_for_valgrind() { setenv("G_SLICE", "always-malloc", true); }
-int const init = (glib_nice_for_valgrind(), 0);
+__attribute__ ((unused)) int const init = (glib_nice_for_valgrind(), 0);
 
 PluginFilesystem const* PluginFilesystem::instance = 0;