[Libreoffice-commits] core.git: configure.ac download.lst external/icu
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Oct 20 11:08:53 UTC 2018
configure.ac | 2 -
download.lst | 8 ++--
external/icu/icu4c-android.patch.1 | 53 ++++++++++++++--------------
external/icu/icu4c-clang-cl.patch.1 | 2 -
external/icu/icu4c-khmerbreakengine.patch.1 | 24 ++++++------
5 files changed, 45 insertions(+), 44 deletions(-)
New commits:
commit 190a1394c2dd2aa338559c99a23ec3c62d29a2eb
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Sat Oct 20 01:57:10 2018 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Sat Oct 20 13:08:31 2018 +0200
Upgrade to ICU 63.1
Change-Id: I3b73fca39f51809f608dd78865c2566357a7b8a1
Reviewed-on: https://gerrit.libreoffice.org/62034
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack at redhat.com>
diff --git a/configure.ac b/configure.ac
index a20e0be6c688..334c4c10759a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9106,7 +9106,7 @@ SYSTEM_GENBRK=
SYSTEM_GENCCODE=
SYSTEM_GENCMN=
-ICU_MAJOR=62
+ICU_MAJOR=63
ICU_MINOR=1
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index 48bf64aa74f2..46afd8e9cd89 100644
--- a/download.lst
+++ b/download.lst
@@ -104,10 +104,10 @@ export HUNSPELL_SHA256SUM := 3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce
export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
export HYPHEN_SHA256SUM := 304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3
-export ICU_TARBALL := icu4c-62_1-src.tgz
-export ICU_DATA_SHA256SUM := 93bcaf58cfa9223972da79cb8e0f94819ace4995db6041b84f4d9bd810246d1d
-export ICU_DATA_TARBALL := icu4c-62_1-data.zip
+export ICU_SHA256SUM := 05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d
+export ICU_TARBALL := icu4c-63_1-src.tgz
+export ICU_DATA_SHA256SUM := 9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c
+export ICU_DATA_TARBALL := icu4c-63_1-data.zip
export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
export JFREEREPORT_FLUTE_SHA256SUM := 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/icu4c-android.patch.1 b/external/icu/icu4c-android.patch.1
index 1f1fdcff2fb9..b012b0c11cd2 100644
--- a/external/icu/icu4c-android.patch.1
+++ b/external/icu/icu4c-android.patch.1
@@ -1,9 +1,9 @@
diff -ur icu.org/source/common/unicode/platform.h icu/source/common/unicode/platform.h
---- icu.org/source/common/unicode/platform.h 2017-03-22 20:06:26.000000000 +0100
-+++ icu/source/common/unicode/platform.h 2017-04-21 22:32:31.656693147 +0200
-@@ -818,7 +818,7 @@
- #elif defined(U_STATIC_IMPLEMENTATION)
- # define U_EXPORT
+--- icu.org/source/common/unicode/platform.h 2018-10-02 00:39:56.000000000 +0200
++++ icu/source/common/unicode/platform.h 2018-10-20 00:36:24.598886605 +0200
+@@ -789,7 +789,7 @@
+ #elif defined(_MSC_VER) || (__has_declspec_attribute(dllexport) && __has_declspec_attribute(dllimport))
+ # define U_EXPORT __declspec(dllexport)
#elif defined(__GNUC__)
-# define U_EXPORT __attribute__((visibility("default")))
+# define U_EXPORT
@@ -11,8 +11,8 @@ diff -ur icu.org/source/common/unicode/platform.h icu/source/common/unicode/plat
|| (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550)
# define U_EXPORT __global
diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux
---- icu.org/source/config/mh-linux 2016-06-15 20:58:17.000000000 +0200
-+++ icu/source/config/mh-linux 2017-04-21 22:32:31.653693154 +0200
+--- icu.org/source/config/mh-linux 2018-09-29 02:34:41.000000000 +0200
++++ icu/source/config/mh-linux 2018-10-20 00:33:36.558130876 +0200
@@ -27,7 +27,7 @@
## Compiler switch to embed a library name
@@ -23,9 +23,9 @@ diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux
#SH# LD_SONAME=
diff -ur icu.org/source/configure icu/source/configure
---- icu.org/source/configure 2017-04-07 09:40:30.000000000 +0200
-+++ icu/source/configure 2017-04-21 22:32:31.656693147 +0200
-@@ -5134,7 +5134,7 @@
+--- icu.org/source/configure 2018-10-02 00:39:56.000000000 +0200
++++ icu/source/configure 2018-10-20 00:33:36.559130874 +0200
+@@ -5207,7 +5207,7 @@
else
icu_cv_host_frag=mh-linux-va
fi ;;
@@ -34,7 +34,7 @@ diff -ur icu.org/source/configure icu/source/configure
i[34567]86-*-cygwin)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-cygwin
-@@ -6358,6 +6358,10 @@
+@@ -6400,6 +6400,10 @@
# Check to see if genccode can generate simple assembly.
GENCCODE_ASSEMBLY=
case "${host}" in
@@ -45,7 +45,7 @@ diff -ur icu.org/source/configure icu/source/configure
*-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu)
if test "$GCC" = yes; then
# We're using gcc, and the simple -a gcc command line works for genccode
-@@ -7445,6 +7449,10 @@
+@@ -7499,6 +7503,10 @@
# wchar_t can be used
CHECK_UTF16_STRING_RESULT="available"
;;
@@ -56,20 +56,9 @@ diff -ur icu.org/source/configure icu/source/configure
*)
;;
esac
-diff -ur icu.org/source/i18n/number_decimalquantity.cpp icu/source/i18n/number_decimalquantity.cpp
---- icu.org/source/i18n/number_decimalquantity.cpp 2017-11-21 12:39:25.068592814 +0100
-+++ icu/source/i18n/number_decimalquantity.cpp 2017-11-21 12:39:53.988590886 +0100
-@@ -384,7 +384,7 @@
- for (; i <= -22; i += 22) n /= 1e22;
- n /= DOUBLE_MULTIPLIERS[-i];
- }
-- auto result = static_cast<int64_t>(std::round(n));
-+ auto result = static_cast<int64_t>(round(n));
- if (result != 0) {
- _setToLong(result);
- scale -= fracLength;
---- icu/source/i18n/decimfmt.cpp.orig 2018-08-03 09:26:22.036924562 +0200
-+++ icu/source/i18n/decimfmt.cpp 2018-08-03 09:25:14.169399374 +0200
+diff -ur icu.org/source/i18n/decimfmt.cpp icu/source/i18n/decimfmt.cpp
+--- icu.org/source/i18n/decimfmt.cpp 2018-10-02 00:39:56.000000000 +0200
++++ icu/source/i18n/decimfmt.cpp 2018-10-20 00:33:36.560130873 +0200
@@ -9,6 +9,13 @@
// Helpful in toString methods and elsewhere.
#define UNISTR_FROM_STRING_EXPLICIT
@@ -84,3 +73,15 @@ diff -ur icu.org/source/i18n/number_decimalquantity.cpp icu/source/i18n/number_d
#include <cmath>
#include <cstdlib>
#include <stdlib.h>
+diff -ur icu.org/source/i18n/number_decimalquantity.cpp icu/source/i18n/number_decimalquantity.cpp
+--- icu.org/source/i18n/number_decimalquantity.cpp 2018-10-02 00:39:56.000000000 +0200
++++ icu/source/i18n/number_decimalquantity.cpp 2018-10-20 00:33:36.560130873 +0200
+@@ -432,7 +432,7 @@
+ for (; i <= -22; i += 22) n /= 1e22;
+ n /= DOUBLE_MULTIPLIERS[-i];
+ }
+- auto result = static_cast<int64_t>(std::round(n));
++ auto result = static_cast<int64_t>(round(n));
+ if (result != 0) {
+ _setToLong(result);
+ scale -= fracLength;
diff --git a/external/icu/icu4c-clang-cl.patch.1 b/external/icu/icu4c-clang-cl.patch.1
index 9e287710a463..a111a0df99eb 100644
--- a/external/icu/icu4c-clang-cl.patch.1
+++ b/external/icu/icu4c-clang-cl.patch.1
@@ -25,4 +25,4 @@ diff -ur icu.org/source/runConfigureICU icu/source/runConfigureICU
+ CXX=${CXX-cl}; export CXX
RELEASE_CFLAGS='-Gy -MD'
RELEASE_CXXFLAGS='-Gy -MD'
- DEBUG_CFLAGS='-Zi -MDd'
+ DEBUG_CFLAGS='-FS -Zi -MDd'
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 b/external/icu/icu4c-khmerbreakengine.patch.1
index 9f134dd961b1..65f7cc0d774f 100644
--- a/external/icu/icu4c-khmerbreakengine.patch.1
+++ b/external/icu/icu4c-khmerbreakengine.patch.1
@@ -1,6 +1,6 @@
diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp
---- icu.org/source/common/dictbe.cpp 2018-03-26 15:38:30.000000000 +0200
-+++ icu/source/common/dictbe.cpp 2018-04-17 17:55:38.620944919 +0200
+--- icu.org/source/common/dictbe.cpp 2018-10-02 00:39:56.000000000 +0200
++++ icu/source/common/dictbe.cpp 2018-10-20 00:14:46.462039038 +0200
@@ -29,7 +29,19 @@
******************************************************************
*/
@@ -498,9 +498,9 @@ diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp
- uc = utext_current32(text);
- if (fEndWordSet.contains(pc) && fBeginWordSet.contains(uc)) {
- // Maybe. See if it's in the dictionary.
-- int32_t candidates = words[(wordsFound + 1) % KHMER_LOOKAHEAD].candidates(text, fDictionary, rangeEnd);
+- int32_t num_candidates = words[(wordsFound + 1) % KHMER_LOOKAHEAD].candidates(text, fDictionary, rangeEnd);
- utext_setNativeIndex(text, current+cuWordLength+chars);
-- if (candidates > 0) {
+- if (num_candidates > 0) {
+ if (c == 0x17D2) { // Coeng
+ utext_next32(text);
+ c = utext_current32(text);
@@ -658,8 +658,8 @@ diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp
#if !UCONFIG_NO_NORMALIZATION
diff -ur icu.org/source/common/dictbe.h icu/source/common/dictbe.h
---- icu.org/source/common/dictbe.h 2018-03-26 15:38:30.000000000 +0200
-+++ icu/source/common/dictbe.h 2018-04-17 14:55:33.307639865 +0200
+--- icu.org/source/common/dictbe.h 2018-09-29 02:34:41.000000000 +0200
++++ icu/source/common/dictbe.h 2018-10-19 14:21:00.339942804 +0200
@@ -34,7 +34,8 @@
* threads without synchronization.</p>
*/
@@ -999,8 +999,8 @@ diff -ur icu.org/source/common/dictbe.h icu/source/common/dictbe.h
/*******************************************************************
diff -ur icu.org/source/common/dictionarydata.cpp icu/source/common/dictionarydata.cpp
---- icu.org/source/common/dictionarydata.cpp 2018-03-26 15:38:30.000000000 +0200
-+++ icu/source/common/dictionarydata.cpp 2018-04-17 14:04:50.775567214 +0200
+--- icu.org/source/common/dictionarydata.cpp 2018-09-29 02:34:41.000000000 +0200
++++ icu/source/common/dictionarydata.cpp 2018-10-19 14:21:00.339942804 +0200
@@ -44,7 +44,7 @@
int32_t UCharsDictionaryMatcher::matches(UText *text, int32_t maxLength, int32_t limit,
@@ -1048,8 +1048,8 @@ diff -ur icu.org/source/common/dictionarydata.cpp icu/source/common/dictionaryda
if (values != NULL) {
values[wordCount] = bt.getValue();
diff -ur icu.org/source/common/dictionarydata.h icu/source/common/dictionarydata.h
---- icu.org/source/common/dictionarydata.h 2018-03-26 15:38:30.000000000 +0200
-+++ icu/source/common/dictionarydata.h 2018-04-17 14:04:50.775567214 +0200
+--- icu.org/source/common/dictionarydata.h 2018-09-29 02:34:41.000000000 +0200
++++ icu/source/common/dictionarydata.h 2018-10-19 14:21:00.339942804 +0200
@@ -21,6 +21,7 @@
#include "unicode/utext.h"
#include "unicode/udata.h"
@@ -1086,8 +1086,8 @@ diff -ur icu.org/source/common/dictionarydata.h icu/source/common/dictionarydata
private:
UChar32 transform(UChar32 c) const;
diff -ur icu.org/source/data/Makefile.in icu/source/data/Makefile.in
---- icu.org/source/data/Makefile.in 2018-04-17 12:28:37.098707466 +0200
-+++ icu/source/data/Makefile.in 2018-04-17 14:04:50.775567214 +0200
+--- icu.org/source/data/Makefile.in 2018-10-19 14:20:11.031075856 +0200
++++ icu/source/data/Makefile.in 2018-10-19 14:21:00.339942804 +0200
@@ -183,7 +183,7 @@
endif
endif
More information about the Libreoffice-commits
mailing list