Fix building w/ GCC 4.4. (bug #272375)

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

4 files changed, 38 insertions, 4 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index e61892f44d14..04f04d60b47a 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.44 2009/06/05 17:29:44 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.45 2009/07/29 04:13:59 dirtyepic Exp $
+
+  29 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> qtiplot-0.9.7.7.ebuild,
+  +files/qtiplot-0.9.7.7-gcc44.patch:
+  Fix building w/ GCC 4.4. (bug #272375)
 
   05 Jun 2009; Andrey Grozin <grozin@gentoo.org> qtiplot-0.9.7.7.ebuild:
   USE-deps on PyQt4 fixed (bug #272182)
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 30a8c17bd514..0980860bad2f 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qtiplot-0.7.7-qmake.patch 11384 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 SHA1 5cd18e99d39664ef48e0d18069d89cb4b417a175 SHA256 2d89427ab1304b1ec8165d6ceaedf474a48ba59d55dafbb4977b5ddaab8509ca
 AUX qtiplot-0.9.7.7-docbuild.patch 2179 RMD160 011a6f3c71f0c5993ddea8a0b679867f40fe6753 SHA1 aed721371c106d041eeabcac55b627eceaa84ae0 SHA256 f3b043e16d099edd45ad4f41af602627883859f91731efcac077e123189073b0
+AUX qtiplot-0.9.7.7-gcc44.patch 663 RMD160 6ba315028c09767d9bb5f7f31ae8c6a17d4a8a3b SHA1 47cad99fe3fcace29c0b11fd005ce2e75542fc00 SHA256 f282fc735a546eed42ab30c38215ff1d32d413c415a6575a7702f8445f392292
 AUX qtiplot-0.9.7.7-syslibs.patch 8389 RMD160 097c97a0a9dece2eec6489d9a5e3a592eeb97f73 SHA1 d74c06566603ff14a2707e19ade09c69694d1ac4 SHA256 3316d612bba76ad2017f3ed618a7fef517a413403bad5a4a81fb782df34715de
 DIST qtiplot-0.7.7.zip 812738 RMD160 6f62b32059eec57bf931b5bae9f524672d436ee9 SHA1 b201e600ec057ff0f7b4b4572850b0b072a0e0fb SHA256 937849c42cc3047df3975d1cb7a26a2503a499d548066937589340f55bd1ab01
 DIST qtiplot-0.9.7.7.tar.bz2 6908502 RMD160 2843c6a614d62613bc383f9d7b678f6fb5df0e01 SHA1 52d93c01013925b43d1f8dc2b372b83c7b84f848 SHA256 6c1cf9425de5609eec98b0e29bd0b7a316ca8d513ea44a462cffacf8695f43b1
 EBUILD qtiplot-0.7.7.ebuild 1095 RMD160 a5ccfad6cdadadf0f11600f9b8114f9c7fb8ae2b SHA1 e6008083cbd394f979d675035c6c11fb6771fc26 SHA256 b4019c8262709376fc6d2d6fc34150da0d1079db79718d3c50adc06ed3f95c03
-EBUILD qtiplot-0.9.7.7.ebuild 2940 RMD160 88d2142b92f66105d8c89057893778363dc8af3a SHA1 d9b7fab3c68bfda5ffe2dca383fb6071048d6a01 SHA256 569d4375937e3b24fc134daf03c4c42558086962fd7f6386af1f0dc5e77c1fe2
-MISC ChangeLog 11472 RMD160 df8ef8e868ba64f9972e0a976682c54a4775920e SHA1 fa4a005ed629b6a92d7c3572bea86d503c5e12b2 SHA256 b46536f04595240febadc4e2e7754f6bbad0901b68cb9622a813a1c671655bf5
+EBUILD qtiplot-0.9.7.7.ebuild 2982 RMD160 0f3a53fa90c32b94fb006411a69a031bc49ed032 SHA1 6aaef5c7a8019d54d1708c2d4655c48465d7551f SHA256 c622f4f4b63e3b4a5fd42766fa8ce8c143eefcb6c25d8ec752ea4e0c46f6540c
+MISC ChangeLog 11627 RMD160 85d526b940e47ccf01150dfad10affd84d55bbef SHA1 92ec4236137f8ab984242ffab92f856f076a92f1 SHA256 6a5f5e27aab87beeade73a8070e8b630885c7915d8c36a6dd39b3f4f9a9b25c1
 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpvzK4ACgkQiqiDRvmkBmKs6wCgt+81hmhOA0Bf4nxH+jxEfbuS
+1VcAoMEv5F1SUTPf72jpAajU9olSv3Hh
+=GkX2
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch
new file mode 100644
index 000000000000..1dc99343476e
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch
@@ -0,0 +1,18 @@
+--- qtiplot-0.9.7.7-orig/3rdparty/qwtplot3d/src/qwt3d_function.cpp
++++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/src/qwt3d_function.cpp
+@@ -1,3 +1,4 @@
++#include <cstdio>
+ #include "qwt3d_surfaceplot.h"
+ #include "qwt3d_function.h"
+ 
+--- qtiplot-0.9.7.7-orig/qtiplot/src/scripting/ScriptEdit.cpp
++++ qtiplot-0.9.7.7/qtiplot/src/scripting/ScriptEdit.cpp
+@@ -291,7 +291,7 @@ void ScriptEdit::insertErrorMsg(const QS
+ 	console->setPlainText(err);

+ 	if (!console->isVisible())

+ 		((QDockWidget *)console->parent())->show();

+-#elif

++#else

+ 	int start = printCursor.position();

+ 	printCursor.insertText(err);

+ 	printCursor.setPosition(start, QTextCursor::KeepAnchor);

diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild
index 9af8f55febe1..43d6cbfc5243 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.7.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-visualization/qtiplot/qtiplot-0.9.7.7.ebuild,v 1.4 2009/06/05 17:29:44 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild,v 1.5 2009/07/29 04:13:59 dirtyepic Exp $
 
 EAPI=2
 inherit eutils qt4 fdo-mime python
@@ -47,6 +47,7 @@ RDEPEND="${CDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-syslibs.patch
 	epatch "${FILESDIR}"/${P}-docbuild.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 
 	python_version
 	sed -i \