summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHong Liu <hongl.fnst@cn.fujitsu.com>2018-08-07 17:31:48 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-08 10:51:59 +0100
commita0b2bb6a9d9bcc2b9ae3f8b869cd4295aa6c7b37 (patch)
tree11cd17a84e3e549ca0d9282e64d071257c67797d
parent2e7ecb8a44e67b1184c36aaee9effd9ba6952e04 (diff)
downloadpoky-a0b2bb6a9d9bcc2b9ae3f8b869cd4295aa6c7b37.tar.gz
icu:61.1 -> 62.1
1.Upgrade icu from 61.1 to 62.1. 2.0001-i18n-Drop-include-xlocale.h.patch has been merged. (From OE-Core rev: 8be6cfb97ea8d5a7938c1ccbf8218a7bfa5e86a2) Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch34
-rw-r--r--meta/recipes-support/icu/icu_62.1.bb (renamed from meta/recipes-support/icu/icu_61.1.bb)5
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
deleted file mode 100644
index f0c49e1976..0000000000
--- a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From d6b57c1b4eb9a24d9d95342a961c93946539c93b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 24 Jun 2017 22:52:40 -0700
4Subject: [PATCH 3/4] i18n: Drop include <xlocale.h>
5
6glibc 2.26 drops this header
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11---
12 source/i18n/digitlst.cpp | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15diff --git a/source/i18n/digitlst.cpp b/source/i18n/digitlst.cpp
16index 8e86fa7..0bdbb2c 100644
17--- a/i18n/digitlst.cpp
18+++ b/i18n/digitlst.cpp
19@@ -62,11 +62,7 @@
20 #endif
21
22 #if U_USE_STRTOD_L
23-# if U_HAVE_XLOCALE_H
24-# include <xlocale.h>
25-# else
26-# include <locale.h>
27-# endif
28+# include <locale.h>
29 #endif
30
31 // ***************************************************************************
32--
332.14.2
34
diff --git a/meta/recipes-support/icu/icu_61.1.bb b/meta/recipes-support/icu/icu_62.1.bb
index ffaf350896..ec9db7de84 100644
--- a/meta/recipes-support/icu/icu_61.1.bb
+++ b/meta/recipes-support/icu/icu_62.1.bb
@@ -16,14 +16,13 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV
16SRC_URI = "${BASE_SRC_URI} \ 16SRC_URI = "${BASE_SRC_URI} \
17 file://icu-pkgdata-large-cmd.patch \ 17 file://icu-pkgdata-large-cmd.patch \
18 file://fix-install-manx.patch \ 18 file://fix-install-manx.patch \
19 file://0001-i18n-Drop-include-xlocale.h.patch \
20 " 19 "
21 20
22SRC_URI_append_class-target = "\ 21SRC_URI_append_class-target = "\
23 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ 22 file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
24 " 23 "
25SRC_URI[md5sum] = "68fe38999fef94d622bd6843d43c0615" 24SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150"
26SRC_URI[sha256sum] = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef" 25SRC_URI[sha256sum] = "3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3"
27 26
28UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" 27UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
29UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" 28UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"