diff options
author | Kai Kang <kai.kang@windriver.com> | 2013-08-21 15:26:50 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-22 18:30:05 +0100 |
commit | f0a690dd9daf8098306a9776975b537e28e07dfa (patch) | |
tree | da2ae1504550a0a4f611053fabc490e553a8940f /meta/recipes-graphics/xorg-lib/libx11 | |
parent | 81f99896fae94f3340d2bf3cce672afd28b38361 (diff) | |
download | openembedded-core-contrib-f0a690dd9daf8098306a9776975b537e28e07dfa.tar.gz |
libx11: upgrade to 1.6.1
Upgrade libx11 to version 1.6.1.
Update:
* Remove PR and INC_PR.
* File Xcms.txt position changes.
* Drop backport patch keysymdef_include.patch.
* Update disable_tests.patch.
[YOCTO #4973]
(From OE-Core rev: 9e2d9608464c189ec460930570557c48d78108bb)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
[sgw - Removed PR and INC_PR]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch index c570e45991..c1b6cde534 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch @@ -1,6 +1,11 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> + +Update for 1.6.1 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am --- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300 +++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 @@ -9,8 +14,8 @@ diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am cat locale.dir.l2 locale.dir.l1 > locale.dir -if HAVE_PERL --TESTS_ENVIRONMENT = $(PERL) --TESTS = $(srcdir)/compose-check.pl +-LOG_COMPILER = $(PERL) +-TESTS = compose-check.pl -endif HAVE_PERL - |