GNOME.org
 

[gnome-modulesets/gnome-3-16] Resync with GNOME 3.16 modulesets

commit 938eab335b7acbc2dd3b8be15066169f9f2e3571
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Oct 5 23:14:28 2015 +0100

    Resync with GNOME 3.16 modulesets

 gnome-apps.modules      |   50 +++++++++++++++++++++++-----------------------
 gnome-core-deps.modules |   26 ++++++++++++------------
 gnome-core.modules      |   41 ++++++++++++++++++++++++++++----------
 3 files changed, 68 insertions(+), 49 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 60a7e0f..c08b698 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -75,7 +75,7 @@
   </autotools>
 
   <autotools id="dconf-editor">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dconf"/>
@@ -436,7 +436,7 @@
   </autotools>
 
   <autotools id="gnome-maps">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="clutter-gtk"/>
       <dep package="gjs"/>
@@ -487,7 +487,7 @@
   </autotools>
 
   <autotools id="gnome-color-manager">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="exiv2"/>
       <dep package="glib"/>
@@ -526,7 +526,7 @@
   </autotools>
 
   <autotools id="gnome-sound-recorder">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="gjs"/>
       <dep package="glib"/>
@@ -558,7 +558,7 @@
   </autotools>
 
   <autotools id="cheese">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -671,7 +671,7 @@
   </autotools>
 
   <autotools id="gnome-boxes" autogenargs="--enable-vala">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -746,7 +746,7 @@
   </autotools>
 
   <autotools id="five-or-more">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -758,7 +758,7 @@
   </autotools>
 
   <autotools id="four-in-a-row">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -770,7 +770,7 @@
   </autotools>
 
   <autotools id="gnome-characters">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="gjs"/>
@@ -779,7 +779,7 @@
   </autotools>
 
   <autotools id="gnome-chess">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -792,7 +792,7 @@
   </autotools>
 
   <autotools id="gnome-klotski">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -803,7 +803,7 @@
   </autotools>
 
   <autotools id="gnome-logs">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -815,7 +815,7 @@
   </autotools>
 
   <autotools id="gnome-mahjongg">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -827,7 +827,7 @@
   </autotools>
 
   <autotools id="gnome-mines">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -927,7 +927,7 @@
   </autotools>
 
   <autotools id="gnome-robots">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -954,7 +954,7 @@
   </autotools>
 
   <autotools id="gnome-taquin">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -967,7 +967,7 @@
   </autotools>
 
   <autotools id="gnome-tetravex">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -979,7 +979,7 @@
   </autotools>
 
   <autotools id="gnome-tweak-tool">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="pygobject"/>
@@ -1000,7 +1000,7 @@
   </autotools>
 
   <autotools id="iagno">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -1013,7 +1013,7 @@
   </autotools>
 
   <autotools id="lightsoff">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -1027,7 +1027,7 @@
   </autotools>
 
   <autotools id="quadrapassel">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -1042,7 +1042,7 @@
   </autotools>
 
   <autotools id="swell-foop">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -1055,7 +1055,7 @@
   </autotools>
 
   <autotools id="tali">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -1076,7 +1076,7 @@
   </autotools>
 
   <autotools id="gnome-software">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="glib"/>
@@ -1169,7 +1169,7 @@
   </autotools>
 
   <autotools id="vinagre">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index e8b4cbb..a3eb6fb 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -127,7 +127,7 @@
   </autotools>
 
   <autotools id="geocode-glib">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="json-glib"/>
@@ -318,7 +318,7 @@
 <!-- OS Core API/ABI stable dependencies -->
 
   <autotools id="atk">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -504,7 +504,7 @@
   </autotools>
 
   <autotools id="caribou" autogenargs="--disable-gtk2-module">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="pygobject"/>
       <dep package="gtk+"/>
@@ -702,7 +702,7 @@
   </autotools>
 
   <autotools id="gobject-introspection">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="bison"/>
       <dep package="flex"/>
@@ -983,7 +983,7 @@
   </autotools>
 
   <autotools id="libgweather">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
@@ -1056,7 +1056,6 @@
       <dep package="gtk+"/>
     </dependencies>
     <suggests>
-      <dep package="gjs"/>
       <dep package="glade"/>
       <dep package="pygobject"/>
     </suggests>
@@ -1080,7 +1079,7 @@
   </autotools>
 
   <autotools id="libsoup" autogenargs="--disable-tls-check">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -1234,13 +1233,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"/>
@@ -1296,9 +1296,9 @@
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
     <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.8.5.tar.xz" version="2.8.5"
+            hash="sha256:3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20"
+            size="10455256">
     </branch>
     <dependencies>
       <dep package="c++"/>
@@ -1352,7 +1352,7 @@
   </autotools>
 
   <autotools id="yelp-xsl">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="libxslt"/>
       <dep package="libxml2"/>
@@ -1362,7 +1362,7 @@
   </autotools>
 
   <autotools id="zenity">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
diff --git a/gnome-core.modules b/gnome-core.modules
index d08ffcd..33bb118 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>
@@ -189,7 +208,7 @@
   </autotools>
 
   <autotools id="adwaita-icon-theme">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="hicolor-icon-theme"/>
       <dep package="gnome-common"/>
@@ -224,7 +243,7 @@
   </autotools>
 
   <autotools id="gnome-packagekit">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="PackageKit"/>
       <dep package="gtk+"/>
@@ -502,7 +521,7 @@
 <!-- Core Utilities -->
 
   <autotools id="baobab">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -580,7 +599,7 @@
   </autotools>
 
   <autotools id="epiphany">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
@@ -666,7 +685,7 @@
   </autotools>
 
   <autotools id="gnome-disk-utility">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gnome-settings-daemon"/>
@@ -723,7 +742,7 @@
   </autotools>
 
   <autotools id="gnome-terminal" autogenargs="--disable-migration">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="dconf"/>
       <dep package="intltool"/>
@@ -749,7 +768,7 @@
   </autotools>
 
   <autotools id="gucharmap">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -759,7 +778,7 @@
   </autotools>
 
   <autotools id="nautilus">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -828,7 +847,7 @@
     <if condition-set="freebsd">
       <autogenargs value="YELP_LZMA_CFLAGS=' ' YELP_LZMA_LIBS='-llzma'"/>
     </if>
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -843,7 +862,7 @@
 <!-- Core Extras -->
 
   <autotools id="gnome-backgrounds">
-    <branch/>
+    <branch revision="gnome-3-16"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]