add python-xklavier, needed by keyboard control panel

5 files changed, 20 insertions, 1 deletions

diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index 74fefa7..1d0780a 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -19,6 +19,9 @@
       href="git://git.sugarlabs.org"/>
   <repository type="tarball" name="ftp.gnome.org"
       href="http://ftp.gnome.org/pub/gnome/sources/"/>
+  <repository type="tarball" name="sourceforge.net"
+      href="http://downloads.sourceforge.net/project/"/>
+
   <tarball id="pygobject" version="2.14">
     <source href="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-2.14.2.tar.bz2"
             md5sum="0e9e9300e81847f4f7266f49d3bebbaf" size="366808"/>
@@ -151,4 +154,16 @@
 	    module="dbus-glib/dbus-glib-0.78.tar.gz"
 	    size="683454" md5sum="d4aa04b9df35b4bd663be38e959941c8" />
   </autotools>
+  <autotools id="python-xklavier">
+    <branch module="python-xkb/mainline.git" checkoutdir="python-xklavier"/>
+    <dependencies>
+      <dep package="libxklavier"/><!-- at least 4.0 -->
+    </dependencies>
+  </autotools>
+  <autotools id="libxklavier" autogenargs="--with-xmodmap-base=/usr/share/X11/xkb/rules"> <!-- this is an ugly hack, but it's the only way to get it to work, at least on Debian -->
+    <branch repo="sourceforge.net"
+            module="gswitchit/libxklavier/4.0/libxklavier-4.0.tar.bz2" version="4.0"
+            size="354149" md5sum="1b714ba04835fb49511f9e1444a5ea4c" />
+    <!-- sysdep: libxkbfile-dev -->
+  </autotools>
 </moduleset>
diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index 9689037..cd3ea67 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -22,10 +22,11 @@
     <branch module="sugar/mainline.git" checkoutdir="sugar"/>
     <dependencies>
       <dep package="GConf-dbus"/>
+      <dep package="metacity"/>
+      <dep package="python-xklavier"/>
       <dep package="sugar-base"/>
       <dep package="sugar-toolkit"/>
       <dep package="sugar-artwork"/>
-      <dep package="metacity"/>
     </dependencies>
   </autotools>
   <autotools id="sugar-presence-service">
diff --git a/config/sysdeps/debian-family.xml b/config/sysdeps/debian-family.xml
index 511f796..b794013 100644
--- a/config/sysdeps/debian-family.xml
+++ b/config/sysdeps/debian-family.xml
@@ -45,6 +45,7 @@
   <package name="libtool"/>
   <package name="libwv-dev"/>
   <package name="libxapian15"/>
+  <package name="libxkbfile-dev"/>
   <package name="libxt-dev"/>
   <package name="make"/>
   <package name="python-avahi"/>
diff --git a/config/sysdeps/fedora-11.xml b/config/sysdeps/fedora-11.xml
index ca072a0..bb89b04 100644
--- a/config/sysdeps/fedora-11.xml
+++ b/config/sysdeps/fedora-11.xml
@@ -48,6 +48,7 @@
   <package name="libtool"/>
   <package name="libXdamage-devel"/>
   <package name="libxml2-python"/>
+  <package name="libxkbfile-devel"/>
   <package name="libXt-devel"/>
   <package name="loudmouth-devel"/>
   <package name="make"/>
diff --git a/config/sysdeps/fedora-rawhide.xml b/config/sysdeps/fedora-rawhide.xml
index d40bf98..879d913 100644
--- a/config/sysdeps/fedora-rawhide.xml
+++ b/config/sysdeps/fedora-rawhide.xml
@@ -68,6 +68,7 @@
   <package name="python-distutils-extra"/><!-- for sugar-update-control -->
   <package name="python-simplejson"/>
   <package name="python-telepathy" source="telepathy-python"/>
+  <package name="python-xklavier" source="python-xklavier"/>
   <package name="subversion"/>
   <package name="telepathy-gabble" source="telepathy-gabble"/>
   <package name="telepathy-glib" source="telepathy-glib"/>