[gnome-modulesets/gnome-3-12] Resync with current 3.12 modulesets

[Javier Jardón <jjardon src gnome org>]

commit 7ca113d1ff8182b74b85583934652095fc4dcaa2
Author: Javier Jardón <javier jardon codethink co uk>
Date:   Thu May 29 10:50:50 2014 +0100

    Resync with current 3.12 modulesets

 gnome-apps.modules      |   15 ++++++------
 gnome-core-deps.modules |   55 ++++++++++++++++++++++------------------------
 gnome-core.modules      |   32 ++++++++++++---------------
 gnome-world.modules     |   23 ++++++++++++++++++-
 4 files changed, 70 insertions(+), 55 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 0d94d61..c17a299 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -34,7 +34,7 @@
   <repository type="tarball" name="tarball.github.com"
     href="https://github.com/"/>
 
-  <include href="gnome-suites-core.modules"/>
+  <include href="gnome-core.modules"/>
 
   <!-- NOTE: gnome-suites-core-* and gnome-suites-core-deps-*
        are supposed to remain self-contained. If apps have dependencies
@@ -58,7 +58,7 @@
   </autotools>
 
   <autotools id="bijiben">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="tracker"/>
       <dep package="clutter-gtk"/>
@@ -99,7 +99,7 @@
   </autotools>
 
   <autotools id="gnome-weather">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
@@ -379,7 +379,7 @@
   </autotools>
 
   <autotools id="devhelp">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -536,7 +536,7 @@
   </autotools>
 
   <autotools id="gedit">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libpeas"/>
@@ -632,7 +632,7 @@
   </autotools>
 
   <autotools id="gnome-getting-started-docs">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -927,6 +927,7 @@
     <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
       <dep package="libnotify"/>
@@ -985,7 +986,7 @@
   </autotools>
 
   <autotools id="polari">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="gjs"/>
       <dep package="glib"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index 9b30e72..035684b 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -84,9 +84,9 @@
   <autotools id="appdata-tools">
     <branch repo="people.freedesktop.org"
             module="~hughsient/releases/appdata-tools-${version}.tar.xz"
-            version="0.1.7"
-            hash="sha256:3d704715aa105cdfa50b1dfbdc352445a2ceafd26ba01ff3260b0bcbf3d726c8"
-            size="265164"/>
+            version="0.1.8"
+            hash="sha256:401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461"
+            size="251320"/>
 <!--
     <branch repo="github.com" checkoutdir="appdata-tools" module="hughsie/appdata-tools.git"/>
 -->
@@ -147,7 +147,7 @@
   </autotools>
 
   <autotools id="gcr">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
@@ -624,7 +624,7 @@
     <if condition-set="coverage">
       <autogenargs value="--enable-coverage"/>
     </if>
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
@@ -651,7 +651,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
-            checkoutdir="gstreamer"/>
+            checkoutdir="gstreamer"
+            revision="1.2" />
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -664,7 +665,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-base"
-            checkoutdir="gst-plugins-base"/>
+            checkoutdir="gst-plugins-base"
+            revision="1.2" />
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
@@ -682,7 +684,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-good"
-            checkoutdir="gst-plugins-good"/>
+            checkoutdir="gst-plugins-good"
+            revision="1.2" />
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -706,7 +709,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-bad"
-            module="gst-plugins-bad"/>
+            module="gst-plugins-bad"
+            revision="1.2" />
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -927,7 +931,7 @@
   </autotools>
 
   <autotools id="libgweather">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
@@ -1019,7 +1023,7 @@
   </autotools>
 
   <autotools id="libsoup" autogenargs="--disable-tls-check">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -1211,27 +1215,20 @@
     </dependencies>
   </autotools>
 
-  <autotools id="xwayland" autogenargs="--with-xkb-bin-directory=/usr/bin --with-xkb-path=/usr/share/X11/xkb 
--with-xkb-output=${prefix}/share/X11/xkb/compiled">
-    <branch repo="xorg.freedesktop.org" checkoutdir="xwayland" module="xserver" revision="xwayland"/>
+  <autotools id="libepoxy">
+    <branch repo="github.com" checkoutdir="libepoxy" module="anholt/libepoxy.git"/>
     <dependencies>
-      <dep package="xfont"/>
       <dep package="xtrans"/>
-      <dep package="wayland"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="xf86-video-intel">
-    <branch repo="xorg.freedesktop.org" checkoutdir="xf86-video-intel" module="driver/xf86-video-intel" 
revision="xwayland"/>
-    <dependencies>
-      <dep package="xwayland"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-wayland">
-    <branch repo="xorg.freedesktop.org"
-            module="driver/xf86-video-wayland"/>
+  <autotools id="xwayland" autogenargs="--with-xkb-bin-directory=/usr/bin --with-xkb-path=/usr/share/X11/xkb 
--with-xkb-output=${prefix}/share/X11/xkb/compiled --enable-xwayland">
+    <branch repo="xorg.freedesktop.org" checkoutdir="xwayland" module="xserver"/>
     <dependencies>
-      <dep package="xwayland"/>
+      <dep package="xfont"/>
+      <dep package="xtrans"/>
+      <dep package="wayland"/>
+      <dep package="libepoxy"/>
     </dependencies>
   </autotools>
 
@@ -1239,9 +1236,9 @@
              autogenargs="--enable-introspection">
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.4.0.tar.xz" version="2.4.0"
-            hash="sha256:dc5277cda89ee038408f78c94b1b07f101997f01ef877a142ffedac3b537dfbb"
-            size="9828272">
+            module="webkitgtk-2.4.3.tar.xz" version="2.4.3"
+            hash="sha256:9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac"
+            size="9841564">
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
diff --git a/gnome-core.modules b/gnome-core.modules
index 7222b14..2774e23 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -24,7 +24,7 @@
   <repository type="tarball" name="kernel.org"
       href="http://www.kernel.org"/>
 
-<include href="gnome-suites-core-deps.modules"/>
+<include href="gnome-core-deps.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
@@ -41,7 +41,7 @@
   </autotools>
 
   <autotools id="at-spi2-atk">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
@@ -116,7 +116,7 @@
   </autotools>
 
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="accountsservice"/>
       <dep package="clutter-gtk"/>
@@ -167,7 +167,7 @@
   </autotools>
 
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxkbfile"/>
@@ -184,7 +184,7 @@
   </autotools>
 
   <autotools id="gnome-icon-theme">
-    <branch/>
+    <branch repo="git.gnome.org" module="adwaita-icon-theme" revision="gnome-3-12"/>
     <dependencies>
       <dep package="hicolor-icon-theme"/>
       <dep package="icon-naming-utils"/>
@@ -275,7 +275,7 @@
     <if condition-unset="linux">
       <autogenargs value="--disable-rfkill --disable-gudev"/>
     </if>
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="colord"/>
       <dep package="geoclue"/>
@@ -310,7 +310,7 @@
     <if condition-unset="linux">
       <autogenargs value="--disable-networkmanager"/>
     </if>
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="accountsservice"/>
       <dep package="caribou"/>
@@ -368,7 +368,7 @@
   </autotools>
 
   <autotools id="gsettings-desktop-schemas" autogenargs="--enable-introspection=yes">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gnome-common"/>
@@ -377,7 +377,7 @@
   </autotools>
 
  <autotools id="gvfs">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -420,7 +420,7 @@
   </autotools>
 
   <autotools id="mutter" autogenargs="--enable-compile-warnings=maximum">
-    <branch />
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="upower"/>
       <dep package="clutter"/>
@@ -453,11 +453,7 @@
       <dep package="wayland"/>
       <dep package="zenity"/>
       <dep package="xwayland"/>
-      <dep package="xf86-video-wayland"/>
     </dependencies>
-    <suggests>
-      <dep package="xf86-video-intel"/>
-    </suggests>
   </autotools>
   <autotools id="network-manager-applet"
              autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
@@ -580,7 +576,7 @@
   </autotools>
 
   <autotools id="eog">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -648,7 +644,7 @@
   </autotools>
 
   <autotools id="gnome-calculator" supports-non-srcdir-builds="no">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -661,7 +657,7 @@
   </autotools>
 
   <autotools id="gnome-contacts">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="folks"/>
       <dep package="glib"/>
@@ -714,7 +710,7 @@
   </autotools>
 
   <autotools id="gnome-screenshot">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
diff --git a/gnome-world.modules b/gnome-world.modules
index fb48331..c976775 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -260,6 +260,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-icon-theme">
+    <branch repo="git.gnome.org" module="adwaita-icon-theme" revision="gnome-3-12"/>
+    <dependencies>
+      <dep package="hicolor-icon-theme"/>
+      <dep package="icon-naming-utils"/>
+      <dep package="gnome-common"/>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtkglarea">
     <branch/>
     <dependencies>
@@ -796,6 +807,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="cluttermm-1.0">
+    <branch revision="cluttermm-1-18" module="cluttermm" checkoutdir="cluttermm-1.0"/>
+    <dependencies>
+      <dep package="clutter"/>
+      <dep package="pangomm"/>
+      <dep package="atkmm"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="cluttermm">
     <branch/>
     <dependencies>
@@ -2483,7 +2503,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-ugly"
-            module="gst-plugins-ugly"/>
+            module="gst-plugins-ugly"
+            revision="1.2" />
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>