Merge lp:~unity-team/unity/unity-7.4.0-bump into lp:unity

[Marco Trevisan (Treviño)]

Bump version to 7.4.0

[Andrea Azzarone (azzar1)]

review: Approve

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-05 11:17:32 +0000
+++ CMakeLists.txt	2015-11-05 11:17:32 +0000
@@ -9,8 +9,8 @@
 #
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 7)
-set (UNITY_MINOR 3)
-set (UNITY_MICRO 3)
+set (UNITY_MINOR 4)
+set (UNITY_MICRO 0)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")
 set (UNITY_COMPONENTS_VERSION "6")
@@ -25,6 +25,12 @@
   ON
 )
 
+option(
+  ENABLE_UNIT_TESTS
+  "Enable Unity Unit Tests"
+  ON
+)
+
 # This is due to bug lp:668799 - qemu-arm segfaults executing msgmerge
 option(
   I18N_SUPPORT
@@ -226,7 +232,7 @@
     gtk+-3.0>=3.1
     indicator3-0.4>=0.4.90
     json-glib-1.0
-    libbamf3>=0.5.0
+    libbamf3>=0.5.2
     gnome-desktop-3.0
     libnotify
     libstartup-notification-1.0
@@ -260,6 +266,7 @@
 add_subdirectory(dash)
 add_subdirectory(launcher)
 add_subdirectory(data)
+
 if (ENABLE_X_SUPPORT)
   add_subdirectory(hud)
   add_subdirectory(lockscreen)
@@ -273,65 +280,71 @@
   add_subdirectory(unity-standalone)
 endif ()
 
-# subdirs
 add_subdirectory(doc)
-
-# Check for google test and build it locally
-set (
-  GMOCK_ROOT_DIR
-  "/usr/src/gmock"
-  CACHE
-  PATH
-  "Path to Google mock srcs"
-)
-
-set (
-  GMOCK_INCLUDE_DIR
-  "/usr/include/gmock/include"
-  CACHE
-  PATH
-  "Path to Google mock include"
-)
-
-set(
-  GTEST_ROOT_DIR
-  "${GMOCK_ROOT_DIR}/gtest" # Default value, adjustable by user with e.g., ccmake
-  CACHE
-  PATH
-  "Path to Google test srcs"
-)
-
-set(
-  GTEST_INCLUDE_DIR
-  "${GMOCK_ROOT_DIR}/gtest/include"
-  CACHE
-  PATH
-  "Path to Google tests include"
-)
-
-if (GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
-  include_directories (
-    ${GMOCK_INCLUDE_DIR}
-    ${GTEST_INCLUDE_DIR}
-  )
-  add_subdirectory(
-    ${GMOCK_ROOT_DIR}
-    "${CMAKE_CURRENT_BINARY_DIR}/gmock"
-  )
-elseif (GTEST_INCLUDE_DIR AND NOT GMOCK_INCLUDE_DIR)
-  include_directories (
-    ${GTEST_INCLUDE_DIR}
-  )
-endif(GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
-
 add_subdirectory(services)
-add_subdirectory(tests)
 add_subdirectory(tools)
 add_subdirectory(UnityCore)
 add_subdirectory(guides)
-
 add_subdirectory(gnome)
 
+if (ENABLE_UNIT_TESTS)
+  # Check for google test and build it locally
+  set (
+    GMOCK_ROOT_DIR
+    "/usr/src/gmock"
+    CACHE
+    PATH
+    "Path to Google mock srcs"
+  )
+
+  set (
+    GMOCK_INCLUDE_DIR
+    "/usr/include/gmock/include"
+    CACHE
+    PATH
+    "Path to Google mock include"
+  )
+
+  set(
+    GTEST_ROOT_DIR
+    "${GMOCK_ROOT_DIR}/gtest" # Default value, adjustable by user with e.g., ccmake
+    CACHE
+    PATH
+    "Path to Google test srcs"
+  )
+
+  set(
+    GTEST_INCLUDE_DIR
+    "${GMOCK_ROOT_DIR}/gtest/include"
+    CACHE
+    PATH
+    "Path to Google tests include"
+  )
+
+  if (GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
+    include_directories (
+      ${GMOCK_INCLUDE_DIR}
+      ${GTEST_INCLUDE_DIR}
+    )
+    add_subdirectory(
+      ${GMOCK_ROOT_DIR}
+      "${CMAKE_CURRENT_BINARY_DIR}/gmock"
+    )
+  elseif (GTEST_INCLUDE_DIR AND NOT GMOCK_INCLUDE_DIR)
+    include_directories (
+      ${GTEST_INCLUDE_DIR}
+    )
+  endif(GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
+
+  add_subdirectory(tests)
+
+else (ENABLE_UNIT_TESTS)
+  set (MISSING_TESTS_MSG "-- Tests disabled, compile with -DENABLE_UNIT_TESTS=ON")
+  add_custom_target (check COMMAND echo ${MISSING_TESTS_MSG})
+  add_custom_target (check-headless COMMAND echo ${MISSING_TESTS_MSG})
+  add_custom_target (gcheck COMMAND echo ${MISSING_TESTS_MSG})
+endif (ENABLE_UNIT_TESTS)
+
 #
 # GSettings Schema
 #

=== modified file 'UnityCore/Scope.h'
--- UnityCore/Scope.h	2014-07-30 00:49:35 +0000
+++ UnityCore/Scope.h	2015-11-05 11:17:32 +0000
@@ -36,7 +36,7 @@
 typedef enum
 {
   G_SCOPE_ERROR_NO_ACTIVATION_HANDLER  = (1 << 0),
-  G_SCOPE_ERROR_INVALID_PREVIEW        = (2 << 0)
+  G_SCOPE_ERROR_INVALID_PREVIEW        = (1 << 1)
 } GScopeError;
 
 GQuark

=== modified file 'dash/previews/CMakeLists.txt'
--- dash/previews/CMakeLists.txt	2013-05-06 11:57:14 +0000
+++ dash/previews/CMakeLists.txt	2015-11-05 11:17:32 +0000
@@ -48,36 +48,36 @@
 # Application Standalone variant
 #
 add_executable (app_previews StandaloneApplicationPreview.cpp)
-target_link_libraries (app_previews previews-lib unity-shared)
+target_link_libraries (app_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Music Standalone variant
 #
 add_executable (music_previews StandaloneMusicPreview.cpp)
-target_link_libraries (music_previews previews-lib unity-shared)
+target_link_libraries (music_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Social Standalone variant
 #
 add_executable (social_previews StandaloneSocialPreview.cpp)
-target_link_libraries (social_previews previews-lib unity-shared)
+target_link_libraries (social_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Movie Standalone variant
 #
 add_executable (movie_previews StandaloneMoviePreview.cpp)
-target_link_libraries (movie_previews previews-lib unity-shared)
+target_link_libraries (movie_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Payment Standalone variant
 #
 add_executable (payment_previews StandaloneMusicPaymentPreview.cpp)
 add_dependencies (payment_previews previews-lib)
-target_link_libraries (payment_previews previews-lib unity-shared)
+target_link_libraries (payment_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Error Standalone variant
 #
 add_executable (error_previews StandaloneErrorPreview.cpp)
 add_dependencies (error_previews previews-lib)
-target_link_libraries (error_previews previews-lib unity-shared)
+target_link_libraries (error_previews previews-lib unity-shared unity-shared-standalone)

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-05 11:17:32 +0000
+++ debian/changelog	2015-11-05 11:17:32 +0000
@@ -1,3 +1,10 @@
+unity (7.4.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Bumping version to 7.4.0
+  * Fix building in xenial
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 26 Oct 2015 15:37:22 +0100
+
 unity (7.3.3-0ubuntu1) UNRELEASED; urgency=medium
 
   * Releasing Unity 7.3.3

=== modified file 'debian/control'
--- debian/control	2015-08-24 16:03:38 +0000
+++ debian/control	2015-11-05 11:17:32 +0000
@@ -13,7 +13,7 @@
                gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140219),
                intltool (>= 0.35.0),
                libatk1.0-dev,
-               libbamf3-dev (>= 0.5.0+13.10.20130731),
+               libbamf3-dev (>= 0.5.2~bzr0),
                libboost-dev,
                libcairo2-dev,
                libdbus-1-dev,

=== modified file 'debian/rules'
--- debian/rules	2015-02-05 14:07:05 +0000
+++ debian/rules	2015-11-05 11:17:32 +0000
@@ -27,11 +27,12 @@
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
   cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
 endif
+
+# Workaround for bug #1511542
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), arm64))
-  cmake_pch_options := -Duse_pch=OFF
+  cmake_pch_options := -DENABLE_UNIT_TESTS=OFF
 endif
 
-
 override_dh_auto_configure:
 	dh_auto_configure -- $(cmake_base_options) $(cmake_gl_options) $(cmake_pch_options)
 

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2015-05-29 12:41:38 +0000
+++ launcher/LauncherController.cpp	2015-11-05 11:17:32 +0000
@@ -150,7 +150,11 @@
 
   WindowManager& wm = WindowManager::Default();
   wm.window_focus_changed.connect(sigc::mem_fun(this, &Controller::Impl::OnWindowFocusChanged));
+#if SIGCXX_MAJOR_VERSION >= 2 && SIGCXX_MINOR_VERSION >= 5
+  wm.viewport_layout_changed.connect(sigc::track_obj([this] (int w, int h) { UpdateNumWorkspaces(w * h); }, *this));
+#else
   wm.viewport_layout_changed.connect(sigc::group(sigc::mem_fun(this, &Controller::Impl::UpdateNumWorkspaces), sigc::_1 * sigc::_2));
+#endif
   average_color_connection_ = wm.average_color.changed.connect([this] (nux::Color const& color) {
     parent_->options()->background_color = color;
   });

=== modified file 'unity-shared/BamfApplicationManager.cpp'
--- unity-shared/BamfApplicationManager.cpp	2015-07-10 10:16:03 +0000
+++ unity-shared/BamfApplicationManager.cpp	2015-11-05 11:17:32 +0000
@@ -425,8 +425,7 @@
 
   bool was_empty = windows_.empty();
 
-  std::shared_ptr<GList> children(bamf_view_get_children(bamf_view_), g_list_free);
-  for (GList* l = children.get(); l; l = l->next)
+  for (GList* l = bamf_view_peek_children(bamf_view_); l; l = l->next)
   {
     if (ApplicationWindowPtr const& window = pool::EnsureWindow(manager_, static_cast<BamfView*>(l->data)))
     {
@@ -686,15 +685,15 @@
       return win_pair.second;
   }
 
-  // TODO: use bamf_matcher_get_window_for_xid
+  if (BamfWindow* win = bamf_matcher_get_window_for_xid(matcher_, xid))
+    return pool::EnsureWindow(*this, reinterpret_cast<BamfView*>(win));
+
   auto* app = bamf_matcher_get_application_for_xid(matcher_, xid);
 
   if (!app)
     return nullptr;
 
-  std::shared_ptr<GList> windows(bamf_view_get_children(reinterpret_cast<BamfView*>(app)), g_list_free);
-
-  for (GList* l = windows.get(); l; l = l->next)
+  for (GList* l = bamf_view_peek_children(reinterpret_cast<BamfView*>(app)); l; l = l->next)
   {
     if (!BAMF_IS_WINDOW(l->data))
       continue;