diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2013-08-21 16:09:45 +0800 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-08-22 10:14:49 -0700 |
| commit | 02c78a1cc849c931f802693e654a72dac71ffb85 (patch) | |
| tree | 376f19f372b1a2218a2fde41bf89b288de258706 | |
| parent | 9e2d9608464c189ec460930570557c48d78108bb (diff) | |
| download | openembedded-core-02c78a1cc849c931f802693e654a72dac71ffb85.tar.gz | |
libx11-diet: upgrade to 1.6.1
Deleted keysymdef_include patch as it's been merged upstream
Signed-off-by: Kai Kang <kai.kang@windriver.com>
[sgw - Removed PR and tweaked commit message]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb) | 7 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch | 42 |
2 files changed, 2 insertions, 47 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb index 0b50f094a3..3c3b8e7dce 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb @@ -3,10 +3,7 @@ require libx11.inc DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ this version." -PR = "${INC_PR}.4" - SRC_URI += "file://X18NCMSstubs.diff \ - file://keysymdef_include.patch \ file://fix-disable-xlocale.diff \ file://fix-utf8-wrong-define.patch \ " @@ -14,8 +11,8 @@ SRC_URI += "file://X18NCMSstubs.diff \ RPROVIDES_${PN}-dev = "libx11-dev" RPROVIDES_${PN}-locale = "libx11-locale" -SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" -SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" +SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579" +SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892" EXTRA_OECONF += "--disable-xlocale" diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch deleted file mode 100644 index 8c50bb7262..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d45b3fc19fbe95c41afc4e51d768df6d42332010 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 12 Sep 2012 13:39:40 +0000 -Subject: Allow overriding location of keysymdef.h - -Currently keysymdef.h is found by using the includedir of xproto. This doesn't -work when cross-compiling with a sysroot as that ends up being /usr/include/X11, -not a path into the cross-build environment. - -So, add an option to allow explicitly specifying the location of keysymdef.h, -and verify that the specified or found path exists. - -(original patch by Martin Jansa <martin.jansa@gmail.com>, revised by myself) - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> -Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> -Reviewed-by: Daniel Stone <daniel@fooishbar.org> ---- -diff --git a/configure.ac b/configure.ac -index 48a0c8a..a45f9d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -306,7 +306,15 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) - # 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 (defaults to xproto include dir)])], -+ [KEYSYMDEFDIR=$withval], -+ [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11]) -+ -+if test ! -d "$KEYSYMDEFDIR"; then -+ AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory]) -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - if test -f "$KEYSYMDEFDIR/$i"; then --- -cgit v0.9.0.2-2-gbebe |