Merge lp:~azzar1/unity/gcc5 into lp:unity

[Andrea Azzarone]

Enable building unity form source with gcc5.

Enable building unity form source with gcc5.

=== modified file 'lockscreen/CMakeLists.txt'
--- lockscreen/CMakeLists.txt	2014-10-21 13:45:43 +0000
+++ lockscreen/CMakeLists.txt	2015-07-31 14:46:28 +0000
@@ -9,7 +9,7 @@
 string (REPLACE ";" " " CFLAGS "${CFLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS}")
 
-set (LIBS ${CACHED_UNITY_DEPS_LDFLAGS} ${UNITY_STANDALONE_LADD})
+set (LIBS ${CACHED_UNITY_DEPS_LDFLAGS} pam)
 
 include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
 
@@ -34,5 +34,6 @@
      )
 
 add_library (lockscreen-lib STATIC ${LOCKSCREEN_SOURCES})
-add_dependencies (lockscreen-lib unity-core-${UNITY_API_VERSION} unity-shared pam)
+target_link_libraries (lockscreen-lib ${LIBS})
+add_dependencies (lockscreen-lib unity-core-${UNITY_API_VERSION} unity-shared)
 add_pch(pch/lockscreen_pch.hh lockscreen-lib)

=== modified file 'plugins/unityshell/CMakeLists.txt'
--- plugins/unityshell/CMakeLists.txt	2014-01-30 16:00:34 +0000
+++ plugins/unityshell/CMakeLists.txt	2015-07-31 14:46:28 +0000
@@ -26,7 +26,6 @@
                  decorations-lib
                  hud-lib
                  launcher-lib
-                 pam
                  lockscreen-lib
                  panel-lib
                  shortcuts-lib

=== modified file 'unity-shared/DecorationStyle.h'
--- unity-shared/DecorationStyle.h	2014-12-19 13:03:44 +0000
+++ unity-shared/DecorationStyle.h	2015-07-31 14:46:28 +0000
@@ -24,6 +24,8 @@
 #include <NuxCore/Rect.h>
 #include <cairo/cairo.h>
 
+#include <memory>
+
 struct _GtkStyleContext;
 
 namespace unity