Fix compilation with gcc-4.4; bug #272417

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

4 files changed, 25 insertions, 7 deletions

diff --git a/x11-libs/qwtplot3d/ChangeLog b/x11-libs/qwtplot3d/ChangeLog
index f41c5376eefb..8cfaa81c2a55 100644
--- a/x11-libs/qwtplot3d/ChangeLog
+++ b/x11-libs/qwtplot3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qwtplot3d
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/ChangeLog,v 1.16 2009/04/08 07:57:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/ChangeLog,v 1.17 2009/07/25 22:20:56 halcy0n Exp $
+
+  25 Jul 2009; Mark Loeser <halcy0n@gentoo.org>
+  +files/qwtplot3d-gcc44.patch, qwtplot3d-0.2.7-r1.ebuild:
+  Fix compilation with gcc-4.4; bug #272417
 
   08 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
   files/qwtplot3d-sys-gl2ps.patch:
diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest
index 680cfb936b9b..5ffd0a84f0d2 100644
--- a/x11-libs/qwtplot3d/Manifest
+++ b/x11-libs/qwtplot3d/Manifest
@@ -3,19 +3,20 @@ Hash: SHA1
 
 AUX qwtplot3d-doxygen.patch 1089 RMD160 bb09e96fbbe756640c3735c5a713ad02b3952c05 SHA1 a60a51469d3ccead63b7b25556338799b4379b31 SHA256 04114570357018265d32bd8a0fd3d96dae6735dde4aaec07ea62f2382e97ff54
 AUX qwtplot3d-examples.patch 4764 RMD160 12a702542c9f834bd1b7b58af54b348a8f237236 SHA1 f239b95320062c05b18d5a89c9dbec9b2f56f206 SHA256 ddd2f6f9a3d075237e4908806e64318580496c856465749ce605f8506ca0e6de
+AUX qwtplot3d-gcc44.patch 440 RMD160 df7b8864e77c2c18f2aa22bf7ab6bb728c34a7fe SHA1 52fa169b651a98550f8a8391ddf52e0eaeb2c215 SHA256 bf376db9e365df372a0c75c95e52fe80d30abb554e9acbf3cb5c6a35c2dfd840
 AUX qwtplot3d-profile.patch 717 RMD160 328c212e334d53f79234069b84c1b8a43675f790 SHA1 2b81c2c2a563a4083545356874966aa8cdf196ca SHA256 4fcbc15ae0e33317b03270b8d4534ea7f2d68d02ccc588813acc20af5b2ca1ac
 AUX qwtplot3d-sys-gl2ps.patch 915 RMD160 d4e17bb8e04e9c093aaf15fc025214017bd77209 SHA1 ce6dd3ce1146ed44cd53f89a0500f52f74256474 SHA256 e60958353524c67c61d04a249e38fbf92ca82c75a24b3f10ed733876410e830d
 DIST qwtplot3d-0.2.6.tgz 148834 RMD160 ce2120f603ba87c4bfb3679457c0c041f4891bcc SHA1 23330688ed2ca6e738e9ef5259e01fcca6aba2e7 SHA256 ea7c2ea3d55960ee60019e0a5a5a63385bdcf7026a6385099fd8b31350803125
 DIST qwtplot3d-0.2.7.tgz 183836 RMD160 0f28462cb95ef6091d73642c8b26ece60d50bfb8 SHA1 4463fafb8420a91825e165da7a296aaabd70abea SHA256 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42
 DIST qwtplot3d-doc.zip 776909 RMD160 bcf5494287447e66c1b277d2edfdd68c07402594 SHA1 a41072a28a04b96c4575d2bdd42b4c48308959e7 SHA256 093e1d6b387551635f42bc5cf977951627c3a9c690c7f28f401e5082dfa72483
 EBUILD qwtplot3d-0.2.6-r2.ebuild 1874 RMD160 be87aa908c36e47bc29418371adee0addcaf0873 SHA1 75308aa6f918541cbda5212601f79286eb4040ac SHA256 cb55f8f28cc9488ed43204a1a8288d9d6852fc431718376a51edc447b3e9e3a5
-EBUILD qwtplot3d-0.2.7-r1.ebuild 1477 RMD160 256c1cfa687b57fd1e66f6a52ebb8a2d789e0c7f SHA1 8efca1b51c6675a4d370f4c80539332bb5ac8f1a SHA256 8d884ba2a5a667ca282bbae2c140ab70f07d6647e1ebd48da371fc867c715fe6
-MISC ChangeLog 2687 RMD160 622ded739d4edc6e100b91a5e536620de03d4838 SHA1 71a8f064cc0dbf436e2d540dbb35532002fea2ed SHA256 2ab56911a83616c75e857784d115b89e19a8d15bcf61a4680d3d11436d9d504d
+EBUILD qwtplot3d-0.2.7-r1.ebuild 1516 RMD160 29ec0f76da56a1f09f2acd8fa423161995d793bc SHA1 511b9a42461c3b19525ba6da0092c7cc15375d0f SHA256 f52b7183b7cd9072282a355f9c4662afad698da9b9e704e6adf0b806d5633bf2
+MISC ChangeLog 2838 RMD160 039a1971d24ec9a58f87ec770d9c1a625703f42e SHA1 7324aba29d07ebf9ded8a2defbd50b320cab3432 SHA256 09c82c0b776658f9edfa6ea822b6c0e9255a391b2e3e247348ddd442c90b3f45
 MISC metadata.xml 401 RMD160 8d2f7fd100b718f7deccf20a0fd5c7858393c0b3 SHA1 0eb3974e1cdf16c1df5d3a4c13214c36302f6fcf SHA256 b9ba2aa2e27cc4605fc4fb411015019b67ca9bd120814e3ac840cba6b917d52c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkncWQkACgkQ1ycZbhPLE2AOewCdG2seSiSpFA5P/hLPHriLboW6
-ebMAnRAdx0MCwmI4ZkQzcVQ6QEmefF9n
-=i0A8
+iEYEARECAAYFAkprhU0ACgkQCRZPokWLroTiAgCg423FrAaRbwZhJ9ecaiMlCaR8
+VxQAnjLOZIhFUlE6/lJAjXKp6Z/+0cBi
+=U+R5
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
new file mode 100644
index 000000000000..a76fe831ab91
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h
+--- qwtplot3d-orig/include/qwt3d_function.h	2009-07-25 18:18:58.000000000 -0400
++++ qwtplot3d/include/qwt3d_function.h	2009-07-25 18:19:19.000000000 -0400
+@@ -2,6 +2,7 @@
+ #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code

+ 

+ #include "qwt3d_gridmapping.h"

++#include <cstdio>

+ 

+ namespace Qwt3D

+ {

+Only in qwtplot3d/tmp: qwt3d_function.o
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r1.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r1.ebuild
index 1b505fa2223a..7df585a399ad 100644
--- a/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r1.ebuild
+++ b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-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/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r1.ebuild,v 1.1 2009/04/07 18:51:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r1.ebuild,v 1.2 2009/07/25 22:20:56 halcy0n Exp $
 
 EAPI=2
 inherit eutils qt4
@@ -27,6 +27,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-examples.patch
 	epatch "${FILESDIR}"/${PN}-doxygen.patch
 	epatch "${FILESDIR}"/${PN}-sys-gl2ps.patch
+	epatch "${FILESDIR}"/${PN}-gcc44.patch
 	cat >> ${PN}.pro <<-EOF
 		target.path = /usr/$(get_libdir)
 		headers.path = /usr/include/${PN}