Fix building with GCC 4.4+ wrt #277082.

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

3 files changed, 65 insertions, 2 deletions

diff --git a/media-gfx/aqsis/ChangeLog b/media-gfx/aqsis/ChangeLog
index 77d159d2b2cb..17a058685326 100644
--- a/media-gfx/aqsis/ChangeLog
+++ b/media-gfx/aqsis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/aqsis
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.18 2009/01/23 19:57:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.19 2009/08/07 16:18:59 ssuominen Exp $
+
+  07 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> aqsis-1.4.2.ebuild,
+  +files/aqsis-1.4.2-gcc44.patch:
+  Fix building with GCC 4.4+ wrt #277082.
 
 *aqsis-1.4.2 (23 Jan 2009)
 
diff --git a/media-gfx/aqsis/aqsis-1.4.2.ebuild b/media-gfx/aqsis/aqsis-1.4.2.ebuild
index 2fa6eaa97461..6c24e9b6049c 100644
--- a/media-gfx/aqsis/aqsis-1.4.2.ebuild
+++ b/media-gfx/aqsis/aqsis-1.4.2.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/media-gfx/aqsis/aqsis-1.4.2.ebuild,v 1.1 2009/01/23 19:57:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.4.2.ebuild,v 1.2 2009/08/07 16:18:59 ssuominen Exp $
 
 EAPI="1"
 
@@ -39,6 +39,8 @@ DEPEND="
 	>=sys-devel/bison-1.35
 	>=sys-devel/flex-2.5.4"
 
+PATCHES=( "${FILESDIR}/${P}-gcc44.patch" )
+
 src_compile() {
 	if use fltk ; then
 		# hack to get fltk library/include paths
diff --git a/media-gfx/aqsis/files/aqsis-1.4.2-gcc44.patch b/media-gfx/aqsis/files/aqsis-1.4.2-gcc44.patch
new file mode 100644
index 000000000000..fcb35d134493
--- /dev/null
+++ b/media-gfx/aqsis/files/aqsis-1.4.2-gcc44.patch
@@ -0,0 +1,57 @@
+diff -ur aqsis-1.4.2.orig/aqsistypes/logging.cpp aqsis-1.4.2/aqsistypes/logging.cpp
+--- aqsis-1.4.2.orig/aqsistypes/logging.cpp	2009-01-21 23:12:32.000000000 +0200
++++ aqsis-1.4.2/aqsistypes/logging.cpp	2009-08-07 19:08:35.000000000 +0300
+@@ -21,6 +21,8 @@
+ #include "logging.h"
+ #include "logging_streambufs.h"
+ 
++#include <stdio.h>
++
+ #include <iostream>
+ #include <sstream>
+ #include <vector>
+diff -ur aqsis-1.4.2.orig/displays/d_xpm/aspXpm.cpp aqsis-1.4.2/displays/d_xpm/aspXpm.cpp
+--- aqsis-1.4.2.orig/displays/d_xpm/aspXpm.cpp	2009-01-21 23:12:32.000000000 +0200
++++ aqsis-1.4.2/displays/d_xpm/aspXpm.cpp	2009-08-07 19:10:14.000000000 +0300
+@@ -1,5 +1,6 @@
+ #include "aspXpm.h"
+ 
++#include <stdio.h>
+ #include <string.h>
+ 
+ aspXpm::aspXpm( const char *filename, int width, int height, int bpp )
+diff -ur aqsis-1.4.2.orig/renderer/render/condition.cpp aqsis-1.4.2/renderer/render/condition.cpp
+--- aqsis-1.4.2.orig/renderer/render/condition.cpp	2009-01-21 23:12:32.000000000 +0200
++++ aqsis-1.4.2/renderer/render/condition.cpp	2009-08-07 19:14:34.000000000 +0300
+@@ -31,6 +31,8 @@
+ #include	"renderer.h"
+ #include	"logging.h"
+ 
++#include	<stdio.h>
++
+ #include	<cstring>
+ 
+ namespace Aqsis {
+diff -ur aqsis-1.4.2.orig/shadercompiler/shaderexecenv/shadeops_tmap.cpp aqsis-1.4.2/shadercompiler/shaderexecenv/shadeops_tmap.cpp
+--- aqsis-1.4.2.orig/shadercompiler/shaderexecenv/shadeops_tmap.cpp	2009-01-21 23:12:32.000000000 +0200
++++ aqsis-1.4.2/shadercompiler/shaderexecenv/shadeops_tmap.cpp	2009-08-07 19:12:14.000000000 +0300
+@@ -25,6 +25,8 @@
+ 
+ #include	"aqsis.h"
+ 
++#include <stdio.h>
++
+ #ifdef AQSIS_SYSTEM_WIN32
+ #include	<io.h>
+ #endif
+diff -ur aqsis-1.4.2.orig/texturing/teqser/teqser.cpp aqsis-1.4.2/texturing/teqser/teqser.cpp
+--- aqsis-1.4.2.orig/texturing/teqser/teqser.cpp	2009-01-21 23:12:32.000000000 +0200
++++ aqsis-1.4.2/texturing/teqser/teqser.cpp	2009-08-07 19:17:42.000000000 +0300
+@@ -23,6 +23,7 @@
+ 		\author Paul C. Gregory (pgregory@aqsis.org)
+ */
+ 
++#include	<cstdio>
+ #include	<cstdlib>
+ #include	<cstring>
+ #include	<memory>