brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[jhbuild] Build libxklavier 5.1 from tarball

Browse Source 
We had to get it from CVS waiting for 5.1 to be released,
but now we can use the same tarball as the GNOME moduleset.

Stop installing CVS since libxklavier was the only module using it.

https://bugzilla.gnome.org/show_bug.cgi?id=646416
This commit is contained in:
Milan Bouchet-Valat 2011-03-31 14:23:42 +02:00
parent 342bc1e72d
commit 7ffea1606d
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/build/gnome-shell-build-setup.sh
View File

@ -54,7 +54,7 @@ fi
#
# General build stuff:
# automake, bison, flex, gettext, gnome-common, gperf, gtk-doc, intltool,
# libtool, pkgconfig, cvs
# libtool, pkgconfig
#
# Devel packages needed by gnome-shell and its deps:
# dbus-glib, expat, GL, gnome-menus, gstreamer, libffi,
@ -73,7 +73,7 @@ fi
if test "x$system" = xUbuntu -o "x$system" = xDebian -o "x$system" = xLinuxMint ; then
reqd="
build-essential curl
automake bison flex gettext git-core gperf cvs gnome-common gtk-doc-tools
automake bison flex gettext git-core gperf gnome-common gtk-doc-tools
gvfs gvfs-backends icon-naming-utils
libdbus-glib-1-dev libexpat-dev libffi-dev libgnome-menu-dev libgnome-desktop-dev libgtop2-dev
libical-dev libjasper-dev libjpeg-dev libpng-dev libstartup-notification0-dev libtiff-dev
@ -110,7 +110,7 @@ fi
if test "x$system" = xFedora ; then
reqd="
binutils curl gcc gcc-c++ make cvs
binutils curl gcc gcc-c++ make
automake bison flex gettext git gnome-common gnome-doc-utils gperf gvfs intltool
libtool pkgconfig dbus-glib-devel gnome-desktop-devel gnome-menus-devel
gnome-python2-gconf jasper-devel libffi-devel libical-devel libjpeg-devel libpng-devel
@ -149,7 +149,7 @@ if test "x$system" = xSUSE -o "x$system" = "xSUSE LINUX" ; then
orbit2-devel libwnck-devel xorg-x11-proto-devel readline-devel \
mozilla-xulrunner191-devel libcroco-devel \
xorg-x11-devel xorg-x11 xorg-x11-server-extra evolution-data-server-devel \
cvs iso-codes-devel \
iso-codes-devel \
; do
if ! rpm -q $pkg > /dev/null 2>&1; then
reqd="$pkg $reqd"
@ -171,7 +171,7 @@ if test "x$system" = xMandrivaLinux ; then
readline-devel libxulrunner-devel \
libxdamage-devel mesa-demos zenity \
libcroco0.6-devel libevolution-data-server3-devel \
cvs iso-codes-devel \
iso-codes-devel \
; do
if ! rpm -q --whatprovides $pkg > /dev/null 2>&1; then
reqd="$pkg $reqd"

13
tools/build/gnome-shell.modules
View File

@ -13,9 +13,6 @@
href="http://cairographics.org/"/>
<repository type="tarball" name="0pointer.de"
href="http://0pointer.de/lennart/projects/"/>
<repository type="cvs" name="libxklavier.freedesktop.org"
cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xklavier"
password=""/>
<repository type="git" name="git.freedesktop.org"
href="git://anongit.freedesktop.org"/>
@ -372,12 +369,14 @@
</dependencies>
</autotools>
<autotools id="libxklavier">
<branch module="libxklavier"
repo="libxklavier.freedesktop.org"/>
<tarball id="libxklavier" supports-non-srcdir-builds="no" version="5.1">
<source href="http://download.gnome.org/sources/libxklavier/5.1/libxklavier-5.1.tar.bz2"
hash="sha256:1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1"
md5sum="cbc2a760827c20aef61eb7b18a6ce598"
size="346858"/>
<dependencies>
<dep package="glib"/>
</dependencies>
</autotools>
</tarball>
</moduleset>