Patchwork [4/4] icu: upgrade to 53.1

login
register
mail settings
Submitter Valentin Popa
Date May 8, 2014, 3:05 p.m.
Message ID <ce5bc858728c5ff3d22965a7d8bfdf1309760520.1399561398.git.valentin.popa@intel.com>
Download mbox | patch
Permalink /patch/71783/
State New
Headers show

Comments

Valentin Popa - May 8, 2014, 3:05 p.m.
Removed patches:
(*) add_buffer_length_check_to_UTF_16_or_32_detector.patch
    - not needed anymore

License is the same. BSD-like copyright inserted for lao-dictionary.

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
 ...fer_length_check_to_UTF_16_or_32_detector.patch | 33 ----------------------
 .../0001-Disable-LDFLAGSICUDT-for-Linux.patch      |  0
 .../{icu-51.2 => icu}/icu-pkgdata-large-cmd.patch  |  0
 .../icu/{icu_51.2.bb => icu_53.1.bb}               | 15 ++++++----
 4 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch
 rename meta/recipes-support/icu/{icu-51.2 => icu}/0001-Disable-LDFLAGSICUDT-for-Linux.patch (100%)
 rename meta/recipes-support/icu/{icu-51.2 => icu}/icu-pkgdata-large-cmd.patch (100%)
 rename meta/recipes-support/icu/{icu_51.2.bb => icu_53.1.bb} (40%)

Patch

diff --git a/meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch b/meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch
deleted file mode 100644
index ad4d61c..0000000
--- a/meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
---- source/i18n/csrucode.cpp
-+++ source/i18n/csrucode.cpp
-@@ -33,8 +33,9 @@ UBool CharsetRecog_UTF_16_BE::match(Inpu
- {
-     const uint8_t *input = textIn->fRawInput;
-     int32_t confidence = 0;
-+    int32_t length = textIn->fRawLength;
- 
--    if (input[0] == 0xFE && input[1] == 0xFF) {
-+    if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) {
-         confidence = 100;
-     }
- 
-@@ -57,8 +58,9 @@ UBool CharsetRecog_UTF_16_LE::match(Inpu
- {
-     const uint8_t *input = textIn->fRawInput;
-     int32_t confidence = 0;
-+    int32_t length = textIn->fRawLength;
- 
--    if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
-+    if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
-         confidence = 100;
-     }
- 
-@@ -81,7 +83,7 @@ UBool CharsetRecog_UTF_32::match(InputTe
-     bool hasBOM = FALSE;
-     int32_t confidence = 0;
- 
--    if (getChar(input, 0) == 0x0000FEFFUL) {
-+    if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) {
-         hasBOM = TRUE;
-     }
- 
diff --git a/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
similarity index 100%
rename from meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
rename to meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
diff --git a/meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch b/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
similarity index 100%
rename from meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
rename to meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
diff --git a/meta/recipes-support/icu/icu_51.2.bb b/meta/recipes-support/icu/icu_53.1.bb
similarity index 40%
rename from meta/recipes-support/icu/icu_51.2.bb
rename to meta/recipes-support/icu/icu_53.1.bb
index 2d1fd42..d93af68 100644
--- a/meta/recipes-support/icu/icu_51.2.bb
+++ b/meta/recipes-support/icu/icu_53.1.bb
@@ -1,16 +1,21 @@ 
 require icu.inc
 
-LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
+LIC_FILES_CHKSUM = "file://../license.html;md5=8b139ac5b93769623bd343318048238c"
 
+def icu_download_version(d):
+    pvsplit = d.getVar('PV', True).split('.')
+    return pvsplit[0] + "_" + pvsplit[1]
 
-BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
+ICU_PV = "${@icu_download_version(d)}"
+
+BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz"
 SRC_URI = "${BASE_SRC_URI} \
            file://icu-pkgdata-large-cmd.patch \
-           file://add_buffer_length_check_to_UTF_16_or_32_detector.patch \
           "
 
 SRC_URI_append_class-target = "\
            file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
-SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"
+
+SRC_URI[md5sum] = "b73baa6fbdfef197608d1f69300919b9"
+SRC_URI[sha256sum] = "6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28"