summaryrefslogtreecommitdiff
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:16:05 +0100
commitead7e6602fd340a2c31ce20941ad9a177395d7b1 (patch)
tree55912c02d3195bf221c1a4662571cddcdd6b4816 /meta
parentf58df3a630b774083934171463b2b07add29dc0e (diff)
downloadopenembedded-core-ead7e6602fd340a2c31ce20941ad9a177395d7b1.tar.gz
openembedded-core-ead7e6602fd340a2c31ce20941ad9a177395d7b1.tar.bz2
openembedded-core-ead7e6602fd340a2c31ce20941ad9a177395d7b1.zip
libx11: update Upstream-Status on a merged patch
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>
Date: Sun, 27 Jul 2014 13:10:07 -0400
Subject: [PATCH] libX11: Add missing NULL check on im and im->methods
-Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=81822]
-
+Upstream-Status: Backport (c827edcd1c4a7f920aa25208083b5b58d60d2b44)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
+
---
src/xlibi18n/ICWrap.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)