libmlocale: Fi build with thud's ICU

recipes-nemomobile/libmlocale/libmlocale/0005-Make-the-usage-of-icu-namespace-explicit.patch

+From 6fa77afa881c952d3236afd2c33b6333c62fa988 Mon Sep 17 00:00:00 2001
+From: Florent Revest <revestflo@gmail.com>
+Date: Sun, 2 Dec 2018 22:18:47 +0100
+Subject: [PATCH] Make the usage of icu namespace explicit
+
+---
+ src/mcalendar.cpp         | 2 ++
+ src/mcity.cpp             | 2 ++
+ src/mcollator.cpp         | 2 ++
+ src/micubreakiterator.cpp | 2 ++
+ src/micuconversions.cpp   | 2 ++
+ src/mlocale.cpp           | 2 ++
+ src/mstringsearch.cpp     | 2 ++
+ 7 files changed, 14 insertions(+)
+
+diff --git a/src/mcalendar.cpp b/src/mcalendar.cpp
+index 420bbf87..f50b21ab 100644
+--- a/src/mcalendar.cpp
++++ b/src/mcalendar.cpp
+@@ -29,6 +29,8 @@
+ 
+ #include "mdebug.h"
+ 
++using namespace icu;
++
+ namespace ML10N {
+ 
+ MCalendarPrivate::MCalendarPrivate(MLocale::CalendarType calendarType)
+diff --git a/src/mcity.cpp b/src/mcity.cpp
+index c9b667ea..2d1f4dec 100644
+--- a/src/mcity.cpp
++++ b/src/mcity.cpp
+@@ -22,6 +22,8 @@
+ #ifdef HAVE_ICU
+ #include <unicode/timezone.h>
+ #include "micuconversions.h"
++
++using namespace icu;
+ #endif
+ 
+ namespace ML10N {
+diff --git a/src/mcollator.cpp b/src/mcollator.cpp
+index 90c294a6..4397f125 100644
+--- a/src/mcollator.cpp
++++ b/src/mcollator.cpp
+@@ -27,6 +27,8 @@
+ #include "micuconversions.h"
+ #include "mlocale_p.h"
+ 
++using namespace icu;
++
+ #include <QDebug>
+ 
+ namespace ML10N {
+diff --git a/src/micubreakiterator.cpp b/src/micubreakiterator.cpp
+index 7a0231f1..c36080cf 100644
+--- a/src/micubreakiterator.cpp
++++ b/src/micubreakiterator.cpp
+@@ -24,6 +24,8 @@
+ #include <unicode/brkiter.h>
+ #include <unicode/uchriter.h>
+ #include "mlocale_p.h"
++
++using namespace icu;
+ #endif
+ 
+ namespace ML10N {
+diff --git a/src/micuconversions.cpp b/src/micuconversions.cpp
+index 046ea8be..2b855619 100644
+--- a/src/micuconversions.cpp
++++ b/src/micuconversions.cpp
+@@ -26,6 +26,8 @@
+ 
+ #include "mlocale_p.h"
+ 
++using namespace icu;
++
+ namespace ML10N {
+ 
+ icu::UnicodeString MIcuConversions::qStringToUnicodeString(const QString &sourceStr)
+diff --git a/src/mlocale.cpp b/src/mlocale.cpp
+index 60cd065f..eb88d7b4 100644
+--- a/src/mlocale.cpp
++++ b/src/mlocale.cpp
+@@ -51,6 +51,8 @@
+ #include "mcalendar.h"
+ #include "mcalendar_p.h"
+ #include "micuconversions.h"
++
++using namespace icu;
+ #endif
+ 
+ #include "mlocaleabstractconfigitem.h"
+diff --git a/src/mstringsearch.cpp b/src/mstringsearch.cpp
+index d7b69609..b9bba310 100644
+--- a/src/mstringsearch.cpp
++++ b/src/mstringsearch.cpp
+@@ -35,6 +35,8 @@
+ 
+ #include "micuconversions.h"
+ 
++using namespace icu;
++
+ namespace ML10N {
+ 
+ MStringSearchPrivate::MStringSearchPrivate()
+-- 
+2.19.1
+

recipes-nemomobile/libmlocale/libmlocale_git.bb

@@ -7,7 +7,8 @@ SRC_URI = "git://git.merproject.org/mer-core/libmlocale.git;protocol=https \
            file://0001-MIcuConversions-Cast-a-pointer-with-reinterpret_cast.patch \
            file://0002-Disable-a-faulty-chinese-collision-text-building.patch \
            file://0003-Disable-tests-and-doc.patch \
-           file://0004-configure-Use-a-usr-prefix-by-default.patch"
+           file://0004-configure-Use-a-usr-prefix-by-default.patch \
+           file://0005-Make-the-usage-of-icu-namespace-explicit.patch"
 SRCREV = "8ba84e50a3ea099a9582dfb99b27078a6cedde3e"
 PR = "r1"
 PV = "+git${SRCPV}"