[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/

["Priit Laes" <plaes@plaes.org>]

commit:     bfd4a5d0d6c2bdd838672fd1b8bd392e0c78221e
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Aug 10 20:34:12 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Aug 10 20:36:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bfd4a5d0

mail-client/evolution: Fix build with < gcc-4.6

---
 mail-client/evolution/evolution-3.5.5.ebuild       |    3 ++
 ...n-of-typedef-causing-build-error-with-gcc.patch |   26 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/mail-client/evolution/evolution-3.5.5.ebuild b/mail-client/evolution/evolution-3.5.5.ebuild
index f7f5055..c666ed5 100644
--- a/mail-client/evolution/evolution-3.5.5.ebuild
+++ b/mail-client/evolution/evolution-3.5.5.ebuild
@@ -124,6 +124,9 @@ pkg_setup() {
 src_prepare() {
 	# Fix paths for Gentoo spamassassin executables
 	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
+
+	epatch "${FILESDIR}/${P}-redefinition-of-typedef-causing-build-error-with-gcc.patch"
+
 	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
 		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
 		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"

diff --git a/mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch b/mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch
new file mode 100644
index 0000000..3b311ac
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch
@@ -0,0 +1,26 @@
+From 56f34fd99f5c8aed29342cb04f061817ed0d1cb6 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Fri, 10 Aug 2012 23:28:01 +0300
+Subject: [PATCH] Redefinition of typedef causing build error with <=gcc-4.5.x
+
+https://bugzilla.gnome.org/show_bug.cgi?id=681625
+---
+ modules/itip-formatter/e-mail-part-itip.h |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/modules/itip-formatter/e-mail-part-itip.h b/modules/itip-formatter/e-mail-part-itip.h
+index 4e464e0..525650c 100644
+--- a/modules/itip-formatter/e-mail-part-itip.h
++++ b/modules/itip-formatter/e-mail-part-itip.h
+@@ -33,8 +33,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-typedef struct _EMailPartItip EMailPartItip;
+-
+ struct _EMailPartItip {
+ 	EMailPart parent;
+ 
+-- 
+1.7.8.6
+