| 1 |
commit: 76c4e3ee7ae45255d6078eb8d4338d39371c4951 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 20 07:41:39 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 20 07:41:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c4e3ee |
| 7 |
|
| 8 |
gnome-extra/evolution-data-server: fix compatibility with dev-libs/icu 61 and 62 |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/666544 |
| 11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 12 |
|
| 13 |
.../evolution-data-server-3.24.7.ebuild | 1 + |
| 14 |
.../evolution-data-server-3.26.6.ebuild | 5 ++- |
| 15 |
.../evolution-data-server/files/icu61-compat.patch | 38 ++++++++++++++++++++++ |
| 16 |
3 files changed, 41 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index cfc4ff4b4e9..6047dfa5c70 100644 |
| 20 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild |
| 21 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild |
| 22 |
@@ -76,6 +76,7 @@ RESTRICT="test" |
| 23 |
PATCHES=( |
| 24 |
"${FILESDIR}"/${PV}-DESTDIR-honoring.patch |
| 25 |
"${FILESDIR}"/${PV}-libical3-compat.patch |
| 26 |
+ "${FILESDIR}"/icu61-compat.patch |
| 27 |
) |
| 28 |
|
| 29 |
pkg_setup() { |
| 30 |
|
| 31 |
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 |
| 32 |
index c48dbec871b..e38990e8c24 100644 |
| 33 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild |
| 34 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild |
| 35 |
@@ -78,10 +78,9 @@ pkg_setup() { |
| 36 |
python-any-r1_pkg_setup |
| 37 |
} |
| 38 |
|
| 39 |
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare |
| 40 |
-# call; if needed, set them after cmake-utils_src_prepare call, if that works |
| 41 |
- |
| 42 |
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call |
| 43 |
src_prepare() { |
| 44 |
+ eapply "${FILESDIR}"/icu61-compat.patch |
| 45 |
use vala && vala_src_prepare |
| 46 |
cmake-utils_src_prepare |
| 47 |
gnome2_src_prepare |
| 48 |
|
| 49 |
diff --git a/gnome-extra/evolution-data-server/files/icu61-compat.patch b/gnome-extra/evolution-data-server/files/icu61-compat.patch |
| 50 |
new file mode 100644 |
| 51 |
index 00000000000..2b5b76afd73 |
| 52 |
--- /dev/null |
| 53 |
+++ b/gnome-extra/evolution-data-server/files/icu61-compat.patch |
| 54 |
@@ -0,0 +1,38 @@ |
| 55 |
+From 2cd08a03bc637fa6fefb6fbe13ae2c78abe6bf9f Mon Sep 17 00:00:00 2001 |
| 56 |
+From: Hussam Al-Tayeb <me@×××××××××.org> |
| 57 |
+Date: Mon, 16 Apr 2018 13:38:33 +0200 |
| 58 |
+Subject: [PATCH] Bug 795295 - Fails to compile after icu 61.1 upgrade |
| 59 |
+ (icu::UnicodeString) |
| 60 |
+ |
| 61 |
+--- |
| 62 |
+ src/libedataserver/e-alphabet-index-private.cpp | 1 + |
| 63 |
+ src/libedataserver/e-transliterator-private.cpp | 1 + |
| 64 |
+ 2 files changed, 2 insertions(+) |
| 65 |
+ |
| 66 |
+diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp |
| 67 |
+index d3e44f488..a789f4409 100644 |
| 68 |
+--- a/src/libedataserver/e-alphabet-index-private.cpp |
| 69 |
++++ b/src/libedataserver/e-alphabet-index-private.cpp |
| 70 |
+@@ -36,6 +36,7 @@ |
| 71 |
+ |
| 72 |
+ using icu::AlphabeticIndex; |
| 73 |
+ using icu::Locale; |
| 74 |
++using icu::UnicodeString; |
| 75 |
+ |
| 76 |
+ struct _EAlphabetIndex { |
| 77 |
+ AlphabeticIndex *priv; |
| 78 |
+diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp |
| 79 |
+index bb15593d5..6f1d89c8d 100644 |
| 80 |
+--- a/src/libedataserver/e-transliterator-private.cpp |
| 81 |
++++ b/src/libedataserver/e-transliterator-private.cpp |
| 82 |
+@@ -35,6 +35,7 @@ |
| 83 |
+ #include <unicode/translit.h> |
| 84 |
+ |
| 85 |
+ using icu::Transliterator; |
| 86 |
++using icu::UnicodeString; |
| 87 |
+ |
| 88 |
+ struct _ETransliterator { |
| 89 |
+ Transliterator *priv; |
| 90 |
+-- |
| 91 |
+2.18.0 |
| 92 |
+ |
Archives