[gnome-modulesets] Resync with current modulesets

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

commit 94c7cbd03f9b45775563e093c4f17fc081750dbc
Author: Javier Jardón <javier jardon codethink co uk>
Date:   Wed Apr 2 13:07:04 2014 +0100

    Resync with current modulesets

 gnome-apps.modules      |   10 +++++++++-
 gnome-core-deps.modules |   16 +++++++++++++---
 gnome-sysdeps.modules   |    6 ------
 gnome-world.modules     |    3 +--
 4 files changed, 23 insertions(+), 12 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index b49e730..1967845 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -41,6 +41,14 @@
        that are not covered there, add them in here
     -->
 
+  <autotools id="appstream-glib">
+    <branch repo="github.com" module="hughsie/appstream-glib.git" checkoutdir="appstream-glib"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="babl">
     <branch/>
   </autotools>
@@ -926,10 +934,10 @@
   <autotools id="gnome-software">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="glib"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
-      <dep package="libnotify"/>
       <dep package="libsoup"/>
       <dep package="PackageKit"/>
       <dep package="sqlite3"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index eebd3b0..28ae142 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"/>
@@ -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-sysdeps.modules b/gnome-sysdeps.modules
index 26d04f5..d8235ab 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"
diff --git a/gnome-world.modules b/gnome-world.modules
index fb48331..0589c5a 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -155,8 +155,7 @@
     <dependencies>
       <dep package="appdata-tools"/>
       <dep package="glib"/>
-      <!-- GTK+ 3 support is still experimental. -->
-      <dep package="gtk+-2"/>
+      <dep package="gtk+"/>
       <dep package="intltool"/>
       <dep package="yelp-tools"/>
     </dependencies>