summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch')
-rw-r--r--meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
deleted file mode 100644
index d3b0ac6735..0000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 698a0e104dcbe4b630df848fd4af7c59f76cdc37 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 5 May 2018 17:46:52 -0700
4Subject: [PATCH] Use recommended way to handle the icu namespace
5
6Fixes build with icu >= 61
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/libedataserver/e-alphabet-index-private.cpp | 2 ++
13 src/libedataserver/e-transliterator-private.cpp | 2 ++
14 2 files changed, 4 insertions(+)
15
16diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp
17index d3e44f4..ddffd99 100644
18--- a/src/libedataserver/e-alphabet-index-private.cpp
19+++ b/src/libedataserver/e-alphabet-index-private.cpp
20@@ -33,9 +33,11 @@
21
22 /* ICU headers */
23 #include <unicode/alphaindex.h>
24+#include <unicode/ustring.h>
25
26 using icu::AlphabeticIndex;
27 using icu::Locale;
28+using U_ICU_NAMESPACE::UnicodeString;
29
30 struct _EAlphabetIndex {
31 AlphabeticIndex *priv;
32diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp
33index bb15593..573446f 100644
34--- a/src/libedataserver/e-transliterator-private.cpp
35+++ b/src/libedataserver/e-transliterator-private.cpp
36@@ -33,8 +33,10 @@
37
38 /* ICU headers */
39 #include <unicode/translit.h>
40+#include <unicode/ustring.h>
41
42 using icu::Transliterator;
43+using U_ICU_NAMESPACE::UnicodeString;
44
45 struct _ETransliterator {
46 Transliterator *priv;