re: misc/libreoffice fails to build

[matthew green <mrg%eterna.com.au@localhost>]

i have fixed some (all?) icu issues, but i'm stuck with another
issue i can't quite understand (c++ magic?).  this is netbsd
amd64 -current.  eg:

libreoffice-6.0.3.2/i18npool/source/collator/collator_unicode.cxx:44:5: error: 'uca_base' was not declared in this scope
     uca_base = nullptr;

this is in the constructor for class Collator_Unicode().  the
whole function is just:

Collator_Unicode::Collator_Unicode()
{
    implementationName = "com.sun.star.i18n.Collator_Unicode";
    collator = nullptr;
    uca_base = nullptr;
#ifndef DISABLE_DYNLOADING
    hModule = nullptr;
#endif
}

the class is defined like this:

class Collator_Unicode final : public cppu::WeakImplHelper < css::i18n::XCollator, css::lang::XServiceInfo >
{
public:
    // Constructors
    Collator_Unicode();
[ .. ]
private:
    const sal_Char *implementationName;
    RuleBasedCollator *uca_base, *collator;

patch below is my w-i-p fix.


.mrg.


--- work.wolf-head/libreoffice-6.0.3.2/i18npool/source/breakiterator/breakiterator_unicode.cxx	2018-03-29 08:04:09.000000000 -0700
+++ work.wolf-head.foo/libreoffice-6.0.3.2/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 -ru work.wolf-head/libreoffice-6.0.3.2/i18npool/source/collator/collator_unicode.cxx work.wolf-head.foo/libreoffice-6.0.3.2/i18npool/source/collator/collator_unicode.cxx
--- work.wolf-head/libreoffice-6.0.3.2/i18npool/source/collator/collator_unicode.cxx	2018-03-29 08:04:09.000000000 -0700
+++ work.wolf-head.foo/libreoffice-6.0.3.2/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 -ru work.wolf-head/libreoffice-6.0.3.2/i18npool/source/ordinalsuffix/ordinalsuffix.cxx work.wolf-head.foo/libreoffice-6.0.3.2/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
--- work.wolf-head/libreoffice-6.0.3.2/i18npool/source/ordinalsuffix/ordinalsuffix.cxx	2018-03-29 08:04:09.000000000 -0700
+++ work.wolf-head.foo/libreoffice-6.0.3.2/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 -ru work.wolf-head/libreoffice-6.0.3.2/i18nutil/source/utility/unicode.cxx work.wolf-head.foo/libreoffice-6.0.3.2/i18nutil/source/utility/unicode.cxx
--- work.wolf-head/libreoffice-6.0.3.2/i18nutil/source/utility/unicode.cxx	2018-03-29 08:04:09.000000000 -0700
+++ work.wolf-head.foo/libreoffice-6.0.3.2/i18nutil/source/utility/unicode.cxx	2018-04-17 18:01:19.268575308 -0700
@@ -35,6 +35,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 -ru work.wolf-head/libreoffice-6.0.3.2/opencl/source/openclconfig.cxx work.wolf-head.foo/libreoffice-6.0.3.2/opencl/source/openclconfig.cxx
--- work.wolf-head/libreoffice-6.0.3.2/opencl/source/openclconfig.cxx	2018-03-29 08:04:09.000000000 -0700
+++ work.wolf-head.foo/libreoffice-6.0.3.2/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 -ru work.wolf-head/libreoffice-6.0.3.2/vcl/inc/scrptrun.h work.wolf-head.foo/libreoffice-6.0.3.2/vcl/inc/scrptrun.h
--- work.wolf-head/libreoffice-6.0.3.2/vcl/inc/scrptrun.h	2018-03-29 08:04:09.000000000 -0700
+++ work.wolf-head.foo/libreoffice-6.0.3.2/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