[gnome-modulesets: 2/2] Resync with current modulesets
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-modulesets: 2/2] Resync with current modulesets
- Date: Thu, 31 Mar 2016 18:07:28 +0000 (UTC)
commit 6cdd6b25b6155ebd476148d2d97b1b0405aca985
Author: Javier Jardón <jjardon gnome org>
Date: Thu Mar 31 19:06:05 2016 +0100
Resync with current modulesets
gnome-apps.modules | 14 +-
gnome-core-deps.modules | 10 +-
gnome-core.modules | 31 ++----
gnome-sysdeps.modules | 15 ---
gnome-world.modules | 323 ++++++++++++++++++++++++-----------------------
5 files changed, 186 insertions(+), 207 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 301a3b7..dc6e245 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -36,7 +36,7 @@
<repository type="git" name="telepathy.freedesktop.org"
href="git://anongit.freedesktop.org/telepathy/"/>
- <include href="gnome-core.modules"/>
+ <include href="gnome-core-3.22.modules"/>
<!-- NOTE: gnome-suites-core-* and gnome-suites-core-deps-*
are supposed to remain self-contained. If apps have dependencies
@@ -543,7 +543,7 @@
</autotools>
<autotools id="glade">
- <branch revision="glade-3-20"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gnome-common"/>
@@ -555,7 +555,7 @@
</autotools>
<autotools id="gnome-boxes" autogenargs="--enable-vala">
- <branch revision="gnome-3-20"/>
+ <branch/>
<dependencies>
<dep package="glib"/>
<dep package="libxml2"/>
@@ -597,7 +597,7 @@
</autotools>
<autotools id="gnome-calendar">
- <branch revision="gnome-3-20"/>
+ <branch/>
<dependencies>
<dep package="appstream-glib"/>
<dep package="gnome-online-accounts"/>
@@ -663,7 +663,7 @@
</autotools>
<autotools id="gnome-photos">
- <branch revision="gnome-3-20"/>
+ <branch/>
<dependencies>
<dep package="babl"/>
<dep package="gegl"/>
@@ -696,7 +696,7 @@
</autotools>
<autotools id="gnome-todo">
- <branch revision="gnome-3-20"/>
+ <branch/>
<dependencies>
<dep package="appstream-glib"/>
<dep package="gnome-online-accounts"/>
@@ -1000,7 +1000,7 @@
</autotools>
<autotools id="tali">
- <branch revision="gnome-3-20"/>
+ <branch/>
<dependencies>
<dep package="appstream-glib"/>
<dep package="intltool"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index 44348af..3047b43 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -87,7 +87,7 @@
</autotools>
<autotools id="atk">
- <branch revision="gnome-3-20"/>
+ <branch/>
<dependencies>
<dep package="glib"/>
<dep package="gobject-introspection"/>
@@ -249,7 +249,7 @@
<dep package="gudev"/>
</if>
<if condition-set="systemd">
- <dep package="libsystemd-login"/>
+ <dep package="libsystemd"/>
</if>
</dependencies>
<suggests>
@@ -391,7 +391,7 @@
</autotools>
<autotools id="glibmm">
- <branch revision="glibmm-2-48"/>
+ <branch/>
<dependencies>
<dep package="glib"/>
<dep package="libsigcplusplus"/>
@@ -442,7 +442,7 @@
<autotools id="gobject-introspection"
autogenargs="--with-python=python3">
- <branch revision="gnome-3-20"/>
+ <branch/>
<dependencies>
<dep package="bison"/>
<dep package="flex"/>
@@ -620,7 +620,7 @@
<if condition-set="quartz">
<autogenargs value="--enable-quartz-backend"/>
</if>
- <branch revision="gtk-3-20"/>
+ <branch/>
<dependencies>
<dep package="atk"/>
<dep package="glib"/>
diff --git a/gnome-core.modules b/gnome-core.modules
index 7543976..083c8f8 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -90,7 +90,7 @@
<if condition-set="freebsd">
<autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
</if>
- <branch revision="gnome-3-20"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="libsoup"/>
@@ -131,9 +131,7 @@
<dep package="plymouth"/>
</if>
<if condition-set="systemd">
- <dep package="libsystemd-daemon"/>
- <dep package="libsystemd-login"/>
- <dep package="libsystemd-journal"/>
+ <dep package="libsystemd"/>
</if>
</dependencies>
<suggests>
@@ -182,7 +180,6 @@
<autotools id="gnome-color-manager">
<branch/>
<dependencies>
- <dep package="appstream-glib"/>
<dep package="colord-gtk"/>
<dep package="exiv2"/>
<dep package="glib"/>
@@ -312,7 +309,7 @@
</autotools>
<autotools id="gnome-session">
- <branch revision="gnome-3-20"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gl"/>
@@ -324,9 +321,7 @@
<dep package="sm"/>
<dep package="xtrans"/>
<if condition-set="systemd">
- <dep package="libsystemd-daemon"/>
- <dep package="libsystemd-journal"/>
- <dep package="libsystemd-login"/>
+ <dep package="libsystemd"/>
</if>
</dependencies>
</autotools>
@@ -403,7 +398,7 @@
<dep package="NetworkManager"/>
</if>
<if condition-set="systemd">
- <dep package="libsystemd-journal"/>
+ <dep package="libsystemd"/>
</if>
</dependencies>
<suggests>
@@ -482,7 +477,6 @@
</if>
<if condition-set="systemd">
<dep package="libsystemd"/>
- <dep package="libsystemd-login"/>
</if>
</dependencies>
<suggests>
@@ -585,15 +579,12 @@
</if>
<if condition-set="systemd">
<dep package="libsystemd"/>
- <dep package="libsystemd-daemon"/>
- <dep package="libsystemd-journal"/>
- <dep package="libsystemd-login"/>
</if>
</dependencies>
</autotools>
<autotools id="rygel">
- <branch revision="rygel-0-30"/>
+ <branch/>
<dependencies>
<dep package="vala"/>
<dep package="gupnp"/>
@@ -908,7 +899,7 @@
<dep package="intltool"/>
<dep package="gsettings-desktop-schemas"/>
<dep package="gtk+"/>
- <dep package="libsystemd-journal"/>
+ <dep package="libsystemd"/>
<dep package="yelp-tools"/>
</dependencies>
</autotools>
@@ -1131,7 +1122,7 @@
<dep package="gobject-introspection"/>
<dep package="polkit-gobject"/>
<if condition-set="systemd">
- <dep package="libsystemd-login"/>
+ <dep package="libsystemd"/>
</if>
</dependencies>
</autotools>
@@ -1172,7 +1163,6 @@
<dep package="wireless-tools"/>
<if condition-set="systemd">
<dep package="libsystemd"/>
- <dep package="libsystemd-login"/>
</if>
</dependencies>
</autotools>
@@ -1192,8 +1182,7 @@
<dep package="dbus"/>
<dep package="dbus-glib"/>
<if condition-set="systemd">
- <dep package="libsystemd-journal"/>
- <dep package="libsystemd-login"/>
+ <dep package="libsystemd"/>
</if>
</dependencies>
<suggests>
@@ -1217,8 +1206,6 @@
<dep package="m4-common"/>
<if condition-set="systemd">
<dep package="libsystemd"/>
- <dep package="libsystemd-daemon"/>
- <dep package="libsystemd-login"/>
</if>
</dependencies>
</autotools>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index 17734a0..2a13e9e 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -707,21 +707,6 @@
version="210"/>
</systemmodule>
- <systemmodule id="libsystemd-daemon">
- <pkg-config>libsystemd-daemon.pc</pkg-config>
- <branch repo="system" version="210"/>
- </systemmodule>
-
- <systemmodule id="libsystemd-journal">
- <pkg-config>libsystemd-journal.pc</pkg-config>
- <branch repo="system" version="201"/>
- </systemmodule>
-
- <systemmodule id="libsystemd-login">
- <pkg-config>libsystemd-login.pc</pkg-config>
- <branch repo="system" version="210"/>
- </systemmodule>
-
<systemmodule id="libtasn1">
<pkg-config>libtasn1.pc</pkg-config>
<branch repo="system"
diff --git a/gnome-world.modules b/gnome-world.modules
index 7d2ea05..1988775 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -53,8 +53,6 @@
href="http://www.gnome.org/~sebp/git/"/>
<repository type="svn" name="hotwire.googlecode.com"
href="http://hotwire-shell.googlecode.com/svn/"/>
- <repository type="svn" name="labyrinth.googlecode.com"
- href="http://labyrinth.googlecode.com/svn/"/>
<repository type="hg" name="hg.circular-chaos.org"
href="http://hg.circular-chaos.org" />
<repository type="svn" name="transmissionbt.com"
@@ -174,6 +172,25 @@
</suggests>
</autotools>
+ <cmake id="FeedReader"
+ cmakeargs="-DUSE_WEBKIT_4=ON -DWITH_LIBUNITY=OFF">
+ <branch repo="github.com" checkoutdir="FeedReader" module="jangernert/FeedReader.git"/>
+ <dependencies>
+ <dep package="gtk+"/>
+ <dep package="glib"/>
+ <dep package="gobject-introspection"/>
+ <dep package="libxml2"/>
+ <dep package="json-glib"/>
+ <dep package="libsoup"/>
+ <dep package="libgee"/>
+ <dep package="vala"/>
+ <dep package="WebKit"/>
+ <dep package="sqlite3"/>
+ <dep package="librest"/>
+ <dep package="libnotify"/>
+ </dependencies>
+ </cmake>
+
<autotools id="gconf"
autogenargs="--enable-gtk --with-gtk=3.0 --disable-orbit">
<branch/>
@@ -257,41 +274,12 @@
</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"/>
+ <branch/>
<dependencies>
<dep package="glib"/>
<dep package="gtk+"/>
+ <dep package="pygobject"/>
<dep package="tracker"/>
<dep package="WebKit"/>
</dependencies>
@@ -336,16 +324,6 @@
</dependencies>
</autotools>
- <waf id="hamster-applet">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="pygtk"/>
- <dep package="py2cairo"/>
- <dep package="gnome-control-center"/>
- </dependencies>
- </waf>
-
<autotools id="libbtctl">
<branch/>
<dependencies>
@@ -494,13 +472,6 @@
</dependencies>
</autotools>
- <autotools id="gnome-code-assistance">
- <branch/>
- <dependencies>
- <dep package="vala"/>
- </dependencies>
- </autotools>
-
<autotools id="gedit-code-assistance">
<branch/>
<dependencies>
@@ -640,7 +611,7 @@
<autotools id="gst-libav"
autogenargs="--disable-fatal-warnings">
- <branch repo="gstreamer.freedesktop.org" revision="1.6"/>
+ <branch repo="gstreamer.freedesktop.org" revision="1.8"/>
<dependencies>
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
@@ -1042,6 +1013,16 @@
</dependencies>
</autotools>
+ <autotools id="gnome-system-log">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ </autotools>
+
<autotools id="gnome-cups-manager">
<branch/>
<dependencies>
@@ -1186,11 +1167,7 @@
<autotools id="pitivi">
<branch/>
<dependencies>
- <dep package="clutter"/>
- <dep package="clutter-gst"/>
- <dep package="clutter-gtk"/>
<dep package="glib"/>
- <dep package="gnonlin"/>
<dep package="gobject-introspection"/>
<dep package="gstreamer"/>
<dep package="gst-editing-services"/>
@@ -1201,8 +1178,8 @@
<dep package="gst-plugins-ugly"/>
<dep package="gst-python"/>
<dep package="gtk+"/>
- <dep package="py2cairo"/>
- <dep package="pygobject-python2"/>
+ <dep package="pycairo"/>
+ <dep package="pygobject"/>
</dependencies>
</autotools>
@@ -1312,6 +1289,16 @@
</dependencies>
</metamodule>
+ <autotools id="gucharmap">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ </autotools>
+
<autotools id="gupnp-tools">
<branch />
<dependencies>
@@ -1563,16 +1550,6 @@
</dependencies>
</distutils>
- <autotools id="labyrinth">
- <branch repo="labyrinth.googlecode.com"
- module="trunk"
- checkoutdir="labyrinth"/>
- <dependencies>
- <dep package="pygtk"/>
- <dep package="py2cairo"/>
- </dependencies>
- </autotools>
-
<autotools id="d-feet" autogenargs="--disable-tests">
<branch/>
<dependencies>
@@ -2504,18 +2481,6 @@
</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"/>
@@ -2533,6 +2498,17 @@
</suggests>
</autotools>
+ <autotools id="notification-daemon">
+ <branch />
+ <dependencies>
+ <dep package="dbus" />
+ <dep package="glib" />
+ <dep package="gtk+" />
+ <dep package="libcanberra" />
+ <dep package="m4-common" />
+ </dependencies>
+ </autotools>
+
<autotools id="libgnomekbd">
<branch/>
<dependencies>
@@ -2569,10 +2545,10 @@
<distutils id="duplicity">
<branch repo="launchpad.net/tarball"
- module="duplicity/0.6-series/0.6.15/+download/duplicity-0.6.15.tar.gz"
- version="0.6.15"
- hash="sha256:69f30388334b84db43ed4eb7838896a73cf53d62718c692a88ab3d3963e1dfad"
- size="304916"/>
+ module="duplicity/0.6-series/0.6.26/+download/duplicity-0.6.26.tar.gz"
+ version="0.6.26"
+ hash="sha256:8bef8a5d805b79ae177e54d42152238bce1b2aaf9ad32e03a2c3a20cbd4e074a"
+ size="1270436"/>
<dependencies>
<dep package="pygobject2"/>
<dep package="librsync"/>
@@ -2993,6 +2969,24 @@
</suggests>
</autotools>
+ <autotools id="gnome-packagekit">
+ <branch/>
+ <dependencies>
+ <dep package="PackageKit"/>
+ <dep package="gtk+"/>
+ <dep package="libnotify"/>
+ <dep package="libcanberra"/>
+ </dependencies>
+ <suggests>
+ <if condition-set="linux">
+ <dep package="gudev"/>
+ </if>
+ <if condition-set="systemd">
+ <dep package="libsystemd-login"/>
+ </if>
+ </suggests>
+ </autotools>
+
<autotools id="gnome-power-manager">
<branch/>
<dependencies>
@@ -3021,85 +3015,20 @@
</dependencies>
</autotools>
- <autotools id="libretro-free"
- skip-autogen="true">
- <branch repo="github.com"
- module="Kekun/libretro-free.git"/>
- <dependencies>
- </dependencies>
- </autotools>
-
- <autotools id="retro-gobject"
- autogenargs="--enable-vala">
- <branch repo="github.com"
- module="Kekun/retro-gobject.git"/>
- <dependencies>
- <dep package="glib"/>
- <dep package="vala"/>
- </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"/>
+ <autotools id="retro-plugins">
+ <branch/>
<dependencies>
- <dep package="glib"/>
- <dep package="vala"/>
</dependencies>
</autotools>
<autotools id="retro-gtk"
autogenargs="--enable-vala">
- <branch repo="github.com"
- module="Kekun/retro-gtk.git"/>
+ <branch/>
<dependencies>
<dep package="clutter-gtk"/>
<dep package="glib"/>
<dep package="gtk+"/>
- <dep package="jsk"/>
<dep package="pulseaudio"/>
- <dep package="retro-gobject"/>
- <dep package="vala"/>
- </dependencies>
- </autotools>
-
- <autotools id="retro-gtk-demo"
- skip-autogen="true">
- <branch repo="github.com"
- module="Kekun/retro-gtk-demo.git"/>
- <dependencies>
- <dep package="libretro-free"/>
- <dep package="retro-gobject"/>
- <dep package="retro-gtk"/>
<dep package="vala"/>
</dependencies>
</autotools>
@@ -3274,24 +3203,102 @@
<autotools id="gnome-games"
autogenargs="--enable-vala">
- <branch repo="github.com"
- module="Kekun/gnome-games.git"/>
+ <branch/>
<dependencies>
<dep package="glib"/>
<dep package="gtk+"/>
<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="retro-plugins-game-boy"/>
- <dep package="retro-plugins-nes"/>
- <dep package="retro-plugins-pce"/>
- <dep package="retro-plugins-snes"/>
+ <dep package="retro-plugins"/>
</suggests>
</autotools>
+ <autotools id="zeitgeist" autogenargs="--with-session-bus-services-dir=${prefix}/share/dbus-1/services">
+ <branch repo="git.freedesktop.org"
+ module="zeitgeist/zeitgeist"
+ checkoutdir="zeitgeist"/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="rapper"/>
+ <dep package="rdflib"/>
+ <dep package="sqlite3"/>
+ <dep package="vala"/>
+ </dependencies>
+ <suggests>
+ <dep package="gobject-introspection"/>
+ <dep package="gtk+"/>
+ <dep package="json-glib"/>
+ <dep package="telepathy-glib"/>
+ </suggests>
+ </autotools>
+
+ <autotools id="gtk-engines">
+ <branch revision="gtk-engines-2-22"/>
+ <dependencies>
+ <dep package="gtk+-2"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="ConsoleKit">
+ <branch repo="git.freedesktop.org" module="ConsoleKit"/>
+ <dependencies>
+ <dep package="dbus-glib"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="anjuta">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gdk-pixbuf"/>
+ <dep package="gtk+"/>
+ <dep package="vte"/>
+ <dep package="gdl"/>
+ <dep package="libgda-5.2"/>
+ <dep package="gtksourceview"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ <suggests>
+ <dep package="glade"/>
+ <dep package="devhelp"/>
+ <dep package="vala"/>
+ </suggests>
+ </autotools>
+
+ <autotools id="libgda"
+ autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi --enable-vala
--enable-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"/>
+ </if>
+ <branch/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="gobject-introspection"/>
+ <dep package="libxml2"/>
+ <dep package="openssl"/>
+ <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"/>
+ </if>
+ <branch checkoutdir="libgda-5.2" module="libgda" revision="LIBGDA_5.2"/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="gobject-introspection"/>
+ <dep package="libxml2"/>
+ <dep package="openssl"/>
+ <dep package="vala"/>
+ </dependencies>
+ </autotools>
+
</moduleset>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]