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

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

commit 3f6213687c11461d1e7bc2d705602cf03eed5301
Author: Javier Jardón <javier jardon codethink co uk>
Date:   Wed Apr 2 13:04:12 2014 +0100

    Resync with current 3.12 modulesets

 gnome-apps.modules      |   70 +++++++++++++++++++++++-----------------------
 gnome-core-deps.modules |   22 +++++++++++----
 gnome-core.modules      |   24 ++++++++--------
 gnome-sysdeps.modules   |    8 +-----
 4 files changed, 64 insertions(+), 60 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index b49e730..0d94d61 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -86,7 +86,7 @@
   </autotools>
 
   <autotools id="gnome-online-miners">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gnome-online-accounts"/>
@@ -125,7 +125,7 @@
   </autotools>
 
   <autotools id="gtkhtml">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -331,7 +331,7 @@
   <!-- Apps start here -->
 
   <autotools id="accerciser">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="at-spi2-atk"/> <!-- to make accerciser's gui accessible -->
       <dep package="intltool"/>
@@ -344,7 +344,7 @@
   </autotools>
 
   <autotools id="gnome-documents">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="evince"/>
       <dep package="gjs"/>
@@ -362,7 +362,7 @@
   </autotools>
 
   <autotools id="gnome-maps">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="clutter-gtk"/>
       <dep package="gjs"/>
@@ -388,7 +388,7 @@
   </autotools>
 
   <autotools id="glade">
-    <branch/>
+    <branch revision="glade-3-18"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gnome-common"/>
@@ -400,7 +400,7 @@
   </autotools>
 
   <autotools id="gnome-color-manager">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="exiv2"/>
       <dep package="glib"/>
@@ -425,7 +425,7 @@
   </autotools>
 
   <autotools id="rygel">
-    <branch/>
+    <branch revision="rygel-0-22"/>
     <dependencies>
       <dep package="vala"/>
       <dep package="gupnp"/>
@@ -450,7 +450,7 @@
 <!-- Featured Apps -->
 
   <autotools id="anjuta">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -470,7 +470,7 @@
   </autotools>
 
   <autotools id="cheese">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="appdata-tools"/>
       <dep package="intltool"/>
@@ -494,7 +494,7 @@
   </autotools>
 
   <autotools id="evolution" autogenargs="--disable-pst-import">
-    <branch/>
+    <branch revision="evolution-3-12"/>
     <dependencies>
       <dep package="bogofilter"/>
       <dep package="evolution-data-server"/>
@@ -574,7 +574,7 @@
   </autotools>
 
   <autotools id="gnome-boxes" autogenargs="--enable-vala">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -607,7 +607,7 @@
   </autotools>
 
   <autotools id="gnome-initial-setup">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="accountsservice"/>
       <dep package="geoclue"/>
@@ -639,7 +639,7 @@
   </autotools>
 
   <autotools id="gnome-video-effects">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="gstreamer"/>
     </dependencies>
@@ -647,7 +647,7 @@
 
   <autotools id="aisleriot"
              autogenargs="--with-platform=gtk-only">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -658,7 +658,7 @@
   </autotools>
 
   <autotools id="five-or-more">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -669,7 +669,7 @@
   </autotools>
 
   <autotools id="four-in-a-row">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -680,7 +680,7 @@
   </autotools>
 
   <autotools id="gnome-chess">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -692,7 +692,7 @@
   </autotools>
 
   <autotools id="gnome-klotski">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -702,7 +702,7 @@
   </autotools>
 
   <autotools id="gnome-logs">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="appdata-tools"/>
       <dep package="intltool"/>
@@ -714,7 +714,7 @@
   </autotools>
 
   <autotools id="gnome-mahjongg">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -725,7 +725,7 @@
   </autotools>
 
   <autotools id="gnome-mines">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -754,7 +754,7 @@
   </autotools>
 
   <autotools id="gnome-nibbles">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -793,7 +793,7 @@
   </autotools>
 
   <autotools id="gnome-photos">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="gegl"/>
       <dep package="cairo"/>
@@ -813,7 +813,7 @@
   </autotools>
 
   <autotools id="gnome-robots">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -824,7 +824,7 @@
   </autotools>
 
   <autotools id="gnome-sudoku">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -834,7 +834,7 @@
   </autotools>
 
   <autotools id="gnome-tetravex">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -854,7 +854,7 @@
   </autotools>
 
   <autotools id="iagno">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -866,7 +866,7 @@
   </autotools>
 
   <autotools id="lightsoff">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -878,7 +878,7 @@
   </autotools>
 
   <autotools id="quadrapassel">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -892,7 +892,7 @@
   </autotools>
 
   <autotools id="swell-foop">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -904,7 +904,7 @@
   </autotools>
 
   <autotools id="tali">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -924,7 +924,7 @@
   </autotools>
 
   <autotools id="gnome-software">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -969,7 +969,7 @@
   </autotools>
 
   <autotools id="orca">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
@@ -1016,7 +1016,7 @@
   </autotools>
 
   <autotools id="vinagre">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="appdata-tools"/>
       <dep package="intltool"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index eebd3b0..9b30e72 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -101,6 +101,16 @@
     </suggests>
   </autotools>
 
+  <autotools id="cairo" autogenargs="--enable-gl">
+    <branch repo="git.freedesktop.org">
+    </branch>
+    <dependencies>
+      <dep package="fontconfig"/>
+      <dep package="gtk-doc"/>
+      <dep package="pixman"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="geoclue">
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-wifi-source"/>
@@ -120,7 +130,7 @@
   </autotools>
 
   <autotools id="geocode-glib">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="json-glib"/>
@@ -271,7 +281,7 @@
 <!-- OS Core API/ABI stable dependencies -->
 
   <autotools id="atk">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -345,7 +355,7 @@
   </autotools>
 
   <autotools id="glib" autogenargs="--enable-installed-tests">
-    <branch/>
+    <branch revision="glib-2-40" />
     <dependencies>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
@@ -1229,9 +1239,9 @@
              autogenargs="--enable-introspection">
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.3.92.tar.xz" version="2.3.92"
-            hash="sha256:bde8f6bcccf6df720fdfdf6151397b7e7af94110cc5229edccf329718804f021"
-            size="9826992">
+            module="webkitgtk-2.4.0.tar.xz" version="2.4.0"
+            hash="sha256:dc5277cda89ee038408f78c94b1b07f101997f01ef877a142ffedac3b537dfbb"
+            size="9828272">
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
diff --git a/gnome-core.modules b/gnome-core.modules
index d831487..7222b14 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -103,7 +103,7 @@
   </autotools>
 
   <autotools id="gnome-online-accounts">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="WebKit"/>
@@ -235,7 +235,7 @@
   </autotools>
 
   <autotools id="gnome-packagekit">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="PackageKit"/>
       <dep package="gtk+"/>
@@ -357,7 +357,7 @@
   </autotools>
 
   <autotools id="gnome-themes-standard">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="cantarell-fonts"/>
@@ -396,7 +396,7 @@
   </autotools>
 
   <autotools id="glib-networking" autogenargs="--enable-installed-tests">
-    <branch/>
+    <branch revision="glib-2-40" />
     <dependencies>
       <dep package="glib"/>
       <dep package="intltool"/>
@@ -408,7 +408,7 @@
   </autotools>
 
   <autotools id="mousetweaks">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -629,7 +629,7 @@
 
   <autotools id="evince" autogenargs="--enable-introspection"
                          supports-parallel-builds="no">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -690,7 +690,7 @@
   </autotools>
 
   <autotools id="gnome-disk-utility">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gnome-settings-daemon"/>
@@ -704,7 +704,7 @@
   </autotools>
 
   <autotools id="gnome-font-viewer">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -733,7 +733,7 @@
   </autotools>
 
   <autotools id="gnome-system-monitor">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -748,7 +748,7 @@
   </autotools>
 
   <autotools id="gnome-terminal" autogenargs="--disable-migration">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="dconf"/>
       <dep package="intltool"/>
@@ -773,7 +773,7 @@
   </autotools>
 
   <autotools id="gucharmap">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -890,7 +890,7 @@
   </autotools>
 
   <autotools id="vino">
-    <branch/>
+    <branch revision="gnome-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index 26d04f5..d6092ec 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -42,12 +42,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="cairo">
-    <pkg-config>cairo.pc</pkg-config>
-    <branch repo="system"
-            version="1.12.2"/>
-  </systemmodule>
-
   <systemmodule id="cairomm">
     <pkg-config>cairomm-1.0.pc</pkg-config>
     <branch repo="system"
@@ -302,7 +296,7 @@
   <systemmodule id="lcms2">
     <pkg-config>lcms2.pc</pkg-config>
     <branch repo="system"
-            version="2.2"/>
+            version="2.4"/>
   </systemmodule>
 
   <systemmodule id="lcov">