summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-11-21 15:42:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-29 11:22:06 +0000
commita791139329c003da2d0fbfc9f69daf0011790ba0 (patch)
tree5c4af791ee2d32091b6a96e0e2ba49adb330f093 /meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch
parent98e370983657ee59a7ebbf24ecaf9a78bbd87010 (diff)
downloadpoky-a791139329c003da2d0fbfc9f69daf0011790ba0.tar.gz
libx11-trim: update to 1.4.4
Some description : 1 Remove --with-xcb because xcb is necessary item in the new version. 2 keysymdef_include.patch uses in keeping native directory of X11 as the default configuration. \ or else host directory "/usr/include/X11" is selected when running ./configure. 3 makekeys_crosscompile.patch avoid host contamination. 4 x11_disable_makekeys.patch uses in compiling makekey.c needed by makekeys-makekeys.o (From OE-Core rev: 6903f53e8e1f48849c9ed1aff837bba6feb1ccbe) 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-trim-1.4.4/keysymdef_include.patch')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch
new file mode 100644
index 0000000000..d1bdab9778
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-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