[jhbuild] 3.8: Use libxklavier from distro packages
- From: Javier JardÃn <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] 3.8: Use libxklavier from distro packages
- Date: Mon, 10 Dec 2012 18:51:53 +0000 (UTC)
commit a004984a3f0fc7f47e540cb3cd4e24831ccee754
Author: Javier JardÃn <jjardon gnome org>
Date: Tue Dec 11 02:48:56 2012 +0900
3.8: Use libxklavier from distro packages
modulesets/gnome-suites-core-deps-3.8.modules | 19 -------------------
modulesets/gnome-sysdeps-3.8.modules | 6 ++++++
2 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index 2d836f1..76af5a0 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -12,9 +12,6 @@
href="git://anongit.freedesktop.org/gstreamer/"/>
<repository type="git" name="telepathy.freedesktop.org"
href="git://anongit.freedesktop.org/telepathy/"/>
-<repository type="cvs" name="libxklavier.freedesktop.org"
- cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/xklavier"
- password=""/>
<repository type="git" name="colord.gitorious.org"
href="git://gitorious.org/colord"/>
<repository type="git" name="gusb.gitorious.org"
@@ -784,22 +781,6 @@
size="544632" />
</autotools>
- <autotools id="libxklavier" supports-non-srcdir-builds="no">
- <pkg-config>libxklavier.pc</pkg-config>
- <branch repo="gnome.org"
- module="libxklavier/5.2/libxklavier-5.2.1.tar.xz"
- version="5.2.1"
- hash="sha256:a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e"
- size="312944">
- </branch>
- <dependencies>
- <dep package="libxml2"/>
- <dep package="gtk-doc"/>
- <dep package="glib"/>
- <dep package="iso-codes"/>
- </dependencies>
- </autotools>
-
<!-- Begin Mozilla stuff subsection -->
<autotools id="nspr" autogen-sh="mozilla/nsprpub/configure"
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 2bd2669..286a251 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -394,6 +394,12 @@
<branch repo="system"/>
</systemmodule>
+ <systemmodule id="libxklavier">
+ <pkg-config>libxklavier.pc</pkg-config>
+ <branch repo="system"
+ version="5.2.1"/>
+ </systemmodule>
+
<systemmodule id="libxslt">
<pkg-config>libxslt.pc</pkg-config>
<branch repo="system"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]