From 0909fa3ab10c62521dc09d0c5990f417dcb1507f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sun, 19 Aug 2018 19:53:28 +0200 Subject: [PATCH] icu: updated to 62.1 Note: prt-get update -fr $(revdep); revdep is in opt/prt-utils --- icu/.footprint | 57 ++++---- icu/.md5sum | 4 +- icu/Pkgfile | 4 +- icu/icu-58.1-iterator.patch | 127 ---------------- icu/icu-58.1-remove-bashisms.patch | 224 ----------------------------- 5 files changed, 32 insertions(+), 384 deletions(-) delete mode 100644 icu/icu-58.1-iterator.patch delete mode 100644 icu/icu-58.1-remove-bashisms.patch diff --git a/icu/.footprint b/icu/.footprint index 9cf1ee3..cb3d778 100644 --- a/icu/.footprint +++ b/icu/.footprint @@ -158,6 +158,7 @@ drwxr-xr-x root/root usr/include/unicode/ -rw-r--r-- root/root usr/include/unicode/unorm.h -rw-r--r-- root/root usr/include/unicode/unorm2.h -rw-r--r-- root/root usr/include/unicode/unum.h +-rw-r--r-- root/root usr/include/unicode/unumberformatter.h -rw-r--r-- root/root usr/include/unicode/unumsys.h -rw-r--r-- root/root usr/include/unicode/uobject.h -rw-r--r-- root/root usr/include/unicode/upluralrules.h @@ -193,30 +194,30 @@ drwxr-xr-x root/root usr/include/unicode/ -rw-r--r-- root/root usr/include/unicode/vtzone.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/icu/ -drwxr-xr-x root/root usr/lib/icu/60.1/ --rw-r--r-- root/root usr/lib/icu/60.1/Makefile.inc --rw-r--r-- root/root usr/lib/icu/60.1/pkgdata.inc +drwxr-xr-x root/root usr/lib/icu/62.1/ +-rw-r--r-- root/root usr/lib/icu/62.1/Makefile.inc +-rw-r--r-- root/root usr/lib/icu/62.1/pkgdata.inc lrwxrwxrwx root/root usr/lib/icu/Makefile.inc -> current/Makefile.inc -lrwxrwxrwx root/root usr/lib/icu/current -> 60.1 +lrwxrwxrwx root/root usr/lib/icu/current -> 62.1 lrwxrwxrwx root/root usr/lib/icu/pkgdata.inc -> current/pkgdata.inc -lrwxrwxrwx root/root usr/lib/libicudata.so -> libicudata.so.60.1 -lrwxrwxrwx root/root usr/lib/libicudata.so.60 -> libicudata.so.60.1 --rwxr-xr-x root/root usr/lib/libicudata.so.60.1 -lrwxrwxrwx root/root usr/lib/libicui18n.so -> libicui18n.so.60.1 -lrwxrwxrwx root/root usr/lib/libicui18n.so.60 -> libicui18n.so.60.1 --rwxr-xr-x root/root usr/lib/libicui18n.so.60.1 -lrwxrwxrwx root/root usr/lib/libicuio.so -> libicuio.so.60.1 -lrwxrwxrwx root/root usr/lib/libicuio.so.60 -> libicuio.so.60.1 --rwxr-xr-x root/root usr/lib/libicuio.so.60.1 -lrwxrwxrwx root/root usr/lib/libicutest.so -> libicutest.so.60.1 -lrwxrwxrwx root/root usr/lib/libicutest.so.60 -> libicutest.so.60.1 --rwxr-xr-x root/root usr/lib/libicutest.so.60.1 -lrwxrwxrwx root/root usr/lib/libicutu.so -> libicutu.so.60.1 -lrwxrwxrwx root/root usr/lib/libicutu.so.60 -> libicutu.so.60.1 --rwxr-xr-x root/root usr/lib/libicutu.so.60.1 -lrwxrwxrwx root/root usr/lib/libicuuc.so -> libicuuc.so.60.1 -lrwxrwxrwx root/root usr/lib/libicuuc.so.60 -> libicuuc.so.60.1 --rwxr-xr-x root/root usr/lib/libicuuc.so.60.1 +lrwxrwxrwx root/root usr/lib/libicudata.so -> libicudata.so.62.1 +lrwxrwxrwx root/root usr/lib/libicudata.so.62 -> libicudata.so.62.1 +-rwxr-xr-x root/root usr/lib/libicudata.so.62.1 +lrwxrwxrwx root/root usr/lib/libicui18n.so -> libicui18n.so.62.1 +lrwxrwxrwx root/root usr/lib/libicui18n.so.62 -> libicui18n.so.62.1 +-rwxr-xr-x root/root usr/lib/libicui18n.so.62.1 +lrwxrwxrwx root/root usr/lib/libicuio.so -> libicuio.so.62.1 +lrwxrwxrwx root/root usr/lib/libicuio.so.62 -> libicuio.so.62.1 +-rwxr-xr-x root/root usr/lib/libicuio.so.62.1 +lrwxrwxrwx root/root usr/lib/libicutest.so -> libicutest.so.62.1 +lrwxrwxrwx root/root usr/lib/libicutest.so.62 -> libicutest.so.62.1 +-rwxr-xr-x root/root usr/lib/libicutest.so.62.1 +lrwxrwxrwx root/root usr/lib/libicutu.so -> libicutu.so.62.1 +lrwxrwxrwx root/root usr/lib/libicutu.so.62 -> libicutu.so.62.1 +-rwxr-xr-x root/root usr/lib/libicutu.so.62.1 +lrwxrwxrwx root/root usr/lib/libicuuc.so -> libicuuc.so.62.1 +lrwxrwxrwx root/root usr/lib/libicuuc.so.62 -> libicuuc.so.62.1 +-rwxr-xr-x root/root usr/lib/libicuuc.so.62.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/icu-i18n.pc -rw-r--r-- root/root usr/lib/pkgconfig/icu-io.pc @@ -230,12 +231,12 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/icupkg drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/icu/ -drwxr-xr-x root/root usr/share/icu/60.1/ --rw-r--r-- root/root usr/share/icu/60.1/LICENSE -drwxr-xr-x root/root usr/share/icu/60.1/config/ --rw-r--r-- root/root usr/share/icu/60.1/config/mh-linux --rwxr-xr-x root/root usr/share/icu/60.1/install-sh --rwxr-xr-x root/root usr/share/icu/60.1/mkinstalldirs +drwxr-xr-x root/root usr/share/icu/62.1/ +-rw-r--r-- root/root usr/share/icu/62.1/LICENSE +drwxr-xr-x root/root usr/share/icu/62.1/config/ +-rw-r--r-- root/root usr/share/icu/62.1/config/mh-linux +-rwxr-xr-x root/root usr/share/icu/62.1/install-sh +-rwxr-xr-x root/root usr/share/icu/62.1/mkinstalldirs drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/derb.1.gz diff --git a/icu/.md5sum b/icu/.md5sum index 2d91893..ffecb7f 100644 --- a/icu/.md5sum +++ b/icu/.md5sum @@ -1,3 +1 @@ -dd2f8f55d76584edaeb975f7dd7f47f9 icu-58.1-iterator.patch -f39223f2dcbfe36fb758e59195dc651d icu-58.1-remove-bashisms.patch -3d164a2d1bcebd1464c6160ebb8315ef icu4c-60_1-src.tgz +490ad9d920158e0314e10ba74ae9a150 icu4c-62_1-src.tgz diff --git a/icu/Pkgfile b/icu/Pkgfile index 131335a..8e57b80 100644 --- a/icu/Pkgfile +++ b/icu/Pkgfile @@ -5,9 +5,9 @@ # Packager: Younes Hafri, ycrux at club-internet dot fr name=icu -version=60.1 +version=62.1 release=1 -source=(http://download.icu-project.org/files/icu4c/$version/icu4c-${version//./_}-src.tgz) +source=(https://ssl.icu-project.org/files/icu4c/$version/icu4c-${version//./_}-src.tgz) build() { cd icu/source diff --git a/icu/icu-58.1-iterator.patch b/icu/icu-58.1-iterator.patch deleted file mode 100644 index 6f52375..0000000 --- a/icu/icu-58.1-iterator.patch +++ /dev/null @@ -1,127 +0,0 @@ -source: http://bugs.icu-project.org/trac/changeset/39484/ - - -Index: icu/common/ulist.c -=================================================================== ---- icu/common/ulist.c (revision 39483) -+++ icu/common/ulist.c (revision 39484) -@@ -30,5 +30,4 @@ - - int32_t size; -- int32_t currentIndex; - }; - -@@ -52,5 +51,4 @@ - newList->tail = NULL; - newList->size = 0; -- newList->currentIndex = -1; - - return newList; -@@ -81,6 +79,7 @@ - p->next->previous = p->previous; - } -- list->curr = NULL; -- list->currentIndex = 0; -+ if (p == list->curr) { -+ list->curr = p->next; -+ } - --list->size; - if (p->forceDelete) { -@@ -151,5 +150,4 @@ - list->head->previous = newItem; - list->head = newItem; -- list->currentIndex++; - } - -@@ -194,5 +192,4 @@ - curr = list->curr; - list->curr = curr->next; -- list->currentIndex++; - - return curr->data; -@@ -210,5 +207,4 @@ - if (list != NULL) { - list->curr = list->head; -- list->currentIndex = 0; - } - } -@@ -273,3 +269,2 @@ - return (UList *)(en->context); - } -- -Index: icu/i18n/ucol_res.cpp -=================================================================== ---- icu/i18n/ucol_res.cpp (revision 39483) -+++ icu/i18n/ucol_res.cpp (revision 39484) -@@ -681,4 +681,5 @@ - } - memcpy(en, &defaultKeywordValues, sizeof(UEnumeration)); -+ ulist_resetList(sink.values); // Initialize the iterator. - en->context = sink.values; - sink.values = NULL; // Avoid deletion in the sink destructor. -Index: icu/test/intltest/apicoll.cpp -=================================================================== ---- icu/test/intltest/apicoll.cpp (revision 39483) -+++ icu/test/intltest/apicoll.cpp (revision 39484) -@@ -82,14 +82,7 @@ - col = Collator::createInstance(Locale::getEnglish(), success); - if (U_FAILURE(success)){ -- errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success)); -- return; -- } -- -- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success); -- if (U_FAILURE(success)){ -- errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success)); -- return; -- } -- delete kwEnum; -+ errcheckln(success, "English Collator creation failed. - %s", u_errorName(success)); -+ return; -+ } - - col->getVersion(versionArray); -@@ -230,4 +223,27 @@ - delete aFrCol; - delete junk; -+} -+ -+void CollationAPITest::TestKeywordValues() { -+ IcuTestErrorCode errorCode(*this, "TestKeywordValues"); -+ LocalPointer col(Collator::createInstance(Locale::getEnglish(), errorCode)); -+ if (errorCode.logIfFailureAndReset("English Collator creation failed")) { -+ return; -+ } -+ -+ LocalPointer kwEnum( -+ col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode)); -+ if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) { -+ return; -+ } -+ assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0); -+ const char *kw; -+ UBool hasStandard = FALSE; -+ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) { -+ if (strcmp(kw, "standard") == 0) { -+ hasStandard = TRUE; -+ } -+ } -+ assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard); - } - -@@ -2467,4 +2483,5 @@ - TESTCASE_AUTO_BEGIN; - TESTCASE_AUTO(TestProperty); -+ TESTCASE_AUTO(TestKeywordValues); - TESTCASE_AUTO(TestOperators); - TESTCASE_AUTO(TestDuplicate); -Index: icu/test/intltest/apicoll.h -=================================================================== ---- icu/test/intltest/apicoll.h (revision 39483) -+++ icu/test/intltest/apicoll.h (revision 39484) -@@ -36,4 +36,5 @@ - */ - void TestProperty(/* char* par */); -+ void TestKeywordValues(); - - /** diff --git a/icu/icu-58.1-remove-bashisms.patch b/icu/icu-58.1-remove-bashisms.patch deleted file mode 100644 index ef60ce4..0000000 --- a/icu/icu-58.1-remove-bashisms.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in ---- a/config/Makefile.inc.in 2016-09-09 23:28:18.000000000 +0200 -+++ b/config/Makefile.inc.in 2016-11-05 19:43:07.688466668 +0100 -@@ -124,12 +124,6 @@ - # with usually. Many applications will want to add $(ICULIBS_I18N) as well. - ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) - --# Proper echo newline handling is needed in icu-config --ECHO_N=@ICU_ECHO_N@ --ECHO_C=@ICU_ECHO_C@ --# Not currently being used but good to have for proper tab handling --ECHO_T=@ICU_ECHO_T@ -- - ################################################################## - ################################################################## - # -diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom ---- a/config/icu-config-bottom 2016-09-09 23:28:18.000000000 +0200 -+++ b/config/icu-config-bottom 2016-11-05 19:49:00.854481361 +0100 -@@ -218,65 +218,65 @@ - ;; - - --cflags) -- echo $ECHO_N "${CFLAGS} ${ECHO_C}" -+ printf "%s" "${CFLAGS} " - ;; - - --cc) -- echo $ECHO_N "${CC} ${ECHO_C}" -+ printf "%s" "${CC} " - ;; - - --cxx) -- echo $ECHO_N "${CXX} ${ECHO_C}" -+ printf "%s" "${CXX} " - ;; - - --cxxflags) -- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" -+ printf "%s" "${CXXFLAGS} " - ;; - - --cppflags) - # Don't echo the -I. - it's unneeded. -- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' -+ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' - ;; - - --cppflags-searchpath) -- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" -+ printf "%s" "-I${prefix}/include " - ;; - - --cppflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCPPFLAGS} " - ;; - - --cxxflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCXXFLAGS} " - ;; - - --cflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCFLAGS} " - ;; - - --ldflags-system) -- echo $ECHO_N "${LIBS} ${ECHO_C}" -+ printf "%s" "${LIBS} " - ;; - - --ldflags) -- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" -+ printf "%s" "${LDFLAGS} ${ICULIBS} " - # $RPATH_LDFLAGS - ;; - - --ldflags-libsonly) -- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" -+ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " - ;; - - --ldflags-icuio) -- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" -+ printf "%s" " ${ICULIBS_ICUIO} " - ;; - - --ldflags-obsolete) -- echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}" -+ printf "%s" "${ICULIBS_OBSOLETE} " - ;; - - --ldflags-toolutil) -- echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}" -+ printf "%s" " ${ICULIBS_TOOLUTIL} " - ;; - - --ldflags-layout) -@@ -285,7 +285,7 @@ - ;; - - --ldflags-searchpath) -- echo $ECHO_N "-L${libdir} ${ECHO_C}" -+ printf "%s" "-L${libdir} " - ;; - - --detect-prefix) -@@ -321,47 +321,47 @@ - ;; - - --shared-datadir) -- echo $ECHO_N "${datadir} ${ECHO_C}" -+ printf "%s" "${datadir} " - ;; - - --incfile) -- echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}" -+ printf "%s" "${pkglibdir}/Makefile.inc " - ;; - - --incpkgdatafile) -- echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}" -+ printf "%s" "${pkglibdir}/pkgdata.inc " - ;; - - --icudata) -- echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}" -+ printf "%s" "${ICUDATA_NAME} " - ;; - - --icudata-mode) -- echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}" -+ printf "%s" "${PKGDATA_MODE} " - ;; - - --icudata-install-dir) -- echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}" -+ printf "%s" "${ICUPKGDATA_DIR} " - ;; - - --icudatadir) -- echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}" -+ printf "%s" "${ICUDATA_DIR} " - ;; - - --shlib-c) -- echo $ECHO_N "${SHLIB_c} ${ECHO_C}" -+ printf "%s" "${SHLIB_c} " - ;; - - --shlib-cc) -- echo $ECHO_N "${SHLIB_cc} ${ECHO_C}" -+ printf "%s" "${SHLIB_cc} " - ;; - - --version) -- echo $ECHO_N $VERSION -+ printf "%s" "$VERSION" - ;; - - --unicode-version) -- echo $ECHO_N $UNICODE_VERSION -+ printf "%s" "$UNICODE_VERSION" - ;; - - --host) -diff -ruN a/configure.ac b/configure.ac ---- a/configure.ac 2016-10-04 21:30:20.000000000 +0200 -+++ b/configure.ac 2016-11-05 19:43:07.688466668 +0100 -@@ -22,24 +22,6 @@ - PACKAGE="icu" - AC_SUBST(PACKAGE) - --# Use custom echo test for newline option --# Current autoconf (2.65) gives incorrect echo newline option --# for icu-config --# This may be removed later - mow (June 17, 2010) --ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T= --case `/bin/sh -c "echo -n x"` in ---n*) -- case `/bin/sh -c "echo 'x\c'"` in -- *c*) ICU_ECHO_T=' ';; # ECHO_T is single tab character. -- *) ICU_ECHO_C='\c';; -- esac;; --*) -- ICU_ECHO_N='-n';; --esac --AC_SUBST(ICU_ECHO_N) --AC_SUBST(ICU_ECHO_C) --AC_SUBST(ICU_ECHO_T) -- - AC_MSG_CHECKING(for ICU version numbers) - - # Get the ICU version from uversion.h or other headers -diff -ruN a/icudefs.mk.in b/icudefs.mk.in ---- a/icudefs.mk.in 2016-09-09 23:28:18.000000000 +0200 -+++ b/icudefs.mk.in 2016-11-05 19:43:07.688466668 +0100 -@@ -157,11 +157,6 @@ - ENABLE_STATIC = @ENABLE_STATIC@ - ENABLE_SHARED = @ENABLE_SHARED@ - --# Echo w/o newline -- --#ECHO_N = @ICU_ECHO_N@ --#ECHO_C = @ICU_ECHO_C@ -- - # Commands to compile - COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c - COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c -diff -ruN a/test/hdrtst/Makefile.in b/test/hdrtst/Makefile.in ---- a/test/hdrtst/Makefile.in 2016-09-28 06:17:24.000000000 +0200 -+++ b/test/hdrtst/Makefile.in 2016-11-05 19:43:07.688466668 +0100 -@@ -35,9 +35,6 @@ - include $(shell icu-config --incfile) - DIRS=$(prefix)/include/unicode - LDIRS=$(prefix)/include/layout --ECHO_T=@ECHO_T@ --ECHO_C=@ECHO_C@ --ECHO_N=@ECHO_N@ - - all: - @echo Please read this Makefile for more information. -- 2.26.2