[gnome-modulesets] Resync with current modulesets

From: Javier Jardón Cabezas <jjardon src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-modulesets] Resync with current modulesets
Date: Wed, 4 Nov 2015 16:45:46 +0000 (UTC)
commit 792f8ab241b94bfa8d6697e8079f5143a717628b
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Nov 4 16:45:19 2015 +0000

    Resync with current modulesets

 gnome-apps.modules      |   47 ++++-----
 gnome-core-deps.modules |  187 +++----------------------------
 gnome-core.modules      |    1 -
 gnome-sysdeps.modules   |  129 ++++++++++------------
 gnome-world.modules     |  284 +++++++++++++++++++++-------------------------
 5 files changed, 225 insertions(+), 423 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index d66bdda..b42efab 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -36,7 +36,7 @@
 
   <include href="gnome-core.modules"/>
 
-  <!-- NOTE: gnome-suites-core-* and gnome-suites-core-deps-*
+  <!-- NOTE: gnome-core-* and gnome-core-deps-*
        are supposed to remain self-contained. If apps have dependencies
        that are not covered there, add them in here
     -->
@@ -82,7 +82,6 @@
       <dep package="dconf"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
-      <dep package="libxml2"/>
     </dependencies>
   </autotools>
 
@@ -222,6 +221,17 @@
     </suggests>
  </autotools>
 
+  <autotools id="libgames-support">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libgee"/>
+      <dep package="m4-common"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libgda-5.2" autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi 
--disable-vala --disable-gdaui-vala">
     <if condition-set="freebsd">
       <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
@@ -684,8 +694,8 @@
              autogenargs="--disable-colorhug --disable-uefi">
     <branch repo="tarball.github.com"
             module="hughsie/fwupd/archive/${version}.tar.gz"
-            version="0.1.5"
-            hash="35f7e8c7b169c58b2e34391ea4dd0c99001ecfe2c767df2861159f05a43b9be1"
+            version="0.5.1"
+            hash="9640a6099c6be03e335a527b864d058a2621202a3050a3d4f9180cc81ac928f0"
             checkoutdir="fwupd-${version}"/>
     <dependencies>
       <dep package="appstream-glib"/>
@@ -926,34 +936,19 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-music">
-    <branch/>
-    <dependencies>
-      <dep package="dbus-python"/>
-      <dep package="gnome-themes-standard"/>
-      <dep package="gobject-introspection"/>
-      <dep package="grilo"/>
-      <dep package="grilo-plugins"/>
-      <dep package="gtk+"/>
-      <dep package="gvfs"/>
-      <dep package="intltool"/>
-      <dep package="pygobject"/>
-      <dep package="tracker"/>
-      <dep package="libmediaart"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-nibbles">
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
-      <dep package="intltool"/>
-      <dep package="librsvg"/>
+      <dep package="clutter"/>
+      <dep package="clutter-gtk"/>
       <dep package="gtk+"/>
+      <dep package="intltool"/>
       <dep package="libcanberra"/>
+      <dep package="libgames-support"/>
+      <dep package="librsvg"/>
+      <dep package="vala"/>
       <dep package="yelp-tools"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
     </dependencies>
   </autotools>
 
@@ -963,7 +958,6 @@
       <dep package="gegl"/>
       <dep package="cairo"/>
       <dep package="clutter-gtk"/>
-      <dep package="dleyna-renderer"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
@@ -1200,6 +1194,7 @@
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
+      <dep package="m4-common"/>
       <dep package="telepathy-glib"/>
     </dependencies>
   </autotools>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index e69922e..be90b21 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -42,18 +42,12 @@
     href="http://icon-theme.freedesktop.org/releases/"/>
 <repository type="tarball" name="nice.freedesktop.org"
     href="http://nice.freedesktop.org/releases/"/>
-<repository type="tarball" name="itstool.org"
-    href="http://files.itstool.org/itstool/"/>
-<repository type="tarball" name="libpwquality"
-    href="https://fedorahosted.org/releases/l/i/libpwquality/"/>
 <repository type="tarball" name="ftp.mozilla.org"
       href="http://ftp.mozilla.org/"/>
 <repository type="tarball" name="kernel.org"
       href="http://www.kernel.org"/>
 <repository type="tarball" name="ftp.gnu.org"
     href="http://ftp.gnu.org/gnu/"/>
-<repository type="tarball" name="libndp"
-    href="http://libndp.org/files/"/>
 <repository type="tarball" name="mir"
     href="https://launchpad.net/mir/"/>
 <repository type="tarball" name="xorg-tar"
@@ -67,7 +61,7 @@
 
 <!-- Please try to keep organized alphabetically by section -->
 
-<!-- Build dependencies of gnome-suites-core -->
+<!-- Build dependencies of gnome-core -->
 
   <autotools id="appstream-glib">
     <if condition-set="freebsd">
@@ -87,23 +81,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cairo" autogenargs="--enable-gl">
-    <if condition-set="quartz">
-      <autogenargs value="--enable-quartz --disable-gl"/>
-    </if>
-    <branch repo="git.freedesktop.org">
-    </branch>
-    <dependencies>
-      <if condition-unset="quartz">
-        <dep package="fontconfig"/>
-        <dep package="gl"/>
-      </if>
-      <dep package="gtk-doc"/>
-      <dep package="librsvg"/>
-      <dep package="pixman"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="cairomm" autogen-sh="configure">
     <branch module="releases/cairomm-${version}.tar.gz"
             version="1.12.0"
@@ -269,15 +246,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libndp">
-    <pkg-config>libndp.pc</pkg-config>
-    <branch module="libndp-${version}.tar.gz"
-            version="1.2"
-            repo="libndp"
-            hash="sha256:38403566cad3eabea04450847ebcdfee520f39497291d35e0c071230f941526a">
-    </branch>
-  </autotools>
-
   <autotools id="libqmi">
     <branch repo="git.freedesktop.org" module="libqmi.git"/>
     <dependencies>
@@ -376,18 +344,6 @@
     </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"/>
@@ -436,13 +392,6 @@
       <dep package="libffi"/>
       <dep package="zlib"/>
     </dependencies>
-    <suggests>
-      <!-- these provide gnome implementations of glib
-           extension points -->
-      <dep package="gvfs"/>
-      <dep package="glib-networking"/>
-      <dep package="dconf"/>
-    </suggests>
     <after>
       <dep package="shared-mime-info"/>
     </after>
@@ -485,7 +434,6 @@
     </dependencies>
     <suggests>
       <dep package="shared-mime-info"/>
-      <dep package="adwaita-icon-theme"/>
     </suggests>
   </autotools>
 
@@ -515,19 +463,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="fontconfig"
-    autogenargs="--disable-docs --with-default-fonts=${prefix}/share/fonts 
--with-add-fonts=/usr/local/share/fonts,/usr/share/fonts">
-    <pkg-config>fontconfig.pc</pkg-config>
-    <branch repo="freedesktop.org"
-            module="fontconfig/release/fontconfig-${version}.tar.bz2"
-            version="2.11.1"
-            hash="sha256:dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99"/>
-    <dependencies>
-      <dep package="freetype2"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="caribou" autogenargs="--disable-gtk2-module">
     <branch/>
     <dependencies>
@@ -682,7 +617,6 @@
   <autotools id="gtksourceview">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
       <dep package="libxml2"/>
       <dep package="shared-mime-info"/>
       <dep package="gtk+"/>
@@ -743,7 +677,7 @@
       <dep package="flex"/>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="python3-devel"/>
+      <dep package="python-devel"/>
     </dependencies>
   </autotools>
 
@@ -767,7 +701,8 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
-            checkoutdir="gstreamer"/>
+            checkoutdir="gstreamer"
+            revision="1.6"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -780,7 +715,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.6"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
@@ -798,7 +734,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.6"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -822,7 +759,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.6"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -915,20 +853,6 @@
     </dependencies>
   </autotools>
 
-  <!-- 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">
-      <patch file="itstool.use-correct-libxml.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libxml2-python"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
     <branch repo="research.operationaldynamics.com"
             module="bzr/java-gnome/mainline"/>
@@ -955,15 +879,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="lcms2" autogen-sh="configure">
-    <pkg-config>lcms2.pc</pkg-config>
-    <branch repo="sourceforge.net"
-            module="lcms/lcms2-2.6.tar.gz"
-            version="2.6"
-            hash="sha256:5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"
-            size="4583389"/>
-  </autotools>
-
  <autotools id="libchamplain">
    <branch/>
    <dependencies>
@@ -1234,28 +1149,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libepoxy">
-    <pkg-config>epoxy.pc</pkg-config>
-    <branch repo="github-tar"
-            module="anholt/libepoxy/archive/v${version}.tar.gz"
-            version="1.2"
-            checkoutdir="libepoxy-${version}"
-            hash="sha256:42c328440f60a5795835c5ec4bdfc1329e75bba16b6e22b3a87ed17e9679e8f6"
-            size="267110"/>
-    <dependencies>
-      <dep package="xtrans"/>
-      <dep package="egl"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libevdev" autogenargs="--disable-gcov">
-    <branch repo="freedesktop.org"
-            checkoutdir="libevdev"
-            module="libevdev/libevdev-${version}.tar.xz"
-            version="1.2.2"
-            hash="sha256:860e9a1d5594393ff1f711cdeaf048efe354992019068408abbcfa4914ad6709"/>
-  </autotools>
-
   <autotools id="libinput">
     <branch repo="git.freedesktop.org" checkoutdir="libinput" module="wayland/libinput.git" />
     <dependencies>
@@ -1292,14 +1185,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="xorg-randrproto">
-    <pkg-config>randrproto.pc</pkg-config>
-    <branch repo="xorg-tar"
-            module="releases/individual/proto/randrproto-1.5.0.tar.gz" version="1.5.0"
-            size="171254"
-            hash="8f8a716d6daa6ba05df97d513960d35a39e040600bf04b313633f11679006fab"/>
-  </autotools>
-
   <autotools id="xorg-xproto">
     <pkg-config>xproto.pc</pkg-config>
     <branch repo="xorg-tar"
@@ -1316,33 +1201,6 @@
             hash="sha256:b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d"/>
   </autotools>
 
-  <autotools id="xwayland"
-             autogenargs="--with-xkb-bin-directory=/usr/bin --with-xkb-path=/usr/share/X11/xkb 
--with-xkb-output=${prefix}/share/X11/xkb/compiled --enable-xwayland">
-    <branch repo="xorg.freedesktop.org"
-            checkoutdir="xwayland"
-            module="xserver"/>
-    <dependencies>
-      <dep package="xfont"/>
-      <dep package="xtrans"/>
-      <dep package="wayland"/>
-      <dep package="libepoxy"/>
-      <dep package="pciaccess"/>
-      <dep package="xorg-xcmiscproto"/>
-      <dep package="xorg-bigreqsproto"/>
-      <dep package="xorg-scrnsaverproto"/>
-      <dep package="xorg-randrproto"/>
-      <dep package="xorg-xproto"/>
-      <dep package="xorg-resourceproto"/>
-      <dep package="xorg-xf86driproto"/>
-      <dep package="xorg-presentproto"/>
-      <dep package="xorg-videoproto"/>
-      <dep package="xcb-keysyms"/>
-      <if condition-set="systemd">
-        <dep package="libsystemd-daemon"/>
-      </if>
-    </dependencies>
-  </autotools>
-
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
     <if condition-unset="x11">
       <cmakeargs value="-DENABLE_X11_TARGET=OFF"/>
@@ -1352,9 +1210,9 @@
     </if>
     <pkg-config>webkit2gtk-4.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.10.0.tar.xz" version="2.10.0"
-            hash="sha256:42325622ef35394fa65a139b55f0a20b843bbd6f8b94cb7c591da6d68c62686d"
-            size="11036516">
+            module="webkitgtk-2.11.1.tar.xz" version="2.11.1"
+            hash="sha256:2e13ca3ab384887cd687bc96aed857ba0191567e3fd579974f17b537e9cb2138"
+            size="11370708">
     </branch>
     <dependencies>
       <dep package="c++"/>
@@ -1496,7 +1354,8 @@
   </autotools>
 
   <autotools id="libwacom">
-    <branch repo="sourceforge.net" module="linuxwacom/libwacom-0.13.tar.bz2" version="0.13"
+    <branch repo="sourceforge.net"
+            module="linuxwacom/files/libwacom/libwacom-${version}.tar.bz2" version="0.13"
             hash="sha256:976b8801007ac96c6512751a0ef6903b482cd361f256965c2884196c88788176"
             size="439767"/>
     <dependencies>
@@ -1505,22 +1364,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libpwquality">
-    <if condition-unset="linux">
-      <!-- uses PAM features not in XSSO spec -->
-      <autogenargs value="--disable-pam"/>
-    </if>
-    <branch repo="libpwquality"
-            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>
-      <dep package="cracklib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="ibus"
              autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui 
GSETTINGS_SCHEMA_CONVERT=/usr/bin/false --with-python=python3">
     <branch repo="github-tar"
diff --git a/gnome-core.modules b/gnome-core.modules
index 55464f2..b68589a 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -668,7 +668,6 @@
       <dep package="gnome-online-accounts"/>
       <dep package="gtk+"/>
       <dep package="libgee"/>
-      <dep package="libnotify"/>
       <dep package="telepathy-glib"/>
       <dep package="vala"/>
       <dep package="libchamplain"/>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index c261d77..fc4475b 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -48,6 +48,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="cairo">
+    <pkg-config>cairo.pc</pkg-config>
+    <branch repo="system" version="1.14.0"/>
+  </systemmodule>
+
   <systemmodule id="c++">
     <branch repo="system"/>
     <systemdependencies>
@@ -69,13 +74,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="cracklib">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="c_include" name="crack.h"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="cups">
     <branch repo="system" version="1.4"/>
     <systemdependencies>
@@ -118,12 +116,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="dleyna-renderer">
-    <pkg-config>dleyna-renderer-service-1.0.pc</pkg-config>
-    <branch repo="system"
-            version="0.4"/>
-  </systemmodule>
-
   <systemmodule id="docbook-xsl">
     <branch repo="system"/>
     <systemdependencies>
@@ -199,6 +191,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="fontconfig">
+    <pkg-config>fontconfig.pc</pkg-config>
+    <branch repo="system"
+            version="2.11.0"/>
+  </systemmodule>
+
   <systemmodule id="freetype2">
     <pkg-config>freetype2.pc</pkg-config>
     <branch repo="system"
@@ -336,6 +334,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="itstool">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="itstool"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="json">
     <pkg-config>json-c.pc</pkg-config>
     <branch repo="system"
@@ -355,6 +360,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="lcms2">
+    <pkg-config>lcms2.pc</pkg-config>
+    <branch repo="system"
+            version="2.6"/>
+  </systemmodule>
+
   <systemmodule id="lcov">
     <branch repo="system"/>
     <systemdependencies>
@@ -409,6 +420,11 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libXi">
+    <pkg-config>xi.pc</pkg-config>
+    <branch repo="system" version="1.7.4"/>
+  </systemmodule>
+
   <systemmodule id="libXdamage">
     <pkg-config>xdamage.pc</pkg-config>
     <branch repo="system"/>
@@ -476,46 +492,11 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xorg-bigreqsproto">
-    <pkg-config>bigreqsproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="xorg-kbproto">
     <pkg-config>kbproto.pc</pkg-config>
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xorg-presentproto">
-    <pkg-config>presentproto.pc</pkg-config>
-    <branch repo="system"/>
-    </systemmodule>
-
-  <systemmodule id="xorg-resourceproto">
-    <pkg-config>resourceproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="xorg-scrnsaverproto">
-    <pkg-config>scrnsaverproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="xorg-videoproto">
-    <pkg-config>videoproto.pc</pkg-config>
-    <branch repo="system"/>
-    </systemmodule>
-
-  <systemmodule id="xorg-xcmiscproto">
-    <pkg-config>xcmiscproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="xorg-xf86driproto">
-    <pkg-config>xf86driproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="libacl">
     <branch repo="system"/>
     <systemdependencies>
@@ -548,6 +529,18 @@
             version="2.4.45"/>
   </systemmodule>
 
+  <systemmodule id="libepoxy">
+    <pkg-config>epoxy.pc</pkg-config>
+    <branch repo="system"
+            version="1.2"/>
+  </systemmodule>
+
+  <systemmodule id="libevdev">
+    <pkg-config>libevdev.pc</pkg-config>
+    <branch repo="system"
+            version="1.2.2"/>
+  </systemmodule>
+
   <systemmodule id="libexif">
     <pkg-config>libexif.pc</pkg-config>
     <branch repo="system"
@@ -585,6 +578,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libndp">
+    <pkg-config>libndp.pc</pkg-config>
+    <branch repo="system"
+            version="1.4"/>
+  </systemmodule>
+
   <systemmodule id="libnl">
     <pkg-config>libnl-3.0.pc</pkg-config>
     <branch repo="system"
@@ -624,6 +623,11 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libpwquality">
+    <pkg-config>pwquality.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libraw">
     <pkg-config>libraw.pc</pkg-config>
     <branch repo="system"/>
@@ -742,13 +746,6 @@
             version="2.7.8"/>
   </systemmodule>
 
-  <systemmodule id="libxml2-python">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="python2" name="libxml2"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="libxslt">
     <pkg-config>libxslt.pc</pkg-config>
     <branch repo="system"
@@ -832,11 +829,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="pciaccess">
-    <pkg-config>pciaccess.pc</pkg-config>
-    <branch repo="system" version="0.12.901"/>
-  </systemmodule>
-
   <systemmodule id="pixman">
     <pkg-config>pixman-1.pc</pkg-config>
     <branch repo="system"
@@ -1034,11 +1026,6 @@
     <branch repo="system" version="1.8.1"/>
   </systemmodule>
 
-  <systemmodule id="xcb-keysyms">
-    <pkg-config>xcb-keysyms.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="xcb-util">
     <pkg-config>xcb-aux.pc</pkg-config>
     <branch repo="system" version="0.1"/>
@@ -1077,11 +1064,6 @@
             version="3.0.0"/>
   </systemmodule>
 
-  <systemmodule id="xfont">
-    <pkg-config>xfont.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="gtkspell-3">
     <pkg-config>gtkspell3-3.0.pc</pkg-config>
     <branch repo="system"/>
@@ -1161,6 +1143,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="xwayland">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="Xwayland"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="zlib">
     <pkg-config>zlib.pc</pkg-config>
     <branch repo="system"/>
diff --git a/gnome-world.modules b/gnome-world.modules
index 7c65b5b..7d2ea05 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -114,6 +114,9 @@
 
   <include href="gnome-apps.modules"/>
 
+  <!-- Temporarily moved from gnome-apps to gnome-world due to the dependency
+       on gconf. gconf is not needed at runtime or even make time, only at
+       configure time, so this should not be hard to fix. -->
   <autotools id="aisleriot"
              autogenargs="--with-platform=gtk-only">
     <branch/>
@@ -181,7 +184,7 @@
       <dep package="dbus-glib"/>
     </dependencies>
     <suggests>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
     </suggests>
   </autotools>
 
@@ -219,31 +222,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="uncrustify">
-    <branch repo="downloads.sourceforge.net"
-            module="project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
-            version="0.61"
-            hash="sha256:1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"
-            size="1143946"/>
-    <dependencies>
-      <dep package="c++"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-builder">
-    <branch/>
-    <dependencies>
-      <dep package="devhelp"/>
-      <dep package="glib"/>
-      <dep package="gnome-code-assistance"/>
-      <dep package="gtk+"/>
-      <dep package="gtksourceview"/>
-      <dep package="libgit2-glib"/>
-      <dep package="librsvg"/>
-      <dep package="uncrustify"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-chat">
     <branch/>
     <dependencies>
@@ -279,6 +257,46 @@
     </dependencies>
   </autotools>
 
+  <!-- Temporarily removed from gnome-apps because:
+
+       a) It needs to be ported to grilo-0.3.
+       b) dbus-python is in gnome-world, which is not included in gnome-apps.
+       c) dbus-python is a python2 build that depends on pygobject-python2,
+          whereas gnome-music depends on pygobject (python3 build).
+
+       Also, pygobject-python2 has a dependency on unknown "py2cairo" module,
+       but that doesn't matter much since this should not depend on
+       pygobject-python2 anyway.
+
+       https://mail.gnome.org/archives/desktop-devel-list/2015-October/msg00030.html
+  -->
+  <autotools id="gnome-music">
+    <branch/>
+    <dependencies>
+      <dep package="dbus-python"/>
+      <dep package="gnome-themes-standard"/>
+      <dep package="gobject-introspection"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gtk+"/>
+      <dep package="gvfs"/>
+      <dep package="intltool"/>
+      <dep package="pygobject"/>
+      <dep package="tracker"/>
+      <dep package="libmediaart"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-news">
+    <branch repo="github.com" module="ignatenkobrain/gnome-news"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="tracker"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtkglarea">
     <branch/>
     <dependencies>
@@ -622,7 +640,7 @@
 
   <autotools id="gst-libav"
              autogenargs="--disable-fatal-warnings">
-    <branch repo="gstreamer.freedesktop.org" revision="1.4"/>
+    <branch repo="gstreamer.freedesktop.org" revision="1.6"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -630,7 +648,7 @@
   </autotools>
 
   <autotools id="gst-python">
-    <branch repo="gstreamer.freedesktop.org"/>
+    <branch repo="gstreamer.freedesktop.org" revision="1.6"/>
     <dependencies>
       <dep package="pygobject-python2"/>
       <dep package="gstreamer"/>
@@ -1342,7 +1360,6 @@
     <branch />
     <dependencies>
       <dep package="gnome-doc-utils"/>
-      <dep package="polkit"/>
       <dep package="pygtk"/>
     </dependencies>
   </autotools>
@@ -1831,12 +1848,16 @@
   <autotools id="almanah">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="gcr"/>
+      <dep package="glib"/>
+      <dep package="gpgme"/>
       <dep package="gtk+"/>
-      <dep package="gconf"/>
       <dep package="sqlite3"/>
+      <dep package="intltool"/>
+      <dep package="appdata-tools"/>
     </dependencies>
     <suggests>
+      <dep package="evolution-data-server"/>
       <dep package="gtkspell-3"/>
     </suggests>
   </autotools>
@@ -2425,7 +2446,7 @@
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-ugly"
             module="gst-plugins-ugly"
-            revision="1.4"/>
+            revision="1.6"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -2478,11 +2499,23 @@
       <dep package="gsettings-desktop-schemas"/>
       <dep package="vala"/>
       <dep package="libgee"/>
-      <dep package="enchant"/>
+      <dep package="gspell"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gspell">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="enchant"/>
+      <dep package="iso-codes"/>
+      <dep package="m4-common"/>
+      <dep package="gtksourceview"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="tumbler">
     <branch repo="git.xfce.org"
             module="xfce/tumbler"/>
@@ -2500,50 +2533,6 @@
     </suggests>
   </autotools>
 
-  <!-- ########## Gnome Flashback Modules ########## -->
-
-  <autotools id="gnome-panel">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libwnck"/>
-      <dep package="evolution-data-server"/>
-      <dep package="gnome-menus"/>
-      <dep package="dbus-glib"/>
-      <dep package="librsvg"/>
-      <dep package="libgweather"/>
-      <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="polkit-gobject"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="metacity">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk+"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="intltool"/>
-      <dep package="libcanberra"/>
-      <dep package="zenity"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="notification-daemon">
-    <branch/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libgnomekbd">
     <branch/>
     <dependencies>
@@ -2568,36 +2557,6 @@
     </suggests>
   </autotools>
 
- <autotools id="polkit-gnome" autogenargs="--with-gtk=3.0">
-    <branch checkoutdir="polkit-gnome" module="PolicyKit-gnome"/>
-    <dependencies>
-      <dep package="polkit"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-    </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-applets"/>
-      <dep package="gnome-flashback"/>
-      <dep package="gnome-panel"/>
-      <dep package="metacity"/>
-      <dep package="notification-daemon"/>
-    </dependencies>
-  </metamodule>
-
-  <!-- ########## End of Gnome Flashback Modules ########## -->
-
   <autotools id="librsync" autogen-sh="configure">
     <branch repo="downloads.sourceforge.net"
             module="librsync/librsync-0.9.7.tar.gz"
@@ -2628,32 +2587,6 @@
   <!--   enscript                                   -->
   <!--   libavcodec                                 -->
   <!-- Those are not managed by jhbuild             -->
-  <autotools id="gnome-applets" autogenargs="--enable-mini-commander">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gnome-panel"/>
-      <dep package="libgtop"/>
-      <dep package="libgnomekbd"/>
-      <dep package="gucharmap"/>
-      <dep package="libgweather"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk+"/>
-      <dep package="glib"/>
-      <dep package="libxklavier" />
-      <dep package="libwnck"/>
-      <dep package="libnotify"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="pygobject"/>
-      <dep package="adwaita-icon-theme"/>
-      <dep package="libxml2"/>
-      <dep package="polkit-gobject"/>
-    </dependencies>
-    <after>
-      <dep package="gnome-control-center"/>
-    </after>
-  </autotools>
 
   <autotools id="gnome-search-tool">
     <branch/>
@@ -2848,6 +2781,7 @@
   <autotools id="abiword">
     <branch repo="svn.abisource.com"/>
     <dependencies>
+      <dep package="boost"/>
       <dep package="cairo"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -3096,7 +3030,7 @@
   </autotools>
 
   <autotools id="retro-gobject"
-             skip-autogen="true">
+             autogenargs="--enable-vala">
     <branch repo="github.com"
             module="Kekun/retro-gobject.git"/>
     <dependencies>
@@ -3105,13 +3039,55 @@
     </dependencies>
   </autotools>
 
+  <autotools id="retro-plugins-game-boy">
+    <branch repo="github.com"
+            module="Kekun/retro-plugins-game-boy.git"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="retro-plugins-nes">
+    <branch repo="github.com"
+            module="Kekun/retro-plugins-nes.git"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="retro-plugins-pce">
+    <branch repo="github.com"
+            module="Kekun/retro-plugins-pce.git"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="retro-plugins-snes">
+    <branch repo="github.com"
+            module="Kekun/retro-plugins-snes.git"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="jsk"
+             autogenargs="--enable-vala">
+    <branch repo="github.com"
+            module="Kekun/jsk.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="retro-gtk"
-             skip-autogen="true">
+             autogenargs="--enable-vala">
     <branch repo="github.com"
             module="Kekun/retro-gtk.git"/>
     <dependencies>
+      <dep package="clutter-gtk"/>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="retro-gtk"/>
+      <dep package="jsk"/>
+      <dep package="pulseaudio"/>
+      <dep package="retro-gobject"/>
       <dep package="vala"/>
     </dependencies>
   </autotools>
@@ -3288,33 +3264,33 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgames-support">
-    <branch/>
+  <autotools id="libratbag">
+    <branch repo="github.com" checkoutdir="libratbag" module="libratbag/libratbag.git"/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libgee"/>
-      <dep package="vala"/>
+      <dep package="libudev"/>
+      <dep package="libevdev"/>
     </dependencies>
   </autotools>
 
-  <autotools id="network-manager-applet"
-             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
-    <branch revision="nma-0-9-8"/>
+  <autotools id="gnome-games"
+             autogenargs="--enable-vala">
+    <branch repo="github.com"
+            module="Kekun/gnome-games.git"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="dbus-glib"/>
-      <dep package="gnome-bluetooth"/>
-      <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
-      <dep package="gudev"/>
-      <dep package="iso-codes"/>
-      <dep package="libsecret"/>
-      <dep package="NetworkManager"/>
-      <dep package="libnotify"/>
+      <dep package="libarchive"/>
+      <dep package="retro-gobject"/>
+      <dep package="retro-gtk"/>
+      <dep package="tracker"/>
+      <dep package="vala"/>
+      <dep package="gnome-themes-standard"/>
     </dependencies>
     <suggests>
-      <dep package="mobile-broadband-provider-info"/>
+      <dep package="retro-plugins-game-boy"/>
+      <dep package="retro-plugins-nes"/>
+      <dep package="retro-plugins-pce"/>
+      <dep package="retro-plugins-snes"/>
     </suggests>
   </autotools>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]