add missing "using namespace U_ICU_NAMESPACE;" for icu 61, which

appears to be tighter about API exports.

this builds again now.

11 files changed, 165 insertions, 1 deletions

diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo
index 0343899f74d..3180f3dff94 100644
--- a/misc/libreoffice/distinfo
+++ b/misc/libreoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2018/04/07 02:44:47 ryoon Exp $
+$NetBSD: distinfo,v 1.54 2018/04/19 18:07:03 mrg Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -219,9 +219,19 @@ SHA1 (patch-external_mysql-connector-cpp_patches_netbsd.patch) = d0981757856f5b2
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce
 SHA1 (patch-external_postgresql_UnpackedTarball__postgresql.mk) = d0b94e20d9e1aa89adac0f4a91c7b684850c78bc
 SHA1 (patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch) = de2b5d8e657e9721867f9c72a402cc30fd093218
+SHA1 (patch-i18npool_inc_collator_unicode.hxx) = 6ae7a3fb622969d76c2475201882d22fdf300384
+SHA1 (patch-i18npool_source_breakiterator_breakiterator_unicode.cxx) = 0a784bced0874b3ef7cc3b6ff19a865e0d64ce49
+SHA1 (patch-i18npool_source_collator_collator_unicode.cxx) = 853367cf9a4be70c5d0de44a82e6fadc70e40ea6
+SHA1 (patch-i18npool_source_collator_gencoll_rule.cxx) = 2fc259c56b9dc9395ea6de06f130f0a6102244d5
+SHA1 (patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx) = 6019a57f8dbf849a503935a3208449b99451488c
+SHA1 (patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx) = 50c810957b48db3cac46f87b6c777c5acb9466a5
+SHA1 (patch-i18nutil_source_utility_unicode.cxx) = b2c48cafe10cf4fd45604c8e501bbd9bb3cc68b8
+SHA1 (patch-lotuswordpro_source_filter_localtime.cxx) = 8db23e81f54b5a71e331dfccb57cceb8aab92d2a
 SHA1 (patch-mysqlc_Library__mysqlc.mk) = b040cfdb25f41896c77df3acafd4c31dc41dd590
+SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
 SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58
+SHA1 (patch-vcl_inc_scrptrun.h) = 52877f7f6c867e2baeed525c200ce7d75a97574a
 SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
 SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 8b744a450175b4e432d41fb6cea0ee6df72ee307
 SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 68e869e1c83b911765bab27f185bbad44636ea0a
diff --git a/misc/libreoffice/patches/patch-i18npool_inc_collator_unicode.hxx b/misc/libreoffice/patches/patch-i18npool_inc_collator_unicode.hxx
new file mode 100644
index 00000000000..d32b146b975
--- /dev/null
+++ b/misc/libreoffice/patches/patch-i18npool_inc_collator_unicode.hxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-i18npool_inc_collator_unicode.hxx,v 1.1 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- i18npool/inc/collator_unicode.hxx.orig	2018-03-29 08:04:09.000000000 -0700
++++ i18npool/inc/collator_unicode.hxx	2018-04-18 00:55:50.988337602 -0700
+@@ -63,7 +63,7 @@
+ 
+ private:
+     const sal_Char *implementationName;
+-    RuleBasedCollator *uca_base, *collator;
++    U_ICU_NAMESPACE::RuleBasedCollator *uca_base, *collator;
+ #ifndef DISABLE_DYNLOADING
+     oslModule hModule;
+ #endif
diff --git a/misc/libreoffice/patches/patch-i18npool_source_breakiterator_breakiterator_unicode.cxx b/misc/libreoffice/patches/patch-i18npool_source_breakiterator_breakiterator_unicode.cxx
new file mode 100644
index 00000000000..fedc271f1de
--- /dev/null
+++ b/misc/libreoffice/patches/patch-i18npool_source_breakiterator_breakiterator_unicode.cxx
@@ -0,0 +1,14 @@
+$NetBSD: patch-i18npool_source_breakiterator_breakiterator_unicode.cxx,v 1.1 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- i18npool/source/breakiterator/breakiterator_unicode.cxx.orig	2018-03-29 08:04:09.000000000 -0700
++++ i18npool/source/breakiterator/breakiterator_unicode.cxx	2018-04-17 18:08:53.324063212 -0700
+@@ -37,6 +37,7 @@
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::i18n;
+ using namespace ::com::sun::star::lang;
++using namespace U_ICU_NAMESPACE;
+ 
+ namespace i18npool {
+ 
diff --git a/misc/libreoffice/patches/patch-i18npool_source_collator_collator_unicode.cxx b/misc/libreoffice/patches/patch-i18npool_source_collator_collator_unicode.cxx
new file mode 100644
index 00000000000..4517ed630cb
--- /dev/null
+++ b/misc/libreoffice/patches/patch-i18npool_source_collator_collator_unicode.cxx
@@ -0,0 +1,14 @@
+$NetBSD: patch-i18npool_source_collator_collator_unicode.cxx,v 1.1 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- i18npool/source/collator/collator_unicode.cxx.orig	2018-03-29 08:04:09.000000000 -0700
++++ i18npool/source/collator/collator_unicode.cxx	2018-04-17 19:05:09.376978924 -0700
+@@ -33,6 +33,7 @@
+ using namespace ::com::sun::star::i18n;
+ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
++using namespace U_ICU_NAMESPACE;
+ 
+ namespace i18npool {
+ 
diff --git a/misc/libreoffice/patches/patch-i18npool_source_collator_gencoll_rule.cxx b/misc/libreoffice/patches/patch-i18npool_source_collator_gencoll_rule.cxx
new file mode 100644
index 00000000000..3fa3244506d
--- /dev/null
+++ b/misc/libreoffice/patches/patch-i18npool_source_collator_gencoll_rule.cxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-i18npool_source_collator_gencoll_rule.cxx,v 1.1 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- i18npool/source/collator/gencoll_rule.cxx.orig	2018-03-29 08:04:09.000000000 -0700
++++ i18npool/source/collator/gencoll_rule.cxx	2018-04-18 03:21:55.610494602 -0700
+@@ -31,6 +31,8 @@
+ 
+ #include <unicode/tblcoll.h>
+ 
++using namespace U_ICU_NAMESPACE;
++
+ /* Main Procedure */
+ 
+ void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len)
diff --git a/misc/libreoffice/patches/patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx b/misc/libreoffice/patches/patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx
new file mode 100644
index 00000000000..b3dd37dd846
--- /dev/null
+++ b/misc/libreoffice/patches/patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx
@@ -0,0 +1,14 @@
+$NetBSD: patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx,v 1.1 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- i18npool/source/ordinalsuffix/ordinalsuffix.cxx.orig	2018-03-29 08:04:09.000000000 -0700
++++ i18npool/source/ordinalsuffix/ordinalsuffix.cxx	2018-04-17 18:02:13.070058714 -0700
+@@ -32,6 +32,7 @@
+ using namespace ::com::sun::star::i18n;
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star;
++using namespace U_ICU_NAMESPACE;
+ 
+ namespace i18npool {
+ 
diff --git a/misc/libreoffice/patches/patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx b/misc/libreoffice/patches/patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx
new file mode 100644
index 00000000000..eea95bcca6d
--- /dev/null
+++ b/misc/libreoffice/patches/patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx,v 1.1 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- i18npool/source/transliteration/ignoreDiacritics_CTL.cxx.orig	2018-03-29 08:04:09.000000000 -0700
++++ i18npool/source/transliteration/ignoreDiacritics_CTL.cxx	2018-04-18 01:02:51.940106962 -0700
+@@ -12,6 +12,8 @@
+ #include <unicode/translit.h>
+ #include <unicode/uchar.h>
+ 
++using namespace U_ICU_NAMESPACE;
++
+ namespace i18npool {
+ 
+ ignoreDiacritics_CTL::ignoreDiacritics_CTL()
diff --git a/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx b/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx
new file mode 100644
index 00000000000..f68904d6210
--- /dev/null
+++ b/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx
@@ -0,0 +1,22 @@
+$NetBSD: patch-i18nutil_source_utility_unicode.cxx,v 1.3 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- i18nutil/source/utility/unicode.cxx.orig	2018-03-29 08:04:09.000000000 -0700
++++ i18nutil/source/utility/unicode.cxx	2018-04-17 18:01:19.268575308 -0700
+@@ -25,6 +25,7 @@
+ #include <i18nutil/unicode.hxx>
+ #include <sal/log.hxx>
+ #include <unicode/numfmt.h>
++#include <unicode/regex.h>
+ #include "unicode_data.h"
+ #include <rtl/character.hxx>
+ #include <memory>
+@@ -35,6 +36,7 @@
+ #undef CURRENCY_SYMBOL
+ 
+ using namespace ::com::sun::star::i18n;
++using namespace U_ICU_NAMESPACE;
+ 
+ template<class L, typename T>
+ T getScriptType( const sal_Unicode ch, const L* typeList, T unknownType ) {
diff --git a/misc/libreoffice/patches/patch-lotuswordpro_source_filter_localtime.cxx b/misc/libreoffice/patches/patch-lotuswordpro_source_filter_localtime.cxx
new file mode 100644
index 00000000000..c00221854fe
--- /dev/null
+++ b/misc/libreoffice/patches/patch-lotuswordpro_source_filter_localtime.cxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-lotuswordpro_source_filter_localtime.cxx,v 1.1 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- lotuswordpro/source/filter/localtime.cxx.orig	2018-03-29 15:04:09.000000000 +0000
++++ lotuswordpro/source/filter/localtime.cxx	2018-04-19 09:34:48.018480883 +0000
+@@ -57,6 +57,8 @@
+ #include <limits.h>
+ #include <unicode/timezone.h>
+ 
++using namespace U_ICU_NAMESPACE;
++
+ const long DAY_SEC =24 * 60 * 60;
+ const long YEAR_SEC = 365 * DAY_SEC;
+ const long FOURYEAR_SEC = 4 * YEAR_SEC + DAY_SEC;
diff --git a/misc/libreoffice/patches/patch-opencl_source_openclconfig.cxx b/misc/libreoffice/patches/patch-opencl_source_openclconfig.cxx
new file mode 100644
index 00000000000..e8b96875c5c
--- /dev/null
+++ b/misc/libreoffice/patches/patch-opencl_source_openclconfig.cxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-opencl_source_openclconfig.cxx,v 1.1 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- opencl/source/openclconfig.cxx.orig	2018-03-29 08:04:09.000000000 -0700
++++ opencl/source/openclconfig.cxx	2018-04-17 18:02:24.130022792 -0700
+@@ -17,6 +17,8 @@
+ #include <sal/log.hxx>
+ #include <sal/types.h>
+ 
++using namespace U_ICU_NAMESPACE;
++
+ OpenCLConfig::OpenCLConfig() :
+     mbUseOpenCL(true)
+ {
diff --git a/misc/libreoffice/patches/patch-vcl_inc_scrptrun.h b/misc/libreoffice/patches/patch-vcl_inc_scrptrun.h
new file mode 100644
index 00000000000..75862b11175
--- /dev/null
+++ b/misc/libreoffice/patches/patch-vcl_inc_scrptrun.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-vcl_inc_scrptrun.h,v 1.1 2018/04/19 18:07:03 mrg Exp $
+
+add missing ICU namespace needed for icu 61.
+
+--- vcl/inc/scrptrun.h.orig	2018-03-29 08:04:09.000000000 -0700
++++ vcl/inc/scrptrun.h	2018-04-17 18:02:20.629348624 -0700
+@@ -45,6 +45,8 @@
+ #include <unicode/uscript.h>
+ #include <vector>
+ 
++using namespace U_ICU_NAMESPACE;
++
+ namespace vcl {
+ 
+ struct ParenStackEntry