From 79f36e7d329a8aa2ed1b1d69878203ced96bc6ca Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Tue, 5 Dec 2017 13:51:46 +0200 Subject: libunistring: upgrade to 0.9.8 Refreshed the following patch: iconv-m4-remove-the-test-to-convert-euc-jp.patch No change in license as update in License Checksum is due to change in Copyright years. Signed-off-by: Maxin B. John Signed-off-by: Ross Burton --- ...conv-m4-remove-the-test-to-convert-euc-jp.patch | 56 ++++++++++++++-------- .../libunistring/libunistring_0.9.7.bb | 30 ------------ .../libunistring/libunistring_0.9.8.bb | 30 ++++++++++++ 3 files changed, 66 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-support/libunistring/libunistring_0.9.7.bb create mode 100644 meta/recipes-support/libunistring/libunistring_0.9.8.bb diff --git a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch index d4489165bf..9e8ce2270d 100644 --- a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch +++ b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch @@ -1,6 +1,6 @@ -From 8d99a368615656a835f5502326afd31cec2cebfe Mon Sep 17 00:00:00 2001 +From 30562065ba9e4c238e76100b5f9f0c5add0e635b Mon Sep 17 00:00:00 2001 From: Jackie Huang -Date: Mon, 16 Sep 2013 18:16:12 +0800 +Date: Tue, 5 Dec 2017 09:30:36 +0200 Subject: [PATCH] remove the test to convert euc-jp Remove the test "Test against HP-UX 11.11 bug: @@ -13,28 +13,44 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jackie Huang --- - gnulib-m4/iconv.m4 | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) +--- + gnulib-m4/iconv.m4 | 23 ----------------------- + 1 file changed, 23 deletions(-) -Index: libunistring-0.9.4/gnulib-m4/iconv.m4 -=================================================================== ---- libunistring-0.9.4.orig/gnulib-m4/iconv.m4 2014-11-03 17:41:29.755011917 +0000 -+++ libunistring-0.9.4/gnulib-m4/iconv.m4 2014-11-03 17:43:03.795014480 +0000 -@@ -159,17 +159,6 @@ +diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 +index b33ecd0..73b6aa1 100644 +--- a/gnulib-m4/iconv.m4 ++++ b/gnulib-m4/iconv.m4 +@@ -165,29 +165,6 @@ AC_DEFUN([AM_ICONV_LINK], } } #endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ -- if (/* Try standardized names. */ -- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) -- /* Try IRIX, OSF/1 names. */ -- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) -- /* Try AIX names. */ -- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) -- /* Try HP-UX names. */ -- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) -- result |= 16; +- { +- /* Try standardized names. */ +- iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); +- /* Try IRIX, OSF/1 names. */ +- iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); +- /* Try AIX names. */ +- iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); +- /* Try HP-UX names. */ +- iconv_t cd4 = iconv_open ("utf8", "eucJP"); +- if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) +- && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) +- result |= 16; +- if (cd1 != (iconv_t)(-1)) +- iconv_close (cd1); +- if (cd2 != (iconv_t)(-1)) +- iconv_close (cd2); +- if (cd3 != (iconv_t)(-1)) +- iconv_close (cd3); +- if (cd4 != (iconv_t)(-1)) +- iconv_close (cd4); +- } return result; - }]])], - [am_cv_func_iconv_works=yes], + ]])], + [am_cv_func_iconv_works=yes], , +-- +2.4.0 + diff --git a/meta/recipes-support/libunistring/libunistring_0.9.7.bb b/meta/recipes-support/libunistring/libunistring_0.9.7.bb deleted file mode 100644 index f77a210b1c..0000000000 --- a/meta/recipes-support/libunistring/libunistring_0.9.7.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Library for manipulating C and Unicode strings" - -DESCRIPTION = "Text files are nowadays usually encoded in Unicode, and may\ - consist of very different scripts from Latin letters to Chinese Hanzi\ - with many kinds of special characters accents, right-to-left writing\ - marks, hyphens, Roman numbers, and much more. But the POSIX platform\ - APIs for text do not contain adequate functions for dealing with\ - particular properties of many Unicode characters. In fact, the POSIX\ - APIs for text have several assumptions at their base which don't hold\ - for Unicode text. This library provides functions for manipulating\ - Unicode strings and for manipulating C strings according to the Unicode\ - standard. This package contains documentation." - -HOMEPAGE = "http://www.gnu.org/software/libunistring/" -SECTION = "devel" -LICENSE = "LGPLv3+ | GPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://README;beginline=45;endline=65;md5=08287d16ba8d839faed8d2dc14d7d6a5 \ - file://doc/libunistring.texi;md5=b86c9fd7acaac623017239640631912c \ - " - -SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ - file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ -" -SRC_URI[md5sum] = "8e663454aa372181ee8e46edaa3ba4c8" -SRC_URI[sha256sum] = "9ce081cbee1951b55597b30e7030bda9d7b2f034ef901a135ff3a020be5a41e5" - -inherit autotools texinfo -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libunistring/libunistring_0.9.8.bb b/meta/recipes-support/libunistring/libunistring_0.9.8.bb new file mode 100644 index 0000000000..4000e54683 --- /dev/null +++ b/meta/recipes-support/libunistring/libunistring_0.9.8.bb @@ -0,0 +1,30 @@ +SUMMARY = "Library for manipulating C and Unicode strings" + +DESCRIPTION = "Text files are nowadays usually encoded in Unicode, and may\ + consist of very different scripts from Latin letters to Chinese Hanzi\ + with many kinds of special characters accents, right-to-left writing\ + marks, hyphens, Roman numbers, and much more. But the POSIX platform\ + APIs for text do not contain adequate functions for dealing with\ + particular properties of many Unicode characters. In fact, the POSIX\ + APIs for text have several assumptions at their base which don't hold\ + for Unicode text. This library provides functions for manipulating\ + Unicode strings and for manipulating C strings according to the Unicode\ + standard. This package contains documentation." + +HOMEPAGE = "http://www.gnu.org/software/libunistring/" +SECTION = "devel" +LICENSE = "LGPLv3+ | GPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://README;beginline=45;endline=65;md5=08287d16ba8d839faed8d2dc14d7d6a5 \ + file://doc/libunistring.texi;md5=0db7ee008b43bde817ca41b69e691e44 \ + " + +SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ + file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ + file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ +" +SRC_URI[md5sum] = "e255167c83d96defe159c3299737e72c" +SRC_URI[sha256sum] = "b792f2bd05d0fa7b339e39e353da7232b2e514e0db2cf5ed95beeff3feb53cf5" + +inherit autotools texinfo +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg