summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-07-20 12:00:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-22 08:23:49 +0100
commitbc0f1cfc0b67804075ae60f6c5eeaeacaf831391 (patch)
treeb5571e60c8088b5fdd5d5a9024f866c7078acc85 /meta
parentd6fa512d90c6baabda6fb3daa1f9ca3da2b08a79 (diff)
downloadpoky-bc0f1cfc0b67804075ae60f6c5eeaeacaf831391.tar.gz
libx11: update Upstream-Status on a merged patch
(From OE-Core rev: ead7e6602fd340a2c31ce20941ad9a177395d7b1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch b/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
index a60e985564..f2abf7c7a9 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
@@ -3,9 +3,9 @@ From: Drew Moseley <drew_moseley@mentor.com>
3Date: Sun, 27 Jul 2014 13:10:07 -0400 3Date: Sun, 27 Jul 2014 13:10:07 -0400
4Subject: [PATCH] libX11: Add missing NULL check on im and im->methods 4Subject: [PATCH] libX11: Add missing NULL check on im and im->methods
5 5
6Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=81822] 6Upstream-Status: Backport (c827edcd1c4a7f920aa25208083b5b58d60d2b44)
7
8Signed-off-by: Drew Moseley <drew_moseley@mentor.com> 7Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
8
9--- 9---
10 src/xlibi18n/ICWrap.c | 5 +++-- 10 src/xlibi18n/ICWrap.c | 5 +++--
11 1 file changed, 3 insertions(+), 2 deletions(-) 11 1 file changed, 3 insertions(+), 2 deletions(-)