Add an upstream patch to be able to build with icu 61.1
This commit is contained in:
parent
277c7f0bc4
commit
67a9ce9fc3
31
evolution-data-server-3.29.1-icu61_1.patch
Normal file
31
evolution-data-server-3.29.1-icu61_1.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 4d53769b4b4c2753f4e7d0a956c6876d6792129a 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)
|
||||||
|
|
||||||
|
|
||||||
|
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;
|
@ -52,6 +52,8 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12
|
|||||||
|
|
||||||
### Patches ###
|
### Patches ###
|
||||||
|
|
||||||
|
Patch01: evolution-data-server-3.29.1-icu61_1.patch
|
||||||
|
|
||||||
### Dependencies ###
|
### Dependencies ###
|
||||||
|
|
||||||
Requires: dconf
|
Requires: dconf
|
||||||
@ -169,6 +171,7 @@ the functionality of the installed %{name} package.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch01 -p1 -b .icu61_1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user