GNOME.org
 

[gnome-modulesets] Resync with current modulesets

commit c015928af059957f14f77eb92d3687142a38a037
Author: Javier Jardón <javier jardon codethink co uk>
Date:   Thu May 29 10:44:05 2014 +0100

    Resync with current modulesets

 gnome-apps.modules      |   10 +++---
 gnome-core-deps.modules |   89 +++++++++++++++++++++++++++++++++-------------
 gnome-core.modules      |   60 +++----------------------------
 gnome-sysdeps.modules   |   36 +++++++++++++++++++
 gnome-world.modules     |   17 +++++----
 5 files changed, 121 insertions(+), 91 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 1967845..52953b0 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -34,7 +34,7 @@
   <repository type="tarball" name="tarball.github.com"
     href="https://github.com/"/>
 
-  <include href="gnome-suites-core.modules"/>
+  <include href="gnome-core.modules"/>
 
   <!-- NOTE: gnome-suites-core-* and gnome-suites-core-deps-*
        are supposed to remain self-contained. If apps have dependencies
@@ -74,6 +74,7 @@
       <dep package="libxml2"/>
       <dep package="glib"/>
       <dep package="WebKit"/>
+      <dep package="evolution"/>
     </dependencies>
     <suggests>
       <dep package="zeitgeist"/>
@@ -140,7 +141,6 @@
       <dep package="enchant"/>
       <dep package="iso-codes"/>
       <dep package="libsoup"/>
-      <dep package="gnome-icon-theme"/>
     </dependencies>
   </autotools>
 
@@ -382,7 +382,6 @@
       <dep package="geocode-glib"/>
       <dep package="geoclue"/>
       <dep package="gnome-themes-standard"/>
-      <dep package="gnome-icon-theme-symbolic"/>
     </dependencies>
   </autotools>
 
@@ -507,7 +506,6 @@
       <dep package="bogofilter"/>
       <dep package="evolution-data-server"/>
       <dep package="gnome-desktop"/>
-      <dep package="gnome-icon-theme"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
@@ -748,7 +746,6 @@
     <branch/>
     <dependencies>
       <dep package="dbus-python"/>
-      <dep package="gnome-icon-theme-symbolic"/>
       <dep package="gnome-themes-standard"/>
       <dep package="gobject-introspection"/>
       <dep package="grilo"/>
@@ -758,6 +755,7 @@
       <dep package="intltool"/>
       <dep package="pygobject"/>
       <dep package="tracker"/>
+      <dep package="libmediaart"/>
     </dependencies>
   </autotools>
 
@@ -882,6 +880,7 @@
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
       <dep package="yelp-tools"/>
+      <dep package="librsvg"/>
     </dependencies>
   </autotools>
 
@@ -936,6 +935,7 @@
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="glib"/>
+      <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
       <dep package="libsoup"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index 28ae142..efc755e 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -74,6 +74,8 @@
     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/"/>
 
 <include href="gnome-sysdeps.modules"/>
 
@@ -113,7 +115,7 @@
 
   <autotools id="geoclue">
     <if condition-unset="linux">
-      <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-wifi-source"/>
+      <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-network-manager"/>
     </if>
     <branch repo="git.freedesktop.org"/>
     <dependencies>
@@ -217,6 +219,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgsystem">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libmbim">
     <branch repo="git.freedesktop.org"
             module="libmbim/libmbim.git"/>
@@ -254,6 +263,31 @@
     </dependencies>
   </autotools>
 
+  <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">
+      <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"/>
+      <dep package="protobuf"/>
+      <dep package="mesa-libGLES"/>
+      <dep package="google-glog"/>
+      <dep package="google-gflags"/>
+      <dep package="gbm"/>
+      <dep package="egl"/>
+      <dep package="glm"/>
+      <dep package="lttng-ust"/>
+      <dep package="lcov"/>
+      <dep package="libudev"/>
+      <dep package="libxkbcommon"/>
+    </dependencies>
+  </cmake>
+
   <autotools id="ModemManager"
              autogenargs="--with-udev-base-dir=${libdir}/udev --with-systemdsystemunitdir=no 
--disable-more-warnings">
     <branch repo="git.freedesktop.org"
@@ -320,7 +354,7 @@
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-backend --enable-wayland-compositor --enable-evdev-input"/>
     </if>
-    <branch revision="clutter-1.18"/>
+    <branch revision="clutter-1.20"/>
     <dependencies>
       <dep package="cogl"/>
       <dep package="atk"/>
@@ -376,6 +410,9 @@
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-backend"/>
     </if>
+    <if condition-set="mir">
+      <autogenargs value="--enable-mir-backend"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="atk"/>
@@ -390,6 +427,9 @@
         <dep package="libxkbcommon"/>
         <dep package="wayland"/>
       </if>
+      <if condition-set="mir">
+        <dep package="mir"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="shared-mime-info"/>
@@ -931,6 +971,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
+      <dep package="geocode-glib"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="libsoup"/>
@@ -1176,6 +1217,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libepoxy">
+    <branch repo="github.com"
+            checkoutdir="libepoxy"
+            module="anholt/libepoxy.git"/>
+    <dependencies>
+      <dep package="xtrans"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libevdev" autogenargs="--disable-gcov">
     <branch repo="freedesktop.org"
             checkoutdir="libevdev"
@@ -1211,27 +1261,16 @@
     </dependencies>
   </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">
-    <branch repo="xorg.freedesktop.org" checkoutdir="xwayland" module="xserver" revision="xwayland"/>
+  <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"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="xf86-video-intel">
-    <branch repo="xorg.freedesktop.org" checkoutdir="xf86-video-intel" module="driver/xf86-video-intel" 
revision="xwayland"/>
-    <dependencies>
-      <dep package="xwayland"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="xf86-video-wayland">
-    <branch repo="xorg.freedesktop.org"
-            module="driver/xf86-video-wayland"/>
-    <dependencies>
-      <dep package="xwayland"/>
+      <dep package="libepoxy"/>
     </dependencies>
   </autotools>
 
@@ -1239,9 +1278,9 @@
              autogenargs="--enable-introspection">
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.4.0.tar.xz" version="2.4.0"
-            hash="sha256:dc5277cda89ee038408f78c94b1b07f101997f01ef877a142ffedac3b537dfbb"
-            size="9828272">
+            module="webkitgtk-2.4.3.tar.xz" version="2.4.3"
+            hash="sha256:9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac"
+            size="9841564">
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
@@ -1270,8 +1309,9 @@
     </suggests>
   </autotools>
 
- <autotools id="vte" autogenargs="--with-gtk=3.0 --enable-introspection=yes">
-    <branch revision="vte-0-36"/>
+ <autotools id="vte"
+            autogenargs="--enable-introspection=yes">
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -1518,5 +1558,4 @@
       <dep package="telepathy-glib"/>
     </suggests>
   </autotools>
-
 </moduleset>
diff --git a/gnome-core.modules b/gnome-core.modules
index d831487..28d888d 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -24,7 +24,7 @@
   <repository type="tarball" name="kernel.org"
       href="http://www.kernel.org"/>
 
-<include href="gnome-suites-core-deps.modules"/>
+<include href="gnome-core-deps.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
@@ -127,7 +127,6 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="gnome-desktop"/>
-      <dep package="gnome-menus"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -183,7 +182,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-icon-theme">
+  <autotools id="adwaita-icon-theme">
     <branch/>
     <dependencies>
       <dep package="hicolor-icon-theme"/>
@@ -194,22 +193,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-icon-theme-extras">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-icon-theme"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-icon-theme-symbolic">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-common"/>
-      <dep package="gtk+"/>
-      <dep package="icon-naming-utils"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-keyring">
     <branch/>
     <dependencies>
@@ -296,6 +279,7 @@
       <dep package="ibus"/>
       <dep package="cups"/>
       <if condition-set="linux">
+        <dep package="libgsystem"/>
         <dep package="libwacom"/>
         <dep package="xorg-wacom"/>
         <dep package="gudev"/>
@@ -320,8 +304,7 @@
       <dep package="gjs"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
-      <dep package="gnome-icon-theme"/>
-      <dep package="gnome-icon-theme-symbolic"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gobject-introspection"/>
@@ -347,9 +330,6 @@
     <suggests>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <if condition-set="wayland">
-        <dep package="mutter-wayland"/>
-      </if>
     </suggests>
     <after>
       <dep package="librsvg"/>
@@ -436,29 +416,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="mutter-wayland" autogenargs="--enable-compile-warnings=maximum --enable-wayland">
-    <branch checkoutdir="mutter-wayland" module="mutter" revision="wayland"/>
-    <dependencies>
-      <dep package="clutter"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-      <dep package="libcanberra"/>
-      <dep package="libsystemd-login"/>
-      <dep package="libXinerama"/>
-      <dep package="startup-notification"/>
-      <dep package="upower"/>
-      <dep package="wayland"/>
-      <dep package="zenity"/>
-      <dep package="xwayland"/>
-      <dep package="xf86-video-wayland"/>
-    </dependencies>
-    <suggests>
-      <dep package="xf86-video-intel"/>
-    </suggests>
-  </autotools>
   <autotools id="network-manager-applet"
              autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
     <branch revision="nma-0-9-8"/>
@@ -587,7 +544,6 @@
       <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
       <dep package="gnome-desktop"/>
-      <dep package="gnome-icon-theme"/>
       <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="libjpeg"/>
@@ -635,7 +591,7 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="libxml2"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="libsecret"/>
       <dep package="poppler"/>
       <dep package="nautilus"/>
@@ -740,7 +696,6 @@
       <dep package="libwnck"/>
       <dep package="libgtop"/>
       <dep package="gtk+"/>
-      <dep package="gnome-icon-theme"/>
       <dep package="gtkmm"/>
       <dep package="libxml2"/>
       <dep package="librsvg"/>
@@ -828,7 +783,6 @@
       <dep package="clutter-gtk"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
-      <dep package="gnome-icon-theme"/>
       <dep package="grilo"/>
       <dep package="grilo-plugins"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -1093,9 +1047,7 @@
       <dep package="dconf"/>
       <dep package="evolution-data-server"/>
       <dep package="gnome-control-center"/>
-      <dep package="gnome-icon-theme"/>
-      <dep package="gnome-icon-theme-symbolic"/>
-      <dep package="gnome-icon-theme-extras"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="gnome-keyring"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-online-accounts"/>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index d8235ab..cc56138 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -857,4 +857,40 @@
     <pkg-config>opus.pc</pkg-config>
     <branch repo="system" version="1.0"/>
   </systemmodule>
+
+  <systemmodule id="google-glog">
+    <branch repo="system" version="0.3.3"/>
+    <systemdependencies>
+      <dep type="c_include" name="glog/logging.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="google-gflags">
+    <branch repo="system" version="1.3.8"/>
+    <systemdependencies>
+      <dep type="c_include" name="gflags/gflags.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="protobuf">
+    <branch repo="system" version="2.5.0"/>
+    <pkg-config>protobuf.pc</pkg-config>
+  </systemmodule>
+
+  <systemmodule id="egl">
+    <branch repo="system" version="10.1.3"/>
+    <pkg-config>egl.pc</pkg-config>
+  </systemmodule>
+
+  <systemmodule id="glm">
+    <branch repo="system" version="0.9.4.6"/>
+    <systemdependencies>
+      <dep type="c_include" name="glm/glm.hpp"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="lttng-ust">
+    <branch repo="system" version="2.3.0"/>
+    <pkg-config>lttng-ust.pc</pkg-config>
+  </systemmodule>
 </moduleset>
diff --git a/gnome-world.modules b/gnome-world.modules
index 0589c5a..2d6214d 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -164,6 +164,7 @@
       <!-- <dep package="id3tag" -->
       <!-- <dep package="id3lib" -->
       <dep package="libvorbis"/>
+      <dep package="opus"/>
       <dep package="speex"/>
       <dep package="taglib"/>
       <dep package="wavpack"/>
@@ -795,6 +796,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="cluttermm-1.0">
+    <branch revision="cluttermm-1-18" module="cluttermm" checkoutdir="cluttermm-1.0"/>
+    <dependencies>
+      <dep package="clutter"/>
+      <dep package="pangomm"/>
+      <dep package="atkmm"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="cluttermm">
     <branch/>
     <dependencies>
@@ -2509,13 +2519,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgsystem">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-desktop-testing">
     <branch/>
     <dependencies>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]