summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-05-31 15:23:37 +0000
committerTim Harder <radhermit@gentoo.org>2012-05-31 15:23:37 +0000
commit9f56bfe85d486bc9ff85dbed414ad388795308f4 (patch)
treed3ca27601b2b6dc821b51b843dfe7fcd578a5ee9 /media-sound/sonic-visualiser
parentRemove duplicate KEYWORDS entries by Slava Bacherikov (bug #418379). Sort KEY... (diff)
downloadgentoo-2-9f56bfe85d486bc9ff85dbed414ad388795308f4.tar.gz
gentoo-2-9f56bfe85d486bc9ff85dbed414ad388795308f4.tar.bz2
gentoo-2-9f56bfe85d486bc9ff85dbed414ad388795308f4.zip
Fix build with gcc-4.7 (bug #417367 by David Kredba).
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/sonic-visualiser')
-rw-r--r--media-sound/sonic-visualiser/ChangeLog6
-rw-r--r--media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch20
-rw-r--r--media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild3
3 files changed, 27 insertions, 2 deletions
diff --git a/media-sound/sonic-visualiser/ChangeLog b/media-sound/sonic-visualiser/ChangeLog
index a7c7c0d419a7..9879e08d0bd7 100644
--- a/media-sound/sonic-visualiser/ChangeLog
+++ b/media-sound/sonic-visualiser/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/sonic-visualiser
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/ChangeLog,v 1.23 2012/05/05 08:50:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/ChangeLog,v 1.24 2012/05/31 15:23:37 radhermit Exp $
+
+ 31 May 2012; Tim Harder <radhermit@gentoo.org> sonic-visualiser-1.9.ebuild,
+ +files/sonic-visualiser-1.9-gcc47.patch:
+ Fix build with gcc-4.7 (bug #417367 by David Kredba).
05 May 2012; Michał Górny <mgorny@gentoo.org> sonic-visualiser-1.8.ebuild,
sonic-visualiser-1.9.ebuild:
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
new file mode 100644
index 000000000000..19f9fb488f01
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
@@ -0,0 +1,20 @@
+--- sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
++++ sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
+@@ -22,6 +22,7 @@
+ #include "base/Serialiser.h"
+ #include "base/Resampler.h"
+
++#include <stdint.h>
+ #include <iostream>
+ #include <QDir>
+ #include <QMutexLocker>
+--- sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
++++ sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
+@@ -26,6 +26,7 @@
+
+ #include <cassert>
+ #include <iostream>
++#include <stdint.h>
+
+ //#define DEBUG_WRITABLE_WAVE_FILE_MODEL 1
+
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
index 91219908c5bb..69bd7b133102 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild,v 1.2 2012/05/05 08:50:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild,v 1.3 2012/05/31 15:23:37 radhermit Exp $
EAPI=4
inherit eutils qt4-r2 autotools fdo-mime
@@ -49,6 +49,7 @@ sv_disable_opt() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8-configure.patch
+ epatch "${FILESDIR}"/${PN}-1.9-gcc47.patch
cd svcore
epatch "${FILESDIR}"/${PN}-1.7.1-liboggz11.patch