Thu Apr 19 18:07:04 2018 UTC ()
add missing "using namespace U_ICU_NAMESPACE;" for icu 61, which
appears to be tighter about API exports.

this builds again now.


(mrg)
diff -r1.53 -r1.54 pkgsrc/misc/libreoffice/distinfo
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-i18npool_inc_collator_unicode.hxx
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-i18npool_source_breakiterator_breakiterator_unicode.cxx
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-i18npool_source_collator_collator_unicode.cxx
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-i18npool_source_collator_gencoll_rule.cxx
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-lotuswordpro_source_filter_localtime.cxx
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-opencl_source_openclconfig.cxx
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-vcl_inc_scrptrun.h
diff -r0 -r1.3 pkgsrc/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx

cvs diff -r1.53 -r1.54 pkgsrc/misc/libreoffice/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/distinfo 2018/04/07 02:44:47 1.53
+++ pkgsrc/misc/libreoffice/distinfo 2018/04/19 18:07:03 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.53 2018/04/07 02:44:47 ryoon Exp $ 1$NetBSD: distinfo,v 1.54 2018/04/19 18:07:03 mrg Exp $
2 2
3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b 4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes 6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
7SHA1 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = c36bccbf6a0e562fa5a7b4b832af7185fa7f8a4b 7SHA1 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = c36bccbf6a0e562fa5a7b4b832af7185fa7f8a4b
8RMD160 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = ff53f6a5027654477d307baa3bcceba7b109220f 8RMD160 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = ff53f6a5027654477d307baa3bcceba7b109220f
9SHA512 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = 0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f 9SHA512 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = 0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f
10Size (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = 1333593 bytes 10Size (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = 1333593 bytes
11SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a 11SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a
12RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb 12RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb
13SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f 13SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f
14Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes 14Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes
@@ -209,19 +209,29 @@ SHA1 (patch-autogen.sh) = eedd0091745cf6 @@ -209,19 +209,29 @@ SHA1 (patch-autogen.sh) = eedd0091745cf6
209SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b 209SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b
210SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4 210SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4
211SHA1 (patch-configure.ac) = 13024963b8d5ee21b2b8268bf6e1d442e5838454 211SHA1 (patch-configure.ac) = 13024963b8d5ee21b2b8268bf6e1d442e5838454
212SHA1 (patch-desktop_scripts_soffice.sh) = b5b2ccf7830d160fd4a1bb087610a1b766b25f08 212SHA1 (patch-desktop_scripts_soffice.sh) = b5b2ccf7830d160fd4a1bb087610a1b766b25f08
213SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075 213SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075
214SHA1 (patch-download.lst) = ebcdd4ad27656f2199312413c5d118c0049f8316 214SHA1 (patch-download.lst) = ebcdd4ad27656f2199312413c5d118c0049f8316
215SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = ffe2b8ff9e9ff6b5faf4eea1d51a8983908d0602 215SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = ffe2b8ff9e9ff6b5faf4eea1d51a8983908d0602
216SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = ed0c6861fd9a61eeac05e235dd505b6bed166a3a 216SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = ed0c6861fd9a61eeac05e235dd505b6bed166a3a
217SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d 217SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
218SHA1 (patch-external_mysql-connector-cpp_patches_netbsd.patch) = d0981757856f5b28082ee468b385dc2fdf027dd0 218SHA1 (patch-external_mysql-connector-cpp_patches_netbsd.patch) = d0981757856f5b28082ee468b385dc2fdf027dd0
219SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce 219SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce
220SHA1 (patch-external_postgresql_UnpackedTarball__postgresql.mk) = d0b94e20d9e1aa89adac0f4a91c7b684850c78bc 220SHA1 (patch-external_postgresql_UnpackedTarball__postgresql.mk) = d0b94e20d9e1aa89adac0f4a91c7b684850c78bc
221SHA1 (patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch) = de2b5d8e657e9721867f9c72a402cc30fd093218 221SHA1 (patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch) = de2b5d8e657e9721867f9c72a402cc30fd093218
 222SHA1 (patch-i18npool_inc_collator_unicode.hxx) = 6ae7a3fb622969d76c2475201882d22fdf300384
 223SHA1 (patch-i18npool_source_breakiterator_breakiterator_unicode.cxx) = 0a784bced0874b3ef7cc3b6ff19a865e0d64ce49
 224SHA1 (patch-i18npool_source_collator_collator_unicode.cxx) = 853367cf9a4be70c5d0de44a82e6fadc70e40ea6
 225SHA1 (patch-i18npool_source_collator_gencoll_rule.cxx) = 2fc259c56b9dc9395ea6de06f130f0a6102244d5
 226SHA1 (patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx) = 6019a57f8dbf849a503935a3208449b99451488c
 227SHA1 (patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx) = 50c810957b48db3cac46f87b6c777c5acb9466a5
 228SHA1 (patch-i18nutil_source_utility_unicode.cxx) = b2c48cafe10cf4fd45604c8e501bbd9bb3cc68b8
 229SHA1 (patch-lotuswordpro_source_filter_localtime.cxx) = 8db23e81f54b5a71e331dfccb57cceb8aab92d2a
222SHA1 (patch-mysqlc_Library__mysqlc.mk) = b040cfdb25f41896c77df3acafd4c31dc41dd590 230SHA1 (patch-mysqlc_Library__mysqlc.mk) = b040cfdb25f41896c77df3acafd4c31dc41dd590
 231SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
223SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d 232SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
224SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58 233SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58
 234SHA1 (patch-vcl_inc_scrptrun.h) = 52877f7f6c867e2baeed525c200ce7d75a97574a
225SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb 235SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
226SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 8b744a450175b4e432d41fb6cea0ee6df72ee307 236SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 8b744a450175b4e432d41fb6cea0ee6df72ee307
227SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 68e869e1c83b911765bab27f185bbad44636ea0a 237SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 68e869e1c83b911765bab27f185bbad44636ea0a

File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-i18npool_inc_collator_unicode.hxx
$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

File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-i18npool_source_breakiterator_breakiterator_unicode.cxx
$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 {
 

File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-i18npool_source_collator_collator_unicode.cxx
$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 {
 

File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-i18npool_source_collator_gencoll_rule.cxx
$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)

File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx
$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 {
 

File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx
$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()

File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-lotuswordpro_source_filter_localtime.cxx
$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;

File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-opencl_source_openclconfig.cxx
$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)
 {

File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-vcl_inc_scrptrun.h
$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

File Added: pkgsrc/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx
$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 ) {