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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 61 insertions, 5 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/Manifest b/sci-misc/boinc/Manifest
index 078025ee8327..ec03f40ec1d4 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,7 +1,8 @@
 AUX 6.4.5-RSA_security.patch 2413 RMD160 8bf2d0573fedbdbc54f0c479747a23f0ff840f22 SHA1 e5fcafdd0da06a8a59350ff85cf3725e9ff8cede SHA256 f21a6904459ffcfd40cc0804d4a7f46e5a9ef013c217f204e100a8adf8cd4f87
+AUX 6.4.5-gcc44.patch 1831 RMD160 82aaff8e51077c712b318a473a77a69ec1e1b615 SHA1 bdd2f4baa48d7949d37150e926dcd0a0625caaf8 SHA256 63d9005aab4e60522f32484694c42f70d291b492c76a839aff348be052845fc4
 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
 AUX boinc.init 3083 RMD160 5e3dffe7cf45f91b340b9e2bfd2986b1b2a25b36 SHA1 3fb5ab86d900c71ae3546f979fe8953082a7b884 SHA256 06508a2a77854e2ad08d61a796d9c3a49e00d9e35850afabf67e60b275e08bcf
 DIST boinc-6.4.5.tar.bz2 7639286 RMD160 8f7232a3e7d273076f6b2ae50b565550c03485cc SHA1 24c63d11c8e9ebda17beac359928407ce3b8678d SHA256 f6f1d053f10873ed9b3b6ce8dc4444a49f6c804196a3eb080f574db36e58557a
-EBUILD boinc-6.4.5-r1.ebuild 4334 RMD160 8f8db0a53eaafcd492d486596e07c411859dd84d SHA1 58d95dd70fea9227666b3ef638fa19e7ee71271e SHA256 6d4beeb5a4069e16c975fb96fafb5a8d89875083f7462f0a81cea4a34c7bb3d0
-MISC ChangeLog 11735 RMD160 fbdca0f797941b95b9772d5e358f805a13a7423e SHA1 bbaa1111372a649037f24a982be472626297ccdb SHA256 740ab7078da7291d3cc111a7fe5c5211986df5474a9a6656835cf582278c0488
+EBUILD boinc-6.4.5-r1.ebuild 4420 RMD160 73421ea8ed5735b8a5f08fb608fb5144ffae4429 SHA1 abfada7ff9f2bbc2241e45241028056702917a52 SHA256 5b84f7fb9b629036e94447ef6b7f1da7c41639380e2a64034b87a17e4e011142
+MISC ChangeLog 11924 RMD160 7ca7ec104397e4a875be1b3f326742f639127203 SHA1 1e24b1dabe77ed2b0cd6db9867fd5bc54a700ed2 SHA256 c5869298339aee57c8677c2a35c19e5bafe343601aea97680eacee08ebdbcbc8
 MISC metadata.xml 697 RMD160 8cfc36bbae9395d2675629d68af1c6354244bd5f SHA1 bcfd28d367a81a6fa8b6a548703270cb066a9392 SHA256 614f44eeb4b76fccb040b9ab7dee69e50152c930a9224946010f39e7eed6e04c
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);