[gnome-modulesets] Resync with current modulesets



commit a4309eb80f727c3037b367de90c08da1937a994c
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Oct 10 02:11:01 2016 +0100

    Resync with current modulesets

 gnome-apps.modules      |  358 +++++++----------------------------
 gnome-core-deps.modules |  489 ++++++++++++++++++++++++++++++++++++++---------
 gnome-core.modules      |  327 ++++++++++++++++++--------------
 gnome-sysdeps.modules   |   28 +--
 gnome-world.modules     |  284 ++++++++++++++++++---------
 5 files changed, 848 insertions(+), 638 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index dc6e245..559db2e 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -13,12 +13,6 @@
       href="git://github.com/"/>
   <repository type="git" name="wayland"
       href="git://anongit.freedesktop.org/git/wayland"/>
-  <repository type="git" name="git.libvirt.org"
-      href="git://libvirt.org/"/>
-  <repository type="git" name="gitlab.com"
-      href="https://gitlab.com/"/>
-  <repository type="tarball" name="spice"
-      href="http://www.spice-space.org/download/"/>
 
 <!-- tarball repos -->
   <repository type="tarball" name="gnome.org"
@@ -36,9 +30,9 @@
   <repository type="git" name="telepathy.freedesktop.org"
       href="git://anongit.freedesktop.org/telepathy/"/>
 
-  <include href="gnome-core-3.22.modules"/>
+  <include href="gnome-core.modules"/>
 
-  <!-- NOTE: gnome-suites-core-* and gnome-suites-core-deps-*
+  <!-- NOTE: gnome-core-* and gnome-core-deps-*
        are supposed to remain self-contained. If apps have dependencies
        that are not covered there, add them in here
 
@@ -52,24 +46,7 @@
 
 <!-- Dependencies and miscellaneous -->
 
-  <autotools id="babl">
-    <branch/>
-  </autotools>
-
-  <autotools id="clutter-gst">
-    <branch revision="clutter-gst-2.0"/>
-    <dependencies>
-      <dep package="cogl"/>
-      <dep package="clutter"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="farstream" autogenargs="--disable-python">
+  <autotools id="farstream" autogenargs="--disable-python" supports-non-srcdir-builds="no">
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
             version="0.2.7"
@@ -89,7 +66,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
@@ -102,19 +79,10 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gegl">
+  <autotools id="gnome-code-assistance">
     <branch/>
     <dependencies>
-      <dep package="babl"/>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="pango"/>
-      <dep package="libjasper"/>
-      <dep package="libjpeg"/>
-      <dep package="libpng"/>
-      <dep package="libraw"/>
-      <dep package="librsvg"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
@@ -133,18 +101,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala">
-    <branch/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="pulseaudio"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="guile">
     <if condition-set="freebsd">
       <autogenargs value="BDW_GC_CFLAGS=' ' BDW_GC_LIBS='-lgc-threaded'"/>
@@ -179,11 +135,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgames-support">
+  <autotools id="libgnome-games-support" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libgee"/>
       <dep package="m4-common"/>
       <dep package="vala"/>
@@ -212,42 +168,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgovirt">
-    <branch/>
-    <dependencies>
-      <dep package="librest"/>
-      <dep package="intltool"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libosinfo"
-             autogenargs="--enable-tests=no --enable-werror=no">
-    <branch repo="gitlab.com" module="libosinfo/libosinfo.git"/>
-    <dependencies>
-      <dep package="libsoup"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="vala"/>
-      <dep package="wget"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libvirt-glib" autogenargs="--enable-werror=no">
-    <branch repo="git.libvirt.org" module="libvirt-glib.git"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libvirt"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="nautilus-sendto">
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="dbus-glib"/>
       <dep package="evolution-data-server"/>
       <dep package="nautilus"/>
@@ -257,16 +182,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="phodav">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="avahi"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="qqwing">
     <branch repo="qqwing"
             module="qqwing-${version}.tar.gz"
@@ -278,45 +193,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
-    <if condition-set="freebsd">
-      <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
-    </if>
-    <branch repo="spice"
-            module="gtk/spice-gtk-0.29.tar.bz2"
-            version="0.29"
-            hash="sha256:44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973"
-            size="1277160"/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="cyrus-sasl"/>
-      <dep package="glib"/>
-      <dep package="gtk-doc"/>
-      <dep package="gtk+"/>
-      <dep package="libjpeg"/>
-      <dep package="openssl"/>
-      <dep package="opus"/>
-      <dep package="phodav"/>
-      <dep package="pixman"/>
-      <dep package="pulseaudio"/>
-      <dep package="spice-protocol"/>
-      <dep package="usbredir"/>
-      <dep package="vala"/>
-      <dep package="zlib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="spice-protocol">
-    <branch repo="spice"
-            module="releases/spice-protocol-0.12.9.tar.bz2"
-            version="0.12.9"
-            hash="sha256:290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876"
-            size="71766"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
-  <autotools id="telepathy-farstream" autogenargs="--disable-python">
+  <autotools id="telepathy-farstream" autogenargs="--disable-python" supports-non-srcdir-builds="no">
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
       <dep package="telepathy-glib"/>
@@ -324,27 +201,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="uncrustify">
-    <branch repo="downloads.sourceforge.net"
-            module="project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
-            version="0.61"
-            hash="sha256:1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"
-            size="1143946"/>
-    <dependencies>
-      <dep package="c++"/>
-    </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-1.0.9"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="weston" autogenargs="--disable-setuid-install">
     <branch repo="wayland"/>
     <dependencies>
@@ -366,7 +222,7 @@
       <dep package="pygobject"/>
       <dep package="pyatspi2"/>
       <dep package="yelp-tools"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="py3cairo"/>
     </dependencies>
   </autotools>
@@ -377,7 +233,7 @@
       <dep package="appstream-glib"/>
       <dep package="tracker"/>
       <dep package="clutter-gtk"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="glib"/>
       <dep package="WebKit1"/>
@@ -385,35 +241,13 @@
     </dependencies>
   </autotools>
 
-  <autotools id="brasero">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-inotify"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="libcanberra"/>
-      <dep package="libnotify"/>
-      <dep package="libxml2"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="nautilus"/>
-      <dep package="totem-pl-parser"/>
-      <dep package="tracker"/>
-    </suggests>
-  </autotools>
-
   <autotools id="dconf-editor">
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="glib"/>
       <dep package="dconf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
     </dependencies>
   </autotools>
@@ -422,16 +256,16 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="WebKit"/>
     </dependencies>
   </autotools>
 
-  <autotools id="empathy">
+  <autotools id="empathy" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="clutter"/>
-      <dep package="clutter-gst"/>
+      <dep package="clutter-gst3"/>
       <dep package="clutter-gtk"/>
       <dep package="dbus-glib"/>
       <dep package="intltool"/>
@@ -445,7 +279,7 @@
       <dep package="gnutls"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gstreamer"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libcanberra"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
@@ -470,7 +304,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="evolution" autogenargs="--disable-autoar --disable-libcryptui --disable-pst-import">
+  <autotools id="evolution" autogenargs="--disable-libcryptui --disable-pst-import">
     <branch/>
     <dependencies>
       <dep package="atk"/>
@@ -480,12 +314,13 @@
       <dep package="evolution-data-server"/>
       <dep package="gcr"/>
       <dep package="gdk-pixbuf"/>
+      <dep package="gnome-autoar"/>
       <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="gtk+-3"/>
       <dep package="highlight"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
@@ -500,7 +335,7 @@
       <dep package="nss"/>
       <dep package="shared-mime-info"/>
       <dep package="spamassassin"/>
-      <dep package="WebKit1"/>
+      <dep package="WebKit"/>
       <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
@@ -513,16 +348,16 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gitg">
+  <autotools id="gitg" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="gtksourceview"/>
@@ -548,34 +383,13 @@
       <dep package="intltool"/>
       <dep package="gnome-common"/>
       <dep package="gtk-doc" />
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-boxes" autogenargs="--enable-vala">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxml2"/>
-      <dep package="gtk-vnc"/>
-      <dep package="libgovirt"/>
-      <dep package="libosinfo"/>
-      <dep package="libusb1-1.0.9"/>
-      <dep package="libvirt-glib"/>
-      <dep package="gtk+"/>
-      <dep package="spice-gtk"/>
-      <dep package="vala"/>
-      <dep package="tracker"/>
-      <dep package="gnome-themes-standard"/>
-      <if condition-set="linux">
-        <dep package="gudev"/>
-      </if>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-builder">
+  <autotools id="gnome-builder" autogenargs="--disable-sysprof-plugin">
     <branch/>
     <dependencies>
       <dep package="clang"/>
@@ -583,34 +397,16 @@
       <dep package="gjs"/>
       <dep package="glib"/>
       <dep package="gnome-code-assistance"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gtksourceview"/>
       <dep package="libgit2-glib"/>
       <dep package="libpeas"/>
       <dep package="librsvg"/>
       <dep package="llvm"/>
       <dep package="pygobject"/>
-      <dep package="uncrustify"/>
       <dep package="vala"/>
       <dep package="vte"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-calendar">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="evolution-data-server"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-code-assistance">
-    <branch/>
-    <dependencies>
-      <dep package="vala"/>
+      <dep package="mm-common"/>
     </dependencies>
   </autotools>
 
@@ -619,7 +415,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -629,7 +425,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libcanberra"/>
       <dep package="libgusb"/>
       <dep package="udisks"/>
@@ -639,11 +435,10 @@
   <autotools id="gnome-music">
     <branch/>
     <dependencies>
-      <dep package="gnome-themes-standard"/>
       <dep package="gobject-introspection"/>
       <dep package="grilo"/>
       <dep package="grilo-plugins"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gvfs"/>
       <dep package="intltool"/>
       <dep package="pygobject"/>
@@ -656,42 +451,19 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libgtop"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-photos">
-    <branch/>
-    <dependencies>
-      <dep package="babl"/>
-      <dep package="gegl"/>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gexiv2"/>
-      <dep package="glib"/>
-      <dep package="gnome-desktop"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gnome-online-miners"/>
-      <dep package="grilo"/>
-      <dep package="grilo-plugins"/>
-      <dep package="gtk+"/>
-      <dep package="libgdata"/>
-      <dep package="libgfbgraph"/>
-      <dep package="libjpeg"/>
-      <dep package="libpng"/>
-      <dep package="tracker"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-sound-recorder">
     <branch/>
     <dependencies>
       <dep package="gjs"/>
       <dep package="glib"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
@@ -702,7 +474,7 @@
       <dep package="gnome-online-accounts"/>
       <dep package="evolution-data-server"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libpeas"/>
     </dependencies>
   </autotools>
@@ -710,7 +482,7 @@
   <autotools id="gnome-tweak-tool">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="pygobject"/>
       <dep package="gsettings-desktop-schemas"/>
     </dependencies>
@@ -741,7 +513,7 @@
       <dep package="gjs"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="m4-common"/>
       <dep package="telepathy-glib"/>
     </dependencies>
@@ -752,7 +524,7 @@
     <dependencies>
       <dep package="vala"/>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="glib"/>
       <dep package="libsoup"/>
       <dep package="libsecret"/>
@@ -773,7 +545,7 @@
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="libxml2"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gtk-vnc"/>
       <dep package="libsecret"/>
       <dep package="vala"/>
@@ -794,7 +566,7 @@
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libcanberra"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -806,7 +578,7 @@
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libcanberra"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -816,10 +588,8 @@
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
-      <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="m4-common"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -830,9 +600,9 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="libgames-support"/>
+      <dep package="libgnome-games-support"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -842,7 +612,7 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="librsvg"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
@@ -854,8 +624,9 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
+      <dep package="libgnome-games-support"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -867,10 +638,10 @@
       <dep package="appstream-glib"/>
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
-      <dep package="libgames-support"/>
+      <dep package="libgnome-games-support"/>
       <dep package="libgee"/>
       <dep package="librsvg"/>
       <dep package="vala"/>
@@ -883,9 +654,9 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="libgames-support"/>
+      <dep package="libgnome-games-support"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libcanberra"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -897,10 +668,11 @@
       <dep package="appstream-glib"/>
       <dep package="c++"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="json-glib"/>
       <dep package="libgee"/>
+      <dep package="m4-common"/>
       <dep package="qqwing"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -913,7 +685,7 @@
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -925,7 +697,7 @@
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -937,7 +709,7 @@
       <dep package="appstream-glib"/>
       <dep package="cairo"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="m4-common"/>
       <dep package="yelp-tools"/>
@@ -950,7 +722,7 @@
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libcanberra"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
@@ -962,7 +734,7 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
@@ -976,7 +748,7 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="librsvg"/>
       <dep package="libcanberra"/>
       <dep package="clutter"/>
@@ -991,7 +763,7 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
       <dep package="vala"/>
@@ -1005,7 +777,7 @@
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -1020,11 +792,11 @@
       <dep package="meta-gnome-core-incubator"/>
       <dep package="meta-gnome-games"/>
       <dep package="accerciser"/>
-      <dep package="brasero"/>
       <dep package="dconf-editor"/>
       <dep package="devhelp"/>
       <dep package="empathy"/>
       <dep package="evolution"/>
+      <dep package="ghex"/>
       <dep package="gitg"/>
       <dep package="glade"/>
       <dep package="gnome-builder"/>
@@ -1036,8 +808,10 @@
       <dep package="nautilus-sendto"/>
       <dep package="nemiver"/>
       <dep package="polari"/>
-      <dep package="seahorse"/>
       <dep package="vinagre"/>
+      <if condition-set="linux">
+        <dep package="gnome-multi-writer"/>
+      </if>
     </dependencies>
   </metamodule>
 
@@ -1047,11 +821,9 @@
   <metamodule id="meta-gnome-core-incubator">
     <dependencies>
       <dep package="bijiben"/>
-      <dep package="gnome-boxes"/>
-      <dep package="gnome-calendar"/>
       <dep package="gnome-dictionary"/>
       <dep package="gnome-music"/>
-      <dep package="gnome-photos"/>
+      <dep package="seahorse"/>
     </dependencies>
   </metamodule>
 
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index 3047b43..5ca0c78 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -18,12 +18,14 @@
     href="git://anongit.freedesktop.org/git/xorg"/>
 <repository type="git" name="github.com"
     href="git://github.com/"/>
-<repository type="bzr" name="research.operationaldynamics.com"
-    href="http://research.operationaldynamics.com/bzr"/>
 <repository type="git" name="linuxwacom.git.sourceforge.net"
     href="git://linuxwacom.git.sourceforge.net/"/>
 <repository type="git" name="quvi"
     href="git://repo.or.cz/"/>
+  <repository type="git" name="gitlab.com"
+      href="https://gitlab.com/"/>
+<repository type="git" name="git.libvirt.org"
+    href="git://libvirt.org/"/>
 
 <!-- tarball repos -->
 <repository type="tarball" name="cairo.org"
@@ -62,15 +64,16 @@
     href="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"/>
 <repository type="tarball" name="speech-dispatcher"
     href="http://devel.freebsoft.org/pub/projects/speechd/"/>
+<repository type="tarball" name="spice"
+    href="http://www.spice-space.org/download/"/>
+<repository type="tarball" name="libarchive"
+    href="http://libarchive.org/downloads/"/>
 
 <include href="gnome-sysdeps.modules"/>
 
 <!-- Please try to keep organized alphabetically -->
 
-  <autotools id="appstream-glib">
-    <if condition-set="freebsd">
-      <autogenargs value="LIBARCHIVE_CFLAGS=' ' LIBARCHIVE_LIBS='-larchive'"/>
-    </if>
+  <autotools id="appstream-glib" autogenargs="--disable-stemmer">
     <branch repo="github.com" module="hughsie/appstream-glib.git"/>
     <dependencies>
       <dep package="freetype2"/>
@@ -78,9 +81,11 @@
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
+      <dep package="gtk+-3"/>
       <dep package="json-glib"/>
       <dep package="libarchive"/>
       <dep package="libsoup"/>
+      <dep package="libuuid"/>
       <dep package="libyaml"/>
       <dep package="sqlite3"/>
     </dependencies>
@@ -103,6 +108,10 @@
     </dependencies>
   </autotools>
 
+  <autotools id="babl">
+    <branch/>
+  </autotools>
+
   <autotools id="cairomm" autogen-sh="configure">
     <branch module="releases/cairomm-${version}.tar.gz"
             version="1.12.0"
@@ -126,7 +135,7 @@
     <branch/>
     <dependencies>
       <dep package="pygobject"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="clutter"/>
       <dep package="libgee"/>
       <dep package="libxklavier"/>
@@ -188,7 +197,7 @@
   <autotools id="clutter-gtk">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="clutter"/>
     </dependencies>
   </autotools>
@@ -261,13 +270,48 @@
     <branch repo="github.com" checkoutdir="colord-gtk" module="hughsie/colord-gtk.git"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="colord"/>
       <dep package="vala"/>
     </dependencies>
   </autotools>
 
-  <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings"
+  <autotools id="evolution-data-server"
+             supports-non-srcdir-builds="no"
+             autogenargs="--enable-vala-bindings --disable-strict --disable-uoa --disable-google-auth"
+             uninstall-before-install="true">
+    <!-- We uninstall the old copy before installing, because the our usage
+         of DESTDIR and libtool's relinking interfere and cause camel providers
+         to link against the install version of libcamel. -->
+    <if condition-set="freebsd">
+      <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
+    </if>
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="gtk+-3"/>
+      <dep package="sqlite3"/>
+      <dep package="gcr"/>
+      <dep package="libgweather"/>
+      <dep package="libical"/>
+      <dep package="libgdata"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="liboauth"/>
+      <dep package="vala"/>
+      <dep package="libdb"/>
+      <dep package="libsecret"/>
+      <dep package="WebKit"/>
+    </dependencies>
+    <suggests>
+      <dep package="nss"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="folks"
+             autogenargs="--enable-eds-backend --disable-libsocialweb-backend --disable-fatal-warnings"
+             supports-non-srcdir-builds="no"
              uninstall-before-install="true">
     <branch/>
     <dependencies>
@@ -313,12 +357,21 @@
     </dependencies>
   </autotools>
 
+ <autotools id="gnome-autoar">
+    <branch revision="gnome-3-22"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="intltool"/>
+      <dep package="libarchive"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gcr">
     <branch/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
@@ -341,6 +394,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gegl" autogenargs="--without-libavformat">
+    <branch/>
+    <dependencies>
+      <dep package="babl"/>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="pango"/>
+      <dep package="libjasper"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="libraw"/>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="geoclue" autogenargs="--with-systemdsystemunitdir=no">
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
@@ -377,9 +446,21 @@
     </branch>
   </autotools>
 
-  <autotools id="glib" autogenargs="--enable-installed-tests">
+  <autotools id="gettext" autogen-sh="configure">
+    <branch repo="ftp.gnu.org"
+            module="gettext/gettext-0.19.8.1.tar.xz" version="0.19.8.1"
+            size="7209808"
+            hash="sha256:105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4">
+    </branch>
+  </autotools>
+
+  <autotools id="glib" autogenargs="--enable-installed-tests --disable-libmount">
+    <if condition-set="freebsd">
+      <autogenargs value="--disable-dtrace --with-libiconv=gnu"/>
+    </if>
     <branch/>
     <dependencies>
+      <dep package="gettext"/>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
       <dep package="libpcre"/>
@@ -390,7 +471,7 @@
     </after>
   </autotools>
 
-  <autotools id="glibmm">
+  <autotools id="glibmm" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -405,6 +486,22 @@
     <branch/>
   </autotools>
 
+  <autotools id="gnome-online-accounts"
+             supports-non-srcdir-builds="no">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-3"/>
+      <dep package="WebKit"/>
+      <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-online-miners">
     <branch/>
     <dependencies>
@@ -471,7 +568,7 @@
       <dep package="libxml2"/>
     </dependencies>
     <suggests>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
     </suggests>
   </autotools>
@@ -518,7 +615,7 @@
   <autotools id="gspell">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="enchant"/>
       <dep package="iso-codes"/>
       <dep package="m4-common"/>
@@ -526,7 +623,7 @@
   </autotools>
 
   <autotools id="gssdp" makeargs="CFLAGS=-Wno-error">
-    <branch />
+    <branch revision="gssdp_1.0"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
@@ -536,18 +633,24 @@
     </suggests>
   </autotools>
 
-  <autotools id="gstreamer"
-             autogenargs="--disable-tests --disable-fatal-warnings"
-             supports-non-srcdir-builds="no">
+  <meson id="gstreamer"
+         autogenargs="--disable-tests --disable-fatal-warnings">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
-            checkoutdir="gstreamer"
-            revision="1.8"/>
+            checkoutdir="gstreamer"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
       <dep package="gobject-introspection"/>
     </dependencies>
+  </meson>
+
+  <autotools id="graphene">
+    <branch repo="github.com" checkoutdir="graphene" module="ebassi/graphene.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
   </autotools>
 
   <autotools id="gst-plugins-bad"
@@ -555,12 +658,14 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-bad"
-            module="gst-plugins-bad"
-            revision="1.8"/>
+            module="gst-plugins-bad"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
+    <suggests>
+      <dep package="graphene"/>
+    </suggests>
   </autotools>
 
   <autotools id="gst-plugins-base"
@@ -568,11 +673,10 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-base"
-            checkoutdir="gst-plugins-base"
-            revision="1.8"/>
+            checkoutdir="gst-plugins-base"/>
     <dependencies>
       <dep package="gstreamer"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="iso-codes"/>
     </dependencies>
     <suggests>
@@ -587,8 +691,7 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-good"
-            checkoutdir="gst-plugins-good"
-            revision="1.8"/>
+            checkoutdir="gst-plugins-good"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -644,6 +747,51 @@
       </if>
     </dependencies>
     <suggests>
+      <!-- Many GTK+ apps require desktop-file-validate. -->
+      <dep package="desktop-file-utils"/>
+      <dep package="shared-mime-info"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gtk+-3" autogenargs="--enable-broadway-backend --enable-installed-tests">
+    <if condition-set="x11">
+      <autogenargs value="--enable-x11-backend"/>
+    </if>
+    <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 checkoutdir="gtk+-3" module="gtk+" revision="gtk-3-22"/>
+    <dependencies>
+      <dep package="atk"/>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <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>
+      <if condition-set="wayland">
+        <dep package="libxkbcommon"/>
+        <dep package="wayland"/>
+        <dep package="wayland-egl"/>
+        <dep package="wayland-protocols"/>
+      </if>
+      <if condition-set="mir">
+        <dep package="mir"/>
+      </if>
+    </dependencies>
+    <suggests>
+      <!-- Many GTK+ apps require desktop-file-validate. -->
+      <dep package="desktop-file-utils"/>
       <dep package="shared-mime-info"/>
     </suggests>
   </autotools>
@@ -673,20 +821,32 @@
       <dep package="libxslt"/>
       <dep package="yelp-tools"/>
       <dep package="libtool"/>
-      <dep package="gettext-bin"/>
+      <dep package="gettext"/>
       <dep package="docbook-xml"/>
       <dep package="docbook-xsl"/>
       <dep package="cc"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala">
+    <branch/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gtk+-3"/>
+      <dep package="pulseaudio"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
  <autotools id="gtkmm">
     <branch/>
     <dependencies>
       <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="glib"/>
     </dependencies>
   </autotools>
@@ -696,7 +856,7 @@
     <dependencies>
       <dep package="libxml2"/>
       <dep package="shared-mime-info"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="m4-common"/>
     </dependencies>
     <suggests>
@@ -706,7 +866,7 @@
 
   <autotools id="gupnp"
              autogenargs="--with-context-manager=network-manager">
-    <branch />
+    <branch revision="gupnp-1.0"/>
     <dependencies>
       <dep package="gssdp"/>
       <dep package="glib"/>
@@ -776,11 +936,12 @@
   </autotools>
 
   <autotools id="ibus"
-             autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui 
GSETTINGS_SCHEMA_CONVERT=/usr/bin/false --with-python=python3">
+             autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui 
GSETTINGS_SCHEMA_CONVERT=/usr/bin/false --with-python=python3 --disable-emoji-dict"
+             supports-non-srcdir-builds="no">
     <branch repo="github-tar"
-            version="1.5.10"
+            version="1.5.14"
             module="ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
-            hash="sha256:1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594">
+            hash="sha256:a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c">
     </branch>
     <dependencies>
       <dep package="dbus"/>
@@ -788,11 +949,13 @@
       <dep package="gobject-introspection"/>
       <dep package="dconf"/>
       <dep package="iso-codes"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
-  <autotools id="ibus-anthy" autogenargs="--enable-private-png=yes">
+  <autotools id="ibus-anthy"
+             autogenargs="--enable-private-png=yes"
+             supports-non-srcdir-builds="no">
     <branch repo="github-tar"
             version="1.5.6"
             module="ibus/ibus-anthy/releases/download/${version}/ibus-anthy-${version}.tar.gz"
@@ -806,7 +969,8 @@
   </autotools>
 
   <autotools id="ibus-hangul"
-             autogen-sh="configure">
+             autogen-sh="configure"
+             supports-non-srcdir-builds="no">
     <branch repo="github-tar"
             version="1.5.0"
             module="choehwanjin/ibus-hangul/releases/download/${version}/ibus-hangul-${version}.tar.gz"
@@ -818,12 +982,13 @@
   </autotools>
 
   <autotools id="ibus-libpinyin"
-             autogenargs="--disable-lua-extension --with-python=python3">
+             autogenargs="--disable-lua-extension --with-python=python3"
+             supports-non-srcdir-builds="no">
     <branch repo="github-tar"
-            version="1.7.4"
+            version="1.8.0"
             module="libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
             checkoutdir="ibus-libpinyin-${version}"
-            hash="sha256:4627eab10ded24bd1a95ee56a2f7bd6a82deb94435aea674267fc40febd66f81"/>
+            hash="sha256:c8f9fbd374273f6210afb6e647dac4574dd0a7c3c4d8d57d2e8592c33a25296d"/>
     <dependencies>
       <dep package="ibus"/>
       <dep package="libpinyin"/>
@@ -840,22 +1005,6 @@
             size="3626932"/>
   </autotools>
 
-  <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
-    <branch repo="research.operationaldynamics.com"
-            module="bzr/java-gnome/mainline"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="gtk+"/>
-      <dep package="gtksourceview"/>
-      <dep package="librsvg"/>
-      <dep package="enchant"/>
-      <dep package="libnotify"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="json-glib" autogenargs="--enable-installed-tests">
     <branch/>
     <dependencies>
@@ -866,13 +1015,21 @@
     </suggests>
   </autotools>
 
+  <autotools id="libarchive" autogen-sh="configure">
+    <pkg-config>libarchive.pc</pkg-config>
+    <branch repo="libarchive"
+            version="3.2.1"
+            module="libarchive-${version}.tar.gz"
+            hash="sha256:72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2"/>
+  </autotools>
+
  <autotools id="libchamplain">
    <branch/>
    <dependencies>
      <dep package="glib"/>
      <dep package="cairo"/>
      <dep package="clutter"/>
-     <dep package="gtk+"/>
+     <dep package="gtk+-3"/>
      <dep package="sqlite3"/>
    </dependencies>
    <suggests>
@@ -911,7 +1068,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgee">
+  <autotools id="libgee" supports-non-srcdir-builds="no">
     <pkg-config>gee-0.8.pc</pkg-config>
     <branch/>
     <dependencies>
@@ -921,6 +1078,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgepub">
+    <pkg-config>libgepub.pc</pkg-config>
+    <branch repo="github.com" checkoutdir="libgepub" module="danigm/libgepub.git"/>
+    <dependencies>
+      <dep package="WebKit"/>
+      <dep package="libsoup"/>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="libarchive"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnomekbd">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-3" />
+      <dep package="libxklavier" />
+    </dependencies>
+  </autotools>
+
   <autotools id="libgfbgraph">
     <branch/>
     <dependencies>
@@ -932,6 +1109,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgovirt">
+    <branch/>
+    <dependencies>
+      <dep package="librest"/>
+      <dep package="intltool"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libgrss">
     <branch/>
     <dependencies>
@@ -955,7 +1141,6 @@
   <autotools id="libgtop">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="texinfo"/>
     </dependencies>
@@ -979,7 +1164,7 @@
       <dep package="libxml2"/>
       <dep package="geocode-glib"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libsoup"/>
     </dependencies>
   </autotools>
@@ -994,6 +1179,22 @@
     </dependencies>
   </autotools>
 
+  <meson id="libhttpseverywhere">
+    <branch repo="github.com" checkoutdir="libhttpseverywhere" module="grindhold/libhttpseverywhere.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="json-glib"/>
+      <dep package="libarchive"/>
+      <dep package="libgee"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+      <dep package="valadoc"/>
+    </dependencies>
+  </meson>
+
   <autotools id="libinput">
     <branch repo="git.freedesktop.org" checkoutdir="libinput" module="wayland/libinput.git" />
     <dependencies>
@@ -1025,7 +1226,8 @@
   </autotools>
 
   <autotools id="libnice"
-             autogenargs="--enable-gupnp">
+             autogenargs="--enable-gupnp"
+             supports-non-srcdir-builds="no">
     <pkg-config>nice.pc</pkg-config>
     <branch repo="nice.freedesktop.org"
             module="libnice-0.1.8.tar.gz"
@@ -1042,22 +1244,62 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
+  <autotools id="libosinfo"
+             autogenargs="--enable-tests=no --enable-werror=no">
+    <branch repo="gitlab.com" module="libosinfo/libosinfo.git"/>
+    <dependencies>
+      <dep package="libsoup"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="vala"/>
+      <dep package="wget"/>
+      <dep package="osinfo-db-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libpinyin"
+             autogenargs="--with-dbm=KyotoCabinet">
+    <branch repo="github-tar"
+            version="1.6.0"
+            module="libpinyin/libpinyin/archive/${version}.tar.gz"
+            checkoutdir="libpinyin-${version}"
+            hash="sha256:ca4a33f01fb4301cfad1f977276823f0172b1aa5736046a5c2ca73c474386e37"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="kyotocabinet"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="osinfo-db-tools">
+    <branch repo="gitlab.com" module="libosinfo/osinfo-db-tools.git"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="osinfo-db" skip-autogen="true" supports-non-srcdir-builds="no" 
makeinstallargs="OSINFO_DB_TARGET=--system install">
+    <branch repo="gitlab.com" module="libosinfo/osinfo-db.git"/>
+    <dependencies>
+      <dep package="osinfo-db-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libpeas"
              autogenargs="--enable-python3">
     <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
+      <dep package="pygobject"/>
     </dependencies>
     <suggests>
       <dep package="glade"/>
-      <dep package="pygobject"/>
     </suggests>
   </autotools>
 
@@ -1073,7 +1315,7 @@
     <if condition-set="freebsd">
       <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
     </if>
-    <branch/>
+    <branch revision="librest-0-7"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
@@ -1110,7 +1352,7 @@
   </autotools>
 
   <autotools id="libsigcplusplus">
-    <branch revision="libsigc++-2-8"/>
+    <branch revision="libsigc++-2-10"/>
     <dependencies>
       <dep package="mm-common"/>
     </dependencies>
@@ -1131,6 +1373,16 @@
     </suggests>
   </autotools>
 
+  <autotools id="libvirt-glib" autogenargs="--enable-werror=no">
+    <branch repo="git.libvirt.org" module="libvirt-glib.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libvirt"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libwacom">
     <branch repo="sourceforge.net"
             module="linuxwacom/files/libwacom/libwacom-${version}.tar.bz2" version="0.13"
@@ -1158,7 +1410,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="startup-notification"/>
     </dependencies>
   </autotools>
@@ -1271,6 +1523,16 @@
             size="1455359"/>
   </autotools>
 
+  <autotools id="phodav">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="avahi"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="pyatspi2" autogenargs="--with-python=python3" >
     <branch/>
     <dependencies>
@@ -1312,7 +1574,47 @@
     </dependencies>
   </autotools>
 
-  <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings --disable-fatal-warnings">
+  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
+    <if condition-set="freebsd">
+      <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl -lcrypto'"/>
+    </if>
+    <branch repo="spice"
+            module="gtk/spice-gtk-0.33.tar.bz2"
+            version="0.33"
+            hash="sha256:7daf33b786ab8ebc9fe6e7b11745100ee1ab66e61a5811d1d5aabe4d66eaaf39"
+            size="1383927"/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="cyrus-sasl"/>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="gtk+-3"/>
+      <dep package="libjpeg"/>
+      <dep package="openssl"/>
+      <dep package="opus"/>
+      <dep package="phodav"/>
+      <dep package="pixman"/>
+      <dep package="pulseaudio"/>
+      <dep package="spice-protocol"/>
+      <dep package="usbredir"/>
+      <dep package="vala"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="spice-protocol">
+    <branch repo="spice"
+            module="releases/spice-protocol-0.12.12.tar.bz2"
+            version="0.12.12"
+            hash="sha256:17abdc2743b5d44b0f4423b61c44aafe9f2078c27218aeea78c2d02a5c409d03"
+            size="80628"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="telepathy-glib"
+             supports-non-srcdir-builds="no"
+             autogenargs="--enable-vala-bindings --disable-fatal-warnings">
     <pkg-config>telepathy-glib.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
@@ -1327,7 +1629,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="telepathy-logger">
+  <autotools id="telepathy-logger" supports-non-srcdir-builds="no">
     <pkg-config>telepathy-logger-0.2.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
@@ -1362,7 +1664,8 @@
        https://bugzilla.gnome.org/show_bug.cgi?id=678235 -->
   <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 
--with-bash-completion-dir=${prefix}/share/bash-completion/completions"
-             check-target="false">
+             check-target="false"
+             supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -1390,7 +1693,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="uhttpmock">
+  <autotools id="uhttpmock" supports-non-srcdir-builds="no">
     <branch repo="github.com" checkoutdir="uhttpmock" module="pwithnall/uhttpmock.git"/>
     <dependencies>
       <dep package="glib"/>
@@ -1399,15 +1702,25 @@
     </dependencies>
   </autotools>
 
+  <autotools id="usbredir">
+    <branch repo="spice"
+            module="usbredir/usbredir-${version}.tar.bz2"
+            version="0.7.1"
+            hash="sha256:407e9e27a1369f01264d5501ffbe88935ddd7d5de675f5835db05dc9c9ac56f3"/>
+    <dependencies>
+      <dep package="libusb1-1.0.9"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
-    <pkg-config>libvala-0.32.pc</pkg-config>
+    <pkg-config>libvala-0.36.pc</pkg-config>
     <branch />
     <dependencies>
       <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="valadoc">
+  <autotools id="valadoc" supports-non-srcdir-builds="no">
     <branch />
     <dependencies>
       <dep package="libgee"/>
@@ -1430,7 +1743,7 @@
     </dependencies>
   </autotools>
 
-  <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
+  <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release -DENABLE_PLUGIN_PROCESS_GTK2=OFF">
     <if condition-unset="x11">
       <cmakeargs value="-DENABLE_X11_TARGET=OFF"/>
     </if>
@@ -1439,9 +1752,9 @@
     </if>
     <pkg-config>webkit2gtk-4.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.12.0.tar.xz" version="2.12.0"
-            hash="sha256:a68604f8fd1bcb247d647709290226289b90c16acb1f3730538b688db8df5ea6"
-            size="11687224">
+            module="webkitgtk-2.14.0.tar.xz" version="2.14.0"
+            hash="sha256:0513ad836c624a3d24bdf1a99f4b4aead984ab6684150bc70f16db651590ea0a"
+            size="13412028">
     </branch>
     <dependencies>
       <dep package="c++"/>
@@ -1454,9 +1767,7 @@
       <dep package="gobject-introspection"/>
       <dep package="gperf"/>
       <dep package="gst-plugins-base"/>
-      <dep package="gtk+"/>
-      <!-- GTK+ 2.x required for the plugin process -->
-      <dep package="gtk+-2"/>
+      <dep package="gtk+-3"/>
       <dep package="harfbuzz"/>
       <dep package="hyphen"/>
       <dep package="libicu"/>
@@ -1506,13 +1817,17 @@
   </autotools>
 
  <autotools id="vte"
-            autogenargs="--enable-introspection=yes">
-    <!-- https://bugzilla.gnome.org/show_bug.cgi?id=762780 -->
-    <branch revision="vte-0-42"/>
+            autogenargs="--enable-introspection=yes"
+            supports-non-srcdir-builds="no"
+            uninstall-before-install="true">
+    <!-- We uninstall the old copy before installing to avoid the version from
+         the installed pkg-config file winding up in the new vapi. See bug #762780. -->
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
+      <dep package="gnutls"/>
       <dep package="pcre2"/>
       <dep package="vala"/>
     </dependencies>
@@ -1523,7 +1838,6 @@
     <dependencies>
       <dep package="libxslt"/>
       <dep package="libxml2"/>
-      <dep package="intltool"/>
       <dep package="yelp-xsl"/>
       <dep package="itstool"/>
       <dep package="xmllint"/>
@@ -1544,8 +1858,7 @@
   <autotools id="zenity">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
diff --git a/gnome-core.modules b/gnome-core.modules
index 083c8f8..87cc66e 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -46,7 +46,7 @@
       <dep package="hicolor-icon-theme"/>
       <dep package="gnome-common"/>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="librsvg"/>
     </dependencies>
   </autotools>
@@ -80,38 +80,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution-data-server"
-             supports-non-srcdir-builds="no"
-             autogenargs="--enable-vala-bindings --disable-strict --disable-uoa --disable-google-auth"
-             uninstall-before-install="true">
-    <!-- We uninstall the old copy before installing, because the our usage
-         of DESTDIR and libtool's relinking interfere and cause camel providers
-         to link against the install version of libcamel. -->
-    <if condition-set="freebsd">
-      <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="gtk+"/>
-      <dep package="sqlite3"/>
-      <dep package="gcr"/>
-      <dep package="libgweather"/>
-      <dep package="libical"/>
-      <dep package="libgdata"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="liboauth"/>
-      <dep package="vala"/>
-      <dep package="libdb"/>
-      <dep package="libsecret"/>
-    </dependencies>
-    <suggests>
-      <dep package="nss"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gdm" autogenargs="--with-systemdsystemunitdir=no --with-log-dir=${prefix}/var/log/gdm">
     <if condition-unset="linux">
       <autogenargs value="--without-plymouth"/>
@@ -122,7 +90,7 @@
       <dep package="dbus-glib"/>
       <dep package="fontconfig"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="nss"/>
@@ -166,25 +134,25 @@
   <autotools id="gnome-bluetooth">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gtk-doc"/>
       <dep package="glib"/>
-      <dep package="nautilus-sendto"/>
+      <dep package="libcanberra-gtk3"/>
+      <dep package="libnotify"/>
+      <dep package="libudev"/>
     </dependencies>
-    <suggests>
-      <dep package="geoclue"/>
-    </suggests>
   </autotools>
 
   <!-- Not an app, but a service for gnome-control-center -->
   <autotools id="gnome-color-manager">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="colord-gtk"/>
       <dep package="exiv2"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="lcms2"/>
       <dep package="libcanberra"/>
@@ -205,7 +173,7 @@
       <dep package="fontconfig"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-settings-daemon"/>
@@ -238,6 +206,7 @@
       <dep package="ibus-libpinyin"/>
       <dep package="ibus-anthy"/>
       <dep package="ibus-hangul"/>
+      <dep package="libgnomekbd"/>
       <if condition-set="linux">
         <dep package="ModemManager"/>
         <dep package="NetworkManager"/>
@@ -246,6 +215,9 @@
   </autotools>
 
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
+    <if condition-unset="udev">
+      <autogenargs value="--disable-udev"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -253,12 +225,14 @@
       <dep package="libXrandr"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gvfs"/> <!-- gvfs-copy used in autogen.sh -->
       <dep package="iso-codes"/>
       <dep package="yelp-tools"/> <!-- for the docs -->
       <dep package="xkeyboard-config"/>
+      <if condition-set="udev">
+        <dep package="libudev"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -276,7 +250,7 @@
       <dep package="dbus"/>
       <dep package="gcr"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libgcrypt"/>
       <dep package="libtasn1"/>
       <dep package="p11-kit"/>
@@ -293,31 +267,18 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-online-accounts">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="WebKit"/>
-      <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-session">
     <branch/>
     <dependencies>
+      <dep package="egl"/>
       <dep package="intltool"/>
       <dep package="gl"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gnome-desktop"/>
       <dep package="json-glib"/>
       <dep package="upower"/>
       <dep package="libXcomposite"/>
+      <dep package="mesa-libGLES"/>
       <dep package="sm"/>
       <dep package="xtrans"/>
       <if condition-set="systemd">
@@ -338,7 +299,7 @@
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="libcanberra-gtk3"/>
       <dep package="libgweather"/>
@@ -379,7 +340,7 @@
       <dep package="adwaita-icon-theme"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="libcroco"/>
@@ -404,6 +365,7 @@
     <suggests>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
+      <dep package="libgnomekbd"/>
     </suggests>
     <after>
       <dep package="librsvg"/>
@@ -424,7 +386,7 @@
       <dep package="intltool"/>
       <dep package="cantarell-fonts"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
@@ -443,7 +405,7 @@
     <branch/>
     <dependencies>
       <dep package="avahi"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="dbus-glib"/>
       <dep package="libcanberra"/>
       <dep package="libnotify"/>
@@ -464,6 +426,9 @@
   </autotools>
 
  <autotools id="gvfs">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-admin"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -490,7 +455,7 @@
   <autotools id="mousetweaks">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="intltool"/>
       <dep package="libXcursor"/>
@@ -500,16 +465,23 @@
   </autotools>
 
   <autotools id="mutter" autogenargs="--enable-compile-warnings=maximum --enable-installed-tests">
+    <if condition-set="x11">
+      <autogenargs value="--enable-xlib-egl-platform"/>
+    </if>
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform"/>
+    </if>
+    <if condition-unset="wayland">
+      <autogenargs value="--disable-wayland-egl-server"/>
+    </if>
     <branch/>
     <dependencies>
-      <dep package="cogl"/>
-      <dep package="clutter"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
       <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gtk-doc"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
@@ -537,14 +509,14 @@
   </autotools>
 
   <autotools id="network-manager-applet"
-             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth --without-team">
     <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
       <dep package="gnome-bluetooth"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gudev"/>
       <dep package="iso-codes"/>
       <dep package="libsecret"/>
@@ -557,6 +529,7 @@
   </autotools>
 
   <autotools id="pulseaudio"
+             supports-non-srcdir-builds="no"
              autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf --disable-gtk3 
--enable-bluez5">
     <if condition-unset="linux">
       <autogenargs value="--disable-bluez4 --disable-bluez5"/>
@@ -583,7 +556,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="rygel">
+  <autotools id="rygel" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="vala"/>
@@ -598,7 +571,9 @@
   </autotools>
 
   <!-- mc 5.16 doesn't build against upower 1.0 -->
-  <autotools id="telepathy-mission-control" autogenargs="--disable-upower">
+  <autotools id="telepathy-mission-control"
+             autogenargs="--disable-upower"
+             supports-non-srcdir-builds="no">
     <branch repo="telepathy.freedesktop.org" revision="telepathy-mission-control-5.16"/>
     <dependencies>
       <dep package="dbus"/>
@@ -618,7 +593,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libsoup"/>
     </dependencies>
     <suggests>
@@ -642,7 +617,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -654,7 +629,7 @@
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-bad"/>
       <dep package="gst-plugins-base"/>
@@ -678,7 +653,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gnome-desktop"/>
       <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -699,20 +674,27 @@
   <autotools id="epiphany">
     <branch/>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="intltool"/>
-      <dep package="iso-codes"/>
-      <dep package="gtk+"/>
-      <dep package="m4-common"/>
-      <dep package="startup-notification"/>
       <dep package="WebKit"/>
+      <dep package="appstream-glib"/>
+      <dep package="cairo"/>
       <dep package="gcr"/>
-      <dep package="avahi"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gettext"/>
+      <dep package="glib"/>
       <dep package="gnome-desktop"/>
-      <dep package="libwnck"/>
+      <dep package="gtk+-3"/>
+      <dep package="iso-codes"/>
+      <dep package="json-glib"/>
+      <dep package="libhttpseverywhere"/>
       <dep package="libnotify"/>
       <dep package="libsecret"/>
       <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="m4-common"/>
+      <dep package="nettle"/>
+      <dep package="sqlite3"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -722,7 +704,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="adwaita-icon-theme"/>
       <dep package="libsecret"/>
@@ -741,9 +723,8 @@
     <dependencies>
       <dep package="file"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
-      <dep package="nautilus"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -763,12 +744,34 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-boxes" autogenargs="--enable-vala"
+             supports-non-srcdir-builds="no">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="gtk-vnc"/>
+      <dep package="libgovirt"/>
+      <dep package="libosinfo"/>
+      <dep package="libusb1-1.0.9"/>
+      <dep package="libvirt-glib"/>
+      <dep package="gtk+-3"/>
+      <dep package="spice-gtk"/>
+      <dep package="vala"/>
+      <dep package="osinfo-db"/>
+      <dep package="tracker"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-calculator" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gtksourceview"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
@@ -779,20 +782,31 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-calendar">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="evolution-data-server"/>
+      <dep package="glib"/>
+      <dep package="gtk+-3"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-characters">
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="gjs"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-clocks">
+  <autotools id="gnome-clocks" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="vala"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gsound"/>
       <dep package="gnome-desktop"/>
       <dep package="libgweather"/>
@@ -802,14 +816,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-contacts">
+  <autotools id="gnome-contacts" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="folks"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-online-accounts"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libgee"/>
       <dep package="telepathy-glib"/>
       <dep package="vala"/>
@@ -827,7 +841,7 @@
       <dep package="appstream-glib"/>
       <dep package="glib"/>
       <dep package="gnome-settings-daemon"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libnotify"/>
       <dep package="libpwquality"/>
       <dep package="libsecret"/>
@@ -837,19 +851,21 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-documents">
+  <autotools id="gnome-documents"
+             supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="evince"/>
       <dep package="gjs"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gnome-desktop"/>
       <dep package="tracker"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-online-miners"/>
       <dep package="libgdata"/>
+      <dep package="libgepub"/>
       <dep package="liboauth"/>
       <dep package="libzapojit"/>
       <dep package="WebKit"/>
@@ -862,7 +878,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
@@ -873,7 +889,7 @@
       <dep package="geoclue"/>
       <dep package="gdm"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gnome-keyring"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gstreamer"/>
@@ -898,7 +914,7 @@
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libsystemd"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -912,25 +928,48 @@
       <dep package="glib"/>
       <dep package="glib-networking"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gnome-desktop"/>
       <dep package="libchamplain"/>
       <dep package="geocode-glib"/>
       <dep package="geoclue"/>
       <dep package="gnome-online-accounts"/>
       <dep package="libgfbgraph"/>
-      <dep package="gnome-themes-standard"/>
       <dep package="folks"/>
       <dep package="libgee"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-photos"
+             supports-non-srcdir-builds="no">
+    <branch/>
+    <dependencies>
+      <dep package="babl"/>
+      <dep package="gegl"/>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gexiv2"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gnome-online-miners"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gtk+-3"/>
+      <dep package="libgdata"/>
+      <dep package="libgfbgraph"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="tracker"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-screenshot">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
@@ -941,7 +980,8 @@
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
+      <dep package="libsecret"/>
       <dep package="libsoup"/>
       <dep package="PackageKit"/>
       <dep package="sqlite3"/>
@@ -959,7 +999,7 @@
       <dep package="glib"/>
       <dep package="libwnck"/>
       <dep package="libgtop"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gtkmm"/>
       <dep package="libxml2"/>
       <dep package="librsvg"/>
@@ -967,13 +1007,12 @@
   </autotools>
 
   <autotools id="gnome-terminal" autogenargs="--disable-migration">
-    <!-- https://bugzilla.gnome.org/show_bug.cgi?id=762780 -->
-    <branch revision="gnome-3-18"/>
+    <branch/>
     <dependencies>
       <dep package="dconf"/>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="libuuid"/>
       <dep package="vte"/>
@@ -986,13 +1025,10 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-weather">
+  <autotools id="gnome-weather" autogenargs="--disable-dogtail">
     <if condition-set="coverage">
       <autogenargs value="--enable-coverage"/>
     </if>
-    <if condition-unset="dogtail">
-      <autogenargs value="--disable-dogtail"/>
-    </if>
     <branch/>
     <dependencies>
       <dep package="m4-common"/>
@@ -1001,28 +1037,24 @@
       <dep package="geoclue"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="libgweather"/>
       <dep package="gjs"/>
       <if condition-set="coverage">
         <dep package="lcov"/>
       </if>
-      <if condition-set="dogtail">
-        <dep package="dogtail"/>
-      </if>
     </dependencies>
   </autotools>
 
-  <autotools id="nautilus">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-selinux"/>
-    </if>
+  <autotools id="nautilus" autogenargs="--disable-selinux">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="m4-common"/>
+      <dep package="gettext"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
+      <dep package="gnome-autoar"/>
       <dep package="pango"/>
       <dep package="libxml2"/>
       <dep package="gnome-desktop"/>
@@ -1036,7 +1068,7 @@
   <autotools id="orca">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
       <dep package="gobject-introspection"/>
       <dep package="intltool"/>
@@ -1064,7 +1096,7 @@
       <dep package="WebKit"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
@@ -1086,7 +1118,7 @@
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
       <dep package="gst-plugins-bad"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
       <dep package="libpeas"/>
@@ -1096,14 +1128,11 @@
   </autotools>
 
   <autotools id="yelp">
-    <if condition-set="freebsd">
-      <autogenargs value="YELP_LZMA_CFLAGS=' ' YELP_LZMA_LIBS='-llzma'"/>
-    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
       <dep package="m4-common"/>
@@ -1130,16 +1159,13 @@
   <autotools id="bluez"
              autogenargs="--enable-library">
     <pkg-config>bluez.pc</pkg-config>
-    <branch repo="kernel.org" module="pub/linux/bluetooth/bluez-5.6.tar.xz" version="5.6"
-            hash="sha256:feef22586e1aac28f61ba22ae836fab7a758501395a532e1a009c50e03de1789"
-            size="990656"/>
-    <dependencies>
-      <dep package="libusb1"/>
-    </dependencies>
+    <branch repo="kernel.org" module="pub/linux/bluetooth/bluez-5.40.tar.xz" version="5.40"
+            hash="sha256:dada8b812055afcad4546d9966f9a763e4723169e89706e2b240c7b7e998dc27"
+            size="1664320"/>
   </autotools>
 
   <autotools id="NetworkManager"
-             autogenargs="--with-udev-dir=${libdir}/udev --with-systemdsystemunitdir=no --with-crypto=gnutls 
--disable-wimax --disable-more-warnings">
+             autogenargs="--with-udev-dir=${libdir}/udev --with-systemdsystemunitdir=no --with-crypto=gnutls 
--disable-wimax --disable-more-warnings --disable-json-validation">
     <branch repo="git.freedesktop.org"
                  module="NetworkManager/NetworkManager.git"
             checkoutdir="NetworkManager"/>
@@ -1178,7 +1204,7 @@
     <branch repo="github.com" module="hughsie/PackageKit.git"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
       <if condition-set="systemd">
@@ -1210,7 +1236,9 @@
     </dependencies>
   </autotools>
 
-  <autotools id="upower" autogenargs="--with-systemdsystemunitdir=no">
+  <autotools id="upower"
+             supports-non-srcdir-builds="no"
+             autogenargs="--with-systemdsystemunitdir=no">
     <branch repo="git.freedesktop.org" />
     <dependencies>
       <dep package="dbus-glib"/>
@@ -1239,12 +1267,14 @@
       <dep package="file-roller"/>
       <dep package="gedit"/>
       <dep package="gnome-calculator"/>
+      <dep package="gnome-calendar"/>
       <dep package="gnome-characters"/>
       <dep package="gnome-clocks"/>
       <dep package="gnome-contacts"/>
+      <dep package="gnome-documents"/>
       <dep package="gnome-font-viewer"/>
-      <dep package="gnome-logs"/>
       <dep package="gnome-maps"/>
+      <dep package="gnome-photos"/>
       <dep package="gnome-screenshot"/>
       <dep package="gnome-software"/>
       <dep package="gnome-system-monitor"/>
@@ -1257,6 +1287,12 @@
       <if condition-set="linux">
         <!-- udisks dependency -->
         <dep package="gnome-disk-utility"/>
+        <!-- udev dependency -->
+        <dep package="gnome-boxes"/>
+      </if>
+      <if condition-set="systemd">
+        <!-- systemd journal dependency -->
+        <dep package="gnome-logs"/>
       </if>
     </dependencies>
   </metamodule>
@@ -1268,24 +1304,19 @@
     <dependencies>
       <dep package="adwaita-icon-theme"/>
       <dep package="dconf"/>
-      <dep package="evolution-data-server"/>
       <dep package="gdm"/>
       <dep package="gnome-backgrounds"/>
       <!-- Not in utilities because the desktop file is hidden -->
       <dep package="gnome-color-manager"/>
       <dep package="gnome-control-center"/>
-      <dep package="gnome-documents"/>
       <dep package="gnome-getting-started-docs"/>
-      <dep package="gnome-initial-setup"/>
       <dep package="gnome-keyring"/>
-      <dep package="gnome-online-accounts"/>
       <dep package="gnome-session"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gnome-shell"/>
       <dep package="gnome-shell-extensions"/>
       <dep package="gnome-themes-standard"/>
       <dep package="gnome-user-docs"/>
-      <dep package="gnome-user-share"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gvfs"/>
       <dep package="glib-networking"/>
@@ -1296,6 +1327,13 @@
       <dep package="rygel"/>
       <dep package="telepathy-mission-control"/>
       <dep package="vino"/>
+      <if condition-set="linux">
+        <!-- NetworkManager dependency -->
+        <dep package="gnome-initial-setup"/>
+      </if>
+      <if condition-set="systemd">
+        <dep package="gnome-user-share"/>
+      </if>
     </dependencies>
   </metamodule>
 
@@ -1337,7 +1375,7 @@
       <dep package="at-spi2-core"/>
       <dep package="at-spi2-atk"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="pango"/>
     </dependencies>
   </metamodule>
@@ -1359,7 +1397,6 @@
       <!-- and bindings -->
       <dep package="pygobject"/>
       <dep package="gtkmm"/>
-      <dep package="java-gnome"/>
       <if condition-set="linux">
         <dep package="NetworkManager"/>
       </if>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index 2a13e9e..28ba83e 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -266,13 +266,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="gettext">
-    <branch repo="system" version="0.19"/>
-    <systemdependencies>
-      <dep type="c_include" name="gettext-po.h"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="gettext-bin">
     <branch repo="system"/>
     <systemdependencies>
@@ -399,6 +392,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="kyotocabinet">
+    <pkg-config>kyotocabinet.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="lcms2">
     <pkg-config>lcms2.pc</pkg-config>
     <branch repo="system"
@@ -549,11 +547,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="libarchive">
-    <pkg-config>libarchive.pc</pkg-config>
-    <branch repo="system" version="2.8.0"/>
-  </systemmodule>
-
   <systemmodule id="libcap">
     <branch repo="system"/>
     <systemdependencies>
@@ -665,11 +658,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"/>
@@ -850,6 +838,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="nettle">
+    <pkg-config>nettle.pc</pkg-config>
+    <branch repo="system"
+            version="3.2"/>
+  </systemmodule>
+
   <systemmodule id="nss">
     <pkg-config>nss.pc</pkg-config>
     <branch repo="system"
diff --git a/gnome-world.modules b/gnome-world.modules
index 1988775..d012188 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -96,6 +96,8 @@
       href="https://svn.code.sf.net/p/opalvoip/code/"/>
   <repository type="svn" name="valgrind.org"
       href="svn://svn.valgrind.org/valgrind/"/>
+  <repository type="bzr" name="research.operationaldynamics.com"
+    href="http://research.operationaldynamics.com/bzr"/>
 
   <repository type="tarball" name="dbus"
     href="http://dbus.freedesktop.org/releases/"/>
@@ -110,18 +112,18 @@
   <repository type="tarball" name="downloads.sourceforge.net"
       href="http://downloads.sourceforge.net/"/>
 
-  <include href="gnome-apps.modules"/>
+  <include href="gnome-apps-3.24.modules"/>
 
-  <!-- Temporarily moved from gnome-apps to gnome-world due to the dependency
-       on gconf. gconf is not needed at runtime or even make time, only at
-       configure time, so this should not be hard to fix. -->
   <autotools id="aisleriot"
              autogenargs="--with-platform=gtk-only">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-pysol-card-theme-path=/usr/local/share/PySolFC"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gconf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libcanberra"/>
       <dep package="librsvg"/>
       <dep package="guile"/>
@@ -137,6 +139,28 @@
     </dependencies>
   </autotools>
 
+  <autotools id="brasero">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-inotify"/>
+    </if>
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+-3"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="libcanberra"/>
+      <dep package="libnotify"/>
+      <dep package="libxml2"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+    <suggests>
+      <dep package="nautilus"/>
+      <dep package="totem-pl-parser"/>
+      <dep package="tracker"/>
+    </suggests>
+  </autotools>
+
   <autotools id="dbus-python">
     <branch module="dbus-python/dbus-python-0.83.1.tar.gz" version="0.83.1"
             repo="dbus"
@@ -156,7 +180,7 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -176,7 +200,7 @@
          cmakeargs="-DUSE_WEBKIT_4=ON -DWITH_LIBUNITY=OFF">
     <branch repo="github.com" checkoutdir="FeedReader" module="jangernert/FeedReader.git"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="libxml2"/>
@@ -197,7 +221,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="dbus-glib"/>
     </dependencies>
     <suggests>
@@ -211,7 +235,7 @@
       <dep package="glib"/>
       <dep package="gmime"/>
       <dep package="gnome-keyring"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libcanberra"/>
       <dep package="libgee"/>
       <dep package="libnotify"/>
@@ -227,7 +251,7 @@
     <dependencies>
       <dep package="glib-networking"/>
       <dep package="gst-plugins-base"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="json-glib"/>
       <dep package="libgee"/>
@@ -243,7 +267,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="telepathy-glib"/>
       <dep package="telepathy-logger"/>
     </dependencies>
@@ -278,7 +302,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="pygobject"/>
       <dep package="tracker"/>
       <dep package="WebKit"/>
@@ -296,7 +320,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="enchant"/>
       <dep package="iso-codes"/>
       <dep package="libsoup"/>
@@ -378,7 +402,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gtksourceview"/>
       <dep package="pygobject"/>
     </dependencies>
@@ -389,7 +413,7 @@
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="gconf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gnome-bluetooth"/>
       <dep package="gnokii"/>
       <dep package="gtkspell"/>
@@ -420,6 +444,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgtkflow">
+    <branch repo="github.com" module="grindhold/libgtkflow"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+-3"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="nautilus-actions">
     <branch/>
     <dependencies>
@@ -484,7 +518,7 @@
   <autotools id="giggle">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="glib"/>
       <dep package="gtksourceview"/>
       <dep package="yelp-tools"/>
@@ -611,7 +645,7 @@
 
   <autotools id="gst-libav"
              autogenargs="--disable-fatal-warnings">
-    <branch repo="gstreamer.freedesktop.org" revision="1.8"/>
+    <branch repo="gstreamer.freedesktop.org"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -999,7 +1033,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="libxml2"/>
       <dep package="gtksourceview"/>
@@ -1018,7 +1052,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -1043,7 +1077,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
@@ -1119,7 +1153,7 @@
     <dependencies>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
@@ -1177,7 +1211,7 @@
       <dep package="gst-plugins-good"/>
       <dep package="gst-plugins-ugly"/>
       <dep package="gst-python"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="pycairo"/>
       <dep package="pygobject"/>
     </dependencies>
@@ -1193,7 +1227,7 @@
   <autotools id="xchat-gnome">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gconf"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
@@ -1245,7 +1279,7 @@
   <autotools id="xdg-user-dirs-gtk">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
@@ -1289,12 +1323,12 @@
     </dependencies>
   </metamodule>
 
-  <autotools id="gucharmap">
+  <autotools id="gucharmap" autogenargs="--with-unicode-data=download">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -1440,7 +1474,7 @@
     <branch repo="github.com" module="mono/mono-tools.git" checkoutdir="mono-tools"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
       <!-- <dep package="gecko-sharp"/> -->
     </dependencies>
   </autotools>
@@ -1457,7 +1491,7 @@
     <dependencies>
       <dep package="desktop-file-utils"/>
       <dep package="mono"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
       <dep package="gtksourceview-sharp"/>
       <!-- <dep package="gecko-sharp"/> -->
     </dependencies>
@@ -1467,7 +1501,7 @@
     <branch repo="github.com" module="mono/gsf-sharp.git" checkoutdir="gsf-sharp"/>
     <dependencies>
       <dep package="libgsf"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
     </dependencies>
   </autotools>
 
@@ -1475,7 +1509,7 @@
     <branch/>
     <dependencies>
       <dep package="evolution-data-server"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
     </dependencies>
   </autotools>
 
@@ -1555,7 +1589,7 @@
    <dependencies>
      <dep package="pygobject"/>
      <dep package="glib"/>
-     <dep package="gtk+"/>
+     <dep package="gtk+-3"/>
    </dependencies>
  </autotools>
 
@@ -1563,7 +1597,7 @@
     <branch repo="hg.circular-chaos.org"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
       <dep package="ndesk-dbus"/>
       <dep package="ndesk-dbus-glib"/>
    </dependencies>
@@ -1573,7 +1607,7 @@
     <branch/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
       <dep package="ndesk-dbus"/>
       <dep package="ndesk-dbus-glib"/>
       <dep package="notify-sharp"/>
@@ -1618,7 +1652,7 @@
   <autotools id="goocanvas">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
@@ -1760,7 +1794,7 @@
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gtkspell-3"/>
       <dep package="json-glib"/>
       <dep package="libgee-0.6"/>
@@ -1828,7 +1862,7 @@
       <dep package="gcr"/>
       <dep package="glib"/>
       <dep package="gpgme"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="sqlite3"/>
       <dep package="intltool"/>
       <dep package="appdata-tools"/>
@@ -1922,7 +1956,7 @@
   <autotools id="liferea">
     <branch repo="github.com" checkoutdir="liferea" module="lwindolf/liferea"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="glib"/>
       <dep package="pango"/>
       <dep package="libxml2"/>
@@ -2055,7 +2089,7 @@
     <branch />
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libchamplain"/>
       <dep package="libpeas"/>
       <dep package="librest"/>
@@ -2066,7 +2100,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="pango"/>
       <dep package="cairo"/>
@@ -2086,7 +2120,7 @@
   <autotools id="hyena">
     <branch/>
     <dependencies>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
     </dependencies>
   </autotools>
 
@@ -2094,7 +2128,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
       <dep package="poppler"/>
       <dep package="hyena"/>
     </dependencies>
@@ -2307,7 +2341,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gconf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="gmime"/>
       <dep package="evolution-data-server"/>
@@ -2329,7 +2363,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libsoup"/>
       <dep package="intltool"/>
       <dep package="evolution-data-server"/>
@@ -2352,7 +2386,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gconf"/>
       <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
@@ -2366,7 +2400,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gconf"/>
       <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
@@ -2380,7 +2414,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gconf"/>
       <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
@@ -2394,7 +2428,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gconf"/>
       <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
@@ -2413,7 +2447,7 @@
   <autotools id="gtkparasite">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 
@@ -2439,13 +2473,13 @@
     <dependencies>
       <dep package="glib"/>
       <if condition-set="systemd">
-        <dep package="libsystemd-journal"/>
+        <dep package="libsystemd"/>
       </if>
     </dependencies>
   </autotools>
 
-  <autotools id="ostree" autogenargs="--with-libarchive --enable-installed-tests">
-    <branch/>
+  <autotools id="ostree" autogenargs="--with-libarchive --enable-installed-tests" 
supports-non-srcdir-builds="no">
+    <branch repo="github.com" module="ostreedev/ostree" checkoutdir="ostree"/>
     <dependencies>
       <dep package="libsoup"/>
       <dep package="libarchive"/>
@@ -2503,7 +2537,7 @@
     <dependencies>
       <dep package="dbus" />
       <dep package="glib" />
-      <dep package="gtk+" />
+      <dep package="gtk+-3" />
       <dep package="libcanberra" />
       <dep package="m4-common" />
     </dependencies>
@@ -2513,7 +2547,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+" />
+      <dep package="gtk+-3" />
       <dep package="libxklavier" />
     </dependencies>
   </autotools>
@@ -2522,7 +2556,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="dbus-glib"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-desktop"/>
@@ -2569,7 +2603,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -2578,7 +2612,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libgsf"/>
       <dep package="libxml2"/>
       <dep package="pango"/>
@@ -2611,7 +2645,7 @@
             checkoutdir="gst-plugins-base-0.10"/>
     <dependencies>
       <dep package="gstreamer-0.10"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
     </dependencies>
     <suggests>
       <if condition-set="linux">
@@ -2640,7 +2674,15 @@
     </suggests>
   </autotools>
 
-  <autotools id="gtk-sharp" autogen-sh="bootstrap-2.12">
+  <autotools id="gtk-sharp">
+    <branch repo="github.com" module="mono/gtk-sharp.git" checkoutdir="gtk-sharp"/>
+    <dependencies>
+      <dep package="mono"/>
+      <dep package="gtk+-3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtk-sharp-2" autogen-sh="bootstrap-2.12">
     <branch repo="github.com" module="mono/gtk-sharp.git" checkoutdir="gtk-sharp"
             revision="gtk-sharp-2-12-branch"/>
     <dependencies>
@@ -2649,6 +2691,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="bindinator">
+    <branch repo="github.com" module="shana/bindinator.git" checkoutdir="bindinator"/>
+    <dependencies>
+      <dep package="gtk-sharp"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libxml++">
     <branch/>
     <dependencies>
@@ -2658,10 +2707,11 @@
   </autotools>
 
   <autotools id="mono">
-    <branch module="mono/mono-2.10.9.tar.bz2" version="2.10.9"
+    <branch module="mono/mono-4.4.0.122.tar.bz2" version="4.4.0"
             repo="mono.net"
-            hash="sha256:4c12b6169ae3589a054bbabc448c13d356ff548376c0eda885ec9d440ef2599a"
-            size="34038017"/>
+            checkoutdir="mono-${version}"
+            hash="sha256:8d29386e5c97ae39a80c732dc854ecba92b24d8f70407ee34b4600820ce9f5b7"
+            size="84904723"/>
     <dependencies>
       <dep package="libgdiplus"/>
       <dep package="sqlite3"/>
@@ -2675,7 +2725,7 @@
             size="304402"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
     </dependencies>
   </autotools>
 
@@ -2760,7 +2810,7 @@
       <dep package="boost"/>
       <dep package="cairo"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="libgsf"/>
       <dep package="wv"/>
@@ -2781,7 +2831,7 @@
       <dep package="gst-plugins-base-0.10"/>
       <dep package="gst-plugins-good-0.10"/>
       <dep package="mono"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
       <dep package="taglib-sharp"/>
       <dep package="mono-addins"/>
       <dep package="dbus-sharp"/>
@@ -2797,7 +2847,7 @@
     <dependencies>
       <dep package="duplicity"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libnotify"/>
       <dep package="libsecret"/>
       <dep package="vala"/>
@@ -2811,7 +2861,7 @@
   <autotools id="f-spot">
     <branch/>
     <dependencies>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
     </dependencies>
   </autotools>
 
@@ -2821,7 +2871,7 @@
       <dep package="clutter"/>
       <dep package="glib"/>
       <dep package="gstreamer-0.10"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libgnome-keyring"/>
       <dep package="librsvg"/>
       <dep package="libsoup"/>
@@ -2848,7 +2898,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gconf"/>
       <dep package="libcanberra"/>
       <dep package="libxml2"/>
@@ -2872,7 +2922,7 @@
     <branch/>
     <dependencies>
       <dep package="goffice"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libgsf"/>
       <dep package="libxml2"/>
       <dep package="pygobject-python2"/>
@@ -2906,7 +2956,7 @@
   <autotools id="libgnome-media-profiles">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gconf"/>
       <dep package="gst-plugins-base-0.10"/>
     </dependencies>
@@ -2936,7 +2986,7 @@
       <dep package="cairo"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
       <if condition-set="linux">
         <dep package="gudev"/>
@@ -2973,7 +3023,7 @@
     <branch/>
     <dependencies>
       <dep package="PackageKit"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libnotify"/>
       <dep package="libcanberra"/>
     </dependencies>
@@ -2982,7 +3032,7 @@
         <dep package="gudev"/>
       </if>
       <if condition-set="systemd">
-        <dep package="libsystemd-login"/>
+        <dep package="libsystemd"/>
       </if>
     </suggests>
   </autotools>
@@ -2993,7 +3043,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="libgnome-keyring"/>
       <dep package="gnome-doc-utils"/>
       <dep package="upower"/>
@@ -3027,7 +3077,7 @@
     <dependencies>
       <dep package="clutter-gtk"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="pulseaudio"/>
       <dep package="vala"/>
     </dependencies>
@@ -3041,7 +3091,7 @@
       <dep package="gobject-introspection"/>
       <dep package="grilo"/>
       <dep package="gst-plugins-base"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="json-glib"/>
       <dep package="libnotify"/>
       <dep package="libpeas"/>
@@ -3071,31 +3121,31 @@
             hash="sha256:50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d"
             size="342778"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="shotwell">
+  <autotools id="shotwell" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="desktop-file-utils"/>
       <dep package="gexiv2"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gtk+-3"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
       <dep package="gudev"/>
       <dep package="json-glib"/>
-      <dep package="libgee-0.6"/>
+      <dep package="libgee"/>
       <dep package="libraw"/>
-      <dep package="librest"/>
       <dep package="libsoup"/>
-      <dep package="libunique"/>
+      <dep package="libgphoto2"/>
+      <dep package="libexif"/>
       <dep package="libxml2"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
-      <dep package="WebKit1"/>
+      <dep package="WebKit"/>
     </dependencies>
   </autotools>
 
@@ -3106,7 +3156,7 @@
       <dep package="iso-codes"/>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="yelp-tools"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -3121,7 +3171,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk-sharp"/>
+      <dep package="gtk-sharp-2"/>
       <dep package="dbus-sharp"/>
       <dep package="dbus-sharp-glib"/>
       <dep package="gnome-doc-utils"/>
@@ -3137,7 +3187,7 @@
     <branch repo="github.com"
             module="evolve-os/budgie-desktop.git"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vala"/>
       <dep package="mutter"/>
       <dep package="libpeas"/>
@@ -3156,8 +3206,8 @@
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libgames-support"/>
+      <dep package="gtk+-3"/>
+      <dep package="libgnome-games-support"/>
       <dep package="libgee"/>
     </dependencies>
   </autotools>
@@ -3184,15 +3234,31 @@
     </dependencies>
   </autotools>
 
-  <autotools id="xdg-app" autogenargs="--enable-sudo">
+  <autotools id="flatpak" autogenargs="--enable-sudo">
     <branch repo="github.com"
-            module="alexlarsson/xdg-app"/>
+            module="flatpak/flatpak"/>
     <dependencies>
       <dep package="ostree"/>
       <dep package="libgsystem"/>
     </dependencies>
   </autotools>
 
+  <autotools id="xdg-desktop-portal" autogenargs="--disable-docbook-docs">
+    <branch repo="github.com" module="flatpak/xdg-desktop-portal"/>
+    <dependencies>
+      <dep package="flatpak"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="xdg-desktop-portal-gtk">
+    <branch repo="github.com" module="flatpak/xdg-desktop-portal-gtk"/>
+    <dependencies>
+      <dep package="xdg-desktop-portal"/>
+      <dep package="gtk+-3"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libratbag">
     <branch repo="github.com" checkoutdir="libratbag" module="libratbag/libratbag.git"/>
     <dependencies>
@@ -3206,7 +3272,10 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gtk+-3"/>
+      <dep package="gvfs"/>
       <dep package="libarchive"/>
       <dep package="retro-gtk"/>
       <dep package="tracker"/>
@@ -3231,7 +3300,7 @@
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="json-glib"/>
       <dep package="telepathy-glib"/>
     </suggests>
@@ -3257,7 +3326,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="vte"/>
       <dep package="gdl"/>
       <dep package="libgda-5.2"/>
@@ -3301,4 +3370,29 @@
     </dependencies>
   </autotools>
 
+  <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
+    <branch repo="research.operationaldynamics.com"
+            module="bzr/java-gnome/mainline"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+      <dep package="gtk+-3"/>
+      <dep package="gtksourceview"/>
+      <dep package="librsvg"/>
+      <dep package="enchant"/>
+      <dep package="libnotify"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="lollypop">
+    <branch repo="github.com" module="gnumdk/lollypop.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+-3"/>
+      <dep package="pygobject"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>


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