Fix build with gcc-4.7 (bug #417367 by David Kredba).

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 38 insertions, 10 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/Manifest b/media-sound/sonic-visualiser/Manifest
index 77948bea6f29..bb8d99e82674 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX sonic-visualiser-1.7.1-liboggz11.patch 1675 RMD160 dcba641395f5d24a55fed0c7ab10360e6744474e SHA1 8327d803362f44486cf863c720c5206caa95ab04 SHA256 b0d97830ec0054bc6dd9ac06427ca3796b17d5212a85895dcc125e70ede001d9
 AUX sonic-visualiser-1.8-configure.patch 317 RMD160 1b62385c1a5c416ee2c90587aa173e19d7c33421 SHA1 385efc4280ab54b7610dcef78845298d62051569 SHA256 816845c5eec0fd76e366c86f25ef1fbf913f8aa7d38b3693238bc777f259feca
 AUX sonic-visualiser-1.8-gcc46.patch 261 RMD160 8d25cd934dafe2b9c5474e47824e01a1896a9a8c SHA1 d49fcf4ccc3cb525f28e2fca5915782accbb8e2b SHA256 4ded2294206176900aa316ffddff551782bdada827e865e31dbe91266e7eafd2
+AUX sonic-visualiser-1.9-gcc47.patch 569 RMD160 28742eeec117d3d87f12946e50fa850466a3a142 SHA1 48ee75396caf2032fa5eb5ae733c386119f8d051 SHA256 5ecdbb368041319b33fe354796bb69f523bd2d96499e8b25835beecc42081036
 DIST sonic-visualiser-1.8.tar.gz 1853221 RMD160 a29785459009678fa2105727451ae643daf6b7cc SHA1 c5e8a25cf81d01c0262445e1d08657ab2346e04a SHA256 07b671528c6e14a7d54cae99db7b1cd78f9dd6f7f06c86ed96948b641336339a
 DIST sonic-visualiser-1.9.tar.gz 1867608 RMD160 4f52130920674ff0f7242abe4bf4d361ea0fe989 SHA1 b33d7885e41210febf0c6139299be560c70a331a SHA256 d899c219403d96c415809521ff71b7f326bf3c5015af496df7ae236de4712f02
 EBUILD sonic-visualiser-1.8.ebuild 2451 RMD160 e01a3bee8fc96c1661d05618b246b1d8ab76d328 SHA1 b84a92e0b2375459dea9947421ea610a8507e2fe SHA256 0a2044820ad3dafcae88b9a1c933bed13c4872d67566210f4cd7779b7690a6e7
-EBUILD sonic-visualiser-1.9.ebuild 2342 RMD160 284c5c0e64fd6c6b5a740410f1c33397f84beb49 SHA1 110f82e96edf61b15b1b216a09099020f773e420 SHA256 f1e9eec935f7e325222326f442d49800bce1988be03d347325a63e4fa69d42b6
-MISC ChangeLog 3711 RMD160 e14aec2e4eedcea3af239e1c44f3fa6f2e344f58 SHA1 5176c2d4523bb49abc7e5360626848308b16b9ec SHA256 180d280616eb9faa109425a779e618c9b5a0d72ef32da19ba04f7dc6ef41e2cc
+EBUILD sonic-visualiser-1.9.ebuild 2389 RMD160 049ed88c9630762eca08266ae7420ab0ce6fa6f5 SHA1 b09c8342d74813317351c7f92576a006b9a48783 SHA256 04016108c0fdefe49ec0bfe667c78199d198ffa3319b0ee85fa47432bea63879
+MISC ChangeLog 3892 RMD160 c0003f64ca7f75831a64f17f3756215db52d5871 SHA1 2ae2369863eecf8c2da086c8856d3c8bbb129f28 SHA256 a1e0d5ca8fd6f03c2eb382705da958e4d581a3a86e61fb25650c7b219efea6d3
 MISC metadata.xml 251 RMD160 6ef519c0c383e28234a231081c2594d4e9039639 SHA1 dc30854be192995bbd477c3ba7b393fe1ab25263 SHA256 48e0a6cccf2eef677daecb7242cd93052641d8eb8b5cb445dfa19fec5eb93242
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k6hsACgkQfXuS5UK5QB2aEgP/SOJUDdzJmOvxeDcJmBU3zZtQ
-8M0VCqMk7joAQ43vg+GJl3XnviRW7qmYLipttlcOd/BhZJCkF9fhuJyJ0y9ZhTt6
-vy3rBWaZ2j60qcSm+jYoBrkE/6mkRuQV0o7KRsrNLYPKTbnRKs8U+ZmKN8nCJflQ
-2dGw7A9hnkNm+whCfAw=
-=1GBs
+iQEcBAEBCgAGBQJPx4z+AAoJEEqz6FtPBkyjQTMH/jXCfdeFOSAPS3Ww94+CFKIi
+oQ33LzGqt47TT43OXiUXW5bKpGdUifImnlCg+klGKnpRIdFNlsjoQEL1wQzPyNUe
+QAYMdW2RMuqwvjo6d7RYjvFhyoQBTge7hsOd8H1WdVasPuQbe/xxPtfW7+GypIvR
+GTO9n2YDBcoCvOMMlLl2TRR/GSAL9pcrZBXIfE2QxERNgW81JLpnkvrPJLHACrk+
+B4iDP3+7J639445w7WM56fx8h6NN0VBiZOschcTVTQH8MKozfLyQjd6kXkghOgLJ
+o8qSZVyidR2nb0GG/YJds7or2T4CUVDFn3d9sBJ58qBr+XPBDWi0ZEyoGZqGh/8=
+=xAk+
 -----END PGP SIGNATURE-----
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