summaryrefslogtreecommitdiff
path: root/packages/xorg-lib/libx11
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2008-10-28 11:44:07 +0000
committerGraeme Gregory <dp@xora.org.uk>2008-11-12 15:19:31 +0000
commit78aea95c4966bdb65f0a2f499ea971bc3d0e9042 (patch)
tree7f16fd084a9e1e8080f9a422a53be5a23aae319e /packages/xorg-lib/libx11
parentc2187973adcacda45f2c44aed1f054d2cd4c4969 (diff)
libx11_1.1.5.bb : add new version for X11R7.4, keysymdef patch had to be
refreshed for this version.
Diffstat (limited to 'packages/xorg-lib/libx11')
-rw-r--r--packages/xorg-lib/libx11/keysymdef_include.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/packages/xorg-lib/libx11/keysymdef_include.patch b/packages/xorg-lib/libx11/keysymdef_include.patch
new file mode 100644
index 0000000000..07487b6b2e
--- /dev/null
+++ b/packages/xorg-lib/libx11/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`pkg-config --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+- AC_MSG_RESULT([$KEYSYMDEF])
++ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)