From e9c43598a86026f8e4a921979c116032d61bb117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Tue, 15 Nov 2011 10:58:18 +0100 Subject: [PATCH] Revert "Use cleaner workaround to fetch xkeyboard-config location" This result into an infinite loop between xkbcomp <-> xkeyboard-config This reverts commit ef8deaff291d0ae5af5b96dc38ea1849074da31e. --- component/xorg/buildout.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/component/xorg/buildout.cfg b/component/xorg/buildout.cfg index 887059ba4..f93ad1498 100644 --- a/component/xorg/buildout.cfg +++ b/component/xorg/buildout.cfg @@ -284,9 +284,9 @@ recipe = hexagonit.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/app/xkbcomp-1.2.0.tar.bz2 md5sum = 0f55995cd8da9b2d88553e1a2e17cd0a # Hardcoded location for xkeyboard-config, needed during compile time -xkeyboard-config-location = ${libxkbfile:location}/../${xkeyboard-config:_buildout_section_name_} +xkeyboard-config-location = ${libxkbfile:location}/../xkeyboard-config/share/X11/xkb configure-options = - --with-xkb-config-root=${:xkeyboard-config-location}/share/X11/xkb + --with-xkb-config-root=${:xkeyboard-config-location} environment = PKG_CONFIG_PATH=${libxkbfile:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig LD_LIBRARY_PATH=${libxkbfile:location}/lib/:${libX11:location}/lib -- 2.30.9