summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-30 11:28:31 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-30 11:28:31 +0000
commit50fe4ca49e95fb6f9dace539625f7adc2560e427 (patch)
treea3d2791e6247145d989ddf75c1bd9a686d74a4f5 /media-libs/stk
parentMask app-editors/qe for removal wrt #275915. (diff)
downloadgentoo-2-50fe4ca49e95fb6f9dace539625f7adc2560e427.tar.gz
gentoo-2-50fe4ca49e95fb6f9dace539625f7adc2560e427.tar.bz2
gentoo-2-50fe4ca49e95fb6f9dace539625f7adc2560e427.zip
Fix building with GCC 4.4 wrt #277668.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/stk')
-rw-r--r--media-libs/stk/ChangeLog6
-rw-r--r--media-libs/stk/files/stk-4.3.1-gcc44.patch22
-rw-r--r--media-libs/stk/stk-4.3.1.ebuild3
3 files changed, 29 insertions, 2 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/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
}