[gnome-modulesets/gnome-3-22] Resync with current 3.22 modulesets

From: Javier Jardón Cabezas <jjardon src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-modulesets/gnome-3-22] Resync with current 3.22 modulesets
Date: Mon, 10 Oct 2016 01:12:25 +0000 (UTC)
commit 3258d2b42b9fa1807fc74208ed0ad58fb97204d8
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Oct 10 02:07:59 2016 +0100

    Resync with current 3.22 modulesets

 gnome-apps.modules      |  280 ++++-------------------------------
 gnome-core-deps.modules |  383 ++++++++++++++++++++++++++++++++++++++---------
 gnome-core.modules      |  221 +++++++++++++++------------
 gnome-sysdeps.modules   |   19 +--
 4 files changed, 471 insertions(+), 432 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index dc6e245..570bbfe 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"
@@ -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,7 +135,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgames-support">
+  <autotools id="libgnome-games-support" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -212,37 +168,6 @@
     </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>
@@ -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>
@@ -385,30 +241,8 @@
     </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/>
+    <branch revision="gnome-3-22"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="glib"/>
@@ -427,11 +261,11 @@
     </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"/>
@@ -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,6 +314,7 @@
       <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"/>
@@ -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>
@@ -519,7 +354,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gitg">
+  <autotools id="gitg" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="gtk+"/>
@@ -554,28 +389,7 @@
     </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"/>
@@ -590,27 +404,9 @@
       <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>
 
@@ -639,7 +435,6 @@
   <autotools id="gnome-music">
     <branch/>
     <dependencies>
-      <dep package="gnome-themes-standard"/>
       <dep package="gobject-introspection"/>
       <dep package="grilo"/>
       <dep package="grilo-plugins"/>
@@ -662,29 +457,6 @@
     </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>
@@ -816,9 +588,7 @@
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
-      <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="m4-common"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
@@ -830,7 +600,7 @@
     <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="yelp-tools"/>
@@ -854,6 +624,7 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
+      <dep package="libgnome-games-support"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
@@ -870,7 +641,7 @@
       <dep package="gtk+"/>
       <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,7 +654,7 @@
     <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="libcanberra"/>
@@ -901,6 +672,7 @@
       <dep package="intltool"/>
       <dep package="json-glib"/>
       <dep package="libgee"/>
+      <dep package="m4-common"/>
       <dep package="qqwing"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -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..79e6a26 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,14 @@
     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/"/>
 
 <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 +79,11 @@
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
       <dep package="json-glib"/>
       <dep package="libarchive"/>
       <dep package="libsoup"/>
+      <dep package="libuuid"/>
       <dep package="libyaml"/>
       <dep package="sqlite3"/>
     </dependencies>
@@ -103,6 +106,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"
@@ -267,7 +274,42 @@
     </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+"/>
+      <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,6 +355,15 @@
     </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>
@@ -341,6 +392,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 +444,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 +469,7 @@
     </after>
   </autotools>
 
-  <autotools id="glibmm">
+  <autotools id="glibmm" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -405,6 +484,22 @@
     <branch/>
   </autotools>
 
+  <autotools id="gnome-online-accounts"
+             supports-non-srcdir-builds="no">
+    <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-online-miners">
     <branch/>
     <dependencies>
@@ -526,7 +621,7 @@
   </autotools>
 
   <autotools id="gssdp" makeargs="CFLAGS=-Wno-error">
-    <branch />
+    <branch revision="gssdp_1.0"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
@@ -541,8 +636,7 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
-            checkoutdir="gstreamer"
-            revision="1.8"/>
+            checkoutdir="gstreamer"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -550,17 +644,27 @@
     </dependencies>
   </autotools>
 
+  <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"
              autogenargs="--disable-fatal-warnings"
              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,8 +672,7 @@
              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+"/>
@@ -587,8 +690,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"/>
@@ -620,7 +722,7 @@
     <if condition-set="quartz">
       <autogenargs value="--enable-quartz-backend"/>
     </if>
-    <branch/>
+    <branch revision="gtk-3-22"/>
     <dependencies>
       <dep package="atk"/>
       <dep package="glib"/>
@@ -644,6 +746,8 @@
       </if>
     </dependencies>
     <suggests>
+      <!-- Many GTK+ apps require desktop-file-validate. -->
+      <dep package="desktop-file-utils"/>
       <dep package="shared-mime-info"/>
     </suggests>
   </autotools>
@@ -673,13 +777,25 @@
       <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+"/>
+      <dep package="pulseaudio"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
  <autotools id="gtkmm">
     <branch/>
     <dependencies>
@@ -706,7 +822,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 +892,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"/>
@@ -792,7 +909,9 @@
     </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 +925,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 +938,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 +961,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>
@@ -911,7 +1016,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 +1026,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+" />
+      <dep package="libxklavier" />
+    </dependencies>
+  </autotools>
+
   <autotools id="libgfbgraph">
     <branch/>
     <dependencies>
@@ -932,6 +1057,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 +1089,6 @@
   <autotools id="libgtop">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="texinfo"/>
     </dependencies>
@@ -1025,7 +1158,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"
@@ -1047,6 +1181,46 @@
     </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/>
@@ -1054,10 +1228,10 @@
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
+      <dep package="pygobject"/>
     </dependencies>
     <suggests>
       <dep package="glade"/>
-      <dep package="pygobject"/>
     </suggests>
   </autotools>
 
@@ -1073,7 +1247,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 +1284,7 @@
   </autotools>
 
   <autotools id="libsigcplusplus">
-    <branch revision="libsigc++-2-8"/>
+    <branch revision="libsigc++-2-10"/>
     <dependencies>
       <dep package="mm-common"/>
     </dependencies>
@@ -1131,6 +1305,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"
@@ -1271,6 +1455,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 +1506,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.32.tar.bz2"
+            version="0.32"
+            hash="sha256:4c48f4099335e0cd100854162a44070d34ed73dfcad2115e80c075013b49ee02"
+            size="1342742"/>
+    <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.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 +1561,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 +1596,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 +1625,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 +1634,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>
-    <branch />
+    <pkg-config>libvala-0.34.pc</pkg-config>
+    <branch revision="0.34"/>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="valadoc">
+  <autotools id="valadoc" supports-non-srcdir-builds="no">
     <branch />
     <dependencies>
       <dep package="libgee"/>
@@ -1430,7 +1675,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 +1684,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++"/>
@@ -1455,8 +1700,6 @@
       <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="harfbuzz"/>
       <dep package="hyphen"/>
       <dep package="libicu"/>
@@ -1506,13 +1749,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="gnutls"/>
       <dep package="pcre2"/>
       <dep package="vala"/>
     </dependencies>
@@ -1523,7 +1770,6 @@
     <dependencies>
       <dep package="libxslt"/>
       <dep package="libxml2"/>
-      <dep package="intltool"/>
       <dep package="yelp-xsl"/>
       <dep package="itstool"/>
       <dep package="xmllint"/>
@@ -1544,7 +1790,6 @@
   <autotools id="zenity">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="yelp-tools"/>
     </dependencies>
diff --git a/gnome-core.modules b/gnome-core.modules
index 083c8f8..4a6e2e2 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -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"/>
@@ -169,17 +137,17 @@
       <dep package="gtk+"/>
       <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"/>
@@ -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"/>
@@ -255,10 +227,12 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <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>
 
@@ -293,24 +267,10 @@
     </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+"/>
@@ -318,6 +278,7 @@
       <dep package="json-glib"/>
       <dep package="upower"/>
       <dep package="libXcomposite"/>
+      <dep package="mesa-libGLES"/>
       <dep package="sm"/>
       <dep package="xtrans"/>
       <if condition-set="systemd">
@@ -404,6 +365,7 @@
     <suggests>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
+      <dep package="libgnomekbd"/>
     </suggests>
     <after>
       <dep package="librsvg"/>
@@ -464,6 +426,9 @@
   </autotools>
 
  <autotools id="gvfs">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-admin"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -500,10 +465,17 @@
   </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"/>
@@ -537,7 +509,7 @@
   </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"/>
@@ -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,8 +556,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="rygel">
-    <branch/>
+  <autotools id="rygel" supports-non-srcdir-builds="no">
+    <branch revision="rygel-0-32"/>
     <dependencies>
       <dep package="vala"/>
       <dep package="gupnp"/>
@@ -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"/>
@@ -709,7 +684,6 @@
       <dep package="gcr"/>
       <dep package="avahi"/>
       <dep package="gnome-desktop"/>
-      <dep package="libwnck"/>
       <dep package="libnotify"/>
       <dep package="libsecret"/>
       <dep package="libsoup"/>
@@ -743,7 +717,6 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
-      <dep package="nautilus"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -763,6 +736,28 @@
     </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+"/>
+      <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>
@@ -779,6 +774,17 @@
     </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-characters">
     <branch/>
     <dependencies>
@@ -788,7 +794,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-clocks">
+  <autotools id="gnome-clocks" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="vala"/>
@@ -802,7 +808,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-contacts">
+  <autotools id="gnome-contacts" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="folks"/>
@@ -837,7 +843,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-documents">
+  <autotools id="gnome-documents"
+             supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="evince"/>
@@ -850,6 +857,7 @@
       <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"/>
@@ -919,12 +927,35 @@
       <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+"/>
+      <dep package="libgdata"/>
+      <dep package="libgfbgraph"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="tracker"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-screenshot">
     <branch/>
     <dependencies>
@@ -942,6 +973,7 @@
       <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
+      <dep package="libsecret"/>
       <dep package="libsoup"/>
       <dep package="PackageKit"/>
       <dep package="sqlite3"/>
@@ -967,8 +999,7 @@
   </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"/>
@@ -986,13 +1017,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"/>
@@ -1008,21 +1036,17 @@
       <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="gnome-autoar"/>
       <dep package="pango"/>
       <dep package="libxml2"/>
       <dep package="gnome-desktop"/>
@@ -1096,9 +1120,6 @@
   </autotools>
 
   <autotools id="yelp">
-    <if condition-set="freebsd">
-      <autogenargs value="YELP_LZMA_CFLAGS=' ' YELP_LZMA_LIBS='-llzma'"/>
-    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -1130,16 +1151,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"/>
@@ -1210,7 +1228,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 +1259,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 +1279,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 +1296,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 +1319,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>
 
@@ -1359,7 +1389,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..f28a35d 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"
@@ -551,7 +549,7 @@
 
   <systemmodule id="libarchive">
     <pkg-config>libarchive.pc</pkg-config>
-    <branch repo="system" version="2.8.0"/>
+    <branch repo="system" version="3.2.0"/>
   </systemmodule>
 
   <systemmodule id="libcap">
@@ -665,11 +663,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"/>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]