more fix for ICU 61

0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch

@@ -260,3 +260,39 @@ index 0ddfe645abaa..2b5ca1ed1bdb 100644
 -- 
 2.17.1
 
+From 8790243df458250b00de67bf6fc892b3fa5660ad Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack@redhat.com>
+Date: Mon, 18 Dec 2017 20:41:30 +0100
+Subject: [PATCH] Explicitly qualify ICU types with icu:: namespace
+
+It will be required by ICU 61 anyway, see
+https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
+
+Change-Id: Ib7accd75a6e35932048d779cf7bf0a5a33f8ed0d
+Reviewed-on: https://gerrit.libreoffice.org/46741
+Reviewed-by: Eike Rathke <erack@redhat.com>
+Tested-by: Eike Rathke <erack@redhat.com>
+(cherry picked from commit 8960ecc689ce41cfaa40b65d75830d7491b06463)
+Reviewed-on: https://gerrit.libreoffice.org/56680
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ opencl/source/openclconfig.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
+index b81ffed22937..0ec2347fb332 100644
+--- a/opencl/source/openclconfig.cxx
++++ b/opencl/source/openclconfig.cxx
+@@ -119,7 +119,7 @@ bool match(const OUString& rPattern, const OUString& rInput)
+     UErrorCode nIcuError(U_ZERO_ERROR);
+     icu::UnicodeString sIcuPattern(reinterpret_cast<const UChar*>(rPattern.getStr()), rPattern.getLength());
+     icu::UnicodeString sIcuInput(reinterpret_cast<const UChar*>(rInput.getStr()), rInput.getLength());
+-    RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
++    icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
+ 
+     return U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) && U_SUCCESS(nIcuError);
+ }
+-- 
+2.17.1
+