GCC 4.4 love, bug #274041

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

4 files changed, 73 insertions, 4 deletions

diff --git a/media-gfx/freepv/ChangeLog b/media-gfx/freepv/ChangeLog
index 53329c7349aa..3b68ecf253d5 100644
--- a/media-gfx/freepv/ChangeLog
+++ b/media-gfx/freepv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/freepv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/ChangeLog,v 1.2 2009/05/02 07:39:49 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/ChangeLog,v 1.3 2009/06/13 20:54:39 voyageur Exp $
+
+  13 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org> freepv-0.3.0.ebuild,
+  +files/freepv-0.3.0-gcc44.patch:
+  GCC 4.4 love, bug #274041
 
 *freepv-0.3.0 (02 May 2009)
 
diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest
index cfac2389cf86..d2538cd6b971 100644
--- a/media-gfx/freepv/Manifest
+++ b/media-gfx/freepv/Manifest
@@ -1,4 +1,5 @@
+AUX freepv-0.3.0-gcc44.patch 2184 RMD160 fa7cfa729bacefece322ff4cf9971177f6ccb46b SHA1 e4697585be0180ee6e947d5a8c71197fe620ed23 SHA256 a2e044ad7d9adaf928bc4840e9ef2334577d255be063b7223f6afe1cb51415ae
 DIST freepv-0.3.0.tar.gz 175545 RMD160 cb5d462844fd731d72886a7def71090bf91b39da SHA1 01ebbb6949680ae5535d90ccfbcc7959346f3ea1 SHA256 a66c58616cbe814b2e23c6fe109c3de906dad83a8faa32ea219c182bf15229f0
-EBUILD freepv-0.3.0.ebuild 849 RMD160 5f5ccece428ea62a9a554ea24a9538deab55f4b9 SHA1 2186837d5beb4976caa97895977f9ae578d71b0b SHA256 f7a3c4c131af934146db70f3f312f7010ff4de518b429e79c13d40104cd74a88
-MISC ChangeLog 585 RMD160 a13fb0a59343e92f090106daacf827e8f1d95f1d SHA1 5145da6f61377552602de22434eab1606f5d926c SHA256 1922a68a301f1bcbdcacf4f540f0e22d8282622a338134e2fce837e8d34f338e
+EBUILD freepv-0.3.0.ebuild 915 RMD160 0e976bf1773b5acdbe320e335b81b74717447475 SHA1 d16df93b3b7a9cacf57f66004888c1590155faec SHA256 bdebab67812bd6da5613b06349b8cc54067f1174cc42815e1e782dc8d68401fe
+MISC ChangeLog 725 RMD160 11b5359b07e922b8edf1201b80fa9249834e3da9 SHA1 92da6b28163b68671f3ffbca786a309824291893 SHA256 3aee6a10b6771daac725243ce3e9e6a15384dcc8f666dc164760f2b047982a1e
 MISC metadata.xml 406 RMD160 f02e3cecd596f45f2595e96b74ff357de1bd7213 SHA1 c0a79053a4af4284742602f3ecf73c5c93e12e92 SHA256 fe6b0623f18d4242be99afc2a93feefee5cfc2ad46fcc3d1fef05b6e77306190
diff --git a/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch b/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch
new file mode 100644
index 000000000000..ff92ae2f4261
--- /dev/null
+++ b/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch
@@ -0,0 +1,58 @@
+diff -Naur freepv-0.3.0.orig/src/libfreepv/OpenGLRenderer.cpp freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp
+--- freepv-0.3.0.orig/src/libfreepv/OpenGLRenderer.cpp	2009-06-13 22:38:40.000000000 +0200
++++ freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp	2009-06-13 22:39:06.000000000 +0200
+@@ -25,6 +25,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstdio>
+ #include <vector>
+ #include <math.h>
+ 
+diff -Naur freepv-0.3.0.orig/src/libfreepv/QTVRDecoder.cpp freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp
+--- freepv-0.3.0.orig/src/libfreepv/QTVRDecoder.cpp	2009-06-13 22:38:40.000000000 +0200
++++ freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp	2009-06-13 22:41:39.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <math.h>
+ #include <errno.h>
+ #include <vector>
++#include <cstdio>
+ #include <cstring>
+ 
+ #include <zlib.h>
+diff -Naur freepv-0.3.0.orig/src/libfreepv/SPiVparser.cpp freepv-0.3.0/src/libfreepv/SPiVparser.cpp
+--- freepv-0.3.0.orig/src/libfreepv/SPiVparser.cpp	2009-06-13 22:38:40.000000000 +0200
++++ freepv-0.3.0/src/libfreepv/SPiVparser.cpp	2009-06-13 22:43:44.000000000 +0200
+@@ -488,8 +488,8 @@
+ //This method remplace the nodes that has src attributes
+ void SPiVparser::parseNodeURL(const char* _url)
+ {
+-    char * aux_url=NULL;
+-    char * url=(char*) _url;
++    const char * aux_url=NULL;
++    const char * url=(char*) _url;
+     if(aux_url = strrchr (_url,'/'))
+     {
+        url=aux_url;
+diff -Naur freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp freepv-0.3.0/src/libfreepv/Utils/signatures.cpp
+--- freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp	2009-06-13 22:38:40.000000000 +0200
++++ freepv-0.3.0/src/libfreepv/Utils/signatures.cpp	2009-06-13 22:42:39.000000000 +0200
+@@ -23,6 +23,7 @@
+  */
+ 
+ #include "signatures.h"
++#include <cstdio>
+ #include <iostream>
+ 
+ namespace FPV{
+diff -Naur freepv-0.3.0.orig/src/libfreepv/utils.cpp freepv-0.3.0/src/libfreepv/utils.cpp
+--- freepv-0.3.0.orig/src/libfreepv/utils.cpp	2009-06-13 22:38:40.000000000 +0200
++++ freepv-0.3.0/src/libfreepv/utils.cpp	2009-06-13 22:39:49.000000000 +0200
+@@ -22,6 +22,7 @@
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+ 
++#include <cstdio>
+ #include <algorithm>
+ 
+ #include "utils.h"
diff --git a/media-gfx/freepv/freepv-0.3.0.ebuild b/media-gfx/freepv/freepv-0.3.0.ebuild
index 8b43fc2eae04..0627051a0b71 100644
--- a/media-gfx/freepv/freepv-0.3.0.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0.ebuild,v 1.1 2009/05/02 07:39:49 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0.ebuild,v 1.2 2009/06/13 20:54:39 voyageur Exp $
+
+EAPI=2
 
 inherit cmake-utils nsplugins
 
@@ -26,6 +28,10 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P/_beta?/}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
 src_install() {
 	cmake-utils_src_install