diff options
| author | Hong Liu <hongl.fnst@cn.fujitsu.com> | 2018-08-07 17:31:48 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-08 10:51:28 +0100 |
| commit | 8be6cfb97ea8d5a7938c1ccbf8218a7bfa5e86a2 (patch) | |
| tree | d96f3d4f152f55e1a295a790e70b4ce7f22136ab | |
| parent | 34f9391ad7ccb8a4d5333bb8300bb65633b75999 (diff) | |
| download | openembedded-core-8be6cfb97ea8d5a7938c1ccbf8218a7bfa5e86a2.tar.gz openembedded-core-8be6cfb97ea8d5a7938c1ccbf8218a7bfa5e86a2.tar.bz2 openembedded-core-8be6cfb97ea8d5a7938c1ccbf8218a7bfa5e86a2.zip | |
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.
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.patch | 34 | ||||
| -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 @@ -From d6b57c1b4eb9a24d9d95342a961c93946539c93b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 24 Jun 2017 22:52:40 -0700 -Subject: [PATCH 3/4] i18n: Drop include <xlocale.h> - -glibc 2.26 drops this header - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - source/i18n/digitlst.cpp | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/source/i18n/digitlst.cpp b/source/i18n/digitlst.cpp -index 8e86fa7..0bdbb2c 100644 ---- a/i18n/digitlst.cpp -+++ b/i18n/digitlst.cpp -@@ -62,11 +62,7 @@ - #endif - - #if U_USE_STRTOD_L --# if U_HAVE_XLOCALE_H --# include <xlocale.h> --# else --# include <locale.h> --# endif -+# include <locale.h> - #endif - - // *************************************************************************** --- -2.14.2 - 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 SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ - file://0001-i18n-Drop-include-xlocale.h.patch \ " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "68fe38999fef94d622bd6843d43c0615" -SRC_URI[sha256sum] = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef" +SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150" +SRC_URI[sha256sum] = "3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" |