Add gcc 4.4 compat patch. Thanks to Victor Ostroga for this one. Per bug #269618

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 58 insertions, 3 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 14176a5c96f5..e44047b08780 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.61 2009/05/11 17:33:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.62 2009/05/13 21:04:22 scarabeus Exp $
+
+  13 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/6.4.5-gcc44.patch, boinc-6.4.5-r1.ebuild:
+  Add gcc 4.4 compat patch. Thanks to Victor Ostroga for this one. Per bug
+  #269618
 
   11 May 2009; Tomas Chvatal <scarabeus@gentoo.org> boinc-6.4.5-r1.ebuild:
   Update in-ebuild url to be correct
diff --git a/sci-misc/boinc/boinc-6.4.5-r1.ebuild b/sci-misc/boinc/boinc-6.4.5-r1.ebuild
index 7bf7f90b6560..db34712a498c 100644
--- a/sci-misc/boinc/boinc-6.4.5-r1.ebuild
+++ b/sci-misc/boinc/boinc-6.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r1.ebuild,v 1.6 2009/05/11 17:33:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r1.ebuild,v 1.7 2009/05/13 21:04:22 scarabeus Exp $
 
 #
 # Don't forget to keep things in sync with binary boinc package!
@@ -53,7 +53,10 @@ src_prepare() {
 	# copy icons to correct location
 	cp "${S}"/sea/*.png "${S}"/clientgui/res/
 	# RSA Security bug fix. Per bug #258011
-	epatch "${FILESDIR}"/${PV}-RSA_security.patch
+	# GCC 4.4 Compilation issue. Per bug #269618
+	epatch \
+		"${FILESDIR}"/${PV}-RSA_security.patch \
+		"${FILESDIR}"/${PV}-gcc44.patch
 	# fix stripping
 	## TODO
 }
diff --git a/sci-misc/boinc/files/6.4.5-gcc44.patch b/sci-misc/boinc/files/6.4.5-gcc44.patch
new file mode 100644
index 000000000000..de491d926957
--- /dev/null
+++ b/sci-misc/boinc/files/6.4.5-gcc44.patch
@@ -0,0 +1,47 @@
+diff -NrU5 boinc-6.4.5.orig/clientgui/common/wxFlatNotebook.cpp boinc-6.4.5/clientgui/common/wxFlatNotebook.cpp
+--- boinc-6.4.5.orig/clientgui/common/wxFlatNotebook.cpp	2009-05-12 15:56:03.000000000 -0600
++++ boinc-6.4.5/clientgui/common/wxFlatNotebook.cpp	2009-05-12 17:19:57.000000000 -0600
+@@ -605,11 +605,11 @@
+ // 

+ //	wxPageContainerBase

+ //

+ ///////////////////////////////////////////////////////////////////////////////////////////

+ 

+-BEGIN_EVENT_TABLE(wxPageContainerBase, wxControl)

++BEGIN_EVENT_TABLE(wxPageContainerBase, wxPanel)

+ EVT_PAINT(wxPageContainerBase::OnPaint)

+ EVT_SIZE(wxPageContainerBase::OnSize)

+ EVT_LEFT_DOWN(wxPageContainerBase::OnLeftDown)

+ EVT_LEFT_UP(wxPageContainerBase::OnLeftUp)

+ EVT_RIGHT_DOWN(wxPageContainerBase::OnRightDown)

+diff -NrU5 boinc-6.4.5.orig/sched/sched_driver.cpp boinc-6.4.5/sched/sched_driver.cpp
+--- boinc-6.4.5.orig/sched/sched_driver.cpp	2009-05-12 15:56:03.000000000 -0600
++++ boinc-6.4.5/sched/sched_driver.cpp	2009-05-12 16:01:00.000000000 -0600
+@@ -38,10 +38,11 @@
+ #define AUTHENTICATOR    "49bcae97f1788385b0f41123acdf5694"
+     // authenticator of a user record
+ #define HOSTID "7"
+     // ID of a host belonging to that user
+ 
++#include <cstdio>
+ #include <vector>
+ #include "util.h"
+ 
+ using std::vector;
+ 
+diff -NrU5 boinc-6.4.5.orig/sched/sched_util.cpp boinc-6.4.5/sched/sched_util.cpp
+--- boinc-6.4.5.orig/sched/sched_util.cpp	2009-05-12 15:56:03.000000000 -0600
++++ boinc-6.4.5/sched/sched_util.cpp	2009-05-12 17:58:59.000000000 -0600
+@@ -102,11 +102,11 @@
+ #ifndef _USING_FCGI_
+ int try_fopen(const char* path, FILE*& f, const char* mode) {
+ #else
+ int try_fopen(const char* path, FCGI_FILE*& f, const char *mode) {
+ #endif
+-    char* p;
++    const char* p;
+     DIR* d;
+     char dirpath[256];
+ 
+ #ifndef _USING_FCGI_
+     f = fopen(path, mode);