[gnome-flashback] modulesets: add gnome-flashback-3-14.modules

[Alberts Muktupāvels <muktupavels src gnome org>]

commit dcf79909497547788729c747209d2882e0fdd7d9
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri May 1 19:32:00 2015 +0300

    modulesets: add gnome-flashback-3-14.modules

 modulesets/gnome-flashback-3.14.modules      |  157 ++++++++++++++++++++++++++
 modulesets/patches/compiz-auto-add-ccp.patch |   58 ++++++++++
 2 files changed, 215 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-flashback-3.14.modules b/modulesets/gnome-flashback-3.14.modules
new file mode 100644
index 0000000..41a56be
--- /dev/null
+++ b/modulesets/gnome-flashback-3.14.modules
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="git" name="git.gnome.org" default="yes" href="git://git.gnome.org/" />
+  <repository type="tarball" name="launchpad-tar" href="https://launchpad.net/"; />
+
+  <include href="https://git.gnome.org/browse/gnome-modulesets/plain/gnome-world.modules?h=gnome-3-14"; />
+
+  <cmake id="compiz" force-non-srcdir-builds="yes" cmakeargs="-DUSE_GCONF=OFF">
+    <branch repo="launchpad-tar" module="compiz/0.9.12/${version}/+download/compiz-${version}.tar.bz2"
+            version="0.9.12.1" hash="sha256:8b9d6a72c581c96b820dff182669864aeb8fd1989e95ff56a73203fc478d854e"
+            size="4569138">
+      <patch file="compiz-auto-add-ccp.patch" strip="1" />
+    </branch>
+    <dependencies>
+      <dep package="boost" />
+      <dep package="cairo" />
+      <dep package="dbus-glib" />
+      <dep package="glib" />
+      <dep package="glibmm" />
+      <dep package="gtk+" />
+      <dep package="gnome-control-center" />
+      <dep package="gsettings-desktop-schemas" />
+      <dep package="intltool" />
+      <dep package="libnotify" />
+      <dep package="libjpeg" />
+      <dep package="libpng" />
+      <dep package="librsvg" />
+      <dep package="libwnck" />
+      <dep package="libxml2" />
+      <dep package="libX11" />
+      <dep package="libXcomposite" />
+      <dep package="libXcursor" />
+      <dep package="libXdamage" />
+      <dep package="libXext" />
+      <dep package="libXfixes" />
+      <dep package="libXi" />
+      <dep package="libXinerama" />
+      <dep package="libXrandr" />
+      <dep package="metacity" />
+      <dep package="pango" />
+      <dep package="pkg-config" />
+      <dep package="protobuf" />
+      <dep package="sm" />
+      <dep package="startup-notification" />
+    </dependencies>
+  </cmake>
+
+  <autotools id="gnome-applets" autogenargs="--enable-mini-commander">
+    <branch revision="gnome-3-14" />
+    <dependencies>
+      <dep package="intltool" />
+      <dep package="gnome-panel" />
+      <dep package="libgtop" />
+      <dep package="libgnomekbd" />
+      <dep package="gucharmap" />
+      <dep package="libgweather" />
+      <dep package="gdk-pixbuf" />
+      <dep package="gtk+" />
+      <dep package="glib" />
+      <dep package="libxklavier" />
+      <dep package="libwnck" />
+      <dep package="libnotify" />
+      <dep package="dbus" />
+      <dep package="dbus-glib" />
+      <dep package="pygobject" />
+      <dep package="adwaita-icon-theme" />
+      <dep package="libxml2" />
+      <dep package="polkit-gobject" />
+    </dependencies>
+    <after>
+      <dep package="gnome-control-center" />
+    </after>
+  </autotools>
+
+  <autotools id="gnome-flashback">
+    <branch revision="gnome-3-14" />
+    <dependencies>
+      <dep package="intltool" />
+      <dep package="gnome-desktop" />
+      <dep package="gtk+" />
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-panel">
+    <branch revision="gnome-3-14" />
+    <dependencies>
+      <dep package="intltool" />
+      <dep package="gnome-desktop" />
+      <dep package="libwnck" />
+      <dep package="evolution-data-server" />
+      <dep package="gnome-menus" />
+      <dep package="dbus-glib" />
+      <dep package="librsvg" />
+      <dep package="libgweather" />
+      <dep package="libcanberra" />
+      <dep package="yelp-tools" />
+    </dependencies>
+    <suggests>
+      <dep package="polkit-gobject" />
+    </suggests>
+  </autotools>
+
+  <autotools id="metacity">
+    <branch revision="gnome-3-14" />
+    <dependencies>
+      <dep package="intltool" />
+      <dep package="gdk-pixbuf" />
+      <dep package="gtk+" />
+      <dep package="gsettings-desktop-schemas" />
+      <dep package="intltool" />
+      <dep package="libcanberra" />
+      <dep package="zenity" />
+    </dependencies>
+  </autotools>
+
+  <autotools id="notification-daemon">
+    <branch revision="gnome-3-14" />
+    <dependencies>
+      <dep package="dbus" />
+      <dep package="glib" />
+      <dep package="gtk+" />
+      <dep package="libcanberra" />
+    </dependencies>
+  </autotools>
+
+  <metamodule id="meta-gnome-flashback-common">
+    <dependencies>
+      <dep package="gnome-applets" />
+      <dep package="gnome-flashback" />
+      <dep package="gnome-panel" />
+      <dep package="notification-daemon" />
+    </dependencies>
+  </metamodule>
+
+  <metamodule id="meta-gnome-flashback-compiz">
+    <dependencies>
+      <dep package="meta-gnome-flashback-common" />
+      <dep package="compiz" />
+    </dependencies>
+  </metamodule>
+
+  <metamodule id="meta-gnome-flashback-metacity">
+    <dependencies>
+      <dep package="meta-gnome-flashback-common" />
+      <dep package="metacity" />
+    </dependencies>
+  </metamodule>
+
+  <metamodule id="meta-gnome-flashback">
+    <dependencies>
+      <dep package="meta-gnome-flashback-compiz" />
+      <dep package="meta-gnome-flashback-metacity" />
+    </dependencies>
+  </metamodule>
+</moduleset>
diff --git a/modulesets/patches/compiz-auto-add-ccp.patch b/modulesets/patches/compiz-auto-add-ccp.patch
new file mode 100644
index 0000000..d5b7522
--- /dev/null
+++ b/modulesets/patches/compiz-auto-add-ccp.patch
@@ -0,0 +1,58 @@
+=== modified file 'src/main.cpp'
+--- compiz-0.9.12.1.orig/src/main.cpp  2013-02-21 17:05:46 +0000
++++ compiz-0.9.12.1/src/main.cpp       2015-04-23 20:18:28 +0000
+@@ -38,6 +38,11 @@
+ #include "privatescreen.h"
+ #include "privatestackdebugger.h"
+ 
++namespace
++{
++    bool autoAddCCP = true;
++}
++
+ void
+ CompManager::usage ()
+ {
+@@ -48,6 +53,7 @@
+             "  --sm-disable          Disable session management\n"
+             "  --sm-client-id ID     Session management client ID\n"
+             "  --keep-desktop-hints  Retain existing desktop hints\n"
++            "  --no-auto-add-ccp     Do not automatically load the ccp plugin\n"
+             "  --sync                Make all X calls synchronous\n"
+             "  --debug               Enable debug mode\n"
+             "  --version             Show the program version\n"
+@@ -99,6 +105,11 @@
+       {
+           useDesktopHints = true;
+       }
++      else if (!strcmp (argv[i], "--no-auto-add-ccp"))
++      {
++          compLogMessage ("core", CompLogLevelInfo, "running without the ccp plugin, no settings will be 
loaded");
++          autoAddCCP = false;
++      }
+       else if (!strcmp (argv[i], "--replace"))
+       {
+           replaceCurrentWm = true;
+@@ -151,6 +162,9 @@
+ 
+     modHandler = new ModifierHandler ();
+ 
++    if (initialPlugins.empty () && autoAddCCP)
++        initialPlugins.push_back ("ccp");
++
+     if (!screen->init (displayName))
+       return false;
+ 
+
+=== modified file 'tests/xorg-gtest/src/compiz-xorg-gtest.cpp'
+--- compiz-0.9.12.1.orig/tests/xorg-gtest/src/compiz-xorg-gtest.cpp    2013-07-18 13:06:24 +0000
++++ compiz-0.9.12.1/tests/xorg-gtest/src/compiz-xorg-gtest.cpp 2015-04-23 20:18:28 +0000
+@@ -778,6 +778,7 @@
+     if (flags & ct::CompizProcess::ReplaceCurrentWM)
+       args.push_back ("--replace");
+ 
++    args.push_back ("--no-auto-add-ccp");
+     args.push_back ("--send-startup-message");
+ 
+     /* Copy in plugin list and set environment variables */
+