fixes bug #414845.

Package-Manager: portage-2.1.10.49/cvs/Linux i686

7 files changed, 55 insertions, 13 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/Manifest b/mail-client/sylpheed/Manifest
index faf6264762ee..7cabc3586fd8 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -4,20 +4,21 @@ Hash: SHA1
 AUX sylpheed-2.1-shared-mime-info.diff 1321 RMD160 c6534cd0df3b559dc3f1de3b45cd3c60d800e267 SHA1 d00e96d612cefd6894567f84d129e24a0c733a16 SHA256 fba8fb53254a90b09e5da73a490a598364438e3e83cebbc88ff5232eae9d4ca0
 AUX sylpheed-2.4-firefox.diff 462 RMD160 cdfac916670401f1679e1208a452197185b09c2a SHA1 197a341215d66fe95807eab93e086837100d371b SHA256 1a371c6a2c97459ca1922a48e35a172e2033cc620ea6e2faa8a05aa132a0ccaa
 AUX sylpheed-2.5-enchant.diff 657 RMD160 60a9f01e855283860606ff39d7efceab24f94f22 SHA1 8c2a0b08ab739dc35d57edcbb6a3a29f5c25f6b0 SHA256 b47b4829cfe20215c6daf3a80a2b3ba1afbf529ca3212986246316e9655fefab
+AUX sylpheed-r3033.diff 662 RMD160 08aad25ae78e2fc1d3e4f375dc22855a1c2a2867 SHA1 03afc55f003b9e17f9bebdffdcc4abb9d3b838e1 SHA256 deb989aac7eb818a40ae59053359f60bd642d3f1f39c78a4ccb3568e47c4734a
 DIST sylpheed-2.6.0.tar.bz2 2833188 RMD160 a4eb3b11d297dce1c42c23ceb553680b0942d75c SHA1 122fe608b5a7cb5a262da65908b1f5cf67a0123f SHA256 121b9f69d5501be2caa8419d5cf1351436db4b43af9f2083b07e59f1def31f51
 DIST sylpheed-3.1.2.tar.bz2 3236955 RMD160 2ce75e5ac8433fa17d399062e6672ed47180cc5d SHA1 bcc9810ea3353a1416ce2ddb2126bca369158244 SHA256 d6fb71ef941c764f53bc2541ce25caf9e4855f84424ced6ef91f4d2dcde3f404
 DIST sylpheed-3.1.3.tar.bz2 3238367 RMD160 9ede9bd42b6bdbda8289d64f22c91d92299e5fdb SHA1 61319d7709526d9edee9dc47126e7be0350caacb SHA256 ddeb9d613f1b5265a687ea54ba29e7920179bc450d639620ca6e79490037db87
 DIST sylpheed-3.1.4.tar.bz2 3239023 RMD160 f04ec8f9fb6dd29f665c60c0954f70337df359d4 SHA1 fa4be1a9409efcff25737b0a4c1477947f22710f SHA256 5bd4105b78a65070000375193c506fda09c1e0471403f7b9e225cfca904c93ab
-EBUILD sylpheed-2.6.0.ebuild 1515 RMD160 2b99bc9d94a127cfc3d4a3c87d16dd5b7ccdde99 SHA1 d9d09a49d3532bc0a9203e5e9893e187315cba8d SHA256 0d8ae422638d2798b40306785d1ea55560f59a2c21436c000745d395152d7795
-EBUILD sylpheed-3.1.2.ebuild 1440 RMD160 7e6850b4bcc330fd48013f9bda10deeb0297ecff SHA1 f4aa64bd49f286a8c5ad5fa3ca06c0c2034f920d SHA256 8bed94d6f92d5c29426b93d2c6cdcbc8493eeb9eb6d65ac99cf30b35acd69912
-EBUILD sylpheed-3.1.3.ebuild 1446 RMD160 f10e4cda46635daed4288d9e9372088e370c97fe SHA1 399c9f9d3599020498bd1b4d65dc2ccc436be3a9 SHA256 d3fb20451c0e127e36e82733503acb71057f7481d36c8c3e24b395f28776c61e
-EBUILD sylpheed-3.1.4.ebuild 1447 RMD160 a6020128b965780ccf1ab46f7b429cd509035059 SHA1 111b408ff18ade635d99de73cc421350f2cc50c0 SHA256 3b7c4a37caa0a9fded72777d511bd4bcad37d115ea9d870ef6d22aea82711b96
-MISC ChangeLog 47826 RMD160 73fac95a55271dd19811eec2ce33b3de54ac02a0 SHA1 26e2b776bb847e6e61aaba69183dd98e382a2e1a SHA256 b56b5c1a4a527c10b7c164cf76247b48666fe209ea66f14d6c069fb8cf5376ac
+EBUILD sylpheed-2.6.0.ebuild 1554 RMD160 2a9e824796e45310c23998edc87f94f89a113170 SHA1 6c6da314afdee08d560c71d842d7b8d946960f19 SHA256 f2e63bfbdb009927662ca4e996bc5781cf80a3654a65a989729de0af0272b70a
+EBUILD sylpheed-3.1.2.ebuild 1498 RMD160 5a54500f31dbd2203a712be2ddcc27e08b8683f5 SHA1 a69e9f9e43898f7eea5bacc956d0703c3218caad SHA256 5ce288f0194c17b47761fcff45b6a56ccf172b967e9e7c5d0188314d9d6d932a
+EBUILD sylpheed-3.1.3.ebuild 1504 RMD160 5f6cb7f80aedacb0067a9dfd07ce78f426e1e685 SHA1 2e6e77693973a71fe1b90404cced89a2cb327e34 SHA256 e03afe130db6b92ca8161cb868d872e5bd84a50acf82e94a4dfe60adbf7cd030
+EBUILD sylpheed-3.1.4.ebuild 1505 RMD160 054ea7b017362831fd973d105b0e54d2188089ce SHA1 89a9222e4515224708bb0ca3d24868a8e949b719 SHA256 0632848886d03069d1cfc4e994736d21928ebc04f53c6d6ac3f9931cccfaa13d
+MISC ChangeLog 48023 RMD160 43bffbb9c69967406f829f92e8d270a262a7245d SHA1 7db7a98f38341b3fa7271284e8bb9e75c897d3bf SHA256 840fa6ad1f052b96d03f841691a500ea96f0a60ac90dafe7af44d4df6a8bb387
 MISC metadata.xml 339 RMD160 a2956f18abd8c76fa16702bbbd18052b17eef412 SHA1 955fea53cc8a0e171611a3ef0301ac4a8f4381c6 SHA256 ba4beec56bd0eaed052b930e04b2a31aec70c619a91fdee00ecfa33f2d4c8c1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+lDk4ACgkQL46suuyRem2T9gCghezV+eeTc1ZH/V0A4MQVWkJ8
-sDQAoI9lSmFnEuOctFKcBy7FXYjigPpP
-=iYYR
+iEYEARECAAYFAk/AkqkACgkQL46suuyRem38JwCfS9Cj35yYAAJcRawB+Cht9A6L
+koMAoI+OOfuKZAUuYDBMNIiqAO5jG9cJ
+=wl9w
 -----END PGP SIGNATURE-----
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 \