Merge lp:~azzar1/unity/unity-active-plugins--safety-check into lp:unity

[Andrea Azzarone]

Add tools to enforce unityshell plugin for the current profile and add "move" and "resize" plugins as requirements.

[Marco Trevisan (Treviño) (3v1n0)]

Remember to include this into the debian/unity.install file.

[Andrea Azzarone (azzar1)]

Done. I also moved unity7.conf outside debian dir in order to properly generate the correct paths.

[Marco Trevisan (Treviño) (3v1n0)]

Thanks for the change, but there's still something to fix inside the unity.install file

[Marco Trevisan (Treviño) (3v1n0)]

Ah, and include this change too: http://bazaar.launchpad.net/~ted/unity/systemd-unit./revision/4169

[Marco Trevisan (Treviño) (3v1n0)]

Fine

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

After this we've this issue on install:

Preparing to unpack .../unity_7.5.0+16.10.20160726.2-0ubuntu1_amd64.deb ...
Unpacking unity (7.5.0+16.10.20160726.2-0ubuntu1) over (7.5.0+16.10.20160715-0ubuntu1) ...
dpkg: error processing archive /var/cache/apt/archives/unity_7.5.0+16.10.20160726.2-0ubuntu1_amd64.deb (--unpack):
 trying to overwrite '/usr/share/upstart/sessions/unity7.conf', which is also in package unity-services 7.5.0+16.10.20160726.2-0ubuntu1
Processing triggers for man-db (2.7.5-1) ...
Errors were encountered while processing:
 /var/cache/apt/archives/unity_7.5.0+16.10.20160726.2-0ubuntu1_amd64.deb
E: Sub-process /usr/bin/dpkg returned an error code (1)

So, please apply this too: http://pastebin.ubuntu.com/21005082/

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Thanks

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

I still get some issues when upgrading... I think we need to set the debian breaks/replaces properly in core file or, we keep the unity7.conf in the libunity-core-6.0-9.install as it used to be...

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-15 02:22:05 +0000
+++ CMakeLists.txt	2016-07-26 16:45:52 +0000
@@ -425,3 +425,9 @@
          ADDITIONAL_MAKE_CLEAN_FILES api-doc)
 
 endif (DOXYGEN_FOUND STREQUAL "YES")
+
+#
+# Upstart
+#
+configure_file(unity7.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
 
=== modified file 'debian/control'
--- debian/control	2016-03-21 15:38:17 +0000
+++ debian/control	2016-07-26 16:45:52 +0000
@@ -18,6 +18,7 @@
                libbamf3-dev (>= 0.5.3~bzr0),
                libboost-dev,
                libcairo2-dev,
+               libcompizconfig0-dev,
                libdbus-1-dev,
                libdbusmenu-glib-dev (>= 0.3.91),
                libdee-dev (>= 1.2.6),
 
=== modified file 'debian/libunity-core-6.0-9.install'
--- debian/libunity-core-6.0-9.install	2016-02-09 01:26:22 +0000
+++ debian/libunity-core-6.0-9.install	2016-07-26 16:45:52 +0000
@@ -3,7 +3,7 @@
 usr/share/ccsm
 usr/share/gnome-control-center/
 usr/share/unity
+usr/share/upstart/sessions/unity7.conf
 debian/unity-crashdb.conf etc/apport/crashdb.conf.d/
 debian/source_unity.py usr/share/apport/package-hooks
-debian/unity7.conf usr/share/upstart/sessions
 tools/convert-files/* usr/lib/compiz/migration/
 
=== modified file 'debian/unity-services.install'
--- debian/unity-services.install	2016-02-09 01:26:22 +0000
+++ debian/unity-services.install	2016-07-26 16:45:52 +0000
@@ -1,3 +1,3 @@
 usr/lib/*/unity/*service
-usr/share/upstart
+usr/share/upstart/sessions/unity-panel-service*.conf
 usr/share/man/*/unity-panel-service.1
 
=== modified file 'debian/unity.install'
--- debian/unity.install	2016-02-09 01:26:22 +0000
+++ debian/unity.install	2016-07-26 16:45:52 +0000
@@ -1,6 +1,7 @@
 etc/pam.d
 usr/bin
 usr/lib/*/compiz/libunity*.so
+usr/lib/*/unity/unity-active-plugins-safety-check
 usr/share/man/*/unity.1
 usr/share/compiz
 usr/share/locale
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2016-04-05 13:23:27 +0000
+++ plugins/unityshell/unityshell.xml.in	2016-07-26 16:45:52 +0000
@@ -39,6 +39,8 @@
                 <plugin>compiztoolbox</plugin>
                 <plugin>scale</plugin>
                 <plugin>expo</plugin>
+                <plugin>move</plugin>
+                <plugin>resize</plugin>
             </requirement>
             <conflict>
                 <plugin>decor</plugin>
 
=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2016-02-09 01:26:22 +0000
+++ tools/CMakeLists.txt	2016-07-26 16:45:52 +0000
@@ -6,3 +6,25 @@
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity.cmake ${CMAKE_BINARY_DIR}/bin/unity)
 install(FILES ${CMAKE_BINARY_DIR}/bin/unity PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
 GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+#
+# unity-active-plugins-safety-check
+#
+pkg_check_modules(UAPSC_DEPS REQUIRED libcompizconfig)
+
+set(CFLAGS
+    ${UAPSC_DEPS_CFLAGS}
+    ${UAPSC_DEPS_CFLAGS_OTHER}
+    )
+
+string (REPLACE ";" " " CFLAGS "${CFLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS}")
+
+set(LIBS ${UAPSC_DEPS_LIBRARIES})
+
+set(LIB_PATHS ${UAPSC_DEPS_LIBRARY_DIRS})
+link_directories(${LIB_PATHS})
+
+add_executable(unity-active-plugins-safety-check unity_active_plugins_safety_check.cpp)
+target_link_libraries(unity-active-plugins-safety-check ${LIBS})
+install(TARGETS unity-active-plugins-safety-check DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)
 
=== added file 'tools/unity_active_plugins_safety_check.cpp'
--- tools/unity_active_plugins_safety_check.cpp	1970-01-01 00:00:00 +0000
+++ tools/unity_active_plugins_safety_check.cpp	2016-07-26 16:45:52 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include <ccs.h>
+#include <gio/gio.h>
+
+#include <iostream>
+#include <string>
+
+extern const CCSInterfaceTable ccsDefaultInterfaceTable;
+
+void PluginSetActiveWithDeps(CCSContext* context, std::string const& plugin_name)
+{
+  if (plugin_name.empty())
+    return;
+
+  auto plugin = ccsFindPlugin(context, plugin_name.c_str());
+
+  if (!plugin)
+    return;
+
+  auto reqs = ccsPluginGetRequiresPlugins(plugin);
+  for (auto req = reqs; req; req = req->next)
+  {
+    if (req->data && req->data->value)
+    {
+      std::string name = req->data->value;
+      PluginSetActiveWithDeps(context, name.c_str());
+    }
+  }
+
+  if (!ccsPluginIsActive(context, plugin_name.c_str())) {
+    std::cout << "Setting plugin '" << plugin_name << "' to active" << std::endl;
+    ccsPluginSetActive(plugin, true);
+  }
+
+  auto conflicts = ccsPluginGetConflictPlugins(plugin);
+  for (auto con = conflicts; con; con = con->next)
+  {
+    if (con->data && con->data->value)
+    {
+      std::string name = con->data->value;
+      auto plugin = ccsFindPlugin(context, name.c_str());
+
+      if (ccsPluginIsActive(context, name.c_str()))
+      {
+        std::cout << "Setting plugin '" << name << "' to non-active" << std::endl;
+        ccsPluginSetActive(plugin, false);
+      }
+    }
+  }
+}
+
+int main()
+{
+  auto context = ccsContextNew (0, &ccsDefaultInterfaceTable);
+
+  if (!context)
+    return -1;
+
+  PluginSetActiveWithDeps(context, "unityshell");
+
+  ccsWriteChangedSettings(context);
+  g_settings_sync();
+  ccsFreeContext(context);
+
+  return 0;
+}
 
=== renamed file 'debian/unity7.conf' => 'unity7.conf.in'
--- debian/unity7.conf	2016-07-05 01:26:04 +0000
+++ unity7.conf.in	2016-07-26 16:45:52 +0000
@@ -21,6 +21,9 @@
 
   echo "Using compiz profile '$compiz_profile'"
   initctl set-env -g COMPIZ_CONFIG_PROFILE="$compiz_profile"
+  export COMPIZ_CONFIG_PROFILE="$compiz_profile"
+
+  ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-active-plugins-safety-check
 end script
 
 respawn