From 515d8b5de2d0ebd601d98ca16036aafdf54ce043 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 18 May 2015 17:45:21 +0100 Subject: libx11: upgrade to 1.6.3 Drop backported patch always-use-XCOMM patch. Refresh Add-missing-NULL-check. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../libx11/libX11-Add-missing-NULL-check.patch | 6 +- ...use-XCOMM-instead-of-for-comments-in-Comp.patch | 101 --------------------- 2 files changed, 3 insertions(+), 104 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch (limited to 'meta/recipes-graphics/xorg-lib/libx11') 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 30686206ab..a60e985564 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 @@ -29,7 +29,7 @@ diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWra - ret = (*im->methods->set_values) (im, args); + if (im && im->methods) + ret = (*im->methods->set_values) (im, args); - if (args) Xfree(args); + Xfree(args); return ret; } @@ -196,7 +197,7 @@ @@ -48,7 +48,7 @@ diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWra - ret = (*im->methods->get_values) (im, args); + if (im && im->methods) + ret = (*im->methods->get_values) (im, args); - if (args) Xfree(args); + Xfree(args); return ret; } @@ -228,7 +230,7 @@ @@ -67,6 +67,6 @@ diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWra - ic = (XIC) (*im->methods->create_ic) (im, args); + if (im && im->methods) + ic = (XIC) (*im->methods->create_ic) (im, args); - if (args) Xfree(args); + Xfree(args); if (ic) { ic->core.next = im->core.ic_chain; diff --git a/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch b/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch deleted file mode 100644 index b7f5356e6c..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch +++ /dev/null @@ -1,101 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Chong Lu - -From b64bee2ddb7b96f00713a8b8435f11ad9ac1c9e0 Mon Sep 17 00:00:00 2001 -From: Ran Benita -Date: Sun, 16 Feb 2014 15:24:58 +0200 -Subject: [PATCH] nls: always use XCOMM instead of # for comments in - Compose.pre files - -Lines starting with # are considered as preprocessor directives in the -.pre files. - -Fixes warnings like: -:3:0: error: invalid preprocessing directive #Khmer - -Signed-off-by: Ran Benita -Signed-off-by: James Cloos ---- - nls/km_KH.UTF-8/Compose.pre | 2 +- - nls/sr_CS.UTF-8/Compose.pre | 32 ++++++++++++++++---------------- - 2 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/nls/km_KH.UTF-8/Compose.pre b/nls/km_KH.UTF-8/Compose.pre -index 77651d0..dc89119 100644 ---- a/nls/km_KH.UTF-8/Compose.pre -+++ b/nls/km_KH.UTF-8/Compose.pre -@@ -1,6 +1,6 @@ - include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" - --# Khmer digraphs -+XCOMM Khmer digraphs - : "ាំ" - : "ោះ" - : "េះ" -diff --git a/nls/sr_CS.UTF-8/Compose.pre b/nls/sr_CS.UTF-8/Compose.pre -index 119e23e..b2397f7 100644 ---- a/nls/sr_CS.UTF-8/Compose.pre -+++ b/nls/sr_CS.UTF-8/Compose.pre -@@ -1,17 +1,17 @@ - include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" - --# Serbian accented Cyrillic --# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A --# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E --# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O --# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U --# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I --# --# ̀ - U+0300 , , --# ́ - U+0301 , , , --# ̂ - U+0302 , --# ̏ - U+030F , --# ̀ - kratkouzlazni, U+0300 , , -+XCOMM Serbian accented Cyrillic -+XCOMM а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A -+XCOMM е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E -+XCOMM о О - U+043E, U+041E Cyrillic_o, Cyrillic_O -+XCOMM у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U -+XCOMM и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I -+XCOMM -+XCOMM ̀ - U+0300 , , -+XCOMM ́ - U+0301 , , , -+XCOMM ̂ - U+0302 , -+XCOMM ̏ - U+030F , -+XCOMM ̀ - kratkouzlazni, U+0300 , , - : "а̀" - : "а̀" - : "а̀" -@@ -42,7 +42,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" - : "У̀" - : "У̀" - : "У̀" --# ́ - dugouzlazni, U+0301 , , , -+XCOMM ́ - dugouzlazni, U+0301 , , , - : "а́" - : "а́" - : "а́" -@@ -83,7 +83,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" - : "У́" - : "У́" - : "У́" --# ̂ - dugosilazni, U+0302 , -+XCOMM ̂ - dugosilazni, U+0302 , - : "а̂" - : "а̂" - : "А̂" -@@ -104,8 +104,8 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" - : "у̂" - : "У̂" - : "У̂" --# ̏ - kratkosilazni, U+030F , --# there's no appropriate dead_doublegrave, so we use these two dead keys -+XCOMM ̏ - kratkosilazni, U+030F , -+XCOMM there's no appropriate dead_doublegrave, so we use these two dead keys - : "а̏" - : "а̏" - : "А̏" --- -1.7.9.5 - -- cgit 1.2.3-korg