gnome-extra/evolution-data-server: fix compatibility with dev-libs/icu 61 and 62

Fixes: https://bugs.gentoo.org/666544
Package-Manager: Portage-2.3.49, Repoman-2.3.10

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
index cfc4ff4b4e9f44be05a7b3b2cb68c76d2515fb36..6047dfa5c70074de8498e98f4b89076e54f76aba 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
@@ -76,6 +76,7 @@ RESTRICT="test"
 PATCHES=(
        "${FILESDIR}"/${PV}-DESTDIR-honoring.patch
        "${FILESDIR}"/${PV}-libical3-compat.patch
+       "${FILESDIR}"/icu61-compat.patch
 )
 
 pkg_setup() {

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
index c48dbec871beb5b1e9e13721bd942bb017d61fb7..e38990e8c24516e0e2cf5580589378a9ab16f3db 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
@@ -78,10 +78,9 @@ pkg_setup() {
        python-any-r1_pkg_setup
 }
 
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake-utils_src_prepare call, if that works
-
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
 src_prepare() {
+       eapply "${FILESDIR}"/icu61-compat.patch
        use vala && vala_src_prepare
        cmake-utils_src_prepare
        gnome2_src_prepare

diff --git a/gnome-extra/evolution-data-server/files/icu61-compat.patch b/gnome-extra/evolution-data-server/files/icu61-compat.patch
new file mode 100644 (file)
index 0000000..2b5b76a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/icu61-compat.patch
@@ -0,0 +1,38 @@
+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: [PATCH] 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 d3e44f488..a789f4409 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 bb15593d5..6f1d89c8d 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;
+-- 
+2.18.0
+