diff --git a/evolution-data-server-3.29.1-icu61_1.patch b/evolution-data-server-3.29.1-icu61_1.patch new file mode 100644 index 0000000..cf9b043 --- /dev/null +++ b/evolution-data-server-3.29.1-icu61_1.patch @@ -0,0 +1,31 @@ +From 4d53769b4b4c2753f4e7d0a956c6876d6792129a Mon Sep 17 00:00:00 2001 +From: Hussam Al-Tayeb +Date: Mon, 16 Apr 2018 13:38:33 +0200 +Subject: Bug 795295 - Fails to compile after icu 61.1 upgrade + (icu::UnicodeString) + + +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 + + using icu::Transliterator; ++using icu::UnicodeString; + + struct _ETransliterator { + Transliterator *priv; diff --git a/evolution-data-server.spec b/evolution-data-server.spec index a77f4c1..cc02b2d 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -52,6 +52,8 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12 ### Patches ### +Patch01: evolution-data-server-3.29.1-icu61_1.patch + ### Dependencies ### Requires: dconf @@ -169,6 +171,7 @@ the functionality of the installed %{name} package. %prep %setup -q +%patch01 -p1 -b .icu61_1 %build