Fix compilation with gcc-4.3. Bug 235320. Thanks to A. Frederick Christensen <christendoc@nosocomia.com>.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64

4 files changed, 45 insertions, 5 deletions

diff --git a/net-mail/gnubiff/ChangeLog b/net-mail/gnubiff/ChangeLog
index eae587c3717d..a7e4dfafe3e8 100644
--- a/net-mail/gnubiff/ChangeLog
+++ b/net-mail/gnubiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/gnubiff
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/ChangeLog,v 1.20 2008/06/10 18:41:17 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/ChangeLog,v 1.21 2008/10/21 15:02:12 loki_val Exp $
+
+  21 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/gnubiff-2.2.10-gcc43.patch, gnubiff-2.2.10.ebuild:
+  Fix compilation with gcc-4.3. Bug 235320. Thanks to A. Frederick
+  Christensen <christendoc@nosocomia.com>.
 
   10 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   gnubiff-2.2.10.ebuild:
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index a74f96dff2e9..394877a2a144 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -1,6 +1,7 @@
+AUX gnubiff-2.2.10-gcc43.patch 977 RMD160 3a053a7425eb59e371474a8ef0999511d1d2467e SHA1 791992b272e53fe5bac2cf41292b59af5495684c SHA256 51ea86a80d83d1c4d08837cb735d1e20dd86a08033f65fae36a08778ff29a0ff
 DIST gnubiff-2.1.3.tar.gz 765654 RMD160 06a2cdbaabfd891f0eae75a607386f4d641c266e SHA1 56d2af3f828adda06fdff3cabe22072d1eb2e5f3 SHA256 9612daa8292ce39f1fc0b6f89dac9aac44ef5c504926309ec07244463424e643
 DIST gnubiff-2.2.10.tar.gz 856771 RMD160 4386cb36eada3158db5c14fb4e5e8ce9879def5c SHA1 c8379bb6c6fa2ee3512c7dd00492ca0eb5ceae0e SHA256 9536f6411bbaa68ff0dea3a203d6d6b65bd1fad367f210a0ec6aa3e8a790b412
 EBUILD gnubiff-2.1.3.ebuild 1144 RMD160 7dfb0f389199051c48aa4704c8a739bdc77f3c11 SHA1 686371d824a2e766eb2ab393fcc5ab6942f8d691 SHA256 ed6537142a81a33c99be8ad8dce7216da5ddf34fac5278ffc161b4689fc31fc6
-EBUILD gnubiff-2.2.10.ebuild 1135 RMD160 0ae8bab44219201cd91e4594e4804a850df1b12a SHA1 9c5a6143baf5050d148d0c076ff7163fe79259ab SHA256 a0b91c552c8dc6afd90759b3835bcb6cab0a2820b9be31a2a5f912916c883d9b
-MISC ChangeLog 3079 RMD160 7643257411cf3707c2a42756cbb56466843e1b29 SHA1 ea48c3094d3093d2bfcbac20bd21bd3f90a92aca SHA256 33da1fbc33c54024e07feef5485059e37bc74cdcebd0879b862cb59718db01dc
+EBUILD gnubiff-2.2.10.ebuild 1177 RMD160 c05ef0085e1d7b82daa2a08ca3da181d8d43ab15 SHA1 0bcc5fe8b98d111be3e7f3c0db0042e03bb7e438 SHA256 0152a91a7f4970b20e18f404e82d70dd7059b1d548b77379976b3068b712d1ee
+MISC ChangeLog 3301 RMD160 ae5fad9f65300dd692e298c0e814269ceda11012 SHA1 47af94026005d1b3df37be87bbcbf692f3f0d1d8 SHA256 60d4583a7766948e8297c5110265449d5e38d50fe55494cf1fdcc03d0d1225e0
 MISC metadata.xml 273 RMD160 6f1255cdc5aca61d5dcb7443a82b7efc0d01d630 SHA1 14320ff253cdc06f0cf869720802f2f5cfbe3bfc SHA256 8ac6ca0ce9f35cd2aac5fbda074690cdfee7018157ce59475fdf3e2c522f796d
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.10-gcc43.patch b/net-mail/gnubiff/files/gnubiff-2.2.10-gcc43.patch
new file mode 100644
index 000000000000..9787a70269b2
--- /dev/null
+++ b/net-mail/gnubiff/files/gnubiff-2.2.10-gcc43.patch
@@ -0,0 +1,33 @@
+diff -r -u srcORIG/gnubiff.cc  src/gnubiff.cc
+--- srcORIG/gnubiff.cc  2008-08-20 18:19:20.000000000 -0500
++++ src/gnubiff.cc      2008-08-20 18:13:07.000000000 -0500
+@@ -43,6 +43,7 @@
+ #include "ui-preferences.h"
+ #include "ui-applet.h"
+ #include "ui-applet-gtk.h"
++#include <stdlib.h>
+ 
+ int main (int argc, char **argv);
+ int mainGNOME (int argc, char **argv);
+diff -r -u srcORIG/gui.cc  src/gui.cc    
+--- srcORIG/gui.cc      2008-08-20 18:19:20.000000000 -0500
++++ src/gui.cc  2008-08-20 18:13:07.000000000 -0500
+@@ -33,6 +33,7 @@
+ #include <gmodule.h>
+ #include "gtk_image_animation.h"
+ #include "gui.h"
++#include <stdlib.h>
+ 
+ 
+ /**
+diff -r -u srcORIG/signals.cc  src/signals.cc
+--- srcORIG/signals.cc  2008-08-20 18:19:20.000000000 -0500
++++ src/signals.cc      2008-08-20 18:13:07.000000000 -0500
+@@ -32,6 +32,7 @@
+ #include "signals.h"
+ #include "ui-applet.h"
+ #include "ui-applet-gui.h"
++#include <stdlib.h>
+ 
+ /// Pointer to biff
+ class Biff *Signals::biff_ = NULL;
diff --git a/net-mail/gnubiff/gnubiff-2.2.10.ebuild b/net-mail/gnubiff/gnubiff-2.2.10.ebuild
index 8a95044552e1..de0839f4c7e8 100644
--- a/net-mail/gnubiff/gnubiff-2.2.10.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.2.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/gnubiff-2.2.10.ebuild,v 1.2 2008/06/10 18:41:17 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/gnubiff-2.2.10.ebuild,v 1.3 2008/10/21 15:02:12 loki_val Exp $
 
-inherit eutils
+inherit base eutils
 
 DESCRIPTION="A mail notification program"
 HOMEPAGE="http://gnubiff.sourceforge.net/"
@@ -23,6 +23,7 @@ RDEPEND=">=x11-libs/gtk+-2.4
 	x11-proto/xproto"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+PATCHES="${FILESDIR}/${P}-gcc43.patch"
 
 src_compile() {
 	econf $(use_enable debug) \