gnome-shell-build-setup.sh: add libxklavier-devel & expat-devel to deps

Add to deps for Fedora and Debian:

 expat: needed by polkit
 libxklavier-devel: need by libgnomekbd

Based on a patch by Kiyoshi Aman <kiyoshi.aman@gmail.com>.

https://bugzilla.gnome.org/show_bug.cgi?id=634865
This commit is contained in:
Owen Taylor 2010-11-14 18:54:49 -05:00 committed by Owen W. Taylor
parent 141b4ffe87
commit 3c33cf425e

View File

@ -57,9 +57,9 @@ fi
# libtool, pkgconfig # libtool, pkgconfig
# #
# Devel packages needed by gnome-shell and its deps: # Devel packages needed by gnome-shell and its deps:
# dbus-glib, GL, gnome-menus, gstreamer, libffi, # dbus-glib, expat, GL, gnome-menus, gstreamer, libffi,
# libjasper, libjpeg, libpng, libpulse, libtiff, libwnck, # libjasper, libjpeg, libpng, libpulse, libtiff, libwnck,
# libxml2, ORBit2, pam, python, readline, # libxklavier, libxml2, ORBit2, pam, python, readline,
# spidermonkey ({mozilla,firefox,xulrunner}-js), startup-notification # spidermonkey ({mozilla,firefox,xulrunner}-js), startup-notification
# xdamage, icon-naming-utils, libtool-ltdl, libvorbis # xdamage, icon-naming-utils, libtool-ltdl, libvorbis
# #
@ -81,13 +81,13 @@ if test "x$system" = xUbuntu -o "x$system" = xDebian -o "x$system" = xLinuxMint
build-essential curl \ build-essential curl \
automake bison flex gettext git-core gnome-common gtk-doc-tools \ automake bison flex gettext git-core gnome-common gtk-doc-tools \
gvfs gvfs-backends icon-naming-utils \ gvfs gvfs-backends icon-naming-utils \
libdbus-glib-1-dev libffi-dev libgnome-menu-dev libgnome-desktop-dev \ libdbus-glib-1-dev libexpat-dev libffi-dev libgnome-menu-dev libgnome-desktop-dev \
libjasper-dev libjpeg-dev libpng-dev libstartup-notification0-dev libtiff-dev \ libjasper-dev libjpeg-dev libpng-dev libstartup-notification0-dev libtiff-dev \
libwnck-dev libgl1-mesa-dev liborbit2-dev libpulse-dev libreadline5-dev libxml2-dev \ libwnck-dev libgl1-mesa-dev liborbit2-dev libpulse-dev libreadline5-dev libxml2-dev \
mesa-common-dev mesa-utils libpam-dev python-dev python-gconf python-gobject \ mesa-common-dev mesa-utils libpam-dev python-dev python-gconf python-gobject \
xulrunner-dev xserver-xephyr gnome-terminal libcroco3-dev \ xulrunner-dev xserver-xephyr gnome-terminal libcroco3-dev \
libgstreamer0.10-dev gstreamer0.10-plugins-base gstreamer0.10-plugins-good \ libgstreamer0.10-dev gstreamer0.10-plugins-base gstreamer0.10-plugins-good \
libltdl-dev libvorbis-dev \ libltdl-dev libvorbis-dev libxklavier-dev \
; do ; do
if ! dpkg-checkbuilddeps -d $pkg /dev/null 2> /dev/null; then if ! dpkg-checkbuilddeps -d $pkg /dev/null 2> /dev/null; then
reqd="$pkg $reqd" reqd="$pkg $reqd"
@ -109,9 +109,9 @@ if test "x$system" = xFedora ; then
libtiff-devel libwnck-devel mesa-libGL-devel ORBit2-devel pam-devel libtiff-devel libwnck-devel mesa-libGL-devel ORBit2-devel pam-devel
pulseaudio-libs-devel python-devel pygobject2 readline-devel xulrunner-devel pulseaudio-libs-devel python-devel pygobject2 readline-devel xulrunner-devel
libXdamage-devel libcroco-devel libxml2-devel gstreamer-devel libXdamage-devel libcroco-devel libxml2-devel gstreamer-devel
gstreamer-plugins-base gstreamer-plugins-good glx-utils gstreamer-plugins-base gstreamer-plugins-good glx-utils expat-devel
startup-notification-devel xorg-x11-server-Xephyr gnome-terminal zenity startup-notification-devel xorg-x11-server-Xephyr gnome-terminal zenity
icon-naming-utils libtool-ltdl-devel libvorbis-devel icon-naming-utils libtool-ltdl-devel libvorbis-devel libxklavier-devel
" "
if expr $version \>= 14 > /dev/null ; then if expr $version \>= 14 > /dev/null ; then