[gnome-modulesets/gnome-3-14] Resync with the 3.14 modulesets



commit 61fb27ea0334f1051c2a5b9980c8fe94902c9331
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Mar 22 21:36:25 2015 +0000

    Resync with the 3.14 modulesets

 gnome-apps.modules      |  270 +++++++++---------------
 gnome-core-deps.modules |  536 ++++++++++++++++++++++++++++-------------------
 gnome-core.modules      |  198 +++++++++---------
 gnome-sysdeps.modules   |  309 +++------------------------
 gnome-world.modules     |    2 +-
 5 files changed, 547 insertions(+), 768 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index b1cdab9..ea92a5c 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -25,6 +25,8 @@
     href="https://download.gnome.org/sources/"/>
   <repository type="tarball" name="spice"
       href="http://www.spice-space.org/download/"/>
+  <repository type="tarball" name="libvirt.org"
+      href="http://libvirt.org/sources/"/>
   <repository type="tarball" name="ftp.gnu.org"
       href="http://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="qqwing"
@@ -41,12 +43,23 @@
        that are not covered there, add them in here
     -->
 
+  <autotools id="appstream-glib">
+    <if condition-set="freebsd">
+      <autogenargs value="LIBARCHIVE_CFLAGS=' ' LIBARCHIVE_LIBS='-larchive'"/>
+    </if>
+    <branch repo="github.com" module="hughsie/appstream-glib.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="babl">
     <branch/>
   </autotools>
 
   <autotools id="gegl">
-    <branch/>
+    <branch revision="gegl-0-2"/>
     <dependencies>
       <dep package="babl"/>
       <dep package="glib"/>
@@ -58,9 +71,8 @@
   </autotools>
 
   <autotools id="bijiben">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="tracker"/>
       <dep package="clutter-gtk"/>
       <dep package="gtk+"/>
@@ -74,24 +86,16 @@
     </suggests>
   </autotools>
 
-  <autotools id="dconf-editor">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="dconf"/>
-      <dep package="gtk+"/>
-      <dep package="vala"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-calendar">
-    <branch/>
+  <autotools id="libvirt" autogenargs="--with-yajl">
+    <branch repo="libvirt.org"
+            module="libvirt-1.0.6.tar.gz"
+            version="1.0.6"
+            hash="sha256:a188eb2056d7936c4c9605f4d435b9097880ec359e10be6546f2c9fa665de67d">
+    </branch>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="evolution-data-server"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="device-mapper"/>
+      <dep package="libnl"/>
+      <dep package="yajl"/>
     </dependencies>
   </autotools>
 
@@ -144,6 +148,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtkhtml">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="enchant"/>
+      <dep package="iso-codes"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
  <autotools id="gtksourceviewmm">
     <branch/>
     <dependencies>
@@ -209,26 +224,11 @@
     </suggests>
  </autotools>
 
-  <autotools id="libgda-5.2" autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi 
--disable-vala --disable-gdaui-vala">
+  <autotools id="libgda" autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi 
--enable-vala --enable-gdaui-vala">
     <if condition-set="freebsd">
       <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
     </if>
-    <branch checkoutdir="libgda-5.2" module="libgda" revision="LIBGDA_5.2"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libxml2"/>
-      <dep package="openssl"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgda"
-             autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi --enable-vala 
--enable-gdaui-vala">
-    <if condition-set="freebsd">
-      <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
-    </if>
-    <branch/>
+    <branch revision="LIBGDA_5.2"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -276,9 +276,7 @@
             version="1.2.0"
             hash="sha256:b9de6cc596049cf852d17a37014f9a4b0cac1682bd8ccff5def4433b0b52d1e1"
             size="350915"/>
-    <dependencies>
-      <dep package="c++"/>
-    </dependencies>
+    <dependencies />
   </autotools>
 
   <autotools id="speech-dispatcher" autogenargs="--with-espeak">
@@ -292,25 +290,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="usbredir">
-    <branch repo="spice"
-            module="usbredir/usbredir-0.7.tar.bz2"
-            version="0.7"
-            hash="sha256:0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"/>
-    <dependencies>
-      <dep package="libusb1"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-static">
     <if condition-set="freebsd">
       <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
     </if>
     <branch repo="spice"
-            module="gtk/spice-gtk-0.28.tar.bz2"
-            version="0.28"
-            hash="sha256:15aeeb63422cb3bfaa2edbf4602ed2025baa4455abfd1677f631245a0d0f81c4"
-            size="1274095"/>
+            module="gtk/spice-gtk-0.25.tar.bz2"
+            version="0.25"
+            hash="sha256:0730c6a80ad9f5012f65927d443377019f300573f7ccc93db84eadec462ad087"
+            size="1242457"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="cyrus-sasl"/>
@@ -323,7 +311,6 @@
       <dep package="pixman"/>
       <dep package="pulseaudio"/>
       <dep package="spice-protocol"/>
-      <dep package="usbredir"/>
       <dep package="vala"/>
       <dep package="zlib"/>
     </dependencies>
@@ -340,7 +327,7 @@
   </autotools>
 
   <autotools id="gdl">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -383,13 +370,10 @@
          cmakeargs="-DTHREADSAFE:BOOL=1">
     <branch repo="tarball.github.com"
             module="libgit2/libgit2/archive/v${version}.tar.gz"
-            version="0.22.0"
-            hash="b70965b35e6d0adc891ba2edb28d982cb27729a3f2bb02186084f692e94922b2"
+            version="0.21.2"
+            hash="619f2c10ad419ebdd2fefcf7dc81bbcfc1620359c491249ee429c503afc75eff"
             checkoutdir="libgit2-${version}">
     </branch>
-    <dependencies>
-      <dep package="libssh2"/>
-    </dependencies>
   </cmake>
 
   <autotools id="libgit2-glib">
@@ -404,7 +388,7 @@
   <!-- Apps start here -->
 
   <autotools id="accerciser">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="at-spi2-atk"/> <!-- to make accerciser's gui accessible -->
       <dep package="intltool"/>
@@ -417,7 +401,7 @@
   </autotools>
 
   <autotools id="gnome-documents">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="evince"/>
       <dep package="gjs"/>
@@ -431,12 +415,11 @@
       <dep package="libgdata"/>
       <dep package="liboauth"/>
       <dep package="libzapojit"/>
-      <dep package="WebKit"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-maps">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="clutter-gtk"/>
       <dep package="gjs"/>
@@ -447,24 +430,10 @@
       <dep package="libchamplain"/>
       <dep package="geocode-glib"/>
       <dep package="geoclue"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="libgfbgraph"/>
       <dep package="gnome-themes-standard"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-multi-writer">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="libgusb"/>
-      <dep package="udisks"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="devhelp">
     <branch/>
     <dependencies>
@@ -475,7 +444,7 @@
   </autotools>
 
   <autotools id="glade">
-    <branch/>
+    <branch revision="glade-3-18"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gnome-common"/>
@@ -512,7 +481,7 @@
   </autotools>
 
   <autotools id="rygel">
-    <branch/>
+    <branch revision="rygel-0-24"/>
     <dependencies>
       <dep package="vala"/>
       <dep package="gupnp"/>
@@ -526,7 +495,7 @@
   </autotools>
 
   <autotools id="gnome-sound-recorder">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gjs"/>
       <dep package="glib"/>
@@ -538,7 +507,7 @@
 <!-- Featured Apps -->
 
   <autotools id="anjuta">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -546,7 +515,7 @@
       <dep package="gtk+"/>
       <dep package="vte"/>
       <dep package="gdl"/>
-      <dep package="libgda-5.2"/>
+      <dep package="libgda"/>
       <dep package="gtksourceview"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -558,7 +527,7 @@
   </autotools>
 
   <autotools id="cheese">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -581,37 +550,27 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution" autogenargs="--disable-autoar --disable-libcryptui --disable-pst-import">
-    <branch/>
+  <autotools id="evolution" autogenargs="--disable-pst-import">
+    <branch revision="evolution-3-12"/>
     <dependencies>
-      <dep package="atk"/>
       <dep package="bogofilter"/>
-      <dep package="cairo"/>
-      <dep package="enchant"/>
       <dep package="evolution-data-server"/>
-      <dep package="gcr"/>
-      <dep package="gdk-pixbuf"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-online-accounts"/>
-      <dep package="gsettings-desktop-schemas"/>
       <dep package="gstreamer"/>
-      <dep package="glib"/>
       <dep package="gtk+"/>
+      <dep package="gtkhtml"/>
       <dep package="highlight"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
-      <dep package="libgcrypt"/>
       <dep package="libgdata"/>
       <dep package="libgweather"/>
       <dep package="libical"/>
-      <dep package="libnotify"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
-      <dep package="nspr"/>
-      <dep package="nss"/>
+      <dep package="libnotify"/>
       <dep package="shared-mime-info"/>
       <dep package="spamassassin"/>
-      <dep package="WebKit1"/>
       <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
@@ -621,7 +580,7 @@
   </autotools>
 
   <autotools id="file-roller">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="file"/>
       <dep package="glib"/>
@@ -649,7 +608,7 @@
   </autotools>
 
   <autotools id="gitg">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="glib"/>
@@ -671,13 +630,12 @@
   </autotools>
 
   <autotools id="gnome-boxes" autogenargs="--enable-vala">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
       <dep package="gtk-vnc"/>
       <dep package="libosinfo"/>
-      <dep package="libusb1"/>
       <dep package="libvirt-glib"/>
       <dep package="gtk+"/>
       <dep package="spice-gtk"/>
@@ -695,7 +653,7 @@
     <dependencies>
       <dep package="vala"/>
       <dep package="gtk+"/>
-      <dep package="gsound"/>
+      <dep package="libcanberra"/>
       <dep package="gnome-desktop"/>
       <dep package="libgweather"/>
       <dep package="libnotify"/>
@@ -719,7 +677,6 @@
       <dep package="iso-codes"/>
       <dep package="libgweather"/>
       <dep package="libpwquality"/>
-      <dep package="WebKit"/>
       <if condition-set="linux">
         <dep package="network-manager-applet"/>
         <dep package="NetworkManager"/>
@@ -745,22 +702,21 @@
     </dependencies>
   </autotools>
 
-  <autotools id="five-or-more">
-    <branch/>
+  <autotools id="aisleriot"
+             autogenargs="--with-platform=gtk-only">
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="librsvg"/>
       <dep package="gtk+"/>
       <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
+      <dep package="librsvg"/>
+      <dep package="guile"/>
     </dependencies>
   </autotools>
 
-  <autotools id="four-in-a-row">
-    <branch/>
+  <autotools id="five-or-more">
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -769,19 +725,20 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-characters">
-    <branch/>
+  <autotools id="four-in-a-row">
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gjs"/>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
       <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-chess">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -792,9 +749,8 @@
   </autotools>
 
   <autotools id="gnome-klotski">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -803,7 +759,7 @@
   </autotools>
 
   <autotools id="gnome-logs">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -815,9 +771,8 @@
   </autotools>
 
   <autotools id="gnome-mahjongg">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="librsvg"/>
@@ -827,9 +782,8 @@
   </autotools>
 
   <autotools id="gnome-mines">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -839,7 +793,7 @@
   </autotools>
 
   <autotools id="gnome-music">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="dbus-python"/>
       <dep package="gnome-themes-standard"/>
@@ -856,9 +810,8 @@
   </autotools>
 
   <autotools id="gnome-nibbles">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -907,7 +860,7 @@
   </autotools>
 
   <autotools id="gnome-photos">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gegl"/>
       <dep package="cairo"/>
@@ -927,9 +880,8 @@
   </autotools>
 
   <autotools id="gnome-robots">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -939,10 +891,8 @@
   </autotools>
 
   <autotools id="gnome-sudoku">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="c++"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
@@ -953,23 +903,9 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-taquin">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="intltool"/>
-      <dep package="libcanberra"/>
-      <dep package="librsvg"/>
-      <dep package="gtk+"/>
-      <dep package="vala"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-tetravex">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -1000,9 +936,8 @@
   </autotools>
 
   <autotools id="iagno">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -1013,9 +948,8 @@
   </autotools>
 
   <autotools id="lightsoff">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
@@ -1027,9 +961,8 @@
   </autotools>
 
   <autotools id="quadrapassel">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="librsvg"/>
@@ -1042,9 +975,8 @@
   </autotools>
 
   <autotools id="swell-foop">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="clutter"/>
@@ -1055,9 +987,8 @@
   </autotools>
 
   <autotools id="tali">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -1076,7 +1007,7 @@
   </autotools>
 
   <autotools id="gnome-software">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="glib"/>
@@ -1122,7 +1053,7 @@
   </autotools>
 
   <autotools id="orca">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
@@ -1138,7 +1069,7 @@
   </autotools>
 
   <autotools id="polari">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gjs"/>
       <dep package="glib"/>
@@ -1149,7 +1080,7 @@
   </autotools>
 
   <autotools id="seahorse">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="vala"/>
       <dep package="intltool"/>
@@ -1169,7 +1100,7 @@
   </autotools>
 
   <autotools id="vinagre">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -1224,11 +1155,6 @@
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="yelp-tools"/>
-      <dep package="gettext-bin"/>
-      <dep package="xmlcatalog"/>
-      <dep package="pkg-config"/>
-      <dep package="python2"/>
-      <dep package="cc"/>
     </dependencies>
   </autotools>
 
@@ -1245,7 +1171,6 @@
       <dep package="bijiben"/>
       <dep package="brasero"/>
       <dep package="cheese"/>
-      <dep package="dconf-editor"/>
       <dep package="devhelp"/>
       <dep package="evolution"/>
       <dep package="file-roller"/>
@@ -1256,9 +1181,7 @@
       <dep package="glade"/>
       <dep package="gnome-boxes"/>
       <dep package="gnome-clocks"/>
-      <dep package="gnome-characters"/>
       <dep package="gnome-chess"/>
-      <dep package="gnome-calendar"/>
       <dep package="gnome-color-manager"/>
       <dep package="gnome-documents"/>
       <dep package="gnome-devel-docs"/>
@@ -1276,7 +1199,6 @@
       <dep package="gnome-software"/>
       <dep package="gnome-sound-recorder"/>
       <dep package="gnome-sudoku"/>
-      <dep package="gnome-taquin"/>
       <dep package="gnome-tetravex"/>
       <dep package="gnome-tweak-tool"/>
       <dep package="gnome-weather"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index 1c22a82..f71376e 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -18,6 +18,8 @@
     href="git://anongit.freedesktop.org/git/xorg"/>
 <repository type="git" name="github.com"
     href="git://github.com/"/>
+<repository type="git" name="gitorious.org"
+    href="git://gitorious.org/"/>
 <repository type="bzr" name="research.operationaldynamics.com"
     href="http://research.operationaldynamics.com/bzr"/>
 <repository type="git" name="linuxwacom.git.sourceforge.net"
@@ -26,6 +28,8 @@
     href="git://repo.or.cz/"/>
 
 <!-- tarball repos -->
+<repository type="tarball" name="0pointer.de"
+    href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="iso-codes"
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
 <repository type="tarball" name="sourceforge.net"
@@ -38,12 +42,30 @@
     href="http://people.freedesktop.org/"/>
 <repository type="tarball" name="icon-theme.freedesktop.org"
     href="http://icon-theme.freedesktop.org/releases/"/>
+<repository type="tarball" name="libopenraw.freedesktop.org"
+    href="http://libopenraw.freedesktop.org/download/"/>
 <repository type="tarball" name="nice.freedesktop.org"
     href="http://nice.freedesktop.org/releases/"/>
+<repository type="tarball" name="poppler.freedesktop.org"
+    href="http://poppler.freedesktop.org/"/>
+<repository type="tarball" name="p11-glue.freedesktop.org"
+    href="http://p11-glue.freedesktop.org/releases/"/>
 <repository type="tarball" name="itstool.org"
     href="http://files.itstool.org/itstool/"/>
 <repository type="tarball" name="libpwquality"
     href="https://fedorahosted.org/releases/l/i/libpwquality/"/>
+<repository type="tarball" name="graphviz.org"
+    href="http://www.graphviz.org/pub/"/>
+<repository type="tarball" name="anthy"
+    href="http://ftp.jaist.ac.jp/pub/sourceforge.jp/anthy/37536/"/>
+<repository type="tarball" name="libhangul"
+    href="http://libhangul.googlecode.com/files/"/>
+<repository type="tarball" name="ibus"
+    href="http://ibus.googlecode.com/files/"/>
+<repository type="tarball" name="pyzy"
+    href="http://pyzy.googlecode.com/files/"/>
+<repository type="tarball" name="maxmind.com"
+      href="http://www.maxmind.com/download/"/>
 <repository type="tarball" name="ftp.mozilla.org"
       href="http://ftp.mozilla.org/"/>
 <repository type="tarball" name="kernel.org"
@@ -54,12 +76,6 @@
     href="http://libndp.org/files/"/>
 <repository type="tarball" name="mir"
     href="https://launchpad.net/mir/"/>
-<repository type="tarball" name="xorg-tar"
-    href="http://xorg.freedesktop.org/"/>
-<repository type="tarball" name="github-tar"
-    href="https://github.com/"/>
-<repository type="tarball" name="libxkbcommon"
-    href="http://xkbcommon.org/download/"/>
 
 <include href="gnome-sysdeps.modules"/>
 
@@ -67,49 +83,37 @@
 
 <!-- Build dependencies of gnome-suites-core -->
 
-  <autotools id="appstream-glib">
-    <if condition-set="freebsd">
-      <autogenargs value="LIBARCHIVE_CFLAGS=' ' LIBARCHIVE_LIBS='-larchive'"/>
-    </if>
-    <branch repo="github.com" module="hughsie/appstream-glib.git"/>
+  <autotools id="appdata-tools">
+    <branch repo="people.freedesktop.org"
+            module="~hughsient/releases/appdata-tools-${version}.tar.xz"
+            version="0.1.8"
+            hash="sha256:401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461"
+            size="251320"/>
+<!--
+    <branch repo="github.com" checkoutdir="appdata-tools" module="hughsie/appdata-tools.git"/>
+-->
     <dependencies>
-      <dep package="freetype2"/>
-      <dep package="gcab"/>
+      <dep package="appstream-glib"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libarchive"/>
+      <dep package="glib-networking"/>
       <dep package="libsoup"/>
-      <dep package="libyaml"/>
-      <dep package="sqlite3"/>
     </dependencies>
+    <suggests>
+      <dep package="libxslt"/>
+    </suggests>
   </autotools>
 
   <autotools id="cairo" autogenargs="--enable-gl">
-    <if condition-set="quartz">
-      <autogenargs value="--enable-quartz --disable-gl"/>
-    </if>
     <branch repo="git.freedesktop.org">
     </branch>
     <dependencies>
-      <if condition-unset="quartz">
-        <dep package="fontconfig"/>
-        <dep package="gl"/>
-      </if>
+      <dep package="fontconfig"/>
       <dep package="gtk-doc"/>
       <dep package="pixman"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gcab">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="vala"/>
-      <dep package="zlib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="geoclue">
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
@@ -127,7 +131,7 @@
   </autotools>
 
   <autotools id="geocode-glib">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="json-glib"/>
@@ -136,16 +140,15 @@
   </autotools>
 
   <autotools id="geoip" skip-autogen="never" autogen-sh="autoreconf">
-    <pkg-config>geoip.pc</pkg-config>
-    <branch repo="github-tar"
-            version="1.6.5"
-            module="maxmind/geoip-api-c/releases/download/v${version}/GeoIP-${version}.tar.gz"
-            hash="sha256:0ae1c95e69ad627d3a45cb897f79ce0c30f13fcd4b4a0dda073be0c9552521b3">
+    <branch repo="maxmind.com"
+            module="geoip/api/c/GeoIP-1.5.1.tar.gz" version="1.5.1"
+            hash="sha256:ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731"
+            size="1195457">
     </branch>
   </autotools>
 
   <autotools id="gcr">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
@@ -169,10 +172,6 @@
     <dependencies>
       <dep package="libxslt"/>
       <dep package="yelp-tools"/>
-      <dep package="libtool"/>
-      <dep package="gettext-bin"/>
-      <dep package="docbook-xsl"/>
-      <dep package="cc"/>
     </dependencies>
   </autotools>
 
@@ -196,7 +195,7 @@
   </autotools>
 
   <autotools id="uhttpmock">
-    <branch repo="github.com" checkoutdir="uhttpmock" module="pwithnall/uhttpmock.git"/>
+    <branch repo="gitorious.org" checkoutdir="uhttpmock" module="uhttpmock/uhttpmock.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
@@ -205,7 +204,7 @@
 
   <autotools id="libgdata">
     <pkg-config>libgdata.pc</pkg-config>
-    <branch/>
+    <branch revision="libgdata-0-16"/>
     <dependencies>
       <dep package="json-glib"/>
       <dep package="gcr"/>
@@ -219,16 +218,12 @@
     </dependencies>
   </autotools>
 
-  <cmake id="libical">
-    <pkg-config>libical.pc</pkg-config>
-    <branch repo="github-tar"
-            module="libical/libical/releases/download/v1.0.1/libical-1.0.1.tar.gz"
-            version="1.0.1"
-            hash="sha256:089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592"
-            size="720618"/>
+  <autotools id="libgsystem">
+    <branch/>
     <dependencies>
+      <dep package="glib"/>
     </dependencies>
-  </cmake>
+  </autotools>
 
   <autotools id="libmbim">
     <branch repo="git.freedesktop.org"
@@ -267,14 +262,13 @@
     </dependencies>
   </autotools>
 
-  <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0 -DMIR_PLATFORM=mesa">
+  <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0">
     <branch repo="mir"
-            module="0.8/${version}/+download/mir-${version}.tar.bz2"
-            version="0.8.0"
-            hash="sha256:a907bb7e6cf4d5975bc02db8a7b0d6e2f668527e6d38ae402ec8b87a8ca0c5f1"
-            size="1047629">
+            module="0.4/${version}/+download/mir-${version}.tar.bz2"
+            version="0.4.0"
+            hash="sha256:5d859d353da88d81bf383e37d0744796d74d24a858fcc7d978a91575ebccd524"
+            size="949452">
       <patch file="mir-gflags-noshutdown.patch" strip="1"/>
-      <patch file="mir-progressbar-example.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="boost"/>
@@ -300,7 +294,7 @@
       <dep package="glib"/>
       <dep package="dbus-glib"/>
       <dep package="gtk-doc"/>
-      <dep package="polkit-gobject"/>
+      <dep package="polkit"/>
       <dep package="gudev"/>
       <dep package="ppp"/>
       <dep package="libmbim"/>
@@ -319,10 +313,11 @@
 <!-- OS Core API/ABI stable dependencies -->
 
   <autotools id="atk">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
+      <dep package="gnome-common"/>
       <dep package="gtk-doc"/>
     </dependencies>
   </autotools>
@@ -332,7 +327,7 @@
       <autogenargs value="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform"/>
     </if>
     <pkg-config>cogl-1.0.pc</pkg-config>
-    <branch revision="cogl-1.20"/>
+    <branch revision="cogl-1.18"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
@@ -369,7 +364,7 @@
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-backend --enable-wayland-compositor --enable-evdev-input"/>
     </if>
-    <branch/>
+    <branch revision="clutter-1.20"/>
     <dependencies>
       <dep package="cogl"/>
       <dep package="atk"/>
@@ -392,9 +387,6 @@
   </autotools>
 
   <autotools id="gdk-pixbuf" autogenargs="--enable-installed-tests">
-    <if condition-set="macos">
-      <autogenargs value="--without-libtiff"/>
-    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -407,11 +399,10 @@
   </autotools>
 
   <autotools id="glib" autogenargs="--enable-installed-tests">
-    <branch/>
+    <branch revision="glib-2-42"/>
     <dependencies>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
-      <dep package="zlib"/>
     </dependencies>
     <suggests>
       <!-- these provide gnome implementations of glib
@@ -425,20 +416,14 @@
     </after>
   </autotools>
 
-  <autotools id="gtk+" autogenargs="--enable-broadway-backend --enable-installed-tests">
-    <if condition-set="x11">
-      <autogenargs value="--enable-x11-backend"/>
-    </if>
+  <autotools id="gtk+" autogenargs="--enable-x11-backend --enable-broadway-backend --enable-installed-tests">
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-backend"/>
     </if>
     <if condition-set="mir">
       <autogenargs value="--enable-mir-backend"/>
     </if>
-    <if condition-set="quartz">
-      <autogenargs value="--enable-quartz-backend"/>
-    </if>
-    <branch/>
+    <branch revision="gtk-3-14"/>
     <dependencies>
       <dep package="atk"/>
       <dep package="glib"/>
@@ -447,10 +432,7 @@
       <dep package="gdk-pixbuf"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
-      <dep package="libepoxy"/>
-      <if condition-unset="quartz">
-        <dep package="at-spi2-atk"/>
-      </if>
+      <dep package="at-spi2-atk"/>
       <if condition-set="wayland">
         <dep package="libxkbcommon"/>
         <dep package="wayland"/>
@@ -472,13 +454,9 @@
       <dep package="cairo"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
-      <if condition-set="x11">
-        <dep package="libXft"/>
-      </if>
-      <if condition-unset="quartz">
-        <dep package="harfbuzz"/>
-        <dep package="fontconfig"/>
-      </if>
+      <dep package="harfbuzz"/>
+      <dep package="libXft"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
@@ -553,8 +531,8 @@
   <autotools id="farstream" autogenargs="--disable-python">
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
-            version="0.2.7"
-            hash="sha256:dad0ed43cf94e71df558c23825abe57db59d1ee8d970ffaec5e2dbc2e7acbf7d"/>
+            version="0.2.4"
+            hash="sha256:120d5b5cd79fcbe19d9e046526fc4bc059e0a3733b3de2d7e5299dc5a3a7bb30"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -573,8 +551,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings"
-             uninstall-before-install="true">
+  <autotools id="exempi" autogenargs="--enable-unittest=no">
+    <pkg-config>exempi-2.0.pc</pkg-config>
+    <branch repo="libopenraw.freedesktop.org"
+            module="exempi-${version}.tar.bz2"
+            version="2.2.1"
+            hash="sha256:6c9e4380041abca80ef0e0029c07109f183506b812f870d8689e7140997fa601"/>
+  </autotools>
+
+  <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings">
     <branch/>
     <dependencies>
       <dep package="dbus"/>
@@ -592,13 +577,15 @@
     </suggests>
   </autotools>
 
-  <autotools id="gom">
+  <autotools id="gnome-js-common">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="sqlite3"/>
-      <dep package="gdk-pixbuf"/>
+      <dep package="intltool"/>
     </dependencies>
+    <suggests>
+      <dep package="seed"/>
+      <dep package="gjs"/>
+    </suggests>
   </autotools>
 
   <autotools id="grilo">
@@ -627,7 +614,6 @@
       <dep package="avahi"/>
       <dep package="gmime"/>
       <dep package="gnome-online-accounts"/>
-      <dep package="gom"/>
       <dep package="gssdp"/>
       <dep package="gupnp"/>
       <dep package="gupnp-av"/>
@@ -645,18 +631,8 @@
     </suggests>
   </autotools>
 
-  <autotools id="gsound" autogenargs="--disable-gtk-doc">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libcanberra"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
@@ -672,9 +648,7 @@
     <branch repo="git.freedesktop.org"
       module="harfbuzz" checkoutdir="harfbuzz"/>
     <dependencies>
-      <dep package="c++"/>
       <dep package="glib"/>
-      <dep package="libicu"/>
       <dep package="ragel"/>
     </dependencies>
   </autotools>
@@ -717,7 +691,7 @@
     <if condition-set="coverage">
       <autogenargs value="--enable-coverage"/>
     </if>
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
@@ -728,6 +702,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="seed" autogenargs="--with-webkit=3.0">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="WebKit1"/>
+      <dep package="gnome-js-common"/>
+      <dep package="mpfr"/>
+      <dep package="readline"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gstreamer"
              autogenargs="--disable-tests --disable-fatal-warnings"
              supports-non-srcdir-builds="no">
@@ -893,9 +878,6 @@
             size="96748">
       <patch file="itstool.use-correct-libxml.patch" strip="1"/>
     </branch>
-    <dependencies>
-      <dep package="libxml2-python"/>
-    </dependencies>
   </autotools>
 
   <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
@@ -914,6 +896,37 @@
     </dependencies>
   </autotools>
 
+  <autotools id="js17" check-target="false"
+      autogenargs="--enable-threadsafe --with-system-nspr --enable-debug --disable-optimize">
+    <pkg-config>mozjs-17.0.pc</pkg-config>
+    <branch repo="ftp.mozilla.org"
+            module="pub/mozilla.org/js/mozjs17.0.0.tar.gz"
+            version="17.0.0"
+            hash="sha256:321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba"
+            checkoutdir="js17-17.0.0">
+      <patch file="js17-build-fixes.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="nspr"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="js24" check-target="false"
+      autogenargs="--enable-threadsafe --with-system-nspr --enable-debug --disable-tests --disable-strip 
--enable-ctypes --enable-system-ffi --disable-intl-api">
+    <pkg-config>mozjs-24.pc</pkg-config>
+    <branch repo="ftp.mozilla.org"
+            module="pub/mozilla.org/js/mozjs-24.2.0.tar.bz2"
+            version="24.2.0"
+            hash="sha256:e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8"
+            checkoutdir="js24-24.2.0">
+      <patch file="js24-buildapi.patch" strip="1"/>
+      <patch file="js24-prettyprinters.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="nspr"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="json-glib" autogenargs="--enable-installed-tests">
     <branch/>
     <dependencies>
@@ -924,15 +937,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="lcms2" autogen-sh="configure">
-    <pkg-config>lcms2.pc</pkg-config>
-    <branch repo="sourceforge.net"
-            module="lcms/lcms2-2.6.tar.gz"
-            version="2.6"
-            hash="sha256:5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"
-            size="4583389"/>
-  </autotools>
-
   <autotools id="libdmapsharing">
     <branch/>
     <dependencies>
@@ -945,6 +949,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libcanberra" autogen-sh="configure" autogenargs="--with-systemdsystemunitdir=no">
+    <pkg-config>libcanberra-gtk.pc</pkg-config>
+    <branch repo="0pointer.de"
+            
module="http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/libcanberra-0.30.tar.xz";
+            version="0.30"
+            hash="sha256:c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72">
+    </branch>
+    <dependencies>
+      <dep package="gtk-doc"/>
+      <dep package="libvorbis"/>
+      <dep package="libtool-ltdl"/>
+    </dependencies>
+    <after>
+      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
+      <dep package="pulseaudio"/>
+      <dep package="gstreamer"/>
+    </after>
+  </autotools>
+
  <autotools id="libchamplain">
    <branch/>
    <dependencies>
@@ -961,9 +985,6 @@
  </autotools>
 
   <autotools id="libcroco" supports-non-srcdir-builds="no">
-    <if condition-unset="gnu-elf">
-      <autogenargs value="--disable-Bsymbolic"/>
-    </if>
     <pkg-config>libcroco-0.6.pc</pkg-config>
     <branch />
     <dependencies>
@@ -983,6 +1004,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgnomekbd">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+" />
+      <dep package="libxklavier" />
+    </dependencies>
+  </autotools>
+
   <autotools id="libgweather">
     <branch/>
     <dependencies>
@@ -1029,9 +1059,9 @@
              autogenargs="--enable-gupnp">
     <pkg-config>nice.pc</pkg-config>
     <branch repo="nice.freedesktop.org"
-            module="libnice-0.1.8.tar.gz"
-            version="0.1.8"
-            hash="sha256:9da7f09909902d535389d929c3e4d69129528fb18438a6c8565ec812d9904ddf"/>
+            module="libnice-0.1.7.tar.gz"
+            version="0.1.7"
+            hash="sha256:4ed165aa2203136dce548c7cef735d8becf5d9869793f96b99dcbbaa9acf78d8"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gst-plugins-base"/>
@@ -1060,13 +1090,11 @@
       <dep package="gjs"/>
       <dep package="glade"/>
       <dep package="pygobject"/>
+      <dep package="seed"/>
     </suggests>
   </autotools>
 
   <autotools id="librsvg" supports-non-srcdir-builds="no" autogenargs="--enable-vala=yes">
-    <if condition-unset="gnu-elf">
-      <autogenargs value="--disable-Bsymbolic"/>
-    </if>
     <branch/>
     <dependencies>
       <dep package="libxml2"/>
@@ -1097,6 +1125,37 @@
     <branch/>
   </autotools>
 
+  <autotools id="p11-kit" supports-non-srcdir-builds="no">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-trust-paths=/usr/local/share/certs/ca-root-nss.crt"/>
+    </if>
+    <branch repo="p11-glue.freedesktop.org"
+            module="p11-kit-0.20.3.tar.gz"
+            version="0.20.3"
+            hash="sha256:b77032bc68c24e6c3cfd8cb340a4a3bb8b7d62a7c659dae08e9b6bb7287193c3"
+            size="1171155" />
+  </autotools>
+
+  <autotools id="poppler" autogenargs="--enable-xpdf-headers --enable-poppler-glib" 
makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
+    <if condition-set="freebsd">
+      <autogenargs value="CXXFLAGS=-std=c++11"/>
+    </if>
+    <pkg-config>poppler-glib.pc</pkg-config>
+    <branch repo="poppler.freedesktop.org"
+            module="poppler-0.26.5.tar.xz"
+            version="0.26.5"
+            hash="sha256:de7de5fa337431e5d1f372e8577b3707322f1dbc1dc28a70f2927476f134d1ee"
+            size="1595232"/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="glib"/>
+    </dependencies>
+    <after>
+      <dep package="gtk+"/>
+      <dep package="gdk-pixbuf"/>
+    </after>
+  </autotools>
+
   <!-- Python 3 build of pygobject -->
   <autotools id="pygobject" autogenargs="--with-python=python3">
     <branch/>
@@ -1160,7 +1219,7 @@
   <autotools id="tracker"
              autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no 
--enable-miner-evolution=no --disable-nautilus-extension --disable-tracker-needle 
--disable-tracker-preferences --with-unicode-support=libicu"
              check-target="false">
-    <branch/>
+    <branch revision="tracker-1.2"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libicu"/>
@@ -1188,13 +1247,22 @@
   </autotools>
 
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
-    <pkg-config>libvala-0.28.pc</pkg-config>
-    <branch/>
+    <pkg-config>libvala-0.26.pc</pkg-config>
+    <branch revision="0.26"/>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
   </autotools>
 
+  <autotools id="graphviz" autogen-sh="configure">
+    <pkg-config>libgvc.pc</pkg-config>
+    <branch repo="graphviz.org"
+            module="graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz" version="2.28.0"
+            hash="md5:8d26c1171f30ca3b1dc1b429f7937e58"
+            size="19620087">
+    </branch>
+  </autotools>
+
   <autotools id="valadoc">
     <branch />
     <dependencies>
@@ -1205,16 +1273,11 @@
   </autotools>
 
   <autotools id="libepoxy">
-    <pkg-config>epoxy.pc</pkg-config>
-    <branch repo="github-tar"
-            module="anholt/libepoxy/archive/v${version}.tar.gz"
-            version="1.2"
-            checkoutdir="libepoxy-${version}"
-            hash="sha256:42c328440f60a5795835c5ec4bdfc1329e75bba16b6e22b3a87ed17e9679e8f6"
-            size="267110"/>
+    <branch repo="github.com"
+            checkoutdir="libepoxy"
+            module="anholt/libepoxy.git"/>
     <dependencies>
       <dep package="xtrans"/>
-      <dep package="egl"/>
     </dependencies>
   </autotools>
 
@@ -1235,40 +1298,42 @@
     </dependencies>
   </autotools>
 
+  <autotools id="xcb-proto">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="xcb-proto"
+            module="xcb/proto.git"
+            revision="1.10"/>
+  </autotools>
+
+  <autotools id="libxcb">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="libxcb"
+            module="xcb/libxcb.git"
+            revision="1.10"/>
+    <dependencies>
+      <dep package="xcb-proto"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
-    <branch repo="libxkbcommon"
-            module="http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz";
-            version="0.5.0"
-            hash="sha256:90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
-            size="615504"/>
+    <branch repo="github.com" checkoutdir="libxkbcommon" module="xkbcommon/libxkbcommon.git"/>
     <dependencies>
-      <dep package="xorg-macros"/>
+      <dep package="xorg-x11-util-macros"/>
       <dep package="xorg-xproto"/>
       <dep package="xorg-kbproto"/>
       <dep package="libX11"/>
-      <dep package="xcb"/>
-      <dep package="xcb-xkb"/>
+      <dep package="libxcb"/>
     </dependencies>
   </autotools>
 
-  <autotools id="wayland"
-             autogenargs="--disable-documentation">
+  <autotools id="wayland">
     <branch repo="wayland.freedesktop.org"/>
     <dependencies>
       <dep package="libffi"/>
       <dep package="doxygen"/>
-      <dep package="xmlto"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xtrans">
-    <pkg-config>xtrans.pc</pkg-config>
-    <branch repo="xorg-tar"
-            module="releases/individual/lib/xtrans-1.3.5.tar.gz" version="1.3.5"
-            size="227536"
-            hash="sha256:b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d"/>
-  </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 --enable-xwayland">
     <branch repo="xorg.freedesktop.org"
@@ -1279,30 +1344,17 @@
       <dep package="xtrans"/>
       <dep package="wayland"/>
       <dep package="libepoxy"/>
-      <dep package="pciaccess"/>
-      <dep package="xorg-xcmiscproto"/>
-      <dep package="xorg-bigreqsproto"/>
-      <dep package="xorg-scrnsaverproto"/>
-      <dep package="xorg-resourceproto"/>
-      <dep package="xorg-xf86driproto"/>
-      <dep package="xorg-presentproto"/>
-      <dep package="xorg-videoproto"/>
-      <dep package="xcb-keysyms"/>
-      <if condition-set="systemd">
-        <dep package="libsystemd-daemon"/>
-      </if>
     </dependencies>
   </autotools>
 
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
     <pkg-config>webkit2gtk-4.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.7.92.tar.xz" version="2.7.92"
-            hash="sha256:5bc7b2737f5372ca82136d3b349d08d2b6bcbc5841d7a6888f10302e6e36bb10"
-            size="10431452">
+            module="webkitgtk-2.6.5.tar.xz" version="2.6.5"
+            hash="sha256:b1658017cea7cc545b9e01f22af585986e21e4242825e215bc5f8e0c0dc67593"
+            size="10000124">
     </branch>
     <dependencies>
-      <dep package="c++"/>
       <dep package="at-spi2-core"/>
       <dep package="cairo"/>
       <dep package="fontconfig"/>
@@ -1347,8 +1399,6 @@
       <dep package="intltool"/>
       <dep package="yelp-xsl"/>
       <dep package="itstool"/>
-      <dep package="xmllint"/>
-      <dep package="xsltproc"/>
     </dependencies>
   </autotools>
 
@@ -1363,7 +1413,7 @@
   </autotools>
 
   <autotools id="zenity">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -1401,12 +1451,9 @@
         <dep package="libgusb"/>
         <dep package="gudev"/>
       </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd-login"/>
-      </if>
     </dependencies>
     <suggests>
-      <dep package="polkit-gobject"/>
+      <dep package="polkit"/>
     </suggests>
   </autotools>
 
@@ -1446,12 +1493,13 @@
     </dependencies>
   </autotools>
 
-  <autotools id="ibus"
-             autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui 
GSETTINGS_SCHEMA_CONVERT=/usr/bin/false --with-python=python3">
-    <branch repo="github-tar"
-            version="1.5.10"
-            module="ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
-            hash="sha256:1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594">
+  <autotools id="ibus" autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf 
--disable-ui GSETTINGS_SCHEMA_CONVERT=/usr/bin/false">
+    <branch repo="ibus"
+            module="ibus-${version}.tar.gz"
+            version="1.5.5"
+            size="2063794"
+            hash="sha256:02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec">
+      <patch file="ibus.skip-dconf-update-if-DESTDIR-is-set.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="dbus"/>
@@ -1463,25 +1511,43 @@
     </dependencies>
   </autotools>
 
-  <autotools id="ibus-libpinyin"
-             autogenargs="--disable-lua-extension --with-python=python3">
-    <branch repo="github-tar"
-            version="1.7.0"
-            module="libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
-            checkoutdir="ibus-libpinyin-${version}"
-            hash="sha256:4fcdf3300afe5b6551f0a05ce3e9f7e9fb43dd73f16604cabed348b4cc7f5d36"/>
+  <autotools id="pyzy"
+             autogenargs="--enable-db-open-phrase --disable-db-android">
+    <branch repo="pyzy"
+            module="pyzy-${version}.tar.gz"
+            version="0.1.0"
+            hash="sha256:fe468a4372473d85a56f05d55b14f0e0201fde6f9336a1a2322cf79421c84d9a"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
+
+  <autotools id="ibus-pinyin"
+             makeargs="CFLAGS=-Wno-error">
+    <branch repo="ibus"
+            module="ibus-pinyin-${version}.tar.gz"
+            version="1.5.0"
+            hash="sha256:a85d458dcc51ea9fd65849e63002428b3fcb3b39adcbea9214b5cb4a4cbdbc96"/>
     <dependencies>
       <dep package="ibus"/>
-      <dep package="libpinyin"/>
+      <dep package="pyzy"/>
       <dep package="sqlite3"/>
     </dependencies>
   </autotools>
 
+  <autotools id="anthy">
+    <branch repo="anthy"
+            module="anthy-9100h.tar.gz" version="9100h"
+            hash="sha1:bfea9e74e208c4b976b6bd7ac6784cd290c636fd" size="4446148"/>
+  </autotools>
+
   <autotools id="ibus-anthy" autogenargs="--enable-private-png=yes">
-    <branch repo="github-tar"
-            version="1.5.6"
-            module="ibus/ibus-anthy/releases/download/${version}/ibus-anthy-${version}.tar.gz"
-            hash="sha256:035c636bc884ff3131bb75aee6ec58db938d3797344687a2eb5f18542801896e"/>
+    <branch repo="ibus"
+            module="ibus-anthy-${version}.tar.gz"
+            version="1.5.0"
+            hash="sha256:3addfa3e3682fcc07b8edc9470dd4bcd4cf42d4303f1538fe56164f029c181b7"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1490,12 +1556,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="ibus-hangul"
-             autogen-sh="configure">
-    <branch repo="github-tar"
-            version="1.5.0"
-            module="choehwanjin/ibus-hangul/releases/download/${version}/ibus-hangul-${version}.tar.gz"
-            hash="sha256:a22d4030bb20f73914a9d8a28c71b823123a5d1902a30f8328111af50f4f1788"/>
+  <autotools id="libhangul">
+    <branch repo="libhangul"
+            module="libhangul-0.1.0.tar.gz" version="0.1.0"
+            hash="sha1:9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77" size="2899845"/>
+  </autotools>
+
+  <autotools id="ibus-hangul">
+    <branch repo="ibus"
+            module="ibus-hangul-1.4.1.tar.gz" version="1.4.1"
+            hash="sha1:659899cf942a983fbd2ffbb4bd4f5ecd883f5c0a" size="484065"/>
     <dependencies>
       <dep package="ibus"/>
       <dep package="libhangul"/>
@@ -1505,9 +1575,6 @@
   <!-- Deprecated dependencies -->
 
   <autotools id="gtk+-2">
-    <if condition-set="quartz">
-      <autogenargs value="--with-backend=quartz"/>
-    </if>
     <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
     <dependencies>
       <dep package="glib"/>
@@ -1538,14 +1605,55 @@
     </dependencies>
   </autotools>
 
+  <autotools id="sbc">
+    <pkg-config>sbc.pc</pkg-config>
+    <branch repo="kernel.org"
+            module="pub/linux/bluetooth/sbc-${version}.tar.xz"
+            version="1.1"
+            hash="sha256:9a30ad2dc20979a0847a7b1a06ea073498810f358a02fcad68ab414f239cfbc6"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="WebKit1" makefile="GNUmakefile"
+             autogenargs="--enable-introspection --disable-webkit2">
+    <pkg-config>webkitgtk-3.0.pc</pkg-config>
+    <branch repo="webkitgtk.org"
+            module="webkitgtk-2.4.6.tar.xz" version="2.4.6"
+            hash="sha256:6fef4aa8d4a2668e03ea15472a71396ea7b776bbe56ad9459a4124b823c11457"
+            size="9862200">
+    </branch>
+    <dependencies>
+      <dep package="at-spi2-core"/>
+      <dep package="cairo"/>
+      <dep package="fontconfig"/>
+      <dep package="geoclue"/>
+      <dep package="libxml2"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gtk+"/>
+      <dep package="pango"/>
+      <dep package="libsoup"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gperf"/>
+      <dep package="libicu"/>
+      <dep package="libXt"/>
+      <dep package="ruby"/>
+      <dep package="libsecret"/>
+      <dep package="libwebp"/>
+    </dependencies>
+    <suggests>
+      <dep package="libxslt"/>
+      <dep package="sqlite3"/>
+      <dep package="enchant"/>
+    </suggests>
+  </autotools>
+
   <autotools id="zeitgeist">
     <branch repo="git.freedesktop.org"
             module="zeitgeist/zeitgeist"
             checkoutdir="zeitgeist"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="rapper"/>
-      <dep package="rdflib"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
     </dependencies>
diff --git a/gnome-core.modules b/gnome-core.modules
index bcd0e54..039a8d0 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -32,7 +32,7 @@
 <!-- Core User Shell -->
 
   <autotools id="at-spi2-core">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
@@ -41,7 +41,7 @@
   </autotools>
 
   <autotools id="at-spi2-atk">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
@@ -55,8 +55,10 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gtk+"/>
       <dep package="dbus"/>
       <dep package="vala"/>
+      <dep package="libxml2"/>
     </dependencies>
   </autotools>
 
@@ -70,7 +72,7 @@
     <if condition-set="freebsd">
       <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
-    <branch/>
+    <branch revision="evolution-data-server-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
@@ -98,6 +100,8 @@
       <dep package="gtk+"/>
       <dep package="gtk-doc"/>
       <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="libnotify"/>
       <dep package="nautilus-sendto"/>
     </dependencies>
     <suggests>
@@ -106,22 +110,20 @@
   </autotools>
 
   <autotools id="gnome-online-accounts">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
+      <dep package="libnotify"/>
       <dep package="librest"/>
-      <dep package="libsoup"/>
-      <dep package="libsecret"/>
       <dep package="json-glib"/>
       <dep package="libsecret"/>
-      <dep package="libxml2"/>
       <dep package="telepathy-glib"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="accountsservice"/>
       <dep package="clutter-gtk"/>
@@ -138,13 +140,12 @@
       <dep package="ibus"/>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
-      <dep package="krb5"/>
-      <dep package="libcanberra-gtk3"/>
+      <dep package="libcanberra"/>
       <dep package="libgtop"/>
       <dep package="libnotify"/>
       <dep package="libpwquality"/>
       <dep package="libxml2"/>
-      <dep package="polkit-gobject"/>
+      <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="smbclient"/>
       <dep package="sound-theme-freedesktop"/>
@@ -160,7 +161,7 @@
       <dep package="cups"/>
       <dep package="cheese"/>
       <dep package="gstreamer"/>
-      <dep package="ibus-libpinyin"/>
+      <dep package="ibus-pinyin"/>
       <dep package="ibus-anthy"/>
       <dep package="ibus-hangul"/>
       <if condition-set="linux">
@@ -172,7 +173,7 @@
   </autotools>
 
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxkbfile"/>
@@ -189,7 +190,7 @@
   </autotools>
 
   <autotools id="adwaita-icon-theme">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="hicolor-icon-theme"/>
       <dep package="gnome-common"/>
@@ -200,7 +201,7 @@
   </autotools>
 
   <autotools id="gnome-keyring">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="dbus"/>
@@ -235,9 +236,6 @@
       <if condition-set="linux">
         <dep package="gudev"/>
       </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd-login"/>
-      </if>
     </suggests>
   </autotools>
 
@@ -249,23 +247,23 @@
       <dep package="gtk+"/>
       <dep package="gnome-desktop"/>
       <dep package="json-glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="startup-notification"/>
       <dep package="upower"/>
       <dep package="libXcomposite"/>
       <dep package="sm"/>
       <dep package="xtrans"/>
-      <if condition-set="systemd">
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-journal"/>
-        <dep package="libsystemd-login"/>
-      </if>
     </dependencies>
+    <suggests>
+      <dep package="polkit"/>
+    </suggests>
   </autotools>
 
   <autotools id="gnome-settings-daemon">
     <if condition-unset="linux">
       <autogenargs value="--disable-rfkill --disable-gudev --disable-network-manager"/>
     </if>
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="colord"/>
       <dep package="geoclue"/>
@@ -275,16 +273,17 @@
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
-      <dep package="libcanberra-gtk3"/>
+      <dep package="libcanberra"/>
       <dep package="libgweather"/>
       <dep package="libnotify"/>
       <dep package="PackageKit"/>
-      <dep package="polkit-gobject"/>
+      <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="upower"/>
       <dep package="ibus"/>
       <dep package="cups"/>
       <if condition-set="linux">
+        <dep package="libgsystem"/>
         <dep package="librsvg"/>
         <dep package="libwacom"/>
         <dep package="xorg-wacom"/>
@@ -301,7 +300,7 @@
     <if condition-unset="linux">
       <autogenargs value="--disable-networkmanager"/>
     </if>
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="accountsservice"/>
       <dep package="caribou"/>
@@ -312,6 +311,7 @@
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
       <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-menus"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
@@ -320,7 +320,7 @@
       <dep package="libcroco"/>
       <dep package="libsoup"/>
       <dep package="mutter"/>
-      <dep package="polkit-agent"/>
+      <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="startup-notification"/>
       <dep package="telepathy-glib"/>
@@ -330,9 +330,7 @@
       <if condition-set="linux">
         <dep package="gnome-bluetooth"/>
         <dep package="NetworkManager"/>
-      </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd-journal"/>
+        <dep package="network-manager-applet"/>
       </if>
     </dependencies>
     <suggests>
@@ -345,7 +343,7 @@
   </autotools>
 
   <autotools id="gnome-themes-standard">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="cantarell-fonts"/>
@@ -365,20 +363,15 @@
   </autotools>
 
  <autotools id="gvfs">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="dbus"/>
-      <dep package="libgcrypt"/>
       <dep package="libsoup"/>
       <if condition-set="linux">
         <dep package="udisks"/>
       </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd"/>
-        <dep package="libsystemd-login"/>
-      </if>
     </dependencies>
     <suggests>
       <dep package="libgphoto2"/>
@@ -416,10 +409,11 @@
   </autotools>
 
   <autotools id="mutter" autogenargs="--enable-compile-warnings=maximum --enable-installed-tests">
-    <branch />
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="cogl"/>
       <dep package="clutter"/>
+      <dep package="gbm"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
@@ -443,7 +437,6 @@
       <dep package="upower"/>
       <dep package="zenity"/>
       <if condition-set="wayland">
-        <dep package="gbm"/>
         <dep package="libdrm"/>
         <dep package="libsystemd"/>
         <dep package="wayland"/>
@@ -452,6 +445,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="network-manager-applet"
+             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+    <branch revision="nma-0-9-8"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-bluetooth"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="gudev"/>
+      <dep package="iso-codes"/>
+      <dep package="libsecret"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+    </dependencies>
+    <suggests>
+      <dep package="mobile-broadband-provider-info"/>
+    </suggests>
+  </autotools>
+
   <autotools id="pulseaudio"
              autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf --disable-gtk3 
--enable-bluez5">
     <if condition-unset="linux">
@@ -473,13 +486,10 @@
         <dep package="libudev"/>
         <dep package="sbc"/>
       </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd"/>
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-journal"/>
-        <dep package="libsystemd-login"/>
-      </if>
     </dependencies>
+    <after>
+      <dep package="polkit"/>
+    </after>
   </autotools>
 
   <!-- mc 5.16 doesn't build against upower 1.0 -->
@@ -502,7 +512,7 @@
 <!-- Core Utilities -->
 
   <autotools id="baobab">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -580,7 +590,7 @@
   </autotools>
 
   <autotools id="epiphany">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
@@ -623,21 +633,20 @@
   </autotools>
 
   <autotools id="gnome-calculator" supports-non-srcdir-builds="no">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="gtksourceview"/>
       <dep package="libxml2"/>
-      <dep package="mpfr"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-contacts">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="folks"/>
       <dep package="glib"/>
@@ -656,7 +665,7 @@
   </autotools>
 
   <autotools id="gnome-dictionary">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -680,7 +689,7 @@
   </autotools>
 
   <autotools id="gnome-font-viewer">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -690,7 +699,7 @@
   </autotools>
 
   <autotools id="gnome-screenshot">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -709,7 +718,7 @@
   </autotools>
 
   <autotools id="gnome-system-monitor">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -723,7 +732,7 @@
   </autotools>
 
   <autotools id="gnome-terminal" autogenargs="--disable-migration">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="dconf"/>
       <dep package="intltool"/>
@@ -734,7 +743,7 @@
       <dep package="vte"/>
       <dep package="yelp-tools"/>
       <dep package="nautilus"/>
-      <dep package="appstream-glib"/>
+      <dep package="appdata-tools"/>
     </dependencies>
     <suggests>
       <dep package="gnome-shell"/>
@@ -749,7 +758,7 @@
   </autotools>
 
   <autotools id="gucharmap">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -759,7 +768,7 @@
   </autotools>
 
   <autotools id="nautilus">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -787,7 +796,7 @@
       <dep package="clutter-gtk"/>
       <dep package="clutter-gst"/>
       <dep package="gtksourceview"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
@@ -797,14 +806,13 @@
   <autotools id="totem">
     <branch/>
     <dependencies>
-      <dep package="appstream-glib"/>
+      <dep package="appdata-tools"/>
       <dep package="cairo"/>
       <dep package="clutter"/>
-      <dep package="clutter-gst3"/>
+      <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
-      <dep package="gnome-desktop"/>
       <dep package="grilo"/>
       <dep package="grilo-plugins"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -869,7 +877,7 @@
   </autotools>
 
   <autotools id="vino">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -895,12 +903,8 @@
   <autotools id="accountsservice" autogenargs="--with-systemdsystemunitdir=no">
     <branch repo="git.freedesktop.org" module="accountsservice"/>
     <dependencies>
-      <dep package="glib"/>
+      <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="polkit-gobject"/>
-      <if condition-set="systemd">
-        <dep package="libsystemd-login"/>
-      </if>
     </dependencies>
   </autotools>
 
@@ -923,9 +927,6 @@
   </autotools>
 
   <autotools id="gdm">
-    <if condition-unset="linux">
-      <autogenargs value="--without-plymouth"/>
-    </if>
     <branch/>
     <dependencies>
       <dep package="accountsservice"/>
@@ -936,15 +937,6 @@
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="nss"/>
-      <dep package="pam"/>
-      <if condition-set="linux">
-        <dep package="plymouth"/>
-      </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-login"/>
-        <dep package="libsystemd-journal"/>
-      </if>
     </dependencies>
     <suggests>
       <dep package="upower"/>
@@ -968,16 +960,12 @@
       <dep package="libgcrypt"/>
       <dep package="libuuid"/>
       <dep package="gtk-doc"/>
-      <dep package="polkit-agent"/>
+      <dep package="polkit"/>
       <dep package="gudev"/>
       <dep package="gnutls"/>
       <dep package="ppp"/>
       <dep package="vala"/>
       <dep package="wireless-tools"/>
-      <if condition-set="systemd">
-        <dep package="libsystemd"/>
-        <dep package="libsystemd-login"/>
-      </if>
     </dependencies>
   </autotools>
 
@@ -995,13 +983,9 @@
       <dep package="gtk+"/>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
-      <if condition-set="systemd">
-        <dep package="libsystemd-journal"/>
-        <dep package="libsystemd-login"/>
-      </if>
     </dependencies>
     <suggests>
-      <dep package="polkit-gobject"/>
+      <dep package="polkit"/>
       <if condition-set="linux">
         <dep package="gudev"/>
         <dep package="NetworkManager"/>
@@ -1009,20 +993,29 @@
     </suggests>
   </autotools>
 
+  <autotools id="polkit">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-test"/>
+    </if>
+    <branch repo="git.freedesktop.org"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="expat"/>
+      <dep package="intltool"/>
+      <dep package="js17"/>
+      <dep package="pam"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="udisks">
     <pkg-config>udisks2.pc</pkg-config>
     <branch repo="git.freedesktop.org" module="udisks"/>
     <dependencies>
       <dep package="gudev"/>
       <dep package="libacl"/>
-      <dep package="polkit-gobject"/>
-      <dep package="polkit-agent"/>
+      <dep package="polkit"/>
       <dep package="libatasmart"/>
-      <if condition-set="systemd">
-        <dep package="libsystemd"/>
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-login"/>
-      </if>
     </dependencies>
   </autotools>
 
@@ -1040,10 +1033,9 @@
   </autotools>
 
   <autotools id="gnome-shell-extensions" autogenargs="--enable-extensions=classic-mode">
-    <branch/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gnome-shell"/>
-      <dep package="gnome-menus"/>
     </dependencies>
   </autotools>
 
@@ -1089,6 +1081,7 @@
       <dep package="gnome-control-center"/>
       <dep package="adwaita-icon-theme"/>
       <dep package="gnome-keyring"/>
+      <dep package="gnome-menus"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-packagekit"/>
       <dep package="gnome-session"/>
@@ -1126,6 +1119,7 @@
       <dep package="dbus"/>
       <dep package="gdm"/>
       <dep package="PackageKit"/>
+      <dep package="polkit"/>
       <dep package="upower"/>
       <dep package="cups"/>
       <!-- <dep package="systemd"/> -->
@@ -1172,6 +1166,7 @@
       <dep package="libnotify"/>
       <dep package="libpeas"/>
       <dep package="PackageKit"/>
+      <dep package="polkit"/>
       <dep package="telepathy-glib"/>
       <dep package="upower"/>
       <dep package="WebKit"/>
@@ -1179,6 +1174,7 @@
       <dep package="pygobject"/>
       <dep package="gtkmm"/>
       <dep package="java-gnome"/>
+      <dep package="seed"/>
       <if condition-set="linux">
         <dep package="NetworkManager"/>
       </if>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index c5d08e8..f5397c2 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -15,12 +15,6 @@
             version="1.0.19"/>
   </systemmodule>
 
-  <systemmodule id="anthy">
-    <pkg-config>anthy.pc</pkg-config>
-    <branch repo="system"
-            version="9100h"/>
-  </systemmodule>
-
   <systemmodule id="avahi">
     <pkg-config>avahi-gobject.pc</pkg-config>
     <branch repo="system"
@@ -28,7 +22,7 @@
   </systemmodule>
 
   <systemmodule id="bison">
-    <branch repo="system" version="2.4"/>
+    <branch repo="system" version="2.0"/>
     <systemdependencies>
       <dep type="path" name="bison"/>
     </systemdependencies>
@@ -48,26 +42,12 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="c++">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="c++"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="cairomm">
     <pkg-config>cairomm-1.0.pc</pkg-config>
     <branch repo="system"
             version="1.8.4"/>
   </systemmodule>
 
-  <systemmodule id="cc">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="cc"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="cracklib">
     <branch repo="system"/>
     <systemdependencies>
@@ -117,13 +97,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="docbook-xsl">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="xml" name="http://docbook.sourceforge.net/release/xsl/current/"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="dotconf">
     <pkg-config>dotconf.pc</pkg-config>
     <branch repo="system" version="1.3"/>
@@ -154,12 +127,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="exempi">
-    <pkg-config>exempi-2.0.pc</pkg-config>
-    <branch repo="system"
-            version="2.2.0"/>
-  </systemmodule>
-
   <systemmodule id="exiv2">
     <pkg-config>exiv2.pc</pkg-config>
     <branch repo="system" version="0"/>
@@ -229,13 +196,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="gettext-bin">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="msgfmt"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="gexiv2">
     <pkg-config>gexiv2.pc</pkg-config>
     <branch repo="system"/>
@@ -288,17 +248,17 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="graphviz">
-    <pkg-config>libgvc.pc</pkg-config>
-    <branch repo="system"
-            version="2.26.0"/>
-  </systemmodule>
-
   <systemmodule id="gudev">
     <pkg-config>gudev-1.0.pc</pkg-config>
     <branch repo="system" version="173"/>
   </systemmodule>
 
+  <systemmodule id="gypsy">
+    <pkg-config>gypsy.pc</pkg-config>
+    <branch repo="system"
+            version="0.8"/>
+  </systemmodule>
+
   <systemmodule id="highlight">
     <branch repo="system"/>
     <systemdependencies>
@@ -328,17 +288,10 @@
             version="0.11"/>
   </systemmodule>
 
-  <systemmodule id="js24">
-    <pkg-config>mozjs-24.pc</pkg-config>
+  <systemmodule id="lcms2">
+    <pkg-config>lcms2.pc</pkg-config>
     <branch repo="system"
-            version="24.2"/>
-  </systemmodule>
-
-  <systemmodule id="krb5">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="krb5-config"/>
-    </systemdependencies>
+            version="2.6"/>
   </systemmodule>
 
   <systemmodule id="lcov">
@@ -355,36 +308,12 @@
             version="0.17"/>
   </systemmodule>
 
-  <systemmodule id="libcanberra">
-    <pkg-config>libcanberra-gtk.pc</pkg-config>
-    <branch repo="system"
-            version="0.30"/>
-  </systemmodule>
-
-  <systemmodule id="libcanberra-gtk3">
-    <pkg-config>libcanberra-gtk3.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="libhangul">
-    <pkg-config>libhangul.pc</pkg-config>
-    <branch repo="system"
-            version="0.1.0"/>
-  </systemmodule>
-
   <systemmodule id="libmusicbrainz">
     <pkg-config>libmusicbrainz5.pc</pkg-config>
     <branch repo="system"
             version="5.0"/>
   </systemmodule>
 
-  <systemmodule id="libtool">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="libtoolize"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="libX11">
     <pkg-config>x11.pc</pkg-config>
     <branch repo="system"/>
@@ -447,7 +376,7 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xorg-macros">
+  <systemmodule id="xorg-x11-util-macros">
     <pkg-config>xorg-macros.pc</pkg-config>
     <branch repo="system"/>
   </systemmodule>
@@ -457,46 +386,11 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xorg-bigreqsproto">
-    <pkg-config>bigreqsproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="xorg-kbproto">
     <pkg-config>kbproto.pc</pkg-config>
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xorg-presentproto">
-    <pkg-config>presentproto.pc</pkg-config>
-    <branch repo="system"/>
-    </systemmodule>
-
-  <systemmodule id="xorg-resourceproto">
-    <pkg-config>resourceproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="xorg-scrnsaverproto">
-    <pkg-config>scrnsaverproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="xorg-videoproto">
-    <pkg-config>videoproto.pc</pkg-config>
-    <branch repo="system"/>
-    </systemmodule>
-
-  <systemmodule id="xorg-xcmiscproto">
-    <pkg-config>xcmiscproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="xorg-xf86driproto">
-    <pkg-config>xf86driproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="libacl">
     <branch repo="system"/>
     <systemdependencies>
@@ -554,6 +448,12 @@
             version="2.4.13"/>
   </systemmodule>
 
+  <systemmodule id="libical">
+    <pkg-config>libical.pc</pkg-config>
+    <branch repo="system"
+            version="0.44"/>
+  </systemmodule>
+
   <systemmodule id="libicu">
     <pkg-config>icu-i18n.pc</pkg-config>
     <branch repo="system" version="4"/>
@@ -590,11 +490,6 @@
             version="0.9.4"/>
   </systemmodule>
 
-  <systemmodule id="libpinyin">
-    <pkg-config>libpinyin.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="libpng">
     <pkg-config>libpng.pc</pkg-config>
     <branch repo="system"/>
@@ -616,30 +511,16 @@
             version="1.0.21"/>
   </systemmodule>
 
-  <systemmodule id="libssh2">
-    <pkg-config>libssh2.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="libsystemd">
     <pkg-config>libsystemd.pc</pkg-config>
     <branch repo="system"
             version="210"/>
   </systemmodule>
 
-  <systemmodule id="libsystemd-daemon">
-    <pkg-config>libsystemd-daemon.pc</pkg-config>
-    <branch repo="system" version="210"/>
-  </systemmodule>
-
   <systemmodule id="libsystemd-journal">
     <pkg-config>libsystemd-journal.pc</pkg-config>
-    <branch repo="system" version="201"/>
-  </systemmodule>
-
-  <systemmodule id="libsystemd-login">
-    <pkg-config>libsystemd-login.pc</pkg-config>
-    <branch repo="system" version="210"/>
+    <branch repo="system"
+            version="201"/>
   </systemmodule>
 
   <systemmodule id="libtasn1">
@@ -690,12 +571,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="libvirt">
-    <pkg-config>libvirt.pc</pkg-config>
-    <branch repo="system"
-            version="1.0.6"/>
-  </systemmodule>
-
   <systemmodule id="libvorbis">
     <pkg-config>vorbisfile.pc</pkg-config>
     <branch repo="system"/>
@@ -723,26 +598,12 @@
             version="2.7.8"/>
   </systemmodule>
 
-  <systemmodule id="libxml2-python">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="python2" name="libxml2"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="libxslt">
     <pkg-config>libxslt.pc</pkg-config>
     <branch repo="system"
             version="1.1.26"/>
   </systemmodule>
 
-  <systemmodule id="libyaml">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="c_include" name="yaml.h"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="libwebp">
    <branch repo="system"/>
     <systemdependencies>
@@ -793,12 +654,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="p11-kit">
-    <pkg-config>p11-kit-1.pc</pkg-config>
-    <branch repo="system"
-            version="0.19.0"/>
-  </systemmodule>
-
   <systemmodule id="pam">
     <branch repo="system"/>
     <systemdependencies>
@@ -806,46 +661,12 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="pciaccess">
-    <pkg-config>pciaccess.pc</pkg-config>
-    <branch repo="system" version="0.12.901"/>
-  </systemmodule>
-
   <systemmodule id="pixman">
     <pkg-config>pixman-1.pc</pkg-config>
     <branch repo="system"
             version="0.30"/>
   </systemmodule>
 
-  <systemmodule id="pkg-config">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="pkg-config"/>
-    </systemdependencies>
-  </systemmodule>
-
-  <systemmodule id="plymouth">
-    <pkg-config>ply-boot-client.pc</pkg-config>
-    <branch repo="system"
-            version="0.8.9"/>
-  </systemmodule>
-
-  <systemmodule id="polkit-agent">
-    <pkg-config>polkit-agent-1.pc</pkg-config>
-    <branch repo="system" version="0.102"/>
-  </systemmodule>
-
-  <systemmodule id="polkit-gobject">
-    <pkg-config>polkit-gobject-1.pc</pkg-config>
-    <branch repo="system" version="0.103"/>
-  </systemmodule>
-
-  <systemmodule id="poppler">
-    <pkg-config>poppler-glib.pc</pkg-config>
-    <branch repo="system"
-            version="0.24.0"/>
-  </systemmodule>
-
   <systemmodule id="ppp">
     <branch repo="system"/>
     <systemdependencies>
@@ -865,13 +686,6 @@
             version="1.10.0"/>
   </systemmodule>
 
-  <systemmodule id="python2">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="python2"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="python2-devel">
     <pkg-config>python2.pc</pkg-config>
     <branch repo="system"
@@ -892,20 +706,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="rapper">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="rapper"/>
-    </systemdependencies>
-  </systemmodule>
-
-  <systemmodule id="rdflib">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="python2" name="rdflib"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="readline">
     <branch repo="system"/>
     <systemdependencies>
@@ -920,12 +720,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="sbc">
-    <pkg-config>sbc.pc</pkg-config>
-    <branch repo="system"
-            version="1.1"/>
-  </systemmodule>
-
   <systemmodule id="shared-mime-info">
     <pkg-config>shared-mime-info.pc</pkg-config>
     <branch repo="system"
@@ -1004,31 +798,16 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="xcb">
-    <pkg-config>xcb.pc</pkg-config>
-    <branch repo="system" version="1.10"/>
-  </systemmodule>
-
   <systemmodule id="xcb-dri2">
     <pkg-config>xcb-dri2.pc</pkg-config>
     <branch repo="system" version="1.8.1"/>
   </systemmodule>
 
-  <systemmodule id="xcb-keysyms">
-    <pkg-config>xcb-keysyms.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="xcb-util">
     <pkg-config>xcb-aux.pc</pkg-config>
     <branch repo="system" version="0.1"/>
   </systemmodule>
 
-  <systemmodule id="xcb-xkb">
-    <pkg-config>xcb-xkb.pc</pkg-config>
-    <branch repo="system" version="1.10"/>
-  </systemmodule>
-
   <systemmodule id="xkeyboard-config">
     <pkg-config>xkeyboard-config.pc</pkg-config>
     <branch repo="system"/>
@@ -1039,6 +818,13 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="yajl">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="yajl/yajl_common.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="yasm">
     <branch repo="system"/>
     <systemdependencies>
@@ -1062,6 +848,11 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="xtrans">
+    <pkg-config>xtrans.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="gtkspell-3">
     <pkg-config>gtkspell3-3.0.pc</pkg-config>
     <branch repo="system"/>
@@ -1107,42 +898,4 @@
     <pkg-config>lttng-ust.pc</pkg-config>
     <branch repo="system" version="2.3.0"/>
   </systemmodule>
-
-  <systemmodule id="WebKit1">
-    <pkg-config>webkitgtk-3.0.pc</pkg-config>
-    <branch repo="system" version="2.0.0"/>
-  </systemmodule>
-
-  <systemmodule id="xmlcatalog">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="xmlcatalog"/>
-    </systemdependencies>
-  </systemmodule>
-
-  <systemmodule id="xmllint">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="xmllint"/>
-    </systemdependencies>
-  </systemmodule>
-
-  <systemmodule id="xmlto">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="xmlto"/>
-    </systemdependencies>
-  </systemmodule>
-
-  <systemmodule id="xsltproc">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="xsltproc"/>
-    </systemdependencies>
-  </systemmodule>
-
-  <systemmodule id="zlib">
-    <pkg-config>zlib.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
 </moduleset>
diff --git a/gnome-world.modules b/gnome-world.modules
index cf5dac2..8681a2f 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -112,7 +112,7 @@
   <repository type="tarball" name="downloads.sourceforge.net"
       href="http://downloads.sourceforge.net/"/>
 
-  <include href="gnome-apps-3.16.modules"/>
+  <include href="gnome-apps.modules"/>
 
   <autotools id="aisleriot"
              autogenargs="--with-platform=gtk-only">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]