[gnome-modulesets/gnome-3-4] GNOME 3.4 modulesets



commit 08d4b819869ae30eaa3d6509d7d25c94b57e9807
Author: Javier JardÃn <javier jardon codethink co uk>
Date:   Mon Apr 2 17:33:59 2012 +0100

    GNOME 3.4 modulesets

 gnome-apps.modules                  |   66 ++++++++++++++++++++---------------
 gnome-suites-core-deps-base.modules |   16 +++-----
 gnome-suites-core-deps.modules      |   43 ++++++++--------------
 gnome-suites-core.modules           |   47 +++++++++++++-----------
 gnome-world.modules                 |   15 +-------
 5 files changed, 86 insertions(+), 101 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 49c298e..abf4417 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -47,9 +47,9 @@
   <repository type="tarball" name="xiph.org"
         href="http://downloads.xiph.org/releases/"/>
 
-  <include href="gnome-suites-core-3.6.modules"/>
+  <include href="gnome-suites-core-3.4.modules"/>
 
-  <!-- NOTE: gnome-suites-core-3.6 and gnome-suites-core-deps-3.6
+  <!-- NOTE: gnome-suites-core-3.4 and gnome-suites-core-deps-3.4
        are supposed to remain self-contained. If apps have dependencies
        that are not covered there, add them in here
     -->
@@ -68,6 +68,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgsf">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="gdk-pixbuf"/>
+    </suggests>
+  </autotools>
+
   <autotools id="libvirt">
     <branch repo="libvirt.org"
             module="libvirt-0.9.10.tar.gz"
@@ -114,14 +125,14 @@
       <dep package="babl"/>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
       <dep package="pango"/>
+      <dep package="gdk-pixbuf"/>
       <dep package="librsvg"/>
     </dependencies>
   </autotools>
 
   <autotools id="ghex">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -173,7 +184,7 @@
   </autotools>
 
   <autotools id="gtkhtml">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -278,7 +289,7 @@
  </autotools>
 
   <autotools id="libgda" autogenargs="--with-java=no">
-    <branch/>
+    <branch revision="LIBGDA_5.0"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -502,7 +513,7 @@
   </autotools>
 
   <autotools id="gdl">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -533,13 +544,13 @@
     </dependencies>
     <suggests>
       <dep package="enchant"/>
-      <dep package="goffice"/>
+      <dep package="libgoffice"/>
       <dep package="gucharmap"/>
     </suggests>
   </autotools>
 
   <autotools id="accerciser">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="at-spi2-atk"/> <!-- to make accerciser's gui accessible -->
       <dep package="intltool"/>
@@ -570,7 +581,7 @@
 
   <autotools id="deja-dup">
     <branch repo="launchpad.net"
-            module="deja-dup/24"
+            module="deja-dup/22"
             checkoutdir="deja-dup/"/>
     <dependencies>
       <dep package="duplicity"/>
@@ -739,7 +750,7 @@
   </autotools>
 
   <autotools id="glade">
-    <branch/>
+    <branch revision="glade-3-12"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gnome-common"/>
@@ -751,7 +762,7 @@
   </autotools>
 
   <autotools id="gnome-color-manager">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
@@ -777,7 +788,7 @@
   </autotools>
 
   <autotools id="rygel">
-    <branch/>
+    <branch revision="rygel-0-14" />
     <dependencies>
       <dep package="vala"/>
       <dep package="gupnp-vala"/>
@@ -809,7 +820,7 @@
 <!-- Featured Apps -->
 
   <autotools id="anjuta">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -829,9 +840,8 @@
   </autotools>
 
  <autotools id="mx">
-    <branch repo="clutter-project.org"
-            module="mx/1.4/mx-1.4.3.tar.xz"
-            version="1.4.3"
+    <branch module="mx/1.4/mx-1.4.3.tar.xz" version="1.4.3"
+            repo="clutter-project.org"
             hash="sha256:d0c259a7bcaf130a17cef00ed4c7118287f05790a6b50bcffa02668130336eb5"
             size="951232"/>
     <dependencies>
@@ -846,7 +856,7 @@
 
 
   <autotools id="cheese">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -893,8 +903,8 @@
     </suggests>
   </autotools>
 
-  <autotools id="evolution" autogenargs="--disable-pst-import --disable-weather">
-    <branch/>
+  <autotools id="evolution" autogenargs="--disable-pst-import">
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="evolution-data-server"/>
       <dep package="gconf"/>
@@ -913,8 +923,8 @@
       <dep package="libsoup"/>
       <dep package="libxml2"/>
       <dep package="libnotify"/>
+      <dep package="NetworkManager"/>
       <dep package="shared-mime-info"/>
-      <dep package="WebKit"/>
     </dependencies>
     <suggests>
       <dep package="geoclue"/>
@@ -951,7 +961,7 @@
   </autotools>
 
   <autotools id="gnome-boxes" autogenargs="--enable-vala">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -968,7 +978,7 @@
   </autotools>
 
   <autotools id="gnome-games">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -983,7 +993,7 @@
   </autotools>
 
   <autotools id="aisleriot">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -1003,7 +1013,7 @@
   </autotools>
 
   <autotools id="nautilus-sendto">
-    <branch/>
+    <branch revision="gnome-3-0"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -1031,7 +1041,7 @@
   </autotools>
 
   <autotools id="orca">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
@@ -1072,7 +1082,7 @@
   </autotools>
 
   <autotools id="seahorse">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -1138,7 +1148,7 @@
   </autotools>
 
   <autotools id="vinagre">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
diff --git a/gnome-suites-core-deps-base.modules b/gnome-suites-core-deps-base.modules
index b7e0a50..1157c4e 100644
--- a/gnome-suites-core-deps-base.modules
+++ b/gnome-suites-core-deps-base.modules
@@ -11,8 +11,6 @@
     href="ftp://ftp.gnu.org/pub/gnu/"/>
 <repository type="tarball" name="iso-codes"
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
-<repository type="tarball" name="launchpad.net/tarball"
-      href="https://launchpad.net/"/>
 <repository type="tarball" name="sqlite.org"
     href="http://www.sqlite.org/"/>
 <repository type="tarball" name="gnome.org"
@@ -197,16 +195,14 @@
     </branch>
   </autotools>
 
-  <autotools id="intltool">
-    <branch repo="launchpad.net/tarball"
-            module="intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz"
-            version="0.50.2"
-            hash="sha256:67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406"
-            size="189483"/>
+  <tarball id="intltool" version="0.50.0">
+    <source href="http://launchpad.net/intltool/trunk/0.50.0/+download/intltool-0.50.0.tar.gz";
+            hash="sha256:dccfb0b7dd35a170130e8934bfd30c29da6ae73bcd3ca4ba71317c977b2893d6"
+            size="142837"/>
     <dependencies>
       <dep package="gnome-common"/>
     </dependencies>
-  </autotools>
+  </tarball>
 
   <autotools id="iso-codes">
     <branch repo="iso-codes"
@@ -368,7 +364,7 @@
             hash="sha256:77e372359caca5375fbcc63ac638f349e6c93c98d291992d8ebb9bb8291ca549"
             size="459597"/>
     <dependencies>
-      <dep package="nss"/>
+       <dep package="nss"/>
     </dependencies>
   </autotools>
 
diff --git a/gnome-suites-core-deps.modules b/gnome-suites-core-deps.modules
index ba5047f..2bfdbdb 100644
--- a/gnome-suites-core-deps.modules
+++ b/gnome-suites-core-deps.modules
@@ -42,7 +42,7 @@
 <repository type="tarball" name="itstool.org"
     href="http://files.itstool.org/itstool/"/>
 
-<include href="gnome-suites-core-deps-base-3.6.modules"/>
+<include href="gnome-suites-core-deps-base-3.4.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
@@ -138,7 +138,7 @@
 <!-- OS Core API/ABI stable dependencies -->
 
   <autotools id="atk">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -158,7 +158,7 @@
   </autotools>
 
   <autotools id="clutter">
-    <branch/>
+    <branch revision="clutter-1.10"/>
     <dependencies>
       <dep package="cogl"/>
       <dep package="atk"/>
@@ -350,7 +350,7 @@
   </autotools>
 
   <autotools id="gnome-video-effects">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="gstreamer"/>
     </dependencies>
@@ -541,7 +541,7 @@
   </autotools>
 
   <autotools id="libgee">
-    <branch/>
+    <branch revision="0.6"/>
     <pkg-config>gee-1.0.pc</pkg-config>
     <dependencies>
       <dep package="glib"/>
@@ -552,7 +552,7 @@
   </autotools>
 
   <autotools id="libgnomekbd">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+" />
@@ -561,27 +561,17 @@
   </autotools>
 
   <autotools id="libgweather">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
+      <dep package="gconf"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="libsoup"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libgsf" autogenargs="--without-bonobo --without-gnome-vfs">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-    </dependencies>
-    <suggests>
-      <dep package="gdk-pixbuf"/>
-    </suggests>
-  </autotools>
-
   <autotools id="libgtop">
     <branch/>
     <dependencies>
@@ -767,7 +757,7 @@
   </autotools>
 
   <autotools id="pygobject">
-    <branch/>
+    <branch revision="pygobject-3-2"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="py2cairo"/>
@@ -830,7 +820,7 @@
   </autotools>
 
   <autotools id="tracker" autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no" check-target="false">
-    <branch/>
+    <branch revision="tracker-0.14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="sqlite3"/>
@@ -858,24 +848,23 @@
   </autotools>
 
   <autotools id="WebKit" makefile="GNUmakefile"
-             autogenargs="--enable-introspection --enable-webkit2">
+             autogenargs="--enable-introspection"
+             supports-parallel-builds="no">
+<!-- parellel build broken, see https://bugs.webkit.org/show_bug.cgi?id=79498
+  -->
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkit-1.8.0.tar.xz"
-            version="1.8.0"
+            module="webkit-1.8.0.tar.xz" version="1.8.0"
             hash="sha256:8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc"
             size="7998384">
     </branch>
     <dependencies>
-      <dep package="at-spi2-core"/>
       <dep package="cairo"/>
       <dep package="fontconfig"/>
       <dep package="geoclue"/>
       <dep package="libxml2"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
-      <!-- GTK+ 2.x required for the plugin process when build Webkit2 -->
-      <dep package="gtk+-2"/>
       <dep package="pango"/>
       <dep package="libsoup"/>
       <dep package="gobject-introspection"/>
@@ -897,7 +886,7 @@
   </autotools>
 
   <autotools id="yelp-tools">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="libxslt"/>
       <dep package="libxml2"/>
diff --git a/gnome-suites-core.modules b/gnome-suites-core.modules
index 799fab5..d903de2 100644
--- a/gnome-suites-core.modules
+++ b/gnome-suites-core.modules
@@ -26,7 +26,7 @@
   <repository type="tarball" name="gnome.org"
       href="http://download.gnome.org/sources/"/>
 
-<include href="gnome-suites-core-deps-3.6.modules"/>
+<include href="gnome-suites-core-deps-3.4.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
@@ -63,8 +63,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution-data-server" supports-non-srcdir-builds="no" autogenargs="--enable-vala-bindings --disable-weather">
-    <branch/>
+  <autotools id="evolution-data-server" supports-non-srcdir-builds="no" autogenargs="--enable-vala-bindings">
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
@@ -103,7 +103,7 @@
   </autotools>
 
   <autotools id="gnome-online-accounts">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="WebKit"/>
@@ -115,7 +115,7 @@
   </autotools>
 
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="colord"/>
       <dep package="fontconfig"/>
@@ -152,7 +152,7 @@
   </autotools>
 
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -215,7 +215,7 @@
   </autotools>
 
   <autotools id="gnome-packagekit" autogenargs="--enable-strict=no">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="PackageKit"/>
       <dep package="gtk+"/>
@@ -279,7 +279,7 @@
   </autotools>
 
   <autotools id="gnome-settings-daemon">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="colord"/>
       <dep package="glib"/>
@@ -344,7 +344,7 @@
   </autotools>
 
   <autotools id="gnome-themes-standard">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="cantarell-fonts"/>
@@ -376,7 +376,7 @@
   </autotools>
 
   <autotools id="mousetweaks">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -446,8 +446,8 @@
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
-      <dep package="telepathy-glib"/>
       <dep package="libgnome-keyring"/>
+      <dep package="telepathy-glib"/>
     </dependencies>
   </autotools>
 
@@ -524,7 +524,7 @@
   </autotools>
 
   <autotools id="brasero">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -541,7 +541,7 @@
   </autotools>
 
   <autotools id="empathy" autogenargs="--disable-Werror">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="clutter"/>
       <dep package="clutter-gst"/>
@@ -553,13 +553,13 @@
       <dep package="folks"/>
       <dep package="gcr"/>
       <dep package="glib"/>
-      <dep package="libgnome-keyring"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnutls"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
       <dep package="libcanberra"/>
+      <dep package="libgnome-keyring"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
       <dep package="pulseaudio"/>
@@ -604,7 +604,7 @@
   </autotools>
 
   <autotools id="epiphany">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
@@ -642,7 +642,7 @@
   </autotools>
 
   <autotools id="gcalctool" supports-non-srcdir-builds="no">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -651,7 +651,7 @@
   </autotools>
 
   <autotools id="gnome-contacts">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="folks"/>
       <dep package="glib"/>
@@ -672,7 +672,7 @@
   </autotools>
 
   <autotools id="gnome-disk-utility">
-    <branch/>
+    <branch revision="gnome-3-2"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -720,7 +720,7 @@
   </autotools>
 
   <autotools id="gnome-system-monitor">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -735,7 +735,7 @@
   </autotools>
 
   <autotools id="gnome-terminal" autogenargs="--with-gtk=3.0">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -763,6 +763,9 @@
       <dep package="gtk+"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
+    <suggests>
+      <dep package="gconf"/>
+    </suggests>
   </autotools>
 
   <autotools id="nautilus">
@@ -801,7 +804,7 @@
   </autotools>
 
   <autotools id="totem">
-    <branch />
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -858,7 +861,7 @@
   </autotools>
 
   <autotools id="vino">
-    <branch/>
+    <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
diff --git a/gnome-world.modules b/gnome-world.modules
index bcacb62..207d0da 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -104,7 +104,7 @@
   <repository type="tarball" name="gnome.org"
       href="http://download.gnome.org/sources/"/>
 
-  <include href="gnome-apps-3.6.modules"/>
+  <include href="gnome-apps-3.4.modules"/>
 
   <autotools id="alacarte">
     <branch/>
@@ -2060,19 +2060,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution-kolab">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gconf"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-      <dep package="gmime"/>
-      <dep package="evolution-data-server"/>
-      <dep package="evolution"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="evolution-mapi">
     <branch/>
     <dependencies>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]