[gnome-modulesets] Resync with current modulesets

From: Javier Jardón <jjardon src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-modulesets] Resync with current modulesets
Date: Fri, 19 Sep 2014 00:00:09 +0000 (UTC)
commit 8b037f80622e3c213c83d388aaa8284e739d6fe9
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Sep 19 00:58:35 2014 +0100

    Resync with current modulesets

 gnome-apps.modules      |  132 ++++++++++++++++++++++------
 gnome-core-deps.modules |  218 ++++++++++++++++++++++++++++++++++------------
 gnome-core.modules      |   70 +++++++++++-----
 gnome-sysdeps.modules   |   47 ++++++-----
 gnome-world.modules     |  126 ++++++++++++++++-----------
 5 files changed, 415 insertions(+), 178 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 52953b0..137f4f6 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -22,13 +22,15 @@
 
 <!-- tarball repos -->
   <repository type="tarball" name="gnome.org"
-    href="http://download.gnome.org/sources/"/>
+    href="https://download.gnome.org/sources/"/>
   <repository type="tarball" name="spice"
       href="http://www.spice-space.org/download/"/>
   <repository type="tarball" name="libvirt.org"
       href="http://libvirt.org/sources/"/>
   <repository type="tarball" name="ftp.gnu.org"
       href="http://ftp.gnu.org/gnu/"/>
+  <repository type="tarball" name="qqwing"
+      href="http://ostermiller.org/qqwing/"/>
   <repository type="tarball" name="speech-dispatcher"
       href="http://devel.freebsoft.org/pub/projects/speechd/"/>
   <repository type="tarball" name="tarball.github.com"
@@ -42,7 +44,10 @@
     -->
 
   <autotools id="appstream-glib">
-    <branch repo="github.com" module="hughsie/appstream-glib.git" checkoutdir="appstream-glib"/>
+    <if condition-set="freebsd">
+      <autogenargs value="LIBARCHIVE_CFLAGS=' ' LIBARCHIVE_LIBS='-larchive'"/>
+    </if>
+    <branch repo="github.com" module="hughsie/appstream-glib.git" revision="0_2_X"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -73,7 +78,7 @@
       <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="glib"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="evolution"/>
     </dependencies>
     <suggests>
@@ -108,8 +113,15 @@
   </autotools>
 
   <autotools id="gnome-weather">
+    <if condition-set="coverage">
+      <autogenargs value="--enable-coverage"/>
+    </if>
+    <if condition-unset="dogtail">
+      <autogenargs value="--disable-dogtail"/>
+    </if>
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -117,10 +129,13 @@
       <dep package="intltool"/>
       <dep package="libgweather"/>
       <dep package="gjs"/>
+      <if condition-set="coverage">
+        <dep package="lcov"/>
+      </if>
+      <if condition-set="dogtail">
+        <dep package="dogtail"/>
+      </if>
     </dependencies>
-    <suggests>
-      <dep package="dogtail"/>
-    </suggests>
   </autotools>
 
   <autotools id="ghex">
@@ -165,15 +180,23 @@
   </autotools>
 
   <autotools id="guile">
+    <if condition-set="freebsd">
+      <autogenargs value="BDW_GC_CFLAGS=' ' BDW_GC_LIBS='-lgc-threaded'"/>
+    </if>
     <pkg-config>guile-2.0.pc</pkg-config>
     <branch repo="ftp.gnu.org"
-            module="guile/guile-2.0.7.tar.xz"
-            version="2.0.7"
-            hash="sha256:6f278fa699685382ae51ba8bfad5840959e0af6414f3ad803d61131567bfa338"
-            size="4396724"/>
+            module="guile/guile-2.0.11.tar.xz"
+            version="2.0.11"
+            hash="sha256:aed0a4a6db4e310cbdfeb3613fa6f86fddc91ef624c1e3f8937a6304c69103e2"
+            size="4634060"/>
     <dependencies>
       <dep package="libunistring"/>
-      <dep package="gc"/>
+      <if condition-unset="freebsd">
+        <dep package="gc"/>
+      </if>
+      <if condition-set="freebsd">
+        <dep package="gc-threaded"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -202,9 +225,13 @@
  </autotools>
 
   <autotools id="libgda" autogenargs="--with-java=no --disable-tools">
-    <branch/>
+    <if condition-set="freebsd">
+      <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
+    </if>
+    <branch revision="LIBGDA_5.2"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="libxml2"/>
       <dep package="openssl"/>
       <dep package="vala"/>
@@ -243,6 +270,15 @@
     </suggests>
   </autotools>
 
+  <autotools id="qqwing">
+    <branch repo="qqwing"
+            module="qqwing-${version}.tar.gz"
+            version="1.2.0"
+            hash="sha256:b9de6cc596049cf852d17a37014f9a4b0cac1682bd8ccff5def4433b0b52d1e1"
+            size="350915"/>
+    <dependencies />
+  </autotools>
+
   <autotools id="speech-dispatcher" autogenargs="--with-espeak">
     <branch repo="speech-dispatcher"
             module="speech-dispatcher-${version}.tar.gz"
@@ -255,13 +291,14 @@
   </autotools>
 
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-static">
+    <if condition-set="freebsd">
+      <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
+    </if>
     <branch repo="spice"
-            module="gtk/spice-gtk-0.23.tar.bz2"
-            version="0.23"
-            hash="sha256:bfdfa6cb12c40327b63167fe7191ce94e7f2a272473c87df31790c25d60cc81d"
-            size="1224546">
-       <patch file="spice-gtk-0.23-fix-disable-static-builds.patch" strip="1"/>
-    </branch>
+            module="gtk/spice-gtk-0.25.tar.bz2"
+            version="0.25"
+            hash="sha256:0730c6a80ad9f5012f65927d443377019f300573f7ccc93db84eadec462ad087"
+            size="1242457"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="cyrus-sasl"/>
@@ -273,11 +310,22 @@
       <dep package="opus"/>
       <dep package="pixman"/>
       <dep package="pulseaudio"/>
+      <dep package="spice-protocol"/>
       <dep package="vala"/>
       <dep package="zlib"/>
     </dependencies>
   </autotools>
 
+  <autotools id="spice-protocol">
+    <branch repo="spice"
+            module="releases/spice-protocol-0.12.7.tar.bz2"
+            version="0.12.7"
+            hash="sha256:96c6cb73361816ed19bfd8536f65d4547da35709aa00af1380e650c1174916c2"
+            size="71276"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
   <autotools id="gdl">
     <branch/>
     <dependencies>
@@ -322,9 +370,9 @@
          cmakeargs="-DTHREADSAFE:BOOL=1">
     <branch repo="tarball.github.com"
             module="libgit2/libgit2/archive/v${version}.tar.gz"
-            version="0.20.0"
-            hash="509ab8091623df5b745cd13682539ca2dc2372051d3418355a7acc5b4a20c2f1"
-            checkoutdir="libgit2">
+            version="0.21.0"
+            hash="ae2afb5729ab6dcf6f690e5d66cb876372eaaedd37dc4fb072ad8da92338e099"
+            checkoutdir="libgit2-${version}">
     </branch>
   </cmake>
 
@@ -333,6 +381,7 @@
     <dependencies>
       <dep package="libgit2"/>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
@@ -479,7 +528,7 @@
   <autotools id="cheese">
     <branch/>
     <dependencies>
-      <dep package="appdata-tools"/>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -501,7 +550,7 @@
   </autotools>
 
   <autotools id="evolution" autogenargs="--disable-pst-import">
-    <branch/>
+    <branch revision="evolution-3-12"/>
     <dependencies>
       <dep package="bogofilter"/>
       <dep package="evolution-data-server"/>
@@ -607,6 +656,7 @@
       <dep package="gnome-desktop"/>
       <dep package="libgweather"/>
       <dep package="libnotify"/>
+      <dep package="geoclue"/>
       <dep package="geocode-glib"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -710,7 +760,7 @@
   <autotools id="gnome-logs">
     <branch/>
     <dependencies>
-      <dep package="appdata-tools"/>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
@@ -735,7 +785,6 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gnome-themes-standard"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
@@ -798,6 +847,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="dleyna-server">
+    <branch repo="github-01org"/>
+    <dependencies>
+      <dep package="dleyna-core"/>
+      <dep package="gssdp"/>
+      <dep package="gupnp"/>
+      <dep package="gupnp-av"/>
+      <dep package="gupnp-dlna"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-photos">
     <branch/>
     <dependencies>
@@ -832,9 +892,12 @@
   <autotools id="gnome-sudoku">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="pygobject"/>
+      <dep package="intltool"/>
+      <dep package="json-glib"/>
+      <dep package="libgee"/>
+      <dep package="qqwing"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -859,6 +922,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="hitori">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="cairo"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="iagno">
     <branch/>
     <dependencies>
@@ -1026,7 +1101,7 @@
   <autotools id="vinagre">
     <branch/>
     <dependencies>
-      <dep package="appdata-tools"/>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="libxml2"/>
       <dep package="gtk+"/>
@@ -1126,6 +1201,7 @@
       <dep package="gnome-tetravex"/>
       <dep package="gnome-tweak-tool"/>
       <dep package="gnome-weather"/>
+      <dep package="hitori"/>
       <dep package="iagno"/>
       <dep package="lightsoff"/>
       <dep package="nautilus-sendto"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index efc755e..53da54e 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -86,13 +86,14 @@
   <autotools id="appdata-tools">
     <branch repo="people.freedesktop.org"
             module="~hughsient/releases/appdata-tools-${version}.tar.xz"
-            version="0.1.7"
-            hash="sha256:3d704715aa105cdfa50b1dfbdc352445a2ceafd26ba01ff3260b0bcbf3d726c8"
-            size="265164"/>
+            version="0.1.8"
+            hash="sha256:401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461"
+            size="251320"/>
 <!--
     <branch repo="github.com" checkoutdir="appdata-tools" module="hughsie/appdata-tools.git"/>
 -->
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="glib-networking"/>
@@ -115,7 +116,7 @@
 
   <autotools id="geoclue">
     <if condition-unset="linux">
-      <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-network-manager"/>
+      <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
     </if>
     <branch repo="git.freedesktop.org"/>
     <dependencies>
@@ -265,12 +266,11 @@
 
   <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0">
     <branch repo="mir"
-            module="utopic/${version}/+download/mir-${version}.tar.bz2"
-            version="0.1.9"
-            hash="sha256:8aaeb911d5a017cded788a22c7322c1fa1e098b8b410e3a17607e9c44a7d7e82">
+            module="0.4/${version}/+download/mir-${version}.tar.bz2"
+            version="0.4.0"
+            hash="sha256:5d859d353da88d81bf383e37d0744796d74d24a858fcc7d978a91575ebccd524"
+            size="949452">
       <patch file="mir-gflags-noshutdown.patch" strip="1"/>
-      <patch file="mir-makeinstall-nodocs.patch" strip="1"/>
-      <patch file="mir-nolink-lttng.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="boost"/>
@@ -350,6 +350,18 @@
     </suggests>
   </autotools>
 
+  <!-- libXi prior to 1.7.4 contains locking bugs that will deadlock the
+       compositor when touch events are received. Avoid a bleading-edge
+       system dependency by building from git. -->
+  <autotools id="libXi">
+    <branch repo="xorg.freedesktop.org" module="lib/libXi" checkoutdir="libXi"/>
+    <dependencies>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
+      <dep package="xorg-xproto"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="clutter" autogenargs="--enable-installed-tests --enable-egl-backend">
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-backend --enable-wayland-compositor --enable-evdev-input"/>
@@ -433,6 +445,7 @@
     </dependencies>
     <suggests>
       <dep package="shared-mime-info"/>
+      <dep package="adwaita-icon-theme"/>
     </suggests>
   </autotools>
 
@@ -463,8 +476,8 @@
     <pkg-config>fontconfig.pc</pkg-config>
     <branch repo="freedesktop.org"
             module="fontconfig/release/fontconfig-${version}.tar.bz2"
-            version="2.11.0"
-            hash="sha256:cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467"/>
+            version="2.11.1"
+            hash="sha256:dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99"/>
     <dependencies>
       <dep package="freetype2"/>
       <dep package="libxml2"/>
@@ -520,13 +533,16 @@
   <autotools id="farstream" autogenargs="--disable-python">
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
-            version="0.2.2"
-            hash="sha256:ffd3c536372781713956eeb28644a6e9ee6e3bab034bee65af6bbb61213cb080">
-      <patch file="farstream.netinet-in.patch" strip="1"/>
-    </branch>
+            version="0.2.4"
+            hash="sha256:120d5b5cd79fcbe19d9e046526fc4bc059e0a3733b3de2d7e5299dc5a3a7bb30"/>
     <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="libnice"/>
     </dependencies>
+    <suggests>
+      <dep package="gupnp-igd"/>
+    </suggests>
   </autotools>
 
   <autotools id="telepathy-farstream" autogenargs="--disable-python --disable-Werror">
@@ -541,8 +557,8 @@
     <pkg-config>exempi-2.0.pc</pkg-config>
     <branch repo="libopenraw.freedesktop.org"
             module="exempi-${version}.tar.bz2"
-            version="2.2.0"
-            hash="sha256:8ac374cca17df023ae978bb5f7a9d5d116da89141192f8de8c8060de0722b00f"/>
+            version="2.2.1"
+            hash="sha256:6c9e4380041abca80ef0e0029c07109f183506b812f870d8689e7140997fa601"/>
   </autotools>
 
   <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings">
@@ -597,14 +613,23 @@
       <dep package="totem-pl-parser"/>
     </dependencies>
     <suggests>
-      <dep package="libgdata"/>
+      <dep package="avahi"/>
       <dep package="gmime"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gssdp"/>
       <dep package="gupnp"/>
       <dep package="gupnp-av"/>
-      <dep package="sqlite3"/>
+      <dep package="json-glib"/>
+      <dep package="libarchive"/>
+      <dep package="libdmapsharing"/>
       <dep package="libgcrypt"/>
-      <dep package="tracker"/>
+      <dep package="libgdata"/>
       <dep package="libmediaart"/>
+      <dep package="liboauth"/>
+      <dep package="librest"/>
+      <dep package="libsoup"/>
+      <dep package="sqlite3"/>
+      <dep package="tracker"/>
     </suggests>
   </autotools>
 
@@ -631,6 +656,9 @@
   </autotools>
 
   <autotools id="librest">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -643,6 +671,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
       <dep package="libgcrypt"/>
@@ -679,7 +708,7 @@
     <branch/>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="gnome-js-common"/>
       <dep package="mpfr"/>
       <dep package="readline"/>
@@ -691,7 +720,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
-            checkoutdir="gstreamer"/>
+            checkoutdir="gstreamer"
+            revision="1.4"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -704,7 +734,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-base"
-            checkoutdir="gst-plugins-base"/>
+            checkoutdir="gst-plugins-base"
+            revision="1.4"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
@@ -722,7 +753,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-good"
-            checkoutdir="gst-plugins-good"/>
+            checkoutdir="gst-plugins-good"
+            revision="1.4"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -746,7 +778,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-bad"
-            module="gst-plugins-bad"/>
+            module="gst-plugins-bad"
+            revision="1.4"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -838,12 +871,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="itstool">
+  <!-- Remove annoying autogen-sh="autoreconf" when itstool.use-correct-libxml.patch is removed -->
+  <autotools id="itstool" autogen-sh="autoreconf">
     <branch repo="itstool.org"
             module="itstool-2.0.2.tar.bz2"
             version="2.0.2"
             hash="sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"
-            size="96748"/>
+            size="96748">
+      <patch file="itstool.use-correct-libxml.patch" strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
@@ -903,6 +939,18 @@
     </suggests>
   </autotools>
 
+  <autotools id="libdmapsharing">
+    <branch/>
+    <dependencies>
+      <dep package="avahi"/>
+      <dep package="glib"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="libgee"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libcanberra" autogen-sh="configure" autogenargs="--with-systemdsystemunitdir=no">
     <pkg-config>libcanberra-gtk.pc</pkg-config>
     <branch repo="0pointer.de"
@@ -1012,9 +1060,9 @@
              autogenargs="--enable-gupnp">
     <pkg-config>nice.pc</pkg-config>
     <branch repo="nice.freedesktop.org"
-            module="libnice-0.1.3.tar.gz"
-            version="0.1.3"
-            hash="sha256:046ce11f66638b54f2e042e7b1fbcc537ec99c27185fb006edbfd80d7f990074"/>
+            module="libnice-0.1.7.tar.gz"
+            version="0.1.7"
+            hash="sha256:4ed165aa2203136dce548c7cef735d8becf5d9869793f96b99dcbbaa9acf78d8"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gst-plugins-base"/>
@@ -1047,7 +1095,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="librsvg" supports-non-srcdir-builds="no" autogenargs="--disable-gtk-theme">
+  <autotools id="librsvg" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="libxml2"/>
@@ -1077,20 +1125,26 @@
   </autotools>
 
   <autotools id="p11-kit" supports-non-srcdir-builds="no">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-trust-paths=/usr/local/share/certs/ca-root-nss.crt"/>
+    </if>
     <branch repo="p11-glue.freedesktop.org"
-            module="p11-kit-0.20.1.tar.gz"
-            version="0.20.1"
-            hash="sha256:524548f0a3bfa1b5712721165b49f0300fb244c907533677e88a9c9743eb4a53"
-            size="1175729" />
+            module="p11-kit-0.20.3.tar.gz"
+            version="0.20.3"
+            hash="sha256:b77032bc68c24e6c3cfd8cb340a4a3bb8b7d62a7c659dae08e9b6bb7287193c3"
+            size="1171155" />
   </autotools>
 
   <autotools id="poppler" autogenargs="--enable-xpdf-headers --enable-poppler-glib" 
makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
+    <if condition-set="freebsd">
+      <autogenargs value="CXXFLAGS=-std=c++11"/>
+    </if>
     <pkg-config>poppler-glib.pc</pkg-config>
     <branch repo="poppler.freedesktop.org"
-            module="poppler-0.24.1.tar.xz"
-            version="0.24.1"
-            hash="5cefc01aa0184bd92b0b3999922b62cf09599ebb3d95f553c2f3de02738effc6"
-            size="1504620"/>
+            module="poppler-0.26.4.tar.xz"
+            version="0.26.4"
+            hash="sha256:7ede502a5ad6651d2ca56f3846ddee1ae66d0b1ab9bd302fb8b39a366d195c65"
+            size="1595096"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="glib"/>
@@ -1192,7 +1246,7 @@
   </autotools>
 
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
-    <pkg-config>libvala-0.24.pc</pkg-config>
+    <pkg-config>libvala-0.26.pc</pkg-config>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -1230,8 +1284,8 @@
     <branch repo="freedesktop.org"
             checkoutdir="libevdev"
             module="libevdev/libevdev-${version}.tar.xz"
-            version="1.0"
-            hash="sha256:6e6d1e307eff03f1c939c9af532228b19030fc896a9257a8abfa6e9b7dc91803"/>
+            version="1.2.2"
+            hash="sha256:860e9a1d5594393ff1f711cdeaf048efe354992019068408abbcfa4914ad6709"/>
   </autotools>
 
   <autotools id="libinput">
@@ -1243,13 +1297,31 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb --disable-x11">
+  <autotools id="xcb-proto">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="xcb-proto"
+            module="xcb/proto.git"
+            revision="1.10"/>
+  </autotools>
+
+  <autotools id="libxcb">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="libxcb"
+            module="xcb/libxcb.git"
+            revision="1.10"/>
+    <dependencies>
+      <dep package="xcb-proto"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
     <branch repo="github.com" checkoutdir="libxkbcommon" module="xkbcommon/libxkbcommon.git"/>
     <dependencies>
       <dep package="xorg-macros"/>
       <dep package="xorg-xproto"/>
       <dep package="xorg-kbproto"/>
       <dep package="libX11"/>
+      <dep package="libxcb"/>
     </dependencies>
   </autotools>
 
@@ -1274,13 +1346,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="WebKit" makefile="GNUmakefile"
-             autogenargs="--enable-introspection">
-    <pkg-config>webkitgtk-3.0.pc</pkg-config>
+  <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.4.3.tar.xz" version="2.4.3"
-            hash="sha256:9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac"
-            size="9841564">
+            module="webkitgtk-2.5.3.tar.xz" version="2.5.3"
+            hash="sha256:010803e371ac92a3e0e297e929978f83a9a3c597e4a10d50363fb1aaa6ea18d6"
+            size="10093908">
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
@@ -1290,7 +1360,7 @@
       <dep package="libxml2"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
-      <!-- GTK+ 2.x required for the plugin process when build Webkit2 -->
+      <!-- GTK+ 2.x required for the plugin process -->
       <dep package="gtk+-2"/>
       <dep package="pango"/>
       <dep package="libsoup"/>
@@ -1307,7 +1377,7 @@
       <dep package="sqlite3"/>
       <dep package="enchant"/>
     </suggests>
-  </autotools>
+  </cmake>
 
  <autotools id="vte"
             autogenargs="--enable-introspection=yes">
@@ -1356,6 +1426,7 @@
     <branch repo="gitorious.org" checkoutdir="libgusb" module="gusb/gusb.git"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="vala"/>
     </dependencies>
   </autotools>
@@ -1395,9 +1466,9 @@
   </autotools>
 
   <autotools id="libwacom">
-    <branch repo="sourceforge.net" module="linuxwacom/libwacom-0.7.tar.bz2" version="0.7"
-            hash="sha256:210c48b595461ebee63b1a846a6eb1d8f029b49d02ccbde34eadf551a5a68a78"
-            size="403532"/>
+    <branch repo="sourceforge.net" module="linuxwacom/libwacom-0.9.tar.bz2" version="0.9"
+            hash="sha256:7a5848b5f069e526257a00ce2d409e2018c17f5a968bdec256423bcb54f2f097"
+            size="413917"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gudev"/>
@@ -1410,9 +1481,9 @@
       <autogenargs value="--disable-pam"/>
     </if>
     <branch repo="libpwquality"
-            module="https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-1.2.2.tar.bz2"; 
version="1.2.2"
-            hash="sha256:9689627283b43d20ca74ca822404ee486242e3e528fa95bf7016d37ff46e0696"
-            size="362081">
+            module="https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-1.2.3.tar.bz2"; 
version="1.2.3"
+            hash="sha256:b11c79ce7b03cdf878fccb653e67bd430155cc6fd224efbbb3e78842f752516a"
+            size="367794">
       <patch file="libpwquality.libintl-link.patch" strip="1"/>
     </branch>
     <dependencies>
@@ -1542,6 +1613,39 @@
     </dependencies>
   </autotools>
 
+  <autotools id="WebKit1" makefile="GNUmakefile"
+             autogenargs="--enable-introspection --disable-webkit2">
+    <pkg-config>webkitgtk-3.0.pc</pkg-config>
+    <branch repo="webkitgtk.org"
+            module="webkitgtk-2.4.4.tar.xz" version="2.4.4"
+            hash="sha256:58cbfc7e352ae1e1f5e383f9f766795794d88483e9a52377a295f56eedf53ab9"
+            size="9844048">
+    </branch>
+    <dependencies>
+      <dep package="at-spi2-core"/>
+      <dep package="cairo"/>
+      <dep package="fontconfig"/>
+      <dep package="geoclue"/>
+      <dep package="libxml2"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gtk+"/>
+      <dep package="pango"/>
+      <dep package="libsoup"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gperf"/>
+      <dep package="libicu"/>
+      <dep package="libXt"/>
+      <dep package="ruby"/>
+      <dep package="libsecret"/>
+      <dep package="libwebp"/>
+    </dependencies>
+    <suggests>
+      <dep package="libxslt"/>
+      <dep package="sqlite3"/>
+      <dep package="enchant"/>
+    </suggests>
+  </autotools>
+
   <autotools id="zeitgeist">
     <branch repo="git.freedesktop.org"
             module="zeitgeist/zeitgeist"
diff --git a/gnome-core.modules b/gnome-core.modules
index 28d888d..c654367 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -13,14 +13,14 @@
       href="git://anongit.freedesktop.org/pulseaudio/"/>
   <repository type="git" name="telepathy.freedesktop.org"
     href="git://anongit.freedesktop.org/telepathy/"/>
-  <repository type="git" name="packagekit.gitorious.org"
-      href="git://gitorious.org/packagekit"/>
+  <repository type="git" name="github.com"
+      href="git://github.com/"/>
 
 <!-- tarball repos -->
   <repository type="tarball" name="freedesktop.org"
       href="http://freedesktop.org/"/>
   <repository type="tarball" name="gnome.org"
-      href="http://download.gnome.org/sources/"/>
+      href="https://download.gnome.org/sources/"/>
   <repository type="tarball" name="kernel.org"
       href="http://www.kernel.org"/>
 
@@ -64,8 +64,15 @@
 
   <autotools id="evolution-data-server"
              supports-non-srcdir-builds="no"
-             autogenargs="--enable-vala-bindings --disable-strict --disable-uoa">
-    <branch/>
+             autogenargs="--enable-vala-bindings --disable-strict --disable-uoa"
+             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 revision="evolution-data-server-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
@@ -106,7 +113,7 @@
     <branch/>
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="libnotify"/>
       <dep package="librest"/>
       <dep package="json-glib"/>
@@ -186,10 +193,10 @@
     <branch/>
     <dependencies>
       <dep package="hicolor-icon-theme"/>
-      <dep package="icon-naming-utils"/>
       <dep package="gnome-common"/>
       <dep package="intltool"/>
       <dep package="gtk+"/>
+      <dep package="librsvg"/>
     </dependencies>
   </autotools>
 
@@ -223,9 +230,7 @@
       <dep package="PackageKit"/>
       <dep package="gtk+"/>
       <dep package="libnotify"/>
-      <dep package="gnome-menus"/>
       <dep package="libcanberra"/>
-      <dep package="gnome-control-center"/>
     </dependencies>
     <suggests>
       <if condition-set="linux">
@@ -245,9 +250,9 @@
       <dep package="dbus-glib"/>
       <dep package="startup-notification"/>
       <dep package="upower"/>
-      <dep package="librsvg"/>
       <dep package="libXcomposite"/>
       <dep package="sm"/>
+      <dep package="xtrans"/>
     </dependencies>
     <suggests>
       <dep package="polkit"/>
@@ -256,7 +261,7 @@
 
   <autotools id="gnome-settings-daemon">
     <if condition-unset="linux">
-      <autogenargs value="--disable-rfkill --disable-gudev"/>
+      <autogenargs value="--disable-rfkill --disable-gudev --disable-network-manager"/>
     </if>
     <branch/>
     <dependencies>
@@ -271,7 +276,6 @@
       <dep package="libcanberra"/>
       <dep package="libgweather"/>
       <dep package="libnotify"/>
-      <dep package="librsvg"/>
       <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
@@ -280,9 +284,11 @@
       <dep package="cups"/>
       <if condition-set="linux">
         <dep package="libgsystem"/>
+        <dep package="librsvg"/>
         <dep package="libwacom"/>
         <dep package="xorg-wacom"/>
         <dep package="gudev"/>
+        <dep package="NetworkManager"/>
       </if>
     </dependencies>
     <suggests>
@@ -376,6 +382,9 @@
   </autotools>
 
   <autotools id="glib-networking" autogenargs="--enable-installed-tests">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -399,20 +408,38 @@
     </dependencies>
   </autotools>
 
-  <autotools id="mutter" autogenargs="--enable-compile-warnings=maximum">
+  <autotools id="mutter" autogenargs="--enable-compile-warnings=maximum --enable-installed-tests">
     <branch />
     <dependencies>
-      <dep package="upower"/>
+      <dep package="cogl"/>
       <dep package="clutter"/>
       <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
       <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
+      <dep package="gtk-doc"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
+      <dep package="libXdamage"/>
+      <dep package="libXext"/>
+      <dep package="libXfixes"/>
+      <dep package="libXi"/>
       <dep package="libXinerama"/>
+      <dep package="libXcomposite"/>
+      <dep package="libXrandr"/>
+      <dep package="pango"/>
+      <dep package="sm"/>
       <dep package="startup-notification"/>
+      <dep package="upower"/>
       <dep package="zenity"/>
+      <if condition-set="wayland">
+        <dep package="libdrm"/>
+        <dep package="libsystemd"/>
+        <dep package="wayland"/>
+        <dep package="xwayland"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -521,7 +548,7 @@
       <dep package="telepathy-logger"/>
       <dep package="telepathy-mission-control"/>
       <dep package="libnotify"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
     </dependencies>
     <suggests>
       <dep package="enchant"/>
@@ -714,6 +741,7 @@
       <dep package="vte"/>
       <dep package="yelp-tools"/>
       <dep package="nautilus"/>
+      <dep package="appdata-tools"/>
     </dependencies>
     <suggests>
       <dep package="gnome-shell"/>
@@ -766,7 +794,7 @@
       <dep package="clutter-gtk"/>
       <dep package="clutter-gst"/>
       <dep package="gtksourceview"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
@@ -803,6 +831,9 @@
   </autotools>
 
   <autotools id="yelp">
+    <if condition-set="freebsd">
+      <autogenargs value="YELP_LZMA_CFLAGS=' ' YELP_LZMA_LIBS='-llzma'"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -810,7 +841,7 @@
       <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="yelp-xsl"/>
     </dependencies>
   </autotools>
@@ -944,7 +975,7 @@
       <autogenargs value="--enable-ports"/>
     </if>
 
-    <branch repo="packagekit.gitorious.org" checkoutdir="PackageKit" module="packagekit.git"/>
+    <branch repo="github.com" module="hughsie/PackageKit.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -970,7 +1001,7 @@
       <dep package="gobject-introspection"/>
       <dep package="expat"/>
       <dep package="intltool"/>
-      <dep package="js185"/>
+      <dep package="js17"/>
       <dep package="pam"/>
     </dependencies>
   </autotools>
@@ -989,7 +1020,6 @@
   <autotools id="upower">
     <branch repo="git.freedesktop.org" />
     <dependencies>
-      <dep package="polkit"/>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
     </dependencies>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index cc56138..bd353b3 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -175,6 +175,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <!-- This module is only used on FreeBSD -->
+  <systemmodule id="gc-threaded">
+    <pkg-config>bdw-gc-threaded.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="gdb">
     <branch repo="system"/>
     <systemdependencies>
@@ -214,7 +220,7 @@
   <systemmodule id="gnutls">
     <pkg-config>gnutls.pc</pkg-config>
     <branch repo="system"
-            version="2.12.8"/>
+            version="3.1"/>
   </systemmodule>
 
   <systemmodule id="gpgme">
@@ -260,12 +266,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="icon-naming-utils">
-    <pkg-config>icon-naming-utils.pc</pkg-config>
-    <branch repo="system"
-            version="0.8.90"/>
-  </systemmodule>
-
   <systemmodule id="intltool">
     <branch repo="system"
             version="0.50"/>
@@ -282,21 +282,16 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="js185">
-    <pkg-config>mozjs185.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="json">
-    <pkg-config>json.pc</pkg-config>
+    <pkg-config>json-c.pc</pkg-config>
     <branch repo="system"
-            version="0.9"/>
+            version="0.11"/>
   </systemmodule>
 
   <systemmodule id="lcms2">
     <pkg-config>lcms2.pc</pkg-config>
     <branch repo="system"
-            version="2.2"/>
+            version="2.6"/>
   </systemmodule>
 
   <systemmodule id="lcov">
@@ -324,6 +319,16 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libXdamage">
+    <pkg-config>xdamage.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libXext">
+    <pkg-config>xext.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libXcomposite">
     <pkg-config>xcomposite.pc</pkg-config>
     <branch repo="system"/>
@@ -506,14 +511,14 @@
             version="1.0.21"/>
   </systemmodule>
 
-  <systemmodule id="libsystemd-journal">
-    <pkg-config>libsystemd-journal.pc</pkg-config>
+  <systemmodule id="libsystemd">
+    <pkg-config>libsystemd.pc</pkg-config>
     <branch repo="system"
-            version="201"/>
+            version="210"/>
   </systemmodule>
 
-  <systemmodule id="libsystemd-login">
-    <pkg-config>libsystemd-login.pc</pkg-config>
+  <systemmodule id="libsystemd-journal">
+    <pkg-config>libsystemd-journal.pc</pkg-config>
     <branch repo="system"
             version="201"/>
   </systemmodule>
@@ -659,7 +664,7 @@
   <systemmodule id="pixman">
     <pkg-config>pixman-1.pc</pkg-config>
     <branch repo="system"
-            version="0.20"/>
+            version="0.30"/>
   </systemmodule>
 
   <systemmodule id="ppp">
diff --git a/gnome-world.modules b/gnome-world.modules
index 2d6214d..815190a 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -75,8 +75,6 @@
       href="git://git.fishsoup.net/"/>
   <repository type="git" name="diracvideo.org"
     href="git://diracvideo.org/git/"/>
-  <repository type="svn" name="liferea.svn.sourceforge.net"
-      href="http://liferea.svn.sourceforge.net/svnroot/"/>
   <repository type="cvs" name="cvs.claws-mail"
       cvsroot=":ext:cvs scm dotsrc org:/srv/cvs/claws-mail"
       password=""/>
@@ -102,9 +100,7 @@
   <repository type="tarball" name="openchange.org"
       href="http://tracker.openchange.org/attachments/download/"/>
   <repository type="tarball" name="gnome.org"
-      href="http://download.gnome.org/sources/"/>
-  <repository type="git" name="yorba.org"
-      href="git://yorba.org/"/>
+      href="https://download.gnome.org/sources/"/>
   <repository type="git" name="fedorahosted.org"
       href="git://git.fedorahosted.org/git/"/>
   <repository type="svn" name="opalvoip.sf.net"
@@ -198,21 +194,37 @@
       <dep package="libunique"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
     </dependencies>
   </cmake>
 
-  <cmake id="corebird"
-         cmakeargs="-DPREFIX=${prefix}">
-     <branch repo="github.com" checkoutdir="corebird" module="baedert/corebird.git"/>
-     <dependencies>
-       <dep package="intltool"/>
-       <dep package="vala"/>
-       <dep package="glib-networking"/>
-       <dep package="librsvg"/>
-       <dep package="gtk+"/>
-     </dependencies>
-  </cmake>
+  <autotools id="corebird">
+    <branch repo="github.com" checkoutdir="corebird" module="baedert/corebird.git"/>
+    <dependencies>
+      <dep package="glib-networking"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="json-glib"/>
+      <dep package="libgee"/>
+      <dep package="librest"/>
+      <dep package="librsvg"/>
+      <dep package="libsoup"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-builder">
+    <branch/>
+    <dependencies>
+      <dep package="devhelp"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gtksourceview"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </autotools>
 
   <autotools id="gnome-calendar">
     <branch/>
@@ -497,18 +509,6 @@
     <branch/>
   </autotools>
 
-  <autotools id="libdmapsharing">
-    <branch/>
-    <dependencies>
-      <dep package="avahi"/>
-      <dep package="glib"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="libgee"/>
-      <dep package="libsoup"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gst-openmax" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org" module="gst-openmax"/>
     <dependencies>
@@ -601,7 +601,7 @@
 
   <autotools id="gst-libav"
              autogenargs="--disable-fatal-warnings">
-    <branch repo="gstreamer.freedesktop.org"/>
+    <branch repo="gstreamer.freedesktop.org" revision="1.4"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -1952,26 +1952,22 @@
   </autotools>
 
   <autotools id="liferea">
-    <branch repo="liferea.svn.sourceforge.net"
-            module="liferea/trunk/liferea"
-            checkoutdir="liferea"/>
+    <branch repo="github.com" checkoutdir="liferea" module="lwindolf/liferea"/>
     <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="intltool"/>
+      <dep package="gtk+"/>
       <dep package="glib"/>
       <dep package="pango"/>
-      <dep package="gconf"/>
       <dep package="libxml2"/>
+      <dep package="libxslt"/>
       <dep package="sqlite3"/>
       <dep package="libsoup"/>
-      <dep package="libunique-1"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
+      <dep package="json-glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="libpeas"/>
+      <dep package="intltool"/>
     </dependencies>
-    <suggests>
-      <dep package="dbus"/>
-      <dep package="NetworkManager"/>
-      <dep package="libnotify"/>
-    </suggests>
   </autotools>
 
   <autotools id="krb5-auth-dialog">
@@ -2047,7 +2043,7 @@
     <branch repo="git.xfce.org" branch="kalikiana/midori"/>
     <dependencies>
       <dep package="gtk+-2"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
     </dependencies>
@@ -2492,7 +2488,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-ugly"
-            module="gst-plugins-ugly"/>
+            module="gst-plugins-ugly"
+            revision="1.4"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -2585,7 +2582,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gtk+-2"/>
+      <dep package="gtk+"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
@@ -2627,6 +2624,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-flashback">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
   <metamodule id="meta-gnome-flashback">
     <dependencies>
       <dep package="gnome-panel"/>
@@ -2637,7 +2643,7 @@
 
   <!-- ########## End of Gnome Flashback Modules ########## -->
 
-  <autotools id="librsync">
+  <autotools id="librsync" autogen-sh="configure">
     <branch repo="downloads.sourceforge.net"
             module="librsync/librsync-0.9.7.tar.gz"
             version="0.9.7"
@@ -2667,7 +2673,7 @@
   <!--   enscript                                   -->
   <!--   libavcodec                                 -->
   <!-- Those are not managed by jhbuild             -->
-  <autotools id="gnome-applets" autogenargs="--without-hal --enable-mixer-applet --enable-mini-commander">
+  <autotools id="gnome-applets" autogenargs="--enable-mixer-applet --enable-mini-commander">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -2970,7 +2976,6 @@
     </dependencies>
     <suggests>
       <dep package="iso-codes"/>
-      <dep package="WebKit"/>
       <dep package="librsvg"/>
       <dep package="poppler"/>
       <dep package="libgnome-keyring"/>
@@ -3161,7 +3166,7 @@
       <dep package="libdmapsharing"/>
       <dep package="libgnome-keyring"/>
       <dep package="vala"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
     </suggests>
   </autotools>
 
@@ -3178,7 +3183,7 @@
   </autotools>
 
   <autotools id="shotwell">
-    <branch repo="yorba.org" module="shotwell"/>
+    <branch/>
     <dependencies>
       <dep package="desktop-file-utils"/>
       <dep package="gexiv2"/>
@@ -3196,7 +3201,7 @@
       <dep package="libxml2"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
     </dependencies>
   </autotools>
 
@@ -3232,4 +3237,21 @@
     </suggests>
   </autotools>
 
+  <autotools id="budgie-desktop">
+    <branch repo="github.com"
+            module="evolve-os/budgie-desktop.git"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="mutter"/>
+      <dep package="libpeas"/>
+      <dep package="libgee"/>
+      <dep package="libwnck"/>
+      <dep package="gnome-menus"/>
+    </dependencies>
+    <suggests>
+      <dep package="pulseaudio"/>
+    </suggests>
+  </autotools>
+
 </moduleset>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]