Fix building with GCC 4.4 wrt #277668.

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

4 files changed, 32 insertions, 4 deletions

diff --git a/media-libs/stk/ChangeLog b/media-libs/stk/ChangeLog
index b42f1146553c..49dbf6be5fc2 100644
--- a/media-libs/stk/ChangeLog
+++ b/media-libs/stk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/stk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.3 2009/03/09 14:10:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.4 2009/07/30 11:28:31 ssuominen Exp $
+
+  30 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> stk-4.3.1.ebuild,
+  +files/stk-4.3.1-gcc44.patch:
+  Fix building with GCC 4.4 wrt #277668.
 
   09 Mar 2009; Raúl Porcel <armin76@gentoo.org> stk-4.3.1.ebuild:
   Add ~x86 wrt #260735
diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index 870382139698..6fee77d6656d 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -1,9 +1,10 @@
 AUX stk-4.3.1-cflags-lib.patch 1687 RMD160 d81cc35b588f48b3fc0b624efe2871134956c81e SHA1 9176b2a49e45a21d247b184e53ec7a8d1f7aecd4 SHA256 ae1a1bca7d4f4ba0f94e61ef52c525b024e684f1ab4df701f5265b24c0644d92
 AUX stk-4.3.1-fpic.patch 1327 RMD160 f8bb978968cd194e80cb099fb33bd479dcea7fb0 SHA1 86858582fb8d235d0aaa16fc29e0d7c88255be2f SHA256 d1215c76d362298c530dfcd1e0ca3a3b4c19a9b84c60129549919cea2f9c0e95
 AUX stk-4.3.1-gcc43.patch 8066 RMD160 db8cbe250fc36f3855c22a7449e0b90b29e2e372 SHA1 265a9f591b86fcc55e17c625bba82232a79cbf40 SHA256 ddd36ac2a288d363d57ec1960ec9be68f01282131dd7b90b3be2d2e124274d43
+AUX stk-4.3.1-gcc44.patch 762 RMD160 8cb1a9d3163615a3cd4628996fa7936b8cf96e65 SHA1 34f1fa380c24d7b546ffd496146370aa131d330e SHA256 ce94cbb0b9366084fa9e03d2531cfe58b6729340fb853f6e083e2772183e27c6
 AUX stk-4.3.1-ldflags.patch 14109 RMD160 53aac79e1acd8072436abc226a1a785824a4150e SHA1 c3aa6b7319bdd1ade81ad4514ccfe756c034428d SHA256 b6471df0ffbefbb71e184f84da9df2e7d6647261907d338dab18edcd7efadc18
 AUX stk-4.3.1-missing.patch 184 RMD160 7934473e75e5dfb7a7abbaba321b0ac24d6ad485 SHA1 306fdf8dbe2f265dfc3a983d851c26915ecac413 SHA256 413f49d39320c4c5af3da6c45f2927fc75eac101cd64c8d0fcc1a054907ed3cb
 DIST stk-4.3.1.tar.gz 1952667 RMD160 f0cde3c13af08f4ae58174272bfd09df6f00fec1 SHA1 56922c001f9fc8f7c5cefe5f0c2e64ffa273dffe SHA256 e87fae4fe4e4681185afb752f5ce90cf8fcf16600a0c76d025a3f638be32cee0
-EBUILD stk-4.3.1.ebuild 1520 RMD160 942187dd28c4ceb3eb59148a9ef6533b66eff774 SHA1 e794aea07e9a5617233c2f882efb65fbb6435fad SHA256 ecbf6bdfcfdf86cf49230d758e84af56ccff21c319a5dfe83c01c5eaf7c22410
-MISC ChangeLog 800 RMD160 602e4cb5cff36ed3ecc8c2081d32640fd69ad20c SHA1 822b536528d226d5642581438f4e132480cc971a SHA256 eaa6d0dd3ab1c4df9589931357044ed92310cc32db391bcb5a29ed0d8e8ef3d3
+EBUILD stk-4.3.1.ebuild 1561 RMD160 89aa5c16ee91e621f0b0a1e768e331351c7a59a3 SHA1 aea8cf5124088380cdc4de5643577cda6e02e58c SHA256 d9debcad40c4ad925c5972c93b2ad74a833d0eb09b30c0f4b3de8dee4d7b8660
+MISC ChangeLog 948 RMD160 db0061c2acd644fc4da58805d99c7932de2a1de0 SHA1 e2bf2f536165d9f12286fae3f8db1ccc9c5d1412 SHA256 cbeb4591e0c13d6d021bafde44395f70628e5511d24cfaef12ae0df2dd543ac8
 MISC metadata.xml 352 RMD160 8d338d54feb3c0f60dc71c3a44460e39a93f115a SHA1 fee1c5535bc79eb5119956e449e8212d4ed16785 SHA256 f2c8dc1810e2ee90a144d4670591484d8ad5ce927df0f493016548ea5cbaf343
diff --git a/media-libs/stk/files/stk-4.3.1-gcc44.patch b/media-libs/stk/files/stk-4.3.1-gcc44.patch
new file mode 100644
index 000000000000..4ad93ceee4b1
--- /dev/null
+++ b/media-libs/stk/files/stk-4.3.1-gcc44.patch
@@ -0,0 +1,22 @@
+diff -ur stk-4.3.1.orig/src/FileRead.cpp stk-4.3.1/src/FileRead.cpp
+--- stk-4.3.1.orig/src/FileRead.cpp	2007-12-06 02:58:27.000000000 +0200
++++ stk-4.3.1/src/FileRead.cpp	2009-07-30 14:28:03.000000000 +0300
+@@ -32,6 +32,7 @@
+ #include "FileRead.h"
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <cstdio>
+ #include <cmath>
+ 
+ FileRead :: FileRead()
+diff -ur stk-4.3.1.orig/src/FileWrite.cpp stk-4.3.1/src/FileWrite.cpp
+--- stk-4.3.1.orig/src/FileWrite.cpp	2007-12-06 02:58:27.000000000 +0200
++++ stk-4.3.1/src/FileWrite.cpp	2009-07-30 14:28:13.000000000 +0300
+@@ -22,6 +22,7 @@
+ /***************************************************/
+ 
+ #include "FileWrite.h"
++#include <cstdio>
+ #include <cmath>
+ 
+ const FileWrite::FILE_TYPE FileWrite :: FILE_RAW = 1;
diff --git a/media-libs/stk/stk-4.3.1.ebuild b/media-libs/stk/stk-4.3.1.ebuild
index 28845887e2dd..b4f5ae2386af 100644
--- a/media-libs/stk/stk-4.3.1.ebuild
+++ b/media-libs/stk/stk-4.3.1.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-libs/stk/stk-4.3.1.ebuild,v 1.3 2009/03/09 14:10:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/stk-4.3.1.ebuild,v 1.4 2009/07/30 11:28:31 ssuominen Exp $
 
 inherit eutils autotools
 
@@ -27,6 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-fpic.patch"
 	epatch "${FILESDIR}/${P}-missing.patch"
 	epatch "${FILESDIR}/${P}-ldflags.patch"
+	epatch "${FILESDIR}/${P}-gcc44.patch"
 	eautoreconf
 }