From cce150502fada2068ef1ab92b88a08ed0b64d766 Mon Sep 17 00:00:00 2001 From: Valentin Popa Date: Tue, 6 May 2014 17:25:04 +0300 Subject: 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. Signed-off-by: Valentin Popa Signed-off-by: Saul Wold --- .../0001-Disable-LDFLAGSICUDT-for-Linux.patch | 28 ------------------ ...fer_length_check_to_UTF_16_or_32_detector.patch | 33 ---------------------- .../icu/icu-51.2/icu-pkgdata-large-cmd.patch | 29 ------------------- .../icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch | 28 ++++++++++++++++++ .../icu/icu/icu-pkgdata-large-cmd.patch | 29 +++++++++++++++++++ meta/recipes-support/icu/icu_51.2.bb | 16 ----------- meta/recipes-support/icu/icu_53.1.bb | 21 ++++++++++++++ 7 files changed, 78 insertions(+), 106 deletions(-) delete mode 100644 meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch delete mode 100644 meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch delete mode 100644 meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch create mode 100644 meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch create mode 100644 meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch delete mode 100644 meta/recipes-support/icu/icu_51.2.bb create mode 100644 meta/recipes-support/icu/icu_53.1.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch deleted file mode 100644 index 2968d571bb..0000000000 --- a/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 15 Feb 2014 21:06:42 +0000 -Subject: [PATCH] Disable LDFLAGSICUDT for Linux - -Upstream-Status: Inappropriate [ OE Configuration ] - -Signed-off-by: Khem Raj ---- - source/config/mh-linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/mh-linux b/config/mh-linux -index 366f0cc..2689aab 100644 ---- a/config/mh-linux -+++ b/config/mh-linux -@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN - LD_RPATH_PRE = -Wl,-rpath, - - ## These are the library specific LDFLAGS --LDFLAGSICUDT=-nodefaultlibs -nostdlib -+# LDFLAGSICUDT=-nodefaultlibs -nostdlib - - ## Compiler switch to embed a library name - # The initial tab in the next line is to prevent icu-config from reading it. --- -1.7.10.4 - 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 @@ ---- 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/icu-pkgdata-large-cmd.patch b/meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch deleted file mode 100644 index 6e40659227..0000000000 --- a/meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch +++ /dev/null @@ -1,29 +0,0 @@ -pkgdata.cpp: use LARGE_BUFFER_MAX_SIZE for cmd - -Use LARGE_BUFFER_MAX_SIZE for cmd rather than SMALL_BUFFER_MAX_SIZE, -otherwise there was a Segmentation fault error when the command line is -long, this should be a misplay since other cmd uses -LARGE_BUFFER_MAX_SIZE. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang ---- - tools/pkgdata/pkgdata.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp ---- a/tools/pkgdata/pkgdata.cpp -+++ b/tools/pkgdata/pkgdata.cpp -@@ -1019,7 +1019,7 @@ normal_symlink_mode: - - static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) { - int32_t result = 0; -- char cmd[SMALL_BUFFER_MAX_SIZE]; -+ char cmd[LARGE_BUFFER_MAX_SIZE]; - - sprintf(cmd, "cd %s && %s %s %s%s%s", - targetDir, --- -1.7.10.4 - diff --git a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch new file mode 100644 index 0000000000..2968d571bb --- /dev/null +++ b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch @@ -0,0 +1,28 @@ +From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Feb 2014 21:06:42 +0000 +Subject: [PATCH] Disable LDFLAGSICUDT for Linux + +Upstream-Status: Inappropriate [ OE Configuration ] + +Signed-off-by: Khem Raj +--- + source/config/mh-linux | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/mh-linux b/config/mh-linux +index 366f0cc..2689aab 100644 +--- a/config/mh-linux ++++ b/config/mh-linux +@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN + LD_RPATH_PRE = -Wl,-rpath, + + ## These are the library specific LDFLAGS +-LDFLAGSICUDT=-nodefaultlibs -nostdlib ++# LDFLAGSICUDT=-nodefaultlibs -nostdlib + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. +-- +1.7.10.4 + diff --git a/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch b/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch new file mode 100644 index 0000000000..6e40659227 --- /dev/null +++ b/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch @@ -0,0 +1,29 @@ +pkgdata.cpp: use LARGE_BUFFER_MAX_SIZE for cmd + +Use LARGE_BUFFER_MAX_SIZE for cmd rather than SMALL_BUFFER_MAX_SIZE, +otherwise there was a Segmentation fault error when the command line is +long, this should be a misplay since other cmd uses +LARGE_BUFFER_MAX_SIZE. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + tools/pkgdata/pkgdata.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp +--- a/tools/pkgdata/pkgdata.cpp ++++ b/tools/pkgdata/pkgdata.cpp +@@ -1019,7 +1019,7 @@ normal_symlink_mode: + + static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) { + int32_t result = 0; +- char cmd[SMALL_BUFFER_MAX_SIZE]; ++ char cmd[LARGE_BUFFER_MAX_SIZE]; + + sprintf(cmd, "cd %s && %s %s %s%s%s", + targetDir, +-- +1.7.10.4 + 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 @@ -require icu.inc - -LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1" - - -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-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" 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 @@ +require icu.inc + +LIC_FILES_CHKSUM = "file://../license.html;md5=8b139ac5b93769623bd343318048238c" + +def icu_download_version(d): + pvsplit = d.getVar('PV', True).split('.') + return pvsplit[0] + "_" + pvsplit[1] + +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 \ + " + +SRC_URI_append_class-target = "\ + file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ + " + +SRC_URI[md5sum] = "b73baa6fbdfef197608d1f69300919b9" +SRC_URI[sha256sum] = "6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28" -- cgit 1.2.3-korg