GNOME.org
 

[gnome-modulesets/gnome-3-18] Resync with GNOME 3.18 modulesets

commit a9b5fb614f113754e99c29de924dcde6b7da94aa
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Oct 5 23:33:06 2015 +0100

    Resync with GNOME 3.18 modulesets

 gnome-apps.modules      |  171 +++++++++++++++++++++++++++++--------------
 gnome-core-deps.modules |  182 ++++++++++++++++++++++++++++++++++-------------
 gnome-core.modules      |   46 ++++++++++--
 gnome-sysdeps.modules   |   58 ++++++++++-----
 4 files changed, 323 insertions(+), 134 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index b1cdab9..276d777 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -17,8 +17,6 @@
       href="git://git.fedorahosted.org/git/"/>
   <repository type="git" name="wayland"
       href="git://anongit.freedesktop.org/git/wayland"/>
-  <repository type="git" name="github-01org"
-    href="git://github.com/01org/"/>
 
 <!-- tarball repos -->
   <repository type="tarball" name="gnome.org"
@@ -33,6 +31,8 @@
       href="http://devel.freebsoft.org/pub/projects/speechd/"/>
   <repository type="tarball" name="tarball.github.com"
     href="https://github.com/"/>
+  <repository type="tarball" name="downloads.sourceforge.net"
+      href="http://downloads.sourceforge.net/"/>
 
   <include href="gnome-core.modules"/>
 
@@ -77,6 +77,7 @@
   <autotools id="dconf-editor">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="glib"/>
       <dep package="dconf"/>
       <dep package="gtk+"/>
@@ -89,6 +90,18 @@
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="evolution-data-server"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-todo">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gnome-online-accounts"/>
       <dep package="evolution-data-server"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -238,6 +251,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgovirt">
+    <branch/>
+    <dependencies>
+      <dep package="librest"/>
+      <dep package="intltool"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libosinfo"
              autogenargs="--enable-tests=no --enable-werror=no">
     <branch repo="fedorahosted.org" module="libosinfo.git"/>
@@ -260,6 +282,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="phodav">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="avahi"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="pyatspi2" autogenargs="--with-python=python3" >
     <branch/>
     <dependencies>
@@ -273,9 +305,9 @@
   <autotools id="qqwing">
     <branch repo="qqwing"
             module="qqwing-${version}.tar.gz"
-            version="1.2.0"
-            hash="sha256:b9de6cc596049cf852d17a37014f9a4b0cac1682bd8ccff5def4433b0b52d1e1"
-            size="350915"/>
+            version="1.3.4"
+            hash="sha256:1753736c31feea0085f5cfac33143743204f8a7e66b81ccd17e249ecafba802f"
+            size="352060"/>
     <dependencies>
       <dep package="c++"/>
     </dependencies>
@@ -302,15 +334,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-static">
+  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
     <if condition-set="freebsd">
       <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
     </if>
     <branch repo="spice"
-            module="gtk/spice-gtk-0.28.tar.bz2"
-            version="0.28"
-            hash="sha256:15aeeb63422cb3bfaa2edbf4602ed2025baa4455abfd1677f631245a0d0f81c4"
-            size="1274095"/>
+            module="gtk/spice-gtk-0.29.tar.bz2"
+            version="0.29"
+            hash="sha256:44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973"
+            size="1277160"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="cyrus-sasl"/>
@@ -320,6 +352,7 @@
       <dep package="libjpeg"/>
       <dep package="openssl"/>
       <dep package="opus"/>
+      <dep package="phodav"/>
       <dep package="pixman"/>
       <dep package="pulseaudio"/>
       <dep package="spice-protocol"/>
@@ -331,10 +364,10 @@
 
   <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"/>
+            module="releases/spice-protocol-0.12.9.tar.bz2"
+            version="0.12.9"
+            hash="sha256:290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876"
+            size="71766"/>
     <dependencies>
     </dependencies>
   </autotools>
@@ -383,8 +416,8 @@
          cmakeargs="-DTHREADSAFE:BOOL=1">
     <branch repo="tarball.github.com"
             module="libgit2/libgit2/archive/v${version}.tar.gz"
-            version="0.22.0"
-            hash="b70965b35e6d0adc891ba2edb28d982cb27729a3f2bb02186084f692e94922b2"
+            version="0.23.1"
+            hash="113748018e5876bea84af5c749af25b62f58cb4ca82730dcbffaac90c87f7056"
             checkoutdir="libgit2-${version}">
     </branch>
     <dependencies>
@@ -401,6 +434,17 @@
     </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>
+
   <!-- Apps start here -->
 
   <autotools id="accerciser">
@@ -450,6 +494,8 @@
       <dep package="gnome-online-accounts"/>
       <dep package="libgfbgraph"/>
       <dep package="gnome-themes-standard"/>
+      <dep package="folks"/>
+      <dep package="libgee"/>
     </dependencies>
   </autotools>
 
@@ -512,7 +558,7 @@
   </autotools>
 
   <autotools id="rygel">
-    <branch/>
+    <branch revision="rygel-0-28"/>
     <dependencies>
       <dep package="vala"/>
       <dep package="gupnp"/>
@@ -568,7 +614,7 @@
       <dep package="gst-plugins-bad"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
-      <dep package="clutter-gst"/>
+      <dep package="clutter-gst3"/>
       <dep package="clutter-gtk"/>
       <dep package="libcanberra"/>
       <dep package="vala"/>
@@ -632,6 +678,28 @@
     </dependencies>
   </autotools>
 
+
+
+  <autotools id="fwupd"
+             autogenargs="--disable-colorhug --disable-uefi">
+    <branch repo="tarball.github.com"
+            module="hughsie/fwupd/archive/${version}.tar.gz"
+            version="0.1.5"
+            hash="35f7e8c7b169c58b2e34391ea4dd0c99001ecfe2c767df2861159f05a43b9be1"
+            checkoutdir="fwupd-${version}"/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gcab"/>
+      <dep package="glib"/>
+      <dep package="gudev"/>
+      <dep package="libarchive"/>
+      <dep package="libgusb"/>
+      <dep package="libsoup"/>
+      <dep package="polkit-gobject"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gedit">
     <branch/>
     <dependencies>
@@ -649,7 +717,7 @@
   </autotools>
 
   <autotools id="gitg">
-    <branch/>
+    <branch revision="gnome-3-18"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="glib"/>
@@ -690,6 +758,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-builder">
+    <branch/>
+    <dependencies>
+      <dep package="clang"/>
+      <dep package="devhelp"/>
+      <dep package="gjs"/>
+      <dep package="glib"/>
+      <dep package="gnome-code-assistance"/>
+      <dep package="gtk+"/>
+      <dep package="gtksourceview"/>
+      <dep package="libgit2-glib"/>
+      <dep package="libpeas"/>
+      <dep package="librsvg"/>
+      <dep package="llvm"/>
+      <dep package="pygobject"/>
+      <dep package="uncrustify"/>
+      <dep package="vte"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-clocks">
     <branch/>
     <dependencies>
@@ -784,6 +872,7 @@
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
+      <dep package="m4-common"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
@@ -869,43 +958,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="dleyna-core">
-    <branch repo="github-01org"/>
-    <dependencies>
-      <dep package="gupnp"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="dleyna-connector-dbus">
-    <branch repo="github-01org"/>
-    <dependencies>
-      <dep package="dleyna-core"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="dleyna-renderer">
-    <branch repo="github-01org"/>
-    <dependencies>
-      <dep package="dleyna-connector-dbus"/>
-      <dep package="dleyna-core"/>
-      <dep package="gssdp"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="gupnp-dlna"/>
-    </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>
@@ -995,6 +1047,7 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
+      <dep package="m4-common"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -1086,6 +1139,9 @@
       <dep package="libsoup"/>
       <dep package="PackageKit"/>
       <dep package="sqlite3"/>
+      <if condition-set="linux">
+        <dep package="fwupd"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -1140,6 +1196,7 @@
   <autotools id="polari">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="gjs"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1255,6 +1312,7 @@
       <dep package="gitg"/>
       <dep package="glade"/>
       <dep package="gnome-boxes"/>
+      <dep package="gnome-builder"/>
       <dep package="gnome-clocks"/>
       <dep package="gnome-characters"/>
       <dep package="gnome-chess"/>
@@ -1278,6 +1336,7 @@
       <dep package="gnome-sudoku"/>
       <dep package="gnome-taquin"/>
       <dep package="gnome-tetravex"/>
+      <dep package="gnome-todo"/>
       <dep package="gnome-tweak-tool"/>
       <dep package="gnome-weather"/>
       <dep package="hitori"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index 8f818b1..59e9c3e 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -26,10 +26,12 @@
     href="git://repo.or.cz/"/>
 
 <!-- tarball repos -->
+<repository type="tarball" name="cairo.org"
+    href="http://cairographics.org/"/>
 <repository type="tarball" name="iso-codes"
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
 <repository type="tarball" name="sourceforge.net"
-    href="http://prdownloads.sourceforge.net/sourceforge/"/>
+    href="http://sourceforge.net/projects/"/>
 <repository type="tarball" name="webkitgtk.org"
     href="http://webkitgtk.org/releases/"/>
 <repository type="tarball" name="freedesktop.org"
@@ -97,20 +99,34 @@
         <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"
+            repo="cairo.org"
+            hash="sha256:50435aec6fdd976934b791e808993160113ad19ca53a5634a9b64ccbe55874cc">
+     </branch>
+     <dependencies>
+        <dep package="cairo"/>
+        <dep package="libsigc++2"/>
+     </dependencies>
+  </autotools>
+
   <autotools id="gcab">
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="vala"/>
       <dep package="zlib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="geoclue">
+  <autotools id="geoclue" autogenargs="--with-systemdsystemunitdir=no">
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
     </if>
@@ -132,6 +148,8 @@
       <dep package="glib"/>
       <dep package="json-glib"/>
       <dep package="libsoup"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk-doc"/>
     </dependencies>
   </autotools>
 
@@ -199,6 +217,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
+      <dep package="m4-common"/>
     </dependencies>
   </autotools>
 
@@ -214,6 +233,7 @@
       <dep package="libxml2"/>
       <dep package="libsoup"/>
       <dep package="liboauth"/>
+      <dep package="m4-common"/>
       <dep package="uhttpmock"/>
     </dependencies>
   </autotools>
@@ -266,6 +286,10 @@
     </dependencies>
   </autotools>
 
+  <autotools id="m4-common">
+    <branch repo="github.com" module="desrt/m4-common.git"/>
+  </autotools>
+
   <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0 -DMIR_PLATFORM=mesa">
     <branch repo="mir"
             module="0.8/${version}/+download/mir-${version}.tar.bz2"
@@ -326,12 +350,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cogl" autogenargs="--enable-xlib-egl-platform --enable-cogl-gst">
+  <autotools id="cogl" autogenargs="--enable-xlib-egl-platform --enable-cogl-gst --disable-maintainer-flags">
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform"/>
     </if>
     <pkg-config>cogl-1.0.pc</pkg-config>
-    <branch revision="cogl-1.20"/>
+    <branch revision="cogl-1.22"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
@@ -406,7 +430,7 @@
   </autotools>
 
   <autotools id="glib" autogenargs="--enable-installed-tests">
-    <branch/>
+    <branch revision="glib-2-46"/>
     <dependencies>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
@@ -453,6 +477,7 @@
       <if condition-set="wayland">
         <dep package="libxkbcommon"/>
         <dep package="wayland"/>
+        <dep package="wayland-egl"/>
       </if>
       <if condition-set="mir">
         <dep package="mir"/>
@@ -601,22 +626,22 @@
   </autotools>
 
   <autotools id="grilo">
-    <branch/>
+    <branch revision="0.2.x"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
+      <dep package="totem-pl-parser"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
     </dependencies>
     <suggests>
       <dep package="gtk+"/>
       <dep package="vala"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="totem-pl-parser"/>
     </suggests>
   </autotools>
 
   <autotools id="grilo-plugins">
-    <branch/>
+    <branch revision="0.2.x"/>
     <dependencies>
       <dep package="grilo"/>
       <dep package="libxml2"/>
@@ -654,13 +679,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
+  <autotools id="gtksourceview">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
       <dep package="shared-mime-info"/>
       <dep package="gtk+"/>
+      <dep package="m4-common"/>
     </dependencies>
     <suggests>
       <dep package="glade"/>
@@ -678,6 +704,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgrss">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="librest">
     <if condition-set="freebsd">
       <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
@@ -733,7 +768,7 @@
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
             checkoutdir="gstreamer"
-            revision="1.4"/>
+            revision="1.6"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -747,7 +782,7 @@
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-base"
             checkoutdir="gst-plugins-base"
-            revision="1.4"/>
+            revision="1.6"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
@@ -766,7 +801,7 @@
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-good"
             checkoutdir="gst-plugins-good"
-            revision="1.4"/>
+            revision="1.6"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -791,7 +826,7 @@
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-bad"
             module="gst-plugins-bad"
-            revision="1.4"/>
+            revision="1.6"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -838,6 +873,7 @@
   <autotools id="gtkmm">
     <branch/>
     <dependencies>
+      <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
       <dep package="gtk+"/>
@@ -932,18 +968,6 @@
             size="4583389"/>
   </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="libchamplain">
    <branch/>
    <dependencies>
@@ -1056,7 +1080,6 @@
       <dep package="gtk+"/>
     </dependencies>
     <suggests>
-      <dep package="gjs"/>
       <dep package="glade"/>
       <dep package="pygobject"/>
     </suggests>
@@ -1086,6 +1109,8 @@
       <dep package="libxml2"/>
       <dep package="sqlite3"/>
       <dep package="gobject-introspection"/>
+      <dep package="m4-common"/>
+      <dep package="vala"/>
     </dependencies>
     <suggests>
       <dep package="glib-networking"/>
@@ -1096,6 +1121,15 @@
     <branch/>
   </autotools>
 
+  <!-- This should be moved to sysdeps once it's widely-available. -->
+  <autotools id="pcre2">
+    <branch repo="sourceforge.net"
+            checkoutdir="pcre2"
+            module="pcre/files/pcre2/${version}/pcre2-${version}.tar.bz2"
+            version="10.20"
+            hash="sha256:332e287101c9e9567d1ed55391b338b32f1f72c5b5ee7cc81ef2274a53ad487a"/>
+  </autotools>
+
   <!-- Python 3 build of pygobject -->
   <autotools id="pygobject" autogenargs="--with-python=python3">
     <branch/>
@@ -1157,11 +1191,12 @@
   <!-- evolution miner broken:
        https://bugzilla.gnome.org/show_bug.cgi?id=678235 -->
   <autotools id="tracker"
-             autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no 
--enable-miner-evolution=no --disable-nautilus-extension --disable-tracker-needle 
--disable-tracker-preferences --with-unicode-support=libicu"
+             autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no 
--enable-miner-evolution=no --disable-nautilus-extension --disable-tracker-needle 
--disable-tracker-preferences --with-unicode-support=libicu 
--with-bash-completion-dir=${prefix}/share/bash-completion/completions"
              check-target="false">
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="libgrss"/>
       <dep package="libicu"/>
       <dep package="libmediaart"/>
       <dep package="libpng"/>
@@ -1187,8 +1222,8 @@
   </autotools>
 
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
-    <pkg-config>libvala-0.28.pc</pkg-config>
-    <branch/>
+    <pkg-config>libvala-0.30.pc</pkg-config>
+    <branch />
     <dependencies>
       <dep package="glib"/>
     </dependencies>
@@ -1234,13 +1269,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
+  <autotools id="libxkbcommon">
     <branch repo="libxkbcommon"
             module="http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz";
             version="0.5.0"
             hash="sha256:90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
             size="615504"/>
     <dependencies>
+      <dep package="xkeyboard-config"/>
       <dep package="xorg-macros"/>
       <dep package="xorg-xproto"/>
       <dep package="xorg-kbproto"/>
@@ -1260,6 +1296,22 @@
     </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"
+            module="releases/individual/proto/xproto-7.0.28.tar.gz" version="7.0.28"
+            size="367523"
+            hash="sha256:6cabc8ce3fa2b1a2427871167b62c24d5b08a58bd3e81ed7aaf08f2bf6dbcfed"/>
+  </autotools>
+
   <autotools id="xtrans">
     <pkg-config>xtrans.pc</pkg-config>
     <branch repo="xorg-tar"
@@ -1282,6 +1334,8 @@
       <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"/>
@@ -1294,37 +1348,61 @@
   </autotools>
 
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
+    <if condition-unset="x11">
+      <cmakeargs value="-DENABLE_X11_TARGET=OFF"/>
+    </if>
+    <if condition-unset="wayland">
+      <cmakeargs value="-DENABLE_WAYLAND_TARGET=OFF"/>
+    </if>
     <pkg-config>webkit2gtk-4.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.8.1.tar.xz" version="2.8.1"
-            hash="sha256:7d214459d216ca499ad75bccae7f248655d6ef5b295ffafd299773e7331860ff"
-            size="10435512">
+            module="webkitgtk-2.10.0.tar.xz" version="2.10.0"
+            hash="sha256:42325622ef35394fa65a139b55f0a20b843bbd6f8b94cb7c591da6d68c62686d"
+            size="11036516">
     </branch>
     <dependencies>
       <dep package="c++"/>
       <dep package="at-spi2-core"/>
       <dep package="cairo"/>
+      <dep package="enchant"/>
       <dep package="fontconfig"/>
+      <dep package="freetype2"/>
       <dep package="geoclue"/>
-      <dep package="libxml2"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gperf"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
       <!-- GTK+ 2.x required for the plugin process -->
       <dep package="gtk+-2"/>
-      <dep package="pango"/>
-      <dep package="libsoup"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gperf"/>
+      <dep package="harfbuzz"/>
+      <dep package="hyphen"/>
       <dep package="libicu"/>
-      <dep package="libXt"/>
-      <dep package="ruby"/>
+      <dep package="libjpeg"/>
+      <dep package="libnotify"/>
+      <dep package="libpng"/>
       <dep package="libsecret"/>
+      <dep package="libsoup"/>
       <dep package="libwebp"/>
-    </dependencies>
-    <suggests>
+      <dep package="libxml2"/>
       <dep package="libxslt"/>
+      <!-- Either libGL or libGLES is required. -->
+      <dep package="mesa-libGLES"/>
+      <dep package="pango"/>
+      <dep package="ruby"/>
       <dep package="sqlite3"/>
-      <dep package="enchant"/>
+      <if condition-set="x11">
+        <dep package="libXcomposite"/>
+        <dep package="libXdamage"/>
+        <dep package="libXrender"/>
+        <dep package="libXt"/>
+      </if>
+      <if condition-set="wayland">
+        <dep package="wayland"/>
+      </if>
+    </dependencies>
+    <suggests>
+      <dep package="gst-plugins-bad"/>
+      <dep package="gst-plugins-good"/>
     </suggests>
   </cmake>
 
@@ -1335,6 +1413,8 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
+      <dep package="pcre2"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
@@ -1382,9 +1462,9 @@
     </dependencies>
   </autotools>
 
-  <autotools id="colord" autogenargs="--disable-examples --disable-strict --disable-bash-completion">
+  <autotools id="colord" autogenargs="--disable-examples --disable-strict --disable-bash-completion 
--with-systemdsystemunitdir=no">
     <if condition-unset="linux">
-      <autogenargs value="--disable-gusb --disable-udev --with-systemdsystemunitdir=no 
--disable-systemd-login"/>
+      <autogenargs value="--disable-gusb --disable-udev --disable-systemd-login"/>
     </if>
     <branch repo="github.com" checkoutdir="colord" module="hughsie/colord.git"/>
     <dependencies>
@@ -1420,9 +1500,9 @@
   </autotools>
 
   <autotools id="libwacom">
-    <branch repo="sourceforge.net" module="linuxwacom/libwacom-0.9.tar.bz2" version="0.9"
-            hash="sha256:7a5848b5f069e526257a00ce2d409e2018c17f5a968bdec256423bcb54f2f097"
-            size="413917"/>
+    <branch repo="sourceforge.net" module="linuxwacom/libwacom-0.13.tar.bz2" version="0.13"
+            hash="sha256:976b8801007ac96c6512751a0ef6903b482cd361f256965c2884196c88788176"
+            size="439767"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gudev"/>
@@ -1537,7 +1617,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="zeitgeist">
+  <autotools id="zeitgeist" autogenargs="--with-session-bus-services-dir=${prefix}/share/dbus-1/services">
     <branch repo="git.freedesktop.org"
             module="zeitgeist/zeitgeist"
             checkoutdir="zeitgeist"/>
diff --git a/gnome-core.modules b/gnome-core.modules
index 70e9778..f6a858e 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -120,6 +120,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="network-manager-applet"
+             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+    <branch revision="nma-1-0"/>
+    <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"/>
+    </dependencies>
+    <suggests>
+      <dep package="mobile-broadband-provider-info"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
@@ -164,7 +184,6 @@
       <dep package="ibus-anthy"/>
       <dep package="ibus-hangul"/>
       <if condition-set="linux">
-        <dep package="network-manager-applet"/>
         <dep package="ModemManager"/>
         <dep package="NetworkManager"/>
       </if>
@@ -297,7 +316,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-shell" autogenargs="--enable-compile-warnings=maximum">
+  <autotools id="gnome-shell">
     <if condition-unset="linux">
       <autogenargs value="--disable-networkmanager"/>
     </if>
@@ -319,6 +338,7 @@
       <dep package="libcanberra"/>
       <dep package="libcroco"/>
       <dep package="libsoup"/>
+      <dep package="m4-common"/>
       <dep package="mutter"/>
       <dep package="polkit-agent"/>
       <dep package="pulseaudio"/>
@@ -372,6 +392,7 @@
       <dep package="dbus"/>
       <dep package="libgcrypt"/>
       <dep package="libsoup"/>
+      <dep package="gcr"/>
       <if condition-set="linux">
         <dep package="udisks"/>
       </if>
@@ -392,7 +413,7 @@
     <if condition-set="freebsd">
       <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
     </if>
-    <branch/>
+    <branch revision="glib-2-46"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="intltool"/>
@@ -582,9 +603,11 @@
   <autotools id="epiphany">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
       <dep package="gtk+"/>
+      <dep package="m4-common"/>
       <dep package="startup-notification"/>
       <dep package="WebKit"/>
       <dep package="gcr"/>
@@ -630,6 +653,7 @@
       <dep package="gtk+"/>
       <dep package="gtksourceview"/>
       <dep package="libxml2"/>
+      <dep package="m4-common"/>
       <dep package="mpfr"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
@@ -648,6 +672,7 @@
       <dep package="libnotify"/>
       <dep package="telepathy-glib"/>
       <dep package="vala"/>
+      <dep package="libchamplain"/>
     </dependencies>
     <suggests>
       <dep package="cheese"/>
@@ -668,12 +693,14 @@
   <autotools id="gnome-disk-utility">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="glib"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gtk+"/>
       <dep package="libnotify"/>
       <dep package="libpwquality"/>
       <dep package="libsecret"/>
+      <dep package="m4-common"/>
       <dep package="udisks"/>
       <dep package="dvdread"/>
     </dependencies>
@@ -835,7 +862,8 @@
       <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
-      <dep package="WebKit1"/>
+      <dep package="m4-common"/>
+      <dep package="WebKit"/>
       <dep package="yelp-xsl"/>
     </dependencies>
   </autotools>
@@ -922,7 +950,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gdm">
+  <autotools id="gdm" autogenargs="--with-systemdsystemunitdir=no --with-log-dir=${prefix}/var/log/gdm">
     <if condition-unset="linux">
       <autogenargs value="--without-plymouth"/>
     </if>
@@ -971,6 +999,7 @@
       <dep package="polkit-agent"/>
       <dep package="gudev"/>
       <dep package="gnutls"/>
+      <dep package="readline"/>
       <dep package="ppp"/>
       <dep package="vala"/>
       <dep package="wireless-tools"/>
@@ -981,7 +1010,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="PackageKit" autogenargs="--disable-tests --disable-qt --disable-browser-plugin" 
makeargs="CFLAGS=-Wno-error">
+  <autotools id="PackageKit" autogenargs="--disable-tests --disable-qt --disable-browser-plugin 
--disable-bash-completion --with-systemdsystemunitdir=no" makeargs="CFLAGS=-Wno-error">
     <if condition-unset="linux">
       <autogenargs value="--disable-systemd --disable-systemd-updates"/>
     </if>
@@ -1009,7 +1038,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="udisks">
+  <autotools id="udisks" autogenargs="--with-systemdsystemunitdir=no">
     <pkg-config>udisks2.pc</pkg-config>
     <branch repo="git.freedesktop.org" module="udisks"/>
     <dependencies>
@@ -1018,6 +1047,7 @@
       <dep package="polkit-gobject"/>
       <dep package="polkit-agent"/>
       <dep package="libatasmart"/>
+      <dep package="m4-common"/>
       <if condition-set="systemd">
         <dep package="libsystemd"/>
         <dep package="libsystemd-daemon"/>
@@ -1026,7 +1056,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="upower">
+  <autotools id="upower" autogenargs="--with-systemdsystemunitdir=no">
     <branch repo="git.freedesktop.org" />
     <dependencies>
       <dep package="dbus-glib"/>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index c5d08e8..c261d77 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -55,12 +55,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="cairomm">
-    <pkg-config>cairomm-1.0.pc</pkg-config>
-    <branch repo="system"
-            version="1.8.4"/>
-  </systemmodule>
-
   <systemmodule id="cc">
     <branch repo="system"/>
     <systemdependencies>
@@ -68,6 +62,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="clang">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="llvm-config"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="cracklib">
     <branch repo="system"/>
     <systemdependencies>
@@ -117,6 +118,12 @@
     </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>
@@ -306,6 +313,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="hyphen">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="hyphen.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="intltool">
     <branch repo="system"
             version="0.50"/>
@@ -366,6 +380,11 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libdmapsharing">
+    <pkg-config>libdmapsharing-3.0.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libhangul">
     <pkg-config>libhangul.pc</pkg-config>
     <branch repo="system"
@@ -432,6 +451,11 @@
     <branch repo="system" version="1.3"/>
   </systemmodule>
 
+  <systemmodule id="libXrender">
+    <pkg-config>xrender.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libXt">
     <pkg-config>xt.pc</pkg-config>
     <branch repo="system"/>
@@ -452,11 +476,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xorg-xproto">
-    <pkg-config>xproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="xorg-bigreqsproto">
     <pkg-config>bigreqsproto.pc</pkg-config>
     <branch repo="system"/>
@@ -750,6 +769,13 @@
       </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="llvm">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="llvm-c/Core.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="mesa-libGLES">
     <pkg-config>glesv2.pc</pkg-config>
     <branch repo="system"
@@ -853,12 +879,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="py2cairo">
-    <pkg-config>pycairo.pc</pkg-config>
-    <branch repo="system"
-            version="1.8.2"/>
-  </systemmodule>
-
   <systemmodule id="py3cairo">
     <pkg-config>py3cairo.pc</pkg-config>
     <branch repo="system"
@@ -873,9 +893,9 @@
   </systemmodule>
 
   <systemmodule id="python2-devel">
-    <pkg-config>python2.pc</pkg-config>
+    <pkg-config>python-2.7.pc</pkg-config>
     <branch repo="system"
-            version="2.5"/>
+            version="2.7"/>
   </systemmodule>
 
   <systemmodule id="python-devel">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]