summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUri Lublin <uril@redhat.com>2015-01-19 00:17:15 +0200
committerUri Lublin <uril@redhat.com>2015-03-08 14:45:08 +0200
commit6f45e758f0a5d7915144250c4032e1ac4fb8c29f (patch)
treec2ecedac5c47e9d0dde503ac4bd73498bbdbac74
parente7b315dfe468eb6212e30c41a61e72486017ee57 (diff)
README.xspice: clone and install xkeyboard-config
Instead of copying /usr/share/X11/xkb
-rw-r--r--README.xspice7
1 files changed, 2 insertions, 5 deletions
diff --git a/README.xspice b/README.xspice
index b04a2b1..803bc6c 100644
--- a/README.xspice
+++ b/README.xspice
@@ -77,6 +77,7 @@ for src in \
git://anongit.freedesktop.org/xorg/xserver \
git://anongit.freedesktop.org/xorg/lib/libxtrans \
git://anongit.freedesktop.org/xorg/lib/libxkbfile \
+ git://anongit.freedesktop.org/xkeyboard-config \
git://git.freedesktop.org/git/spice/spice-protocol \
git://git.freedesktop.org/git/spice/spice ;
do
@@ -108,6 +109,7 @@ sudo yum install xorg-x11-server-devel libxcb-util-devel xcb-util-keysyms-devel
(cd libxtrans; ./autogen.sh --prefix=$TEST && make install)
(cd libxkbfile; ./autogen.sh --prefix=$TEST && make install)
(cd xkbcomp; ./autogen.sh --prefix=$TEST && make install)
+(cd xkeyboard-config; ./autogen.sh --prefix=$TEST && make install)
# make sure DBUS_TYPE_UNIX_FD is defined (failed on my RHEL6 machine)
@@ -127,11 +129,6 @@ export ACLOCAL="aclocal -I $TEST/share/aclocal"
mkdir -p $TEST/etc/X11
cp xspice/examples/spiceqxl.xorg.conf.example $TEST/etc/X11/spiceqxl.xorg.conf
-last bit is a little ugly (FIXME), copy over the xkb bits from the existing X11
-installation:
-mkdir -p $TEST/share/X11
-cp -R /usr/share/X11/xkb $TEST/share/X11
-
# Possibly also build spice-vdagent:
sudo yum install libXrandr-devel libXinerama-devel
git clone git://anongit.freedesktop.org/spice/linux/vd_agent spice-vdagent