summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-11-15 12:58:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 17:32:43 +0000
commitbe24bd3ca24c0916b12a1c15b981b498035e462d (patch)
treeda3e2c11ded8fe42eb710a73b3d071cf95f0d799 /meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
parentbc9c52cf396e74ee7417a61f7716926926c6a64b (diff)
downloadpoky-be24bd3ca24c0916b12a1c15b981b498035e462d.tar.gz
libx11-diet: update to 1.4.4
I remove patch "nodolt.patch" because it is no use in the new version \ and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4. (From OE-Core rev: dbb86f8445512f95d9dc3cbbdf935901fe2e04b9) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
new file mode 100644
index 0000000000..d1bdab9778
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
4
5diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
6--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
7+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
8@@ -355,7 +355,14 @@
9 # Find keysymdef.h
10 #
11 AC_MSG_CHECKING([keysym definitions])
12-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
13+AC_ARG_WITH(keysymdefdir,
14+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
15+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
16+
17+if test x$KEYSYMDEFDIR = x; then
18+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
19+fi
20+
21 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
22 for i in $FILES; do
23 if test -f "$KEYSYMDEFDIR/$i"; then