Accepting request 597133 from GNOME:Factory

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

OBS-URL: https://build.opensuse.org/request/show/597133
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=189

evolution-data-server-3.28.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb9546d5fedbb00de6c6cec3850f2cdfea234af221e645d15721686a8df77ef9
-size 4443780

evolution-data-server-3.28.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b04fc1adaba0541546267a77f1bc5aa549fe85eb9933492fdf994c69fa36989
+size 4445420

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
+
+

evolution-data-server.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+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
+
+- Update to version 3.28.1:
+  + [ECalMetaBackend]: Doesn't store custom time zones permanently.
+  + Correct typo in config.h.in.
+  + Update POTFILES.in.
+  + Bugs fixed: bgo#767683, bgo#725295, bgo#794434, bgo#794534,
+    bgo#794628, bgo#793601, bgo#794639, bgo#794879.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Tue Mar 20 17:36:46 UTC 2018 - dimstar@opensuse.org
 

evolution-data-server.spec

@@ -30,7 +30,7 @@
 %define so_edata_cal 28
 %define _evo_version 3.28
 Name:           evolution-data-server
-Version:        3.28.0
+Version:        3.28.1
 Release:        0
 Summary:        Evolution Data Server
 License:        LGPL-2.1-or-later
@@ -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