fixes bug #414845.

(Portage version: 2.1.10.49/cvs/Linux i686)

6 files changed, 46 insertions, 5 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 21504a73d0cb..8d2df240dee2 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.304 2012/05/05 11:25:51 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.305 2012/05/26 08:19:00 hattya Exp $
+
+  26 May 2012; Akinori Hattori <hattya@gentoo.org> +files/sylpheed-r3033.diff,
+  sylpheed-2.6.0.ebuild, sylpheed-3.1.2.ebuild, sylpheed-3.1.3.ebuild,
+  sylpheed-3.1.4.ebuild:
+  fixes bug #414845.
 
   05 May 2012; Akinori Hattori <hattya@gentoo.org> sylpheed-3.1.3.ebuild:
   stable on x86. wrt bug #413445.
diff --git a/mail-client/sylpheed/files/sylpheed-r3033.diff b/mail-client/sylpheed/files/sylpheed-r3033.diff
new file mode 100644
index 000000000000..1d84628fe563
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-r3033.diff
@@ -0,0 +1,23 @@
+------------------------------------------------------------------------
+r3033 | hiro | 2012-03-26 16:36:06 +0900 (Mon, 26 Mar 2012) | 1 line
+
+removed direct inclusion of <glibconfig.h> and <glib/gwin32.h> (fixes Bug #53).
+------------------------------------------------------------------------
+Index: libsylph/defs.h
+===================================================================
+--- libsylph/defs.h	(revision 3032)
++++ libsylph/defs.h	(revision 3033)
+@@ -24,12 +24,8 @@
+ #  include "config.h"
+ #endif
+ 
+-#include <glibconfig.h>
++#include <glib.h>
+ 
+-#ifdef G_OS_WIN32
+-#  include <glib/gwin32.h>
+-#endif
+-
+ #if HAVE_PATHS_H
+ #  include <paths.h>
+ #endif
diff --git a/mail-client/sylpheed/sylpheed-2.6.0.ebuild b/mail-client/sylpheed/sylpheed-2.6.0.ebuild
index e05bd34dcb34..c483f6019e91 100644
--- a/mail-client/sylpheed/sylpheed-2.6.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.6.0.ebuild,v 1.12 2012/05/04 08:42:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.6.0.ebuild,v 1.13 2012/05/26 08:19:00 hattya Exp $
 
 EAPI="4"
 
@@ -33,6 +33,7 @@ AT_M4DIR="ac"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.[145]-*.diff
+	epatch "${FILESDIR}"/${PN}-r3033.diff
 	use crypt || cp ac/missing/gpgme.m4 ac
 	eautoreconf
 }
diff --git a/mail-client/sylpheed/sylpheed-3.1.2.ebuild b/mail-client/sylpheed/sylpheed-3.1.2.ebuild
index ceb69a4df6a1..a8342a14a2d0 100644
--- a/mail-client/sylpheed/sylpheed-3.1.2.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.2.ebuild,v 1.7 2012/05/04 08:42:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.2.ebuild,v 1.8 2012/05/26 08:19:00 hattya Exp $
 
 EAPI="4"
 
@@ -30,6 +30,10 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	xface? ( media-libs/compface )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-r3033.diff
+}
+
 src_configure() {
 	local htmldir=/usr/share/doc/${PF}/html
 	econf \
diff --git a/mail-client/sylpheed/sylpheed-3.1.3.ebuild b/mail-client/sylpheed/sylpheed-3.1.3.ebuild
index 90290cd2e937..df268a7e75e4 100644
--- a/mail-client/sylpheed/sylpheed-3.1.3.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.3.ebuild,v 1.3 2012/05/05 11:25:51 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.3.ebuild,v 1.4 2012/05/26 08:19:00 hattya Exp $
 
 EAPI="4"
 
@@ -30,6 +30,10 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	xface? ( media-libs/compface )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-r3033.diff
+}
+
 src_configure() {
 	local htmldir=/usr/share/doc/${PF}/html
 	econf \
diff --git a/mail-client/sylpheed/sylpheed-3.1.4.ebuild b/mail-client/sylpheed/sylpheed-3.1.4.ebuild
index 242b511a6bc0..39d951ef665b 100644
--- a/mail-client/sylpheed/sylpheed-3.1.4.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.4.ebuild,v 1.1 2012/05/05 11:15:18 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.4.ebuild,v 1.2 2012/05/26 08:19:00 hattya Exp $
 
 EAPI="4"
 
@@ -30,6 +30,10 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	xface? ( media-libs/compface )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-r3033.diff
+}
+
 src_configure() {
 	local htmldir=/usr/share/doc/${PF}/html
 	econf \