[gnome-modulesets] Resync with current modulesets



commit a4fba8bf0cf20f54d032b85134a911b4cc2f3a56
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Jan 6 15:48:30 2017 +0000

    Resync with current modulesets

 gnome-apps.modules      |  138 +++------------------------
 gnome-core-deps.modules |  242 ++++++++++++++++++++++++++++++++---------------
 gnome-core.modules      |  110 ++++++++++-----------
 gnome-sysdeps.modules   |   97 ++++++++++++++-----
 gnome-world.modules     |  229 ++++++++++++++++++++++++++++++--------------
 5 files changed, 461 insertions(+), 355 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 6aabc48..7f3e858 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -11,8 +11,6 @@
       href="git://anongit.freedesktop.org/git/"/>
   <repository type="git" name="github.com"
       href="git://github.com/"/>
-  <repository type="git" name="wayland"
-      href="git://anongit.freedesktop.org/git/wayland"/>
 
 <!-- tarball repos -->
   <repository type="tarball" name="gnome.org"
@@ -61,24 +59,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gdl">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="librsvg"/>
-      <dep package="gtk+-3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gdlmm">
-    <branch/>
-    <dependencies>
-      <dep package="gdl"/>
-      <dep package="glibmm"/>
-      <dep package="gtkmm"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-code-assistance">
     <branch/>
     <dependencies>
@@ -93,14 +73,6 @@
     </dependencies>
   </autotools>
 
- <autotools id="gtksourceviewmm">
-    <branch/>
-    <dependencies>
-      <dep package="gtksourceview"/>
-      <dep package="gtkmm"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="guile">
     <if condition-set="freebsd">
       <autogenargs value="BDW_GC_CFLAGS=' ' BDW_GC_LIBS='-lgc-threaded'"/>
@@ -201,17 +173,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="weston" autogenargs="--disable-setuid-install">
-    <branch repo="wayland"/>
-    <dependencies>
-      <dep package="wayland-protocols"/>
-      <dep package="wayland"/>
-      <dep package="cairo"/>
-      <dep package="libxkbcommon"/>
-      <dep package="mesa-libGLES"/>
-    </dependencies>
-  </autotools>
-
   <!-- Apps start here -->
 
   <autotools id="accerciser">
@@ -241,57 +202,16 @@
   <autotools id="devhelp">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="appstream-glib"/>
       <dep package="gtk+-3"/>
+      <dep package="gtk-doc"/>
+      <dep package="m4-common"/>
       <dep package="WebKit"/>
     </dependencies>
   </autotools>
 
-  <autotools id="empathy" supports-non-srcdir-builds="no">
-    <branch/>
-    <dependencies>
-      <dep package="clutter"/>
-      <dep package="clutter-gst3"/>
-      <dep package="clutter-gtk"/>
-      <dep package="dbus-glib"/>
-      <dep package="intltool"/>
-      <dep package="farstream"/>
-      <dep package="folks"/>
-      <dep package="gcr"/>
-      <dep package="glib"/>
-      <dep package="libgee"/>
-      <dep package="libsecret"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gnutls"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gstreamer"/>
-      <dep package="gtk+-3"/>
-      <dep package="libcanberra"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="pulseaudio"/>
-      <dep package="telepathy-farstream"/>
-      <dep package="telepathy-glib"/>
-      <dep package="telepathy-logger"/>
-      <dep package="telepathy-mission-control"/>
-      <dep package="libnotify"/>
-      <dep package="WebKit1"/>
-    </dependencies>
-    <suggests>
-      <dep package="enchant"/>
-      <dep package="geoclue"/>
-      <dep package="geocode-glib"/>
-      <dep package="iso-codes"/>
-      <dep package="libchamplain"/>
-      <if condition-set="linux">
-        <dep package="NetworkManager"/>
-        <dep package="gudev"/>
-      </if>
-    </suggests>
-  </autotools>
-
   <cmake id="evolution"
-         cmakeargs="-DENABLE_LIBCRYPTUI=OFF -DENABLE_PST_IMPORT=OFF">
+         cmakeargs="-DENABLE_LIBCRYPTUI=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_YTNEF=OFF">
     <branch/>
     <dependencies>
       <dep package="atk"/>
@@ -348,7 +268,7 @@
       <dep package="gtk+-3"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="json-glib"/>
       <dep package="libgee"/>
@@ -366,6 +286,9 @@
   </autotools>
 
   <autotools id="glade">
+    <if condition-set="macos">
+      <autogenargs value="--disable-man-pages"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -374,6 +297,9 @@
       <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="yelp-tools"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -386,7 +312,7 @@
       <dep package="glib"/>
       <dep package="gnome-code-assistance"/>
       <dep package="gtk+-3"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="libgit2-glib"/>
       <dep package="libpeas"/>
       <dep package="librsvg"/>
@@ -476,24 +402,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="nemiver"
-             autogenargs="--enable-gsettings=yes">
-    <branch/>
-    <dependencies>
-      <dep package="boost"/>
-      <dep package="gdb"/>
-      <dep package="gdlmm"/>
-      <dep package="gtkmm"/>
-      <dep package="glibmm"/>
-      <dep package="gtksourceviewmm"/>
-      <dep package="vte"/>
-      <dep package="libgtop"/>
-      <dep package="libxml2"/>
-      <dep package="ghex"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="polari">
     <branch/>
     <dependencies>
@@ -527,25 +435,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="vinagre">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="intltool"/>
-      <dep package="libxml2"/>
-      <dep package="gtk+-3"/>
-      <dep package="gtk-vnc"/>
-      <dep package="libsecret"/>
-      <dep package="vala"/>
-    </dependencies>
-    <suggests>
-      <dep package="avahi"/>
-      <dep package="spice-gtk"/>
-      <dep package="telepathy-glib"/>
-      <dep package="vte"/>
-    </suggests>
-  </autotools>
-
 <!-- Games -->
 
   <autotools id="five-or-more">
@@ -782,7 +671,6 @@
       <dep package="accerciser"/>
       <dep package="dconf-editor"/>
       <dep package="devhelp"/>
-      <dep package="empathy"/>
       <dep package="evolution"/>
       <dep package="ghex"/>
       <dep package="gitg"/>
@@ -794,9 +682,7 @@
       <dep package="gnome-todo"/>
       <dep package="gnome-tweak-tool"/>
       <dep package="nautilus-sendto"/>
-      <dep package="nemiver"/>
       <dep package="polari"/>
-      <dep package="vinagre"/>
       <if condition-set="linux">
         <dep package="gnome-multi-writer"/>
       </if>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index e822e13..91b3b86 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -68,6 +68,8 @@
     href="http://www.spice-space.org/download/"/>
 <repository type="tarball" name="libarchive"
     href="http://libarchive.org/downloads/"/>
+<repository type="tarball" name="people.mozilla.org"
+    href="https://people.mozilla.org/~sstangl/"/>
 
 <include href="gnome-sysdeps.modules"/>
 
@@ -100,6 +102,14 @@
     </dependencies>
   </autotools>
 
+  <autotools id="atkmm-1.6">
+    <branch checkoutdir="atkmm-1.6" module="atkmm" revision="atkmm-2-24"/>
+    <dependencies>
+      <dep package="glibmm-2.4"/>
+      <dep package="atk"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="atkmm">
     <branch/>
     <dependencies>
@@ -109,14 +119,30 @@
   </autotools>
 
   <autotools id="babl">
+    <if condition-set="darwin">
+      <!-- https://bugzilla.gnome.org/show_bug.cgi?id=725530 -->
+      <autogenargs value="--disable-sse"/>
+    </if>
     <branch/>
   </autotools>
 
+  <autotools id="cairomm-1.0" autogen-sh="configure">
+    <branch module="releases/cairomm-${version}.tar.gz"
+            version="1.13.1"
+            repo="cairo.org"
+            hash="sha256:97a78bd7de6baf8af3da1f9b39f1317f8da9f1145b7694e928fbd5521da08ef6">
+     </branch>
+     <dependencies>
+        <dep package="cairo"/>
+        <dep package="libsigcplusplus-2.0"/>
+     </dependencies>
+  </autotools>
+
   <autotools id="cairomm" autogen-sh="configure">
     <branch module="releases/cairomm-${version}.tar.gz"
-            version="1.12.0"
+            version="1.15.1"
             repo="cairo.org"
-            hash="sha256:50435aec6fdd976934b791e808993160113ad19ca53a5634a9b64ccbe55874cc">
+            hash="sha256:15ee5f681fd2d835b9162dbf5a85a6e96f8523afa478fb6c65d7c63830457ce2">
      </branch>
      <dependencies>
         <dep package="cairo"/>
@@ -131,18 +157,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="caribou" autogenargs="--disable-gtk2-module">
-    <branch/>
-    <dependencies>
-      <dep package="pygobject"/>
-      <dep package="gtk+-3"/>
-      <dep package="clutter"/>
-      <dep package="libgee"/>
-      <dep package="libxklavier"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="clutter" autogenargs="--enable-installed-tests --disable-maintainer-flags">
     <if condition-unset="quartz">
       <autogenargs value="--enable-egl-backend"/>
@@ -181,7 +195,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="clutter-gst3">
+  <autotools id="clutter-gst">
     <branch revision="clutter-gst-3.0" module="clutter-gst" checkoutdir="clutter-gst3"/>
     <dependencies>
       <dep package="cogl"/>
@@ -250,6 +264,7 @@
       <dep package="sqlite3"/>
       <dep package="lcms2"/>
       <dep package="gobject-introspection"/>
+      <dep package="docbook-xml"/>
       <!-- and cups -->
       <!-- and sane -->
       <if condition-set="linux">
@@ -279,7 +294,7 @@
   <cmake id="evolution-data-server"
          cmakeargs="-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON -DENABLE_UOA=OFF 
-DENABLE_GOOGLE_AUTH=OFF">
     <if condition-set="freebsd">
-      <cmakeargs value="-DDB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
+      <cmakeargs value="-DWITH_LIBDB_CFLAGS=-I/usr/local/include/db5 -DWITH_LIBDB_LIBS=-ldb-5"/>
     </if>
     <branch/>
     <dependencies>
@@ -299,10 +314,9 @@
       <dep package="libsecret"/>
       <dep package="WebKit"/>
       <dep package="openldap"/>
-    </dependencies>
-    <suggests>
+      <dep package="nspr"/>
       <dep package="nss"/>
-    </suggests>
+    </dependencies>
   </cmake>
 
   <autotools id="folks"
@@ -340,6 +354,8 @@
       <dep package="sqlite3"/>
       <dep package="gpgme"/>
       <dep package="docbook-utils"/>
+      <dep package="libgusb"/>
+      <dep package="libelf"/>
     </dependencies>
   </autotools>
 
@@ -363,15 +379,20 @@
   </autotools>
 
   <autotools id="gcr">
+    <if condition-unset="x11">
+      <autogenargs value="--without-gtk"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
       <dep package="vala"/>
+      <if condition-set="x11">
+        <dep package="gtk+-3"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -390,7 +411,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gegl" autogenargs="--without-libavformat">
+  <autotools id="gegl" autogenargs="--without-libavformat --without-jasper">
     <branch/>
     <dependencies>
       <dep package="babl"/>
@@ -398,7 +419,6 @@
       <dep package="cairo"/>
       <dep package="gdk-pixbuf"/>
       <dep package="pango"/>
-      <dep package="libjasper"/>
       <dep package="libjpeg"/>
       <dep package="libpng"/>
       <dep package="libraw"/>
@@ -410,6 +430,9 @@
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--disable-nmea-source"/>
+    </if>
     <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="glib"/>
@@ -454,19 +477,34 @@
     <if condition-set="freebsd">
       <autogenargs value="--disable-dtrace --with-libiconv=gnu"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--with-pcre=internal"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gettext"/>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
-      <dep package="libpcre"/>
       <dep package="zlib"/>
+      <if condition-unset="macos">
+        <dep package="libpcre"/>
+      </if>
     </dependencies>
     <after>
-      <dep package="shared-mime-info"/>
+      <if condition-unset="macos">
+        <dep package="shared-mime-info"/>
+      </if>
     </after>
   </autotools>
 
+  <autotools id="glibmm-2.4" supports-non-srcdir-builds="no">
+    <branch checkoutdir="glibmm-2.4" module="glibmm" revision="glibmm-2-50"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsigcplusplus-2.0"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="glibmm" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
@@ -524,9 +562,10 @@
     </if>
     <branch/>
     <dependencies>
+      <dep package="m4-common"/>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="js24"/>
+      <dep package="mozjs31"/>
       <if condition-set="coverage">
         <dep package="lcov"/>
       </if>
@@ -615,6 +654,9 @@
       <dep package="enchant"/>
       <dep package="iso-codes"/>
       <dep package="m4-common"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -629,8 +671,9 @@
     </suggests>
   </autotools>
 
-  <meson id="gstreamer"
-         autogenargs="--disable-tests --disable-fatal-warnings">
+  <autotools id="gstreamer"
+         autogenargs="--disable-tests --disable-fatal-warnings"
+         supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
             checkoutdir="gstreamer"/>
@@ -639,15 +682,15 @@
       <dep package="libxml2"/>
       <dep package="gobject-introspection"/>
     </dependencies>
-  </meson>
+  </autotools>
 
-  <meson id="graphene">
+  <autotools id="graphene">
     <branch repo="github.com" checkoutdir="graphene" module="ebassi/graphene.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
     </dependencies>
-  </meson>
+  </autotools>
 
   <autotools id="gst-plugins-bad"
              autogenargs="--disable-fatal-warnings"
@@ -692,10 +735,12 @@
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="flac"/>
-      <dep package="libv4l"/>
       <dep package="libvpx"/>
       <dep package="taglib"/>
       <dep package="wavpack"/>
+      <if condition-unset="macos">
+        <dep package="libv4l"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="pulseaudio"/>
@@ -794,25 +839,6 @@
     </suggests>
   </autotools>
 
-  <!-- Deprecated -->
-  <autotools id="gtk+-2">
-    <if condition-set="quartz">
-      <autogenargs value="--with-backend=quartz"/>
-    </if>
-    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-    <suggests>
-      <dep package="shared-mime-info"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gtk-doc">
     <branch/>
     <dependencies>
@@ -826,6 +852,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtk-mac-integration">
+    <branch />
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="pygobject"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala">
     <branch/>
     <dependencies>
@@ -838,12 +873,23 @@
     </dependencies>
   </autotools>
 
- <autotools id="gtkmm">
+  <autotools id="gtkmm">
     <branch/>
     <dependencies>
       <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
+      <dep package="gtk+"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtkmm-3">
+    <branch checkoutdir="gtkmm-3" module="gtkmm" revision="gtkmm-3-22"/>
+    <dependencies>
+      <dep package="cairomm-1.0"/>
+      <dep package="pangomm-1.4"/>
+      <dep package="atkmm-1.6"/>
       <dep package="gtk+-3"/>
       <dep package="glib"/>
     </dependencies>
@@ -862,6 +908,19 @@
     </suggests>
   </autotools>
 
+  <autotools id="gtksourceview-3">
+    <branch checkoutdir="gtksourceview-3" module="gtksourceview" revision="gnome-3-24"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+      <dep package="gtk+-3"/>
+      <dep package="m4-common"/>
+    </dependencies>
+    <suggests>
+      <dep package="glade"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gupnp"
              autogenargs="--with-context-manager=network-manager">
     <branch revision="gupnp-1.0"/>
@@ -952,7 +1011,7 @@
   </autotools>
 
   <autotools id="ibus-anthy"
-             autogenargs="--enable-private-png=yes"
+             autogenargs="--enable-private-png=yes --with-python=python3"
              supports-non-srcdir-builds="no">
     <branch repo="github-tar"
             version="1.5.6"
@@ -1178,7 +1237,7 @@
   </autotools>
 
   <meson id="libhttpseverywhere">
-    <branch revision="v0.2"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1189,7 +1248,6 @@
       <dep package="libxml2"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
-      <dep package="valadoc"/>
     </dependencies>
   </meson>
 
@@ -1280,13 +1338,6 @@
     </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/>
@@ -1313,6 +1364,9 @@
     <if condition-set="freebsd">
       <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--without-ca-certificates"/>
+    </if>
     <branch revision="librest-0-7"/>
     <dependencies>
       <dep package="glib"/>
@@ -1339,6 +1393,9 @@
   </autotools>
 
   <autotools id="libsecret">
+    <if condition-set="macos">
+      <autogenargs value="--disable-manpages"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -1349,8 +1406,15 @@
     </suggests>
   </autotools>
 
+  <autotools id="libsigcplusplus-2.0">
+    <branch checkoutdir="libsigcplusplus-2.0" module="libsigcplusplus" revision="libsigc++-2-10"/>
+    <dependencies>
+      <dep package="mm-common"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libsigcplusplus">
-    <branch revision="libsigc++-2-10"/>
+    <branch/>
     <dependencies>
       <dep package="mm-common"/>
     </dependencies>
@@ -1485,6 +1549,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="mozjs31" autogen-sh="configure"
+             autogenargs="--with-system-nspr --with-system-zlib --enable-system-ffi --with-system-icu">
+    <pkg-config>mozjs-31.pc</pkg-config>
+    <branch repo="people.mozilla.org" module="mozjs-31.5.0.tar.bz2"
+            version="31.5.0" source-subdir="js/src">
+      <patch file="mozjs31-1021171.patch" strip="1"/>
+      <patch file="mozjs31-1037470.patch" strip="1"/>
+      <patch file="mozjs31-1046176.patch" strip="1"/>
+      <patch file="mozjs31-1119228.patch" strip="1"/>
+      <patch file="mozjs31-install-name.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="libffi"/>
+      <dep package="libicu"/>
+      <dep package="nspr"/>
+      <dep package="python2"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="pango" autogenargs="--with-cairo --enable-installed-tests">
     <branch/>
     <dependencies>
@@ -1502,6 +1586,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="pangomm-1.4">
+    <branch checkoutdir="pangomm-1.4" module="pangomm" revision="pangomm-2-40"/>
+    <dependencies>
+      <dep package="glibmm-2.4"/>
+      <dep package="cairomm-1.0"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="pangomm">
     <branch/>
     <dependencies>
@@ -1674,6 +1768,9 @@
       <dep package="libuuid"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
+      <if condition-set="linux">
+        <dep package="libseccomp"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="libsecret"/>
@@ -1711,23 +1808,15 @@
   </autotools>
 
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
-    <pkg-config>libvala-0.36.pc</pkg-config>
     <branch />
     <dependencies>
+      <dep package="bison"/>
+      <dep package="flex"/>
       <dep package="glib"/>
       <dep package="vala-bootstrap"/>
     </dependencies>
   </autotools>
 
-  <autotools id="valadoc" supports-non-srcdir-builds="no">
-    <branch />
-    <dependencies>
-      <dep package="libgee"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="graphviz"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="wayland-protocols">
     <branch repo="wayland.freedesktop.org"/>
   </autotools>
@@ -1751,9 +1840,9 @@
     </if>
     <pkg-config>webkit2gtk-4.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.15.1.tar.xz" version="2.15.1"
-            hash="sha256:43b57d79d636a76f6ee3fbcf2a7e63aba7b86931b2113fa8dd59ca674f95ed80"
-            size="13761228">
+            module="webkitgtk-2.15.2.tar.xz" version="2.15.2"
+            hash="sha256:756f14ad2ca84e25dc245f2b736ab31de58d1eb66fef76e75a1985179072471f"
+            size="14443148">
     </branch>
     <dependencies>
       <dep package="c++"/>
@@ -1821,6 +1910,9 @@
             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. -->
+    <if condition-unset="gnu-elf">
+      <autogenargs value="--disable-Bsymbolic"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/gnome-core.modules b/gnome-core.modules
index 134db59..b21a1d9 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -63,11 +63,16 @@
   </autotools>
 
   <autotools id="at-spi2-core">
+    <if condition-unset="x11">
+      <autogenargs value="--disable-x11"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="libXtst"/>
+      <if condition-set="x11">
+        <dep package="libXtst"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -112,6 +117,9 @@
     <if condition-set="freebsd">
       <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--without-pkcs11 --without-ca-certificates"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -119,7 +127,9 @@
       <dep package="libproxy"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gnutls"/>
-      <dep package="p11-kit"/>
+      <if condition-unset="macos">
+        <dep package="p11-kit"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -380,14 +390,13 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-themes-standard">
+  <autotools id="gnome-themes-standard" autogenargs="--disable-gtk2-engine">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="cantarell-fonts"/>
       <dep package="librsvg"/>
       <dep package="gtk+-3"/>
-      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -434,6 +443,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="dbus"/>
+      <dep package="libcap"/>
       <dep package="libgcrypt"/>
       <dep package="libsoup"/>
       <dep package="gcr"/>
@@ -476,6 +486,8 @@
     </if>
     <branch/>
     <dependencies>
+      <dep package="cairo"/>
+      <dep package="egl"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
@@ -484,19 +496,27 @@
       <dep package="gtk+-3"/>
       <dep package="gtk-doc"/>
       <dep package="intltool"/>
+      <dep package="json-glib"/>
       <dep package="libcanberra"/>
+      <dep package="libX11"/>
+      <dep package="libXcomposite"/>
+      <dep package="libXcursor"/>
       <dep package="libXdamage"/>
       <dep package="libXext"/>
       <dep package="libXfixes"/>
       <dep package="libXi"/>
       <dep package="libXinerama"/>
-      <dep package="libXcomposite"/>
       <dep package="libXrandr"/>
+      <dep package="libXrender"/>
       <dep package="libxkbcommon"/>
+      <dep package="libxkbfile"/>
       <dep package="pango"/>
       <dep package="sm"/>
       <dep package="startup-notification"/>
       <dep package="upower"/>
+      <dep package="xcb-randr"/>
+      <dep package="xcb-res"/>
+      <dep package="xkeyboard-config"/>
       <dep package="zenity"/>
       <if condition-set="wayland">
         <dep package="gbm"/>
@@ -528,34 +548,6 @@
     </suggests>
   </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"/>
-    </if>
-    <branch repo="pulseaudio.freedesktop.org"/>
-    <dependencies>
-      <dep package="alsa"/>
-      <dep package="avahi"/>
-      <dep package="dbus"/>
-      <dep package="json"/>
-      <dep package="libcap"/>
-      <dep package="libsndfile"/>
-      <dep package="libtool-ltdl"/>
-      <dep package="glib"/>
-      <dep package="speex"/>
-      <if condition-set="linux">
-        <dep package="bluez"/>
-        <dep package="libudev"/>
-        <dep package="sbc"/>
-      </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd"/>
-      </if>
-    </dependencies>
-  </autotools>
-
   <autotools id="rygel" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
@@ -565,7 +557,6 @@
       <dep package="gupnp-dlna"/>
       <dep package="libgee"/>
       <dep package="tracker"/>
-      <dep package="valadoc"/>
       <dep package="libmediaart"/>
     </dependencies>
   </autotools>
@@ -634,7 +625,7 @@
       <dep package="gst-plugins-bad"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
-      <dep package="clutter-gst3"/>
+      <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
       <dep package="libcanberra"/>
       <dep package="vala"/>
@@ -683,6 +674,7 @@
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
       <dep package="gtk+-3"/>
+      <dep package="hogweed"/>
       <dep package="iso-codes"/>
       <dep package="json-glib"/>
       <dep package="libhttpseverywhere"/>
@@ -735,9 +727,12 @@
       <dep package="intltool"/>
       <dep package="libpeas"/>
       <dep package="yelp-tools"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="python3-devel"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gspell"/>
@@ -758,7 +753,6 @@
       <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"/>
@@ -772,7 +766,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+-3"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
       <dep package="m4-common"/>
@@ -1001,7 +995,7 @@
       <dep package="libwnck"/>
       <dep package="libgtop"/>
       <dep package="gtk+-3"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
       <dep package="libxml2"/>
       <dep package="librsvg"/>
     </dependencies>
@@ -1092,8 +1086,8 @@
       <dep package="evince"/>
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
-      <dep package="clutter-gst3"/>
-      <dep package="gtksourceview"/>
+      <dep package="clutter-gst"/>
+      <dep package="gtksourceview-3"/>
       <dep package="WebKit"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -1107,7 +1101,7 @@
       <dep package="appstream-glib"/>
       <dep package="cairo"/>
       <dep package="clutter"/>
-      <dep package="clutter-gst3"/>
+      <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
@@ -1157,25 +1151,21 @@
     </dependencies>
   </autotools>
 
-  <autotools id="bluez"
-             autogenargs="--enable-library">
-    <pkg-config>bluez.pc</pkg-config>
-    <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 --disable-json-validation">
-    <branch repo="git.freedesktop.org"
-                 module="NetworkManager/NetworkManager.git"
-            checkoutdir="NetworkManager"/>
+             autogenargs="PYTHON=python3 --with-udev-dir=${libdir}/udev --with-systemdsystemunitdir=no 
--with-crypto=gnutls --disable-more-warnings --disable-json-validation">
+    <branch repo="gnome.org"
+           version="1.4.2"
+           module="NetworkManager/1.4/NetworkManager-${version}.tar.xz"
+           hash="a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204"
+           size="3758636">
+    </branch>
     <dependencies>
       <dep package="libndp"/>
       <dep package="libnl"/>
       <dep package="libnl-genl"/>
       <dep package="libnl-route"/>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="iptables"/>
       <dep package="dbus-glib"/>
       <dep package="libgcrypt"/>
@@ -1378,6 +1368,9 @@
       <dep package="glib"/>
       <dep package="gtk+-3"/>
       <dep package="pango"/>
+      <if condition-set="macos">
+        <dep package="adwaita-icon-theme"/>
+      </if>
     </dependencies>
   </metamodule>
 
@@ -1391,16 +1384,19 @@
       <dep package="gstreamer"/>
       <dep package="libnotify"/>
       <dep package="libpeas"/>
-      <dep package="PackageKit"/>
       <dep package="telepathy-glib"/>
-      <dep package="upower"/>
       <dep package="WebKit"/>
       <!-- and bindings -->
       <dep package="pygobject"/>
-      <dep package="gtkmm"/>
+      <dep package="gjs"/>
+      <dep package="gtkmm-3"/>
       <if condition-set="linux">
         <dep package="NetworkManager"/>
       </if>
+      <if condition-unset="macos">
+        <dep package="PackageKit"/>
+        <dep package="upower"/>
+      </if>
     </dependencies>
   </metamodule>
 
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index f28a35d..16b448a 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -41,6 +41,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="bluez">
+    <pkg-config>bluez.pc</pkg-config>
+    <branch repo="system"
+            version="5.40"/>
+  </systemmodule>
+
   <systemmodule id="bogofilter">
     <branch repo="system"/>
     <systemdependencies>
@@ -60,6 +66,11 @@
     <branch repo="system" version="1.14.0"/>
   </systemmodule>
 
+  <systemmodule id="caribou">
+    <pkg-config>caribou-1.0.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="c++">
     <branch repo="system"/>
     <systemdependencies>
@@ -343,6 +354,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="hogweed">
+    <pkg-config>hogweed.pc</pkg-config>
+    <branch repo="system"
+            version="3.2"/>
+  </systemmodule>
+
   <systemmodule id="hyphen">
     <branch repo="system"/>
     <systemdependencies>
@@ -352,7 +369,7 @@
 
   <systemmodule id="intltool">
     <branch repo="system"
-            version="0.50"/>
+            version="0.50.2"/>
     <systemdependencies>
       <dep type="path"
            name="intltoolize"/>
@@ -379,16 +396,10 @@
             version="0.11"/>
   </systemmodule>
 
-  <systemmodule id="js24">
-    <pkg-config>mozjs-24.pc</pkg-config>
-    <branch repo="system"
-            version="24.2"/>
-  </systemmodule>
-
   <systemmodule id="krb5">
     <branch repo="system"/>
     <systemdependencies>
-      <dep type="path" name="krb5-config"/>
+      <dep type="c_include" name="krb5.h"/>
     </systemdependencies>
   </systemmodule>
 
@@ -433,6 +444,11 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libelf">
+    <pkg-config>libelf.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libhangul">
     <pkg-config>libhangul.pc</pkg-config>
     <branch repo="system"
@@ -547,11 +563,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="libarchive">
-    <pkg-config>libarchive.pc</pkg-config>
-    <branch repo="system" version="3.2.0"/>
-  </systemmodule>
-
   <systemmodule id="libcap">
     <branch repo="system"/>
     <systemdependencies>
@@ -619,13 +630,6 @@
     <branch repo="system" version="4"/>
   </systemmodule>
 
-  <systemmodule id="libjasper">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="c_include" name="jasper/jasper.h"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="libjpeg">
     <branch repo="system"/>
     <systemdependencies>
@@ -683,6 +687,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libseccomp">
+    <pkg-config>libseccomp.pc</pkg-config>
+    <branch repo="system"
+            version="2.0"/>
+  </systemmodule>
+
   <systemmodule id="libsndfile">
     <pkg-config>sndfile.pc</pkg-config>
     <branch repo="system"
@@ -812,6 +822,7 @@
     <systemdependencies>
       <dep type="c_include" name="llvm-c/Core.h">
         <!-- Debian -->
+        <altdep type="c_include" name="llvm-c-4.0/llvm-c/Core.h"/>
         <altdep type="c_include" name="llvm-c-3.9/llvm-c/Core.h"/>
         <altdep type="c_include" name="llvm-c-3.8/llvm-c/Core.h"/>
         <altdep type="c_include" name="llvm-c-3.7/llvm-c/Core.h"/>
@@ -836,6 +847,13 @@
             version="9.2"/>
   </systemmodule>
 
+  <systemmodule id="mpc">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="mpc.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="mpfr">
     <branch repo="system"/>
     <systemdependencies>
@@ -843,6 +861,21 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="nettle">
+    <pkg-config>nettle.pc</pkg-config>
+    <branch repo="system"
+            version="3.2"/>
+  </systemmodule>
+
+  <systemmodule id="ninja">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="ninja">
+        <altdep type="path" name="ninja-build"/>
+      </dep>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="nss">
     <pkg-config>nss.pc</pkg-config>
     <branch repo="system"
@@ -928,6 +961,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="pulseaudio">
+    <pkg-config>libpulse-mainloop-glib.pc</pkg-config>
+    <branch repo="system"
+            version="2.0"/>
+  </systemmodule>
+
   <systemmodule id="py3cairo">
     <pkg-config>py3cairo.pc</pkg-config>
     <branch repo="system"
@@ -1083,6 +1122,16 @@
     <branch repo="system" version="1.8.1"/>
   </systemmodule>
 
+  <systemmodule id="xcb-randr">
+    <pkg-config>xcb-randr.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="xcb-res">
+    <pkg-config>xcb-res.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="xcb-util">
     <pkg-config>xcb-aux.pc</pkg-config>
     <branch repo="system" version="0.1"/>
@@ -1167,9 +1216,11 @@
     <branch repo="system" version="2.3.0"/>
   </systemmodule>
 
-  <systemmodule id="WebKit1">
-    <pkg-config>webkitgtk-3.0.pc</pkg-config>
-    <branch repo="system" version="2.0.0"/>
+  <systemmodule id="vala-bootstrap">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="valac"/>
+    </systemdependencies>
   </systemmodule>
 
   <systemmodule id="xmlcatalog">
diff --git a/gnome-world.modules b/gnome-world.modules
index e5a4fc6..7305ea3 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -7,6 +7,8 @@
       href="git://git.gnome.org/"/>
   <repository type="svn" name="svn.abisource.com"
       href="http://svn.abisource.com/"/>
+  <repository type="git" name="wayland.freedesktop.org"
+      href="git://anongit.freedesktop.org/git/wayland"/>
   <repository type="git" name="gstreamer.freedesktop.org"
       href="git://anongit.freedesktop.org/gstreamer/"/>
   <repository type="git" name="fprint.freedesktop.org"
@@ -128,6 +130,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="aws-glib">
+    <branch repo="github.com" module="chergert/aws-glib.git"/>
+    <dependencies>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="alacarte">
     <branch/>
     <dependencies>
@@ -137,6 +146,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="bolso">
+    <branch repo="github.com" module="felipeborges/bolso.git"/>
+    <dependencies>
+      <dep package="gtk+-3"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gjs"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="brasero">
     <if condition-unset="linux">
       <autogenargs value="--disable-inotify"/>
@@ -186,6 +204,7 @@
       <dep package="flac"/>
       <!-- <dep package="id3tag" -->
       <!-- <dep package="id3lib" -->
+      <dep package="libsoup"/>
       <dep package="libvorbis"/>
       <dep package="opus"/>
       <dep package="speex"/>
@@ -227,23 +246,6 @@
     </suggests>
   </autotools>
 
-  <cmake id="geary">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gmime"/>
-      <dep package="gnome-keyring"/>
-      <dep package="gtk+-3"/>
-      <dep package="libcanberra"/>
-      <dep package="libgee"/>
-      <dep package="libnotify"/>
-      <dep package="libunique"/>
-      <dep package="sqlite3"/>
-      <dep package="vala"/>
-      <dep package="WebKit1"/>
-    </dependencies>
-  </cmake>
-
   <autotools id="corebird">
     <branch repo="github.com" checkoutdir="corebird" module="baedert/corebird.git"/>
     <dependencies>
@@ -401,7 +403,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+-3"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="pygobject"/>
     </dependencies>
   </distutils>
@@ -518,7 +520,7 @@
     <dependencies>
       <dep package="gtk+-3"/>
       <dep package="glib"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
@@ -643,7 +645,7 @@
 
   <autotools id="gst-libav"
              autogenargs="--disable-fatal-warnings">
-    <branch repo="gstreamer.freedesktop.org"/>
+    <branch repo="gstreamer.freedesktop.org" revision="1.10"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -786,7 +788,7 @@
   <autotools id="libgdamm">
     <branch/>
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
       <dep package="libgda"/>
     </dependencies>
   </autotools>
@@ -794,7 +796,7 @@
   <autotools id="libgda-uimm">
     <branch/>
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
       <dep package="libgdamm"/>
     </dependencies>
   </autotools>
@@ -802,15 +804,23 @@
   <autotools id="gtkmm_hello">
     <branch/>
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
  <autotools id="gtksourceviewmm">
     <branch/>
     <dependencies>
-      <dep package="gtksourceview"/>
-      <dep package="gtkmm"/>
+      <dep package="gtksourceview-3"/>
+      <dep package="gtkmm-3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="goocanvasmm-2.0">
+    <branch revision="goocanvasmm-2.0" module="goocanvasmm" checkoutdir="goocanvasmm-2.0"/>
+    <dependencies>
+      <dep package="goocanvas-2.0"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
@@ -826,7 +836,7 @@
     <branch />
     <dependencies>
       <dep package="libnotify"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
@@ -852,7 +862,7 @@
     <branch/>
     <dependencies>
       <dep package="clutter-gtk"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
@@ -867,7 +877,7 @@
   <autotools id="gstreamermm">
     <branch/>
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
@@ -898,7 +908,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
@@ -914,7 +924,7 @@
     <branch/>
     <dependencies>
       <dep package="glibmm"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
       <dep package="cluttermm-1.0"/>
       <dep package="libchamplain"/>
     </dependencies>
@@ -1034,7 +1044,7 @@
       <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="libxml2"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="gsettings-desktop-schemas"/>
     </dependencies>
   </autotools>
@@ -1067,7 +1077,7 @@
     <branch/>
     <dependencies>
       <dep package="libxml++"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
@@ -1122,7 +1132,7 @@
       <dep package="libgdamm"/>
       <dep package="iso-codes"/>
       <dep package="gtksourceviewmm"/>
-      <dep package="goocanvasmm"/>
+      <dep package="goocanvasmm-2.0"/>
       <dep package="libepc"/>
       <dep package="evince"/>
       <dep package="pygobject-python2"/>
@@ -1417,21 +1427,21 @@
   <autotools id="gtkmm-documentation">
     <branch/>
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
   <autotools id="gtkmm-utils">
     <branch repo="git.savannah.nongnu.org" module="gtkmm-utils" checkoutdir="gtkmm-utils" />
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
   <autotools id="paperbox">
     <branch/>
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
       <dep package="gtkmm-utils"/>
       <dep package="goocanvas"/>
       <dep package="dbus-glib"/>
@@ -1645,12 +1655,19 @@
       <dep package="dbus-glib"/>
       <dep package="libnotify"/>
     </suggests>
-  </autotools> 
+  </autotools>
+
+  <autotools id="goocanvas-2.0">
+    <branch revision="goocanvas-2.0" module="goocanvas" checkoutdir="goocanvas-2.0"/>
+    <dependencies>
+      <dep package="gtk+-3"/>
+    </dependencies>
+  </autotools>
 
   <autotools id="goocanvas">
     <branch/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -1933,7 +1950,7 @@
   <autotools id="gparted">
     <branch/>
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
@@ -1941,7 +1958,7 @@
     <branch/>
     <dependencies>
       <dep package="glibmm"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
       <dep package="gconf"/>
       <dep package="sqlite3"/>
       <dep package="gegl"/>
@@ -1961,7 +1978,7 @@
       <dep package="libxslt"/>
       <dep package="sqlite3"/>
       <dep package="libsoup"/>
-      <dep package="WebKit1"/>
+      <dep package="WebKit"/>
       <dep package="json-glib"/>
       <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -2024,21 +2041,6 @@
 
   <!-- ########## End of Pimplico Modules ########## -->
 
-  <autotools id="midori">
-    <branch repo="git.xfce.org" branch="kalikiana/midori"/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="WebKit1"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-    </dependencies>
-    <suggests>
-      <dep package="libunique-1"/>
-      <dep package="libnotify"/>
-      <dep package="sqlite3"/>
-    </suggests>
-  </autotools>
-
   <autotools id="librsvgmm">
     <branch/>
     <dependencies>
@@ -2053,7 +2055,7 @@
     <dependencies>
       <dep package="mm-common"/>
       <dep package="glibmm"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
@@ -2110,7 +2112,7 @@
     <branch repo="git.ardour.org" module="ardour/ardour.git"/>
     <dependencies>
       <dep package="glibmm"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
       <dep package="libxml2"/>
     </dependencies>
   </waf>
@@ -2504,12 +2506,16 @@
   <autotools id="latexila">
     <branch/>
     <dependencies>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="vala"/>
       <dep package="libgee"/>
       <dep package="gspell"/>
       <dep package="yelp-tools"/>
+      <dep package="m4-common"/>
+      <dep package="appstream-glib"/>
+      <dep package="intltool"/>
+      <dep package="gtk-doc"/>
     </dependencies>
   </autotools>
 
@@ -2616,6 +2622,9 @@
       <dep package="pango"/>
       <dep package="librsvg"/>
       <dep package="cairo"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -2658,10 +2667,12 @@
       <dep package="gstreamer-0.10"/>
       <dep package="gst-plugins-base-0.10"/>
       <dep package="flac"/>
-      <dep package="libv4l"/>
       <dep package="libvpx"/>
       <dep package="taglib"/>
       <dep package="wavpack"/>
+      <if condition-unset="macos">
+        <dep package="libv4l"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="pulseaudio"/>
@@ -2882,6 +2893,9 @@
       <dep package="gtk+-2"/>
       <dep package="intltool"/>
       <dep package="gegl"/>
+      <if condition-set="macos">
+        <dep package="gtk-mac-integration"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="iso-codes"/>
@@ -2912,7 +2926,7 @@
       <dep package="glibmm"/>
       <dep package="libxml2"/>
       <dep package="libxml++"/>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
     </dependencies>
   </autotools>
 
@@ -2933,7 +2947,7 @@
             module="inkscape"
             checkoutdir="inkscape/"/>
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm-3"/>
       <dep package="libxslt"/>
     </dependencies>
   </autotools>
@@ -3108,7 +3122,6 @@
       <dep package="libdmapsharing"/>
       <dep package="libgnome-keyring"/>
       <dep package="vala"/>
-      <dep package="WebKit1"/>
     </suggests>
   </autotools>
 
@@ -3221,11 +3234,11 @@
     </suggests>
   </autotools>
 
-  <autotools id="seed" autogenargs="--with-webkit=3.0">
+  <autotools id="seed" autogenargs="--with-webkit=4.0">
     <branch/>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="WebKit1"/>
+      <dep package="WebKit"/>
       <dep package="gnome-js-common"/>
       <dep package="mpfr"/>
       <dep package="readline"/>
@@ -3328,7 +3341,7 @@
       <dep package="vte"/>
       <dep package="gdl"/>
       <dep package="libgda-5.2"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
@@ -3377,7 +3390,7 @@
       <dep package="pango"/>
       <dep package="atk"/>
       <dep package="gtk+-3"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-3"/>
       <dep package="librsvg"/>
       <dep package="enchant"/>
       <dep package="libnotify"/>
@@ -3393,17 +3406,85 @@
     </dependencies>
   </autotools>
 
-  <autotools id="bijiben">
+  <autotools id="weston" autogenargs="--disable-setuid-install">
+    <branch repo="wayland.freedesktop.org"/>
+    <dependencies>
+      <dep package="wayland-protocols"/>
+      <dep package="wayland"/>
+      <dep package="cairo"/>
+      <dep package="libxkbcommon"/>
+      <dep package="mesa-libGLES"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="valadoc" supports-non-srcdir-builds="no">
+    <branch />
+    <dependencies>
+      <dep package="libgee"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="graphviz"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="nemiver"
+             autogenargs="--enable-gsettings=yes">
     <branch/>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="tracker"/>
-      <dep package="clutter-gtk"/>
-      <dep package="gtk+-3"/>
+      <dep package="boost"/>
+      <dep package="gdb"/>
+      <dep package="gdlmm"/>
+      <dep package="gtkmm-3"/>
+      <dep package="glibmm"/>
+      <dep package="gtksourceviewmm"/>
+      <dep package="vte"/>
+      <dep package="libgtop"/>
       <dep package="libxml2"/>
+      <dep package="ghex"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtk+-2">
+    <if condition-set="quartz">
+      <autogenargs value="--with-backend=quartz"/>
+    </if>
+    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
+    <dependencies>
       <dep package="glib"/>
-      <dep package="WebKit1"/>
-      <dep package="evolution-data-server"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="shared-mime-info"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gdlmm">
+    <branch/>
+    <dependencies>
+      <dep package="gdl"/>
+      <dep package="glibmm"/>
+      <dep package="gtkmm-3"/>
+    </dependencies>
+  </autotools>
+
+ <autotools id="gtksourceviewmm">
+    <branch/>
+    <dependencies>
+      <dep package="gtksourceview-3"/>
+      <dep package="gtkmm-3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gdl">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
+      <dep package="gtk+-3"/>
     </dependencies>
   </autotools>
 


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