[jhbuild/more-sysdeps: 81/81] Revert "Revert a serie of "3.6: add ... dep""

[Ray Strode <halfline src gnome org>]

commit 1bff6a7b8c89239bca311b820b8cff17d0cad925
Author: Ray Strode <rstrode redhat com>
Date:   Sat May 12 14:17:26 2012 -0400

    Revert "Revert a serie of "3.6: add ... dep""
    
    This reverts commit 1f8ef32c77f32f7f550aad0e9afd3557667e6396.

 modulesets/gnome-suites-core-3.6.modules           |    1 +
 modulesets/gnome-suites-core-deps-3.6.modules      |   60 ++++++++++++++++++++
 modulesets/gnome-suites-core-deps-base-3.6.modules |   22 +++++++-
 3 files changed, 82 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.6.modules b/modulesets/gnome-suites-core-3.6.modules
index 5b1a48d..ab17f6f 100644
--- a/modulesets/gnome-suites-core-3.6.modules
+++ b/modulesets/gnome-suites-core-3.6.modules
@@ -38,6 +38,7 @@
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
+      <dep package="libXtst"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index a846a0b..47a6a88 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -178,6 +178,7 @@
   <autotools id="gdk-pixbuf">
     <branch/>
     <dependencies>
+      <dep package="libtiff"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="gtk-doc"/>
@@ -188,6 +189,7 @@
     <branch/>
     <dependencies>
       <dep package="gtk-doc"/>
+      <dep package="libffi"/>
     </dependencies>
     <after>
       <dep package="shared-mime-info"/>
@@ -228,6 +230,54 @@
     </suggests>
   </autotools>
 
+  <autotools id="xorg-macros">
+    <pkg-config>xorg-macros.pc</pkg-config>
+    <branch repo="git.freedesktop.org"
+     module="xorg/util/macros" checkoutdir="xorg-macros"/>
+  </autotools>
+
+  <autotools id="xtrans">
+    <pkg-config>xtrans.pc</pkg-config>
+    <branch repo="git.freedesktop.org"
+     module="xorg/lib/libxtrans" checkoutdir="libxtrans"/>
+  </autotools>
+
+  <autotools id="libICE">
+    <pkg-config>ice.pc</pkg-config>
+    <branch repo="git.freedesktop.org"
+     module="xorg/lib/libICE" checkoutdir="libICE"/>
+    <dependencies>
+      <dep package="xtrans"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libSM">
+    <pkg-config>sm.pc</pkg-config>
+    <branch repo="git.freedesktop.org"
+     module="xorg/lib/libSM" checkoutdir="libSM"/>
+    <dependencies>
+      <dep package="libICE"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libXt">
+    <pkg-config>xt.pc</pkg-config>
+    <branch repo="git.freedesktop.org"
+     module="xorg/lib/libXt" checkoutdir="libXt"/>
+    <dependencies>
+      <dep package="libSM"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libXtst">
+    <pkg-config>xtst.pc</pkg-config>
+    <branch repo="git.freedesktop.org"
+     module="xorg/lib/libXtst" checkoutdir="libXtst"/>
+    <dependencies>
+      <dep package="xorg-macros"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="pango">
     <branch/>
     <dependencies>
@@ -881,6 +931,8 @@
       <dep package="pango"/>
       <dep package="libsoup"/>
       <dep package="gobject-introspection"/>
+      <dep package="icu"/>
+      <dep package="libXt"/>
     </dependencies>
     <suggests>
       <dep package="libxslt"/>
@@ -931,10 +983,18 @@
 
   <!-- OS Core Services dependencies -->
 
+  <tarball id="libusb" version="1.0.9" checkoutdir="libusb-1.0.9">
+    <pkg-config>libusb-1.0.pc</pkg-config>
+    <source href="http://downloads.sourceforge.net/libusb/libusb-1.0.9.tar.bz2";
+            hash="sha256:e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b"
+            size="421971"/>
+  </tarball>
+
   <autotools id="libgusb">
     <branch repo="gusb.gitorious.org" checkoutdir="libgusb" module="gusb.git"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="libusb"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-base-3.6.modules b/modulesets/gnome-suites-core-deps-base-3.6.modules
index a4a1a1e..4618036 100644
--- a/modulesets/gnome-suites-core-deps-base-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.6.modules
@@ -185,6 +185,13 @@
     <branch repo="icon-theme.freedesktop.org"/>
   </tarball>
 
+  <tarball id="icu" version="49.1.1" checkoutdir="icu/source">
+    <pkg-config>icu-i18n.pc</pkg-config>
+    <source href="http://download.icu-project.org/files/icu4c/49.1.1/icu4c-49_1_1-src.tgz";
+            hash="sha256:e6f079e9bd92d9eddc3fcdeb943408c4bfd3d25a569a7060c9221f174403cdf1"
+            size="19001722"/>
+  </tarball>
+
   <repository type="tarball" name="icon-theme.freedesktop.org"
 	  href="http://icon-theme.freedesktop.org/releases/"/>
   <autotools id="hicolor-icon-theme" supports-non-srcdir-builds="no"
@@ -270,6 +277,13 @@
             size="340474"/>
   </autotools>
 
+  <tarball id="libffi" version="3.0.11">
+    <pkg-config>libffi.pc</pkg-config>
+    <source href="ftp://sourceware.org/pub/libffi/libffi-3.0.11.tar.gz";
+            hash="sha256:70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283"
+            size="794220"/>
+  </tarball>
+
   <autotools id="libgpg-error" autogen-sh="configure" check-target="false">
     <branch module="libgpg-error/libgpg-error-1.8.tar.bz2"
             repo="gnupg.org" version="1.8"
@@ -399,6 +413,13 @@
             size="1641693" />
   </autotools>
 
+  <tarball id="libtiff" version="4.0.1">
+    <pkg-config>libtiff-4.pc</pkg-config>
+    <source href="ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.1.tar.gz";
+            hash="sha256:9a7a039e516c37478038740f1642818250bfb1414cf404cc8b569e5f9d4bf2f0"
+            size="1991580"/>
+  </tarball>
+
   <autotools id="libxml2">
     <pkg-config>libxml-2.0.pc</pkg-config>
     <branch module="libxml2/libxml2-2.7.8.tar.gz"
@@ -507,5 +528,4 @@
             size="355285"/>
   </tarball>
 
-
 </moduleset>