diff options
author | Valentin Popa <valentin.popa@intel.com> | 2014-05-06 17:25:04 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-11 12:27:21 +0100 |
commit | f9421caf32504d6716a8caa0c4de8c64e8b4f570 (patch) | |
tree | afad52d4a367dd31662a0064574af6ecfeb32482 | |
parent | 1b82c73df43500d64dc49a9fb4a2546d88a5f95e (diff) | |
download | poky-f9421caf32504d6716a8caa0c4de8c64e8b4f570.tar.gz |
icu: upgrade to 53.1
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.
(From OE-Core rev: cce150502fada2068ef1ab92b88a08ed0b64d766)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch | 33 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch (renamed from meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch (renamed from meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu_51.2.bb | 16 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu_53.1.bb | 21 |
5 files changed, 21 insertions, 49 deletions
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 ad4d61c3ea..0000000000 --- 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 @@ | |||
1 | --- source/i18n/csrucode.cpp | ||
2 | +++ source/i18n/csrucode.cpp | ||
3 | @@ -33,8 +33,9 @@ UBool CharsetRecog_UTF_16_BE::match(Inpu | ||
4 | { | ||
5 | const uint8_t *input = textIn->fRawInput; | ||
6 | int32_t confidence = 0; | ||
7 | + int32_t length = textIn->fRawLength; | ||
8 | |||
9 | - if (input[0] == 0xFE && input[1] == 0xFF) { | ||
10 | + if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) { | ||
11 | confidence = 100; | ||
12 | } | ||
13 | |||
14 | @@ -57,8 +58,9 @@ UBool CharsetRecog_UTF_16_LE::match(Inpu | ||
15 | { | ||
16 | const uint8_t *input = textIn->fRawInput; | ||
17 | int32_t confidence = 0; | ||
18 | + int32_t length = textIn->fRawLength; | ||
19 | |||
20 | - if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) { | ||
21 | + if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) { | ||
22 | confidence = 100; | ||
23 | } | ||
24 | |||
25 | @@ -81,7 +83,7 @@ UBool CharsetRecog_UTF_32::match(InputTe | ||
26 | bool hasBOM = FALSE; | ||
27 | int32_t confidence = 0; | ||
28 | |||
29 | - if (getChar(input, 0) == 0x0000FEFFUL) { | ||
30 | + if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) { | ||
31 | hasBOM = TRUE; | ||
32 | } | ||
33 | |||
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 index 2968d571bb..2968d571bb 100644 --- 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 | |||
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 index 6e40659227..6e40659227 100644 --- a/meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch +++ b/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_51.2.bb deleted file mode 100644 index 2d1fd42924..0000000000 --- a/meta/recipes-support/icu/icu_51.2.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require icu.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1" | ||
4 | |||
5 | |||
6 | BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz" | ||
7 | SRC_URI = "${BASE_SRC_URI} \ | ||
8 | file://icu-pkgdata-large-cmd.patch \ | ||
9 | file://add_buffer_length_check_to_UTF_16_or_32_detector.patch \ | ||
10 | " | ||
11 | |||
12 | SRC_URI_append_class-target = "\ | ||
13 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | ||
14 | " | ||
15 | SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709" | ||
16 | SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc" | ||
diff --git a/meta/recipes-support/icu/icu_53.1.bb b/meta/recipes-support/icu/icu_53.1.bb new file mode 100644 index 0000000000..d93af68438 --- /dev/null +++ b/meta/recipes-support/icu/icu_53.1.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | require icu.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://../license.html;md5=8b139ac5b93769623bd343318048238c" | ||
4 | |||
5 | def icu_download_version(d): | ||
6 | pvsplit = d.getVar('PV', True).split('.') | ||
7 | return pvsplit[0] + "_" + pvsplit[1] | ||
8 | |||
9 | ICU_PV = "${@icu_download_version(d)}" | ||
10 | |||
11 | BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" | ||
12 | SRC_URI = "${BASE_SRC_URI} \ | ||
13 | file://icu-pkgdata-large-cmd.patch \ | ||
14 | " | ||
15 | |||
16 | SRC_URI_append_class-target = "\ | ||
17 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | ||
18 | " | ||
19 | |||
20 | SRC_URI[md5sum] = "b73baa6fbdfef197608d1f69300919b9" | ||
21 | SRC_URI[sha256sum] = "6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28" | ||