libx11: Upgrade 1.8.11 -> 1.8.12

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
index c1b6cde534e4c33639b73b4d995c6e1b6de0738a..d2c5f5f142240994f8ca07b8a83e67fd13806054 100644 (file)
--- a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
@@ -1,3 +1,8 @@
+From 37debe301336cfb61e7f81e9e47e5e1019177d8c Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Tue, 8 Jan 2013 09:16:37 +0200
+Subject: [PATCH] libx11: disable tests
+
 Upstream-Status: Inappropriate [disable feature]
 
 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
@@ -5,18 +10,23 @@ Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
 Update for 1.6.1
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ nls/Makefile.am | 5 -----
+ 1 file changed, 5 deletions(-)
 
-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
-@@ -36,11 +36,6 @@
+diff --git a/nls/Makefile.am b/nls/Makefile.am
+index 7eda58e..4d4050b 100644
+--- a/nls/Makefile.am
++++ b/nls/Makefile.am
+@@ -36,11 +36,6 @@ locale.dir: locale.dir.pre
          < locale.dir.l1 > locale.dir.l2
-       cat locale.dir.l2 locale.dir.l1 > locale.dir
-
+       cat locale.dir.l2 locale.dir.l1 > locale.dir
+ 
 -if HAVE_PERL
 -LOG_COMPILER = $(PERL)
 -TESTS = compose-check.pl
 -endif HAVE_PERL
 -
-
+ 
  # Per-locale data files
+ 

diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.11.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb
similarity index 92%
rename from meta/recipes-graphics/xorg-lib/libx11_1.8.11.bb
rename to meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb
index d7c34c74a165904f88d8629e3819897557e2f4c4..5ce5481743262fedc758e1e66b55cd3c65c1b240 100644 (file)
--- a/meta/recipes-graphics/xorg-lib/libx11_1.8.11.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb
@@ -24,7 +24,7 @@ XORG_PN = "libX11"
 
 SRC_URI += "file://disable_tests.patch"
 
-SRC_URI[sha256sum] = "3b74e82943924b45a0b778cc6842976909c3010d9445a8fd185e1dca4d380e88"
+SRC_URI[sha256sum] = "fa026f9bb0124f4d6c808f9aef4057aad65e7b35d8ff43951cef0abe06bb9a9a"
 
 inherit gettext