Mercurial > mxe-octave
changeset 5041:1896847270bf
icu4c: update to v64.1
* src/icu4c-1-fixes.patch: remove file
* dist-files.mk: remove ref to old file
* src/icu4c.mk: update version/checksum
| author | John Donoghue |
|---|---|
| date | Mon, 01 Apr 2019 16:00:24 -0400 |
| parents | 390c9db1bcb0 |
| children | 56cce715e32f |
| files | dist-files.mk src/icu4c-1-fixes.patch src/icu4c.mk |
| diffstat | 3 files changed, 2 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Mon Apr 01 15:37:42 2019 -0400 +++ b/dist-files.mk Mon Apr 01 16:00:24 2019 -0400 @@ -182,7 +182,6 @@ hunspell-test.cpp \ hunspell.mk \ ice.mk \ - icu4c-1-fixes.patch \ icu4c.mk \ id3lib-1-win32.patch \ id3lib.mk \
--- a/src/icu4c-1-fixes.patch Mon Apr 01 15:37:42 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -diff -ur icu.orig/source/common/umutex.h icu/source/common/umutex.h ---- icu.orig/source/common/umutex.h 2018-11-28 07:44:08.599310972 -0500 -+++ icu/source/common/umutex.h 2018-11-28 07:48:11.600429267 -0500 -@@ -54,15 +54,15 @@ - - #include <atomic> - --U_NAMESPACE_BEGIN -- - // Export an explicit template instantiation of std::atomic<int32_t>. - // When building DLLs for Windows this is required as it is used as a data member of the exported SharedObject class. - // See digitlst.h, pluralaffix.h, datefmt.h, and others for similar examples. --#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN -+#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN) - template struct U_COMMON_API std::atomic<int32_t>; - #endif - -+U_NAMESPACE_BEGIN -+ - typedef std::atomic<int32_t> u_atomic_int32_t; - #define ATOMIC_INT32_T_INITIALIZER(val) ATOMIC_VAR_INIT(val) - -diff -ur icu.orig/source/i18n/unicode/numberrangeformatter.h icu/source/i18n/unicode/numberrangeformatter.h ---- icu.orig/source/i18n/unicode/numberrangeformatter.h 2018-11-28 07:44:08.647312767 -0500 -+++ icu/source/i18n/unicode/numberrangeformatter.h 2018-11-28 07:50:46.246265906 -0500 -@@ -185,8 +185,15 @@ - * Export an explicit template instantiation. See datefmt.h - * (When building DLLs for Windows this is required.) - */ --#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN) --template struct U_I18N_API std::atomic<impl::NumberRangeFormatterImpl*>; -+#if U_PLATFORM == U_PF_WINDOWS && !defined(U_IN_DOXYGEN) -+} // namespace icu::number -+U_NAMESPACE_END -+ -+template struct U_I18N_API std::atomic< U_NAMESPACE_QUALIFIER number::impl::NumberRangeFormatterImpl*>; -+ -+U_NAMESPACE_BEGIN -+namespace number { // icu::number -+ - #endif - /** \endcond */ - -diff -ur icu.orig/source/test/intltest/numbertest.h icu/source/test/intltest/numbertest.h ---- icu.orig/source/test/intltest/numbertest.h 2018-11-28 07:44:08.547309026 -0500 -+++ icu/source/test/intltest/numbertest.h 2018-11-28 07:51:46.752552939 -0500 -@@ -10,6 +10,7 @@ - #include "intltest.h" - #include "number_affixutils.h" - #include "numparse_stringsegment.h" -+#include "numrange_impl.h" - #include "unicode/locid.h" - #include "unicode/numberformatter.h" - #include "unicode/numberrangeformatter.h"
--- a/src/icu4c.mk Mon Apr 01 15:37:42 2019 -0400 +++ b/src/icu4c.mk Mon Apr 01 16:00:24 2019 -0400 @@ -1,7 +1,7 @@ PKG := icu4c $(PKG)_IGNORE := -$(PKG)_VERSION := 63.1 -$(PKG)_CHECKSUM := ad523232f19af1c698c6489f8e15f7e9824f1662 +$(PKG)_VERSION := 64.1 +$(PKG)_CHECKSUM := 50f900fe983dcdb46c68a078b8b09afde1339ad7 $(PKG)_SUBDIR := icu $(PKG)_FILE := $(PKG)-$(subst .,_,$($(PKG)_VERSION))-src.tgz $(PKG)_URL := http://download.icu-project.org/files/icu4c/$($(PKG)_VERSION)/$($(PKG)_FILE)