All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCHv2 13/16] libx11: Upgrade 1.6.3 -> 1.6.4
Date: Wed, 26 Oct 2016 11:37:36 +0300	[thread overview]
Message-ID: <ef020d630026f9ff0fb3816a22a25e04eb01b1af.1477469885.git.jussi.kukkonen@intel.com> (raw)
In-Reply-To: <b4be4ec82b3f01924e2fb87dc868f56284d0a8cf.1477469885.git.jussi.kukkonen@intel.com>
In-Reply-To: <cover.1477469885.git.jussi.kukkonen@intel.com>

Maintenance release. libx11-xcb no longer links against libx11.

Remove backported patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../libx11/libX11-Add-missing-NULL-check.patch     | 72 ----------------------
 meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb     | 11 ----
 meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb     | 10 +++
 3 files changed, 10 insertions(+), 83 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb

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
deleted file mode 100644
index f2abf7c..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 4d85d5f3bd8afac893738fd88e19d8cb5cf998ff Mon Sep 17 00:00:00 2001
-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: Backport (c827edcd1c4a7f920aa25208083b5b58d60d2b44)
-Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
-
----
- src/xlibi18n/ICWrap.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWrap.c
---- libX11-1.6.2-orig/src/xlibi18n/ICWrap.c	2014-07-27 13:38:29.586666449 -0400
-+++ libX11-1.6.2/src/xlibi18n/ICWrap.c	2014-07-27 13:41:39.671609030 -0400
-@@ -169,7 +169,7 @@
-     va_list var;
-     int     total_count;
-     XIMArg *args;
--    char   *ret;
-+    char   *ret = NULL;
- 
-     /*
-      * so count the stuff dangling here
-@@ -185,7 +185,8 @@
-     _XIMVaToNestedList(var, total_count, &args);
-     va_end(var);
- 
--    ret = (*im->methods->set_values) (im, args);
-+    if (im && im->methods)
-+	ret = (*im->methods->set_values) (im, args);
-     Xfree(args);
-     return ret;
- }
-@@ -196,7 +197,7 @@
-     va_list var;
-     int     total_count;
-     XIMArg *args;
--    char   *ret;
-+    char   *ret = NULL;
- 
-     /*
-      * so count the stuff dangling here
-@@ -212,7 +213,8 @@
-     _XIMVaToNestedList(var, total_count, &args);
-     va_end(var);
- 
--    ret = (*im->methods->get_values) (im, args);
-+    if (im && im->methods)
-+	ret = (*im->methods->get_values) (im, args);
-     Xfree(args);
-     return ret;
- }
-@@ -228,7 +230,7 @@
-     va_list var;
-     int     total_count;
-     XIMArg *args;
--    XIC     ic;
-+    XIC     ic = NULL;
- 
-     /*
-      * so count the stuff dangling here
-@@ -244,7 +246,8 @@
-     _XIMVaToNestedList(var, total_count, &args);
-     va_end(var);
- 
--    ic = (XIC) (*im->methods->create_ic) (im, args);
-+    if (im && im->methods)
-+	ic = (XIC) (*im->methods->create_ic) (im, args);
-     Xfree(args);
-     if (ic) {
- 	ic->core.next = im->core.ic_chain;
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb
deleted file mode 100644
index 8e531c7..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libx11.inc
-inherit gettext
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI += "file://disable_tests.patch \
-            file://libX11-Add-missing-NULL-check.patch \
-           "
-
-SRC_URI[md5sum] = "2e36b73f8a42143142dda8129f02e4e0"
-SRC_URI[sha256sum] = "cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb
new file mode 100644
index 0000000..caa95fb
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb
@@ -0,0 +1,10 @@
+require libx11.inc
+inherit gettext
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += "file://disable_tests.patch \
+           "
+
+SRC_URI[md5sum] = "6d54227082f3aa2c596f0b3a3fbb9175"
+SRC_URI[sha256sum] = "b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441"
-- 
2.1.4



  parent reply	other threads:[~2016-10-26  8:37 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-26  8:37 [PATCHv2 00/16] Make libinput default X input driver + upgrades Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 01/16] libinput: Upgrade 1.4.1 -> 1.5.0 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 02/16] libevdev: Upgrade 1.5.2 -> 1.5.4 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 03/16] libdrm: Upgrade 2.4.70 -> 2.4.71 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 04/16] xf86-input-libinput: Upgrade 0.19.0 -> 0.22.0 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 05/16] xproto: Upgrade 7.0.29 -> 7.0.31 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 06/16] libxvmc: Upgrade 1.0.9 -> 1.0.10 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 07/16] libxv: Upgrade 1.0.10 -> 1.0.11 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 08/16] libxtst: Upgrade 1.2.2 -> 1.2.3 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 09/16] libxrender: Upgrade 0.9.9 -> 0.9.10 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 10/16] libxi: Upgrade 1.7.6 -> 1.7.7 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 11/16] libxfont: Upgrade 1.5.1 -> 1.5.2 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 12/16] libxfixes: Upgrade 5.0.2 -> 5.0.3 Jussi Kukkonen
2016-10-26  8:37 ` Jussi Kukkonen [this message]
2016-10-26  8:37 ` [PATCHv2 14/16] libx11-diet: Upgrade 1.6.3 -> 1.6.4 Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 15/16] conf: Use xf86-input-libinput by default Jussi Kukkonen
2016-10-26  8:37 ` [PATCHv2 16/16] xserver-xf86-config: Remove legacy drivers from xorg.conf Jussi Kukkonen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ef020d630026f9ff0fb3816a22a25e04eb01b1af.1477469885.git.jussi.kukkonen@intel.com \
    --to=jussi.kukkonen@intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.