CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

evolution-data-server: Update to 3.26.6 and fix build with icu 61

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2018-05-05 23:17:59 -07:00 committed by Armin Kuster
parent e59a9738c2
commit 6cb102d0ef
2 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch Normal file
View File

@ -0,0 +1,46 @@
From 698a0e104dcbe4b630df848fd4af7c59f76cdc37 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 5 May 2018 17:46:52 -0700
Subject: [PATCH] Use recommended way to handle the icu namespace
Fixes build with icu >= 61
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/libedataserver/e-alphabet-index-private.cpp | 2 ++
src/libedataserver/e-transliterator-private.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp
index d3e44f4..ddffd99 100644
--- a/src/libedataserver/e-alphabet-index-private.cpp
+++ b/src/libedataserver/e-alphabet-index-private.cpp
@@ -33,9 +33,11 @@
/* ICU headers */
#include <unicode/alphaindex.h>
+#include <unicode/ustring.h>
using icu::AlphabeticIndex;
using icu::Locale;
+using U_ICU_NAMESPACE::UnicodeString;
struct _EAlphabetIndex {
AlphabeticIndex *priv;
diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp
index bb15593..573446f 100644
--- a/src/libedataserver/e-transliterator-private.cpp
+++ b/src/libedataserver/e-transliterator-private.cpp
@@ -33,8 +33,10 @@
/* ICU headers */
#include <unicode/translit.h>
+#include <unicode/ustring.h>
using icu::Transliterator;
+using U_ICU_NAMESPACE::UnicodeString;
struct _ETransliterator {
Transliterator *priv;

17
meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb → meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb
View File

@ -18,14 +18,15 @@ inherit distro_features_check gnomebase cmake gtk-doc gettext gobject-introspect
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI += " \
file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
file://iconv-detect.h \
"
SRC_URI[archive.md5sum] = "568a21a4df4e0ec985c849b38fc66908"
SRC_URI[archive.sha256sum] = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
file://iconv-detect.h \
file://0004-Use-recommended-way-to-handle-the-icu-namespace.patch \
"
SRC_URI[archive.md5sum] = "ae7bbf543b2c3ff79af27e0edea5d472"
SRC_URI[archive.sha256sum] = "e43aa1847ddc02965f560261ef88d18fb8704eddaa55555bf96b884a33e510ec"
LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"