From da0e5844cbc74d318555f29d0c6d767d16e3f89b56fa9c99cc2e7b7a6fc4080e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 16 Apr 2018 15:45:43 +0000
Subject: [PATCH] Accepting request 597126 from home:dimstar:Factory

- Add evolution-data-server-icu61.1.patch: Fix build with icu 61.1
  (bgo#795295).

OBS-URL: https://build.opensuse.org/request/show/597126
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=322
---
 evolution-data-server-icu61.1.patch | 39 +++++++++++++++++++++++++++++
 evolution-data-server.changes       |  6 +++++
 evolution-data-server.spec          |  3 +++
 3 files changed, 48 insertions(+)
 create mode 100644 evolution-data-server-icu61.1.patch

diff --git a/evolution-data-server-icu61.1.patch b/evolution-data-server-icu61.1.patch
new file mode 100644
index 0000000..3791a9f
--- /dev/null
+++ b/evolution-data-server-icu61.1.patch
@@ -0,0 +1,39 @@
+From 2cd08a03bc637fa6fefb6fbe13ae2c78abe6bf9f Mon Sep 17 00:00:00 2001
+From: Hussam Al-Tayeb <me@hussam.eu.org>
+Date: Mon, 16 Apr 2018 13:38:33 +0200
+Subject: Bug 795295 - Fails to compile after icu 61.1 upgrade
+ (icu::UnicodeString)
+
+---
+ src/libedataserver/e-alphabet-index-private.cpp | 1 +
+ src/libedataserver/e-transliterator-private.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp
+index d3e44f4..a789f44 100644
+--- a/src/libedataserver/e-alphabet-index-private.cpp
++++ b/src/libedataserver/e-alphabet-index-private.cpp
+@@ -36,6 +36,7 @@
+ 
+ using icu::AlphabeticIndex;
+ using icu::Locale;
++using icu::UnicodeString;
+ 
+ struct _EAlphabetIndex {
+ 	AlphabeticIndex *priv;
+diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp
+index bb15593..6f1d89c 100644
+--- a/src/libedataserver/e-transliterator-private.cpp
++++ b/src/libedataserver/e-transliterator-private.cpp
+@@ -35,6 +35,7 @@
+ #include <unicode/translit.h>
+ 
+ using icu::Transliterator;
++using icu::UnicodeString;
+ 
+ struct _ETransliterator {
+ 	Transliterator *priv;
+-- 
+cgit v0.12
+
+
diff --git a/evolution-data-server.changes b/evolution-data-server.changes
index 4e88508..364bafe 100644
--- a/evolution-data-server.changes
+++ b/evolution-data-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 16 15:15:47 UTC 2018 - dimstar@opensuse.org
+
+- Add evolution-data-server-icu61.1.patch: Fix build with icu 61.1
+  (bgo#795295).
+
 -------------------------------------------------------------------
 Mon Apr  9 21:28:45 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index d1cbb5e..fd332cc 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -38,6 +38,8 @@ Group:          Development/Libraries/GNOME
 URL:            https://wiki.gnome.org/Apps/Evolution
 Source0:        http://download.gnome.org/sources/evolution-data-server/%{_evo_version}/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM evolution-data-server-icu61.1.patch bgo#795295 dimstar@opensuse.org -- Fix build with icu 61.1
+Patch0:         evolution-data-server-icu61.1.patch
 BuildRequires:  cmake
 BuildRequires:  db-devel
 BuildRequires:  fdupes
@@ -267,6 +269,7 @@ This package contains developer documentation.
 
 %prep
 %setup -q
+%patch0 -p1
 translation-update-upstream
 
 %build