summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2013-08-21 15:26:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-22 18:30:05 +0100
commitf0a690dd9daf8098306a9776975b537e28e07dfa (patch)
treeda2ae1504550a0a4f611053fabc490e553a8940f /meta/recipes-graphics/xorg-lib/libx11
parent81f99896fae94f3340d2bf3cce672afd28b38361 (diff)
downloadpoky-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.patch9
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 @@
1Upstream-Status: Inappropriate [disable feature] 1Upstream-Status: Inappropriate [disable feature]
2 2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4
5Update for 1.6.1
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8
4diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am 9diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am
5--- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300 10--- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300
6+++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 11+++ 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
9 cat locale.dir.l2 locale.dir.l1 > locale.dir 14 cat locale.dir.l2 locale.dir.l1 > locale.dir
10 15
11-if HAVE_PERL 16-if HAVE_PERL
12-TESTS_ENVIRONMENT = $(PERL) 17-LOG_COMPILER = $(PERL)
13-TESTS = $(srcdir)/compose-check.pl 18-TESTS = compose-check.pl
14-endif HAVE_PERL 19-endif HAVE_PERL
15- 20-
16 21