Merge lp:~azzar1/compiz/gcc5 into lp:compiz/0.9.12

[Andrea Azzarone]

Enable building compiz from sources using gcc5.

Enable building compiz from sources using gcc5.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3965
http://jenkins.qa.ubuntu.com/job/compiz-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/73/rebuild

review: Approve (continuous-integration)

Unmerged revisions

3965. By Andrea Azzarone <email address hidden> on 2015-07-31

Fixes for gcc5.

3964. By Andrea Azzarone <email address hidden> on 2015-07-31

Remove use of -Wno-unused-private-field. Seems like it's not supported anymore with gcc5+

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2015-07-31 14:53:31 +0000
+++ cmake/CompizCommon.cmake	2015-07-31 14:53:32 +0000
@@ -53,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")

=== 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-07-31 14:53:32 +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-07-31 14:53:32 +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-07-31 14:53:32 +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-07-31 14:53:32 +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;