Update to ICU 68.1

Also made it necessary to adapt two places in libcdr and libebook
that used UBool TRUE which is gone now to use standard true
instead.

Change-Id: I1c1df3030f8b883bec6045756907ee0b78060382
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105964
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>

9 files changed, 52 insertions, 82 deletions

diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index 002b7d28cab5..435382fa7988 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -28,20 +28,19 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	external/icu/icu4c-macosx.patch.1 \
 	external/icu/icu4c-solarisgcc.patch.1 \
 	external/icu/icu4c-mkdir.patch.1 \
-	external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
 	external/icu/icu4c-ubsan.patch.1 \
 	external/icu/icu4c-scriptrun.patch.1 \
 	external/icu/icu4c-rtti.patch.1 \
 	external/icu/icu4c-clang-cl.patch.1 \
-	$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
 	external/icu/gcc9.patch \
 	external/icu/c++20-comparison.patch \
-	external/icu/ubsan.patch \
+	external/icu/ubsan.patch.1 \
 	external/icu/Wdeprecated-copy-dtor.patch \
 	external/icu/icu4c-khmerbreakengine.patch.1 \
 	external/icu/strict_ansi.patch \
-	external/icu/icu4c-link-scrptrun.patch.2 \
 	external/icu/icu4c-windows-cygwin-cross.patch.1 \
+	external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
+	$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-link-scrptrun.patch.2 b/external/icu/icu4c-link-scrptrun.patch.2
deleted file mode 100644
index 8c94361a163c..000000000000
--- a/external/icu/icu4c-link-scrptrun.patch.2
+++ /dev/null
@@ -1,43 +0,0 @@
-Based on: https://github.com/unicode-org/icu/commit/e3f2c0dd70018d924bf22a9b3f0cbf387316b50b.patch
-
-From e3f2c0dd70018d924bf22a9b3f0cbf387316b50b Mon Sep 17 00:00:00 2001
-From: Paul Smith <paul@mad-scientist.net>
-Date: Wed, 5 Aug 2020 13:18:30 -0400
-Subject: [PATCH] ICU-21217 Windows: Fix link command for extra/scrptrun
-
----
- icu4c/source/extra/scrptrun/Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/icu4c/source/extra/scrptrun/Makefile.in b/icu4c/source/extra/scrptrun/Makefile.in
-index f6e47735631..d951f66a4bd 100644
---- a/icu4c/source/extra/scrptrun/Makefile.in
-+++ b/icu4c/source/extra/scrptrun/Makefile.in
-@@ -12,9 +12,6 @@
- 
- include $(top_builddir)/icudefs.mk
- 
--## Platform-specific setup
--include @platform_make_fragment@
--
- ## Build directory information
- subdir = extra/scrptrun
- 
-@@ -33,7 +33,7 @@ ifeq ($(ENABLE_RPATH),YES)
- RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
- endif
- LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
--LIBS = $(LIBICUUC) @LIBS@ @LIB_M@
-+LIBS = $(LIBICUUC) $(LIB_M)
- 
- OBJECTS = scrptrun.o srtest.o
-
-@@ -75,7 +75,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- $(TARGET) : $(OBJECTS)
--	$(LINK.cc) -o $@ $^ $(LIBS)
-+	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
- 	$(POST_BUILD_STEP)
- 
- invoke:
diff --git a/external/icu/icu4c-mkdir.patch.1 b/external/icu/icu4c-mkdir.patch.1
index 112e57cc2910..0cdcf2b0784f 100644
--- a/external/icu/icu4c-mkdir.patch.1
+++ b/external/icu/icu4c-mkdir.patch.1
@@ -1,11 +1,17 @@
 diff -ur icu.org/source/data/Makefile.in icu/source/data/Makefile.in
---- icu.org/source/data/Makefile.in	2019-04-17 21:42:15.000000000 +0200
-+++ icu/source/data/Makefile.in	2019-10-28 12:57:15.033649494 +0100
-@@ -226,6 +226,7 @@
+--- icu.org/source/data/Makefile.in	2020-10-28 22:21:12.000000000 +0100
++++ icu/source/data/Makefile.in	2020-11-17 10:18:37.960032668 +0100
+@@ -239,6 +239,13 @@
+ 
+ ifeq ($(ENABLE_SO_VERSION_DATA),1)
  ifeq ($(PKGDATA_MODE),dll)
++
++# This should be in the included rules.mk but that is generated empty by
++# configure because we have no data/locales/root.txt with prebuilt data/in/
++$(TMP_DIR)/dirs.timestamp:
++	$(MKINSTALLDIRS) $(OUTTMPDIR) $(TMP_DIR)
++	echo timestamp > $@
++
  SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
- $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc
-+	mkdir -p $(OUTTMPDIR)
+ $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc | $(TMP_DIR)/dirs.timestamp
  ifeq ($(MSYS_RC_MODE),1)
- 	rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
- else
diff --git a/external/icu/icu4c-warnings.patch.1 b/external/icu/icu4c-warnings.patch.1
index 76f8b72986a0..d8df0e14e9cf 100644
--- a/external/icu/icu4c-warnings.patch.1
+++ b/external/icu/icu4c-warnings.patch.1
@@ -1,10 +1,10 @@
 diff -ur icu.org/source/common/unicode/utf16.h icu/source/common/unicode/utf16.h
---- icu.org/source/common/unicode/utf16.h	2019-10-03 13:16:41.000000000 +0200
-+++ icu/source/common/unicode/utf16.h	2019-10-28 18:03:07.967208272 +0100
-@@ -397,6 +397,7 @@
+--- icu.org/source/common/unicode/utf16.h	2020-10-28 22:21:12.000000000 +0100
++++ icu/source/common/unicode/utf16.h	2020-11-16 19:31:03.356478154 +0100
+@@ -398,6 +398,7 @@
          (s)[(i)++]=(uint16_t)(((c)&0x3ff)|0xdc00); \
      } else /* c>0x10ffff or not enough space */ { \
-         (isError)=TRUE; \
+         (isError)=true; \
 +        (void)(isError); \
      } \
  } UPRV_BLOCK_MACRO_END
diff --git a/external/icu/ubsan.patch b/external/icu/ubsan.patch.1
index 762bd6e5ae15..1c10f8cefcc2 100644
--- a/external/icu/ubsan.patch
+++ b/external/icu/ubsan.patch.1
@@ -1,27 +1,6 @@
---- source/common/uloc.cpp
-+++ source/common/uloc.cpp
-@@ -1203,7 +1203,8 @@
-         return 0;
-     }
-     int32_t reslen = result.length();
--    uprv_memcpy(language, result.data(), std::min(reslen, languageCapacity));
-+    auto const n = std::min(reslen, languageCapacity);
-+    if (n != 0) uprv_memcpy(language, result.data(), n);
-     return reslen;
- }
- 
-@@ -1251,7 +1252,8 @@
-         return 0;
-     }
-     int32_t reslen = result.length();
--    uprv_memcpy(script, result.data(), std::min(reslen, scriptCapacity));
-+    auto const n = std::min(reslen, scriptCapacity);
-+    if (n != 0) uprv_memcpy(script, result.data(), n);
-     return reslen;
- }
- 
---- source/tools/genrb/rbutil.c
-+++ source/tools/genrb/rbutil.c
+diff -ur icu.org/source/tools/genrb/rbutil.c icu/source/tools/genrb/rbutil.c
+--- icu.org/source/tools/genrb/rbutil.c	2020-10-28 22:21:12.000000000 +0100
++++ icu/source/tools/genrb/rbutil.c	2020-11-16 19:50:44.005119253 +0100
 @@ -30,7 +30,12 @@
  get_dirname(char *dirname,
              const char *filename)
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk
index fd227a2f7445..778fd9eca123 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
     external/libcdr/libcdr-visibility-win.patch \
+    external/libcdr/libcdr-no-icu-boolean.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libcdr/libcdr-no-icu-boolean.patch.1 b/external/libcdr/libcdr-no-icu-boolean.patch.1
new file mode 100644
index 000000000000..65884fbbf873
--- /dev/null
+++ b/external/libcdr/libcdr-no-icu-boolean.patch.1
@@ -0,0 +1,12 @@
+diff -ur libcdr.org/src/lib/libcdr_utils.cpp libcdr/src/lib/libcdr_utils.cpp
+--- libcdr.org/src/lib/libcdr_utils.cpp	2020-02-02 16:30:44.000000000 +0100
++++ libcdr/src/lib/libcdr_utils.cpp	2020-11-16 21:08:04.092927628 +0100
+@@ -108,7 +108,7 @@
+     csd = ucsdet_open(&status);
+     if (U_FAILURE(status) || !csd)
+       return 0;
+-    ucsdet_enableInputFilter(csd, TRUE);
++    ucsdet_enableInputFilter(csd, true);
+     ucsdet_setText(csd, (const char *)buffer, bufferLength, &status);
+     if (U_FAILURE(status))
+       throw libcdr::EncodingException();
diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 0b0658652fc8..4a85ee5093be 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -13,4 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libebook))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libebook, \
+    external/libebook/libebook-no-icu-boolean.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libebook/libebook-no-icu-boolean.patch.1 b/external/libebook/libebook-no-icu-boolean.patch.1
new file mode 100644
index 000000000000..0e53546b7cc9
--- /dev/null
+++ b/external/libebook/libebook-no-icu-boolean.patch.1
@@ -0,0 +1,12 @@
+diff -ur libebook.org/src/lib/EBOOKCharsetConverter.cpp libebook/src/lib/EBOOKCharsetConverter.cpp
+--- libebook.org/src/lib/EBOOKCharsetConverter.cpp	2018-01-01 12:16:28.000000000 +0100
++++ libebook/src/lib/EBOOKCharsetConverter.cpp	2020-11-16 21:19:46.699315299 +0100
+@@ -124,7 +124,7 @@
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {