diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-07-04 10:28:20 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-09 16:58:55 +0100 |
commit | 9d2e665d71a2c358f4c9e52df961fc13127ebdd4 (patch) | |
tree | c36667b47d364a0c689c75ea36e6dc864616a726 /meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch | |
parent | 0ae18875766d983eddf6680a4259a26bb53ad1a0 (diff) | |
download | ast2050-yocto-poky-9d2e665d71a2c358f4c9e52df961fc13127ebdd4.zip ast2050-yocto-poky-9d2e665d71a2c358f4c9e52df961fc13127ebdd4.tar.gz |
libx11: upgrade to 1.5.0
Removed one backported patch.
(From OE-Core rev: 52d4ff7b35602faa52360a3e7a800891ef60c739)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch new file mode 100644 index 0000000..d1bdab9 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> + +diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac +--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 ++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 +@@ -355,7 +355,14 @@ + # Find keysymdef.h + # + AC_MSG_CHECKING([keysym definitions]) +-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++AC_ARG_WITH(keysymdefdir, ++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), ++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") ++ ++if test x$KEYSYMDEFDIR = x; then ++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++fi ++ + FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" + for i in $FILES; do + if test -f "$KEYSYMDEFDIR/$i"; then |