helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-18 21:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

evolution-data-server: Fix build with clang

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2017-08-25 00:14:19 -07:00 committed by Martin Jansa
parent bcbd6884a5
commit 59d3cd68b8
2 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch Normal file
View File

@ -0,0 +1,33 @@
From 0e10e976025b21d12df099e82951f759024ad649 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 24 Aug 2017 22:04:56 -0700
Subject: [PATCH] imapx: Fix signature for imapx_tokenise_struct()
clang complains about different signature for this patch
Fixes
camel/providers/imapx/camel-imapx-tokens.txt:56:1: error: conflicting types for 'imapx_tokenise_struct'
| imapx_tokenise_struct (register const char *str, register size_t len)
| ^
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
camel/providers/imapx/camel-imapx-tokens.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel/providers/imapx/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt
index d48501865..994c368c0 100644
--- a/camel/providers/imapx/camel-imapx-tokens.txt
+++ b/camel/providers/imapx/camel-imapx-tokens.txt
@@ -1,7 +1,7 @@
/* This contains all of the keywords we care about. These
can be converted to an id very efficiently */
struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
-struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
+struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register size_t len);
%%
ALERT, IMAPX_ALERT
APPENDUID, IMAPX_APPENDUID
--
2.14.1

20
meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
View File

@ -15,16 +15,16 @@ SRCREV = "a9e4e74ec4473a4fd09e56b690bd4fa72f686687"
# 3.4 series needs libgdata-0.10*, 3.8 series needs also libsecret instead of gnome-keyring
PV = "3.2.3+git${SRCPV}"
SRC_URI = " \
git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \
file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \
file://0002-Fix-for-automake-1.12.x.patch \
file://0003-Disable-Werror-for-automake.patch \
file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
file://0006-configure.ac-do-not-overwrite-localedir.patch \
file://iconv-detect.h \
"
SRC_URI = "git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \
file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \
file://0002-Fix-for-automake-1.12.x.patch \
file://0003-Disable-Werror-for-automake.patch \
file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
file://0006-configure.ac-do-not-overwrite-localedir.patch \
file://iconv-detect.h \
file://0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch \
"
S = "${WORKDIR}/git"