[jhbuild/desrt/master: 13/26] 3.16: take xtrans out of sysdeps

[Ryan Lortie <desrt src gnome org>]

commit 5ac847f9d1d4dbdeb36d2f9e662348d611ca5f9e
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Jan 2 22:29:28 2015 -0500

    3.16: take xtrans out of sysdeps
    
    Debian jessie doesn't have new enough xtrans, so take it out of sysdeps
    and build it from tar if we don't have a new enough version on the
    system.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=742269

 modulesets/gnome-suites-core-deps-3.16.modules |   10 ++++++++++
 modulesets/gnome-sysdeps-3.16.modules          |    5 -----
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index 58e508e..e2f09d9 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -66,6 +66,8 @@
     href="http://libndp.org/files/"/>
 <repository type="tarball" name="mir"
     href="https://launchpad.net/mir/"/>
+<repository type="tarball" name="xorg-tar"
+    href="http://xorg.freedesktop.org/"/>
 
 <include href="gnome-sysdeps-3.16.modules"/>
 
@@ -1280,6 +1282,14 @@
     </dependencies>
   </autotools>
 
+  <autotools id="xtrans">
+    <pkg-config>xtrans.pc</pkg-config>
+    <branch repo="xorg-tar"
+            module="releases/individual/lib/xtrans-1.3.5.tar.gz" version="1.3.5"
+            size="227536"
+            hash="sha256:b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d"/>
+  </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 --enable-xwayland">
     <branch repo="xorg.freedesktop.org"
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index 92cd345..54c3590 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -991,11 +991,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xtrans">
-    <pkg-config>xtrans.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="gtkspell-3">
     <pkg-config>gtkspell3-3.0.pc</pkg-config>
     <branch repo="system"/>