Fix building with GCC 4.3 wrt #219051, thanks to Holger Ackermann.

Package-Manager: portage-2.1.5_rc6

4 files changed, 34 insertions, 6 deletions

diff --git a/media-sound/soundkonverter/ChangeLog b/media-sound/soundkonverter/ChangeLog
index aafe05583ddb..6fde4ccaf3da 100644
--- a/media-sound/soundkonverter/ChangeLog
+++ b/media-sound/soundkonverter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/soundkonverter
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/ChangeLog,v 1.4 2007/10/21 11:45:10 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/ChangeLog,v 1.5 2008/04/24 17:34:12 drac Exp $
+
+  24 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/soundkonverter-0.3.6-gcc43.patch, soundkonverter-0.3.6.ebuild:
+  Fix building with GCC 4.3 wrt #219051, thanks to Holger Ackermann.
 
 *soundkonverter-0.3.6 (21 Oct 2007)
 
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index c39ec983f0b9..10714d37ba3d 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -1,6 +1,7 @@
+AUX soundkonverter-0.3.6-gcc43.patch 1116 RMD160 61c29bb8991388f7a7be3ea48565dccaf03c48e2 SHA1 b3c4953dd1c3b9d4285ee714d1d25a63ac434b61 SHA256 3395b62ba379efc9f87820f41ce6c6f5a5d2d8570dd33b682ee73c01616335d6
 DIST soundkonverter-0.3.4.tar.bz2 658866 RMD160 0a7af45b57ee64c5d7aec0ed275b104ac072a2a2 SHA1 3397e8fdee0c4a09c3ca6e413158ea05dc8b466d SHA256 8f5c1c15f6f216c039a693030f4adaf3e5d957edd5ef864a5f77a3ecd0bf697e
 DIST soundkonverter-0.3.6.tar.bz2 673335 RMD160 4a97c906737c047eabc237796cdacd1c98acab71 SHA1 93fa83ce6afab7e72a5264d14f08b06aedbde1b3 SHA256 767349b2afc18e238531674793afda52aa544d485a8a613ce000cb4678172dae
 EBUILD soundkonverter-0.3.4.ebuild 1451 RMD160 15289862db9ed123f2f8755212984dfc95d07068 SHA1 5fca8a73f2faae6f404c17c8160ff0a54665743b SHA256 408fa40fdd29f89b2954ea4d082ca43bfd9ca6059b2eb288735f382f2fe3ceba
-EBUILD soundkonverter-0.3.6.ebuild 1505 RMD160 bce82ec4df82e011c27de901dda116c1543b58ba SHA1 486336635dc489b52e813d996bf72969a6e50f45 SHA256 91785001b37eedd75f54e37dbca5d82abd752b2d4b5076f6048d1ece09db8145
-MISC ChangeLog 738 RMD160 30286e5459e45364943c46e6735ec87abcc5e1ac SHA1 1c6c977545057fc90d43f854ffd669d23805b7a4 SHA256 6afe6c56e7aa36ef9353f40756ef24cd0bb4cc73f28e9ce935f6c5275df20082
+EBUILD soundkonverter-0.3.6.ebuild 1544 RMD160 32401ca0a5faf23df36414704eddfaacb5bb0358 SHA1 91ad76915e071a4e6bc6ca1c7f8f63bd8b183a3f SHA256 6ef99012a93498505f6c6e4ddb4109006d7119185239c807db9a296b63171fad
+MISC ChangeLog 929 RMD160 07d71fab11201c21eb737fc67af946883a9948ef SHA1 6051357754e0ae263c1e39a262593534587a6834 SHA256 ee543f5a9bfd195befff2f2b238b89341a44a261e20fdba96e38982a95495680
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/soundkonverter/files/soundkonverter-0.3.6-gcc43.patch b/media-sound/soundkonverter/files/soundkonverter-0.3.6-gcc43.patch
new file mode 100644
index 000000000000..fea5eaa8e018
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-0.3.6-gcc43.patch
@@ -0,0 +1,22 @@
+diff -urb src-orig/metadata/ape/taglib_monkeysaudiofiletyperesolver.cpp src/metadata/ape/taglib_monkeysaudiofiletyperesolver.cpp
+--- src-orig/metadata/ape/taglib_monkeysaudiofiletyperesolver.cpp	2008-04-23 19:46:24.000000000 +0200
++++ src/metadata/ape/taglib_monkeysaudiofiletyperesolver.cpp	2008-04-23 19:46:35.000000000 +0200
+@@ -4,6 +4,7 @@
+ 
+ #include "taglib_monkeysaudiofiletyperesolver.h"
+ #include <taglib/mpcfile.h>
++#include <cstring>
+ 
+ TagLib::File *MonkeysAudioFileTypeResolver::createFile(const char *fileName,
+         bool readProperties,
+diff -urb src-orig/metadata/optimfrog/taglib_optimfrogfiletyperesolver.cpp src/metadata/optimfrog/taglib_optimfrogfiletyperesolver.cpp
+--- src-orig/metadata/optimfrog/taglib_optimfrogfiletyperesolver.cpp	2008-04-23 19:46:24.000000000 +0200
++++ src/metadata/optimfrog/taglib_optimfrogfiletyperesolver.cpp	2008-04-23 19:47:08.000000000 +0200
+@@ -4,6 +4,7 @@
+ 
+ #include "taglib_optimfrogfiletyperesolver.h"
+ #include <taglib/mpcfile.h>
++#include <cstring>
+ 
+ TagLib::File *OptimFrogFileTypeResolver::createFile(const char *fileName,
+         bool readProperties,
diff --git a/media-sound/soundkonverter/soundkonverter-0.3.6.ebuild b/media-sound/soundkonverter/soundkonverter-0.3.6.ebuild
index 65dd2b90e04c..23a5dd6c9d87 100644
--- a/media-sound/soundkonverter/soundkonverter-0.3.6.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-0.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/soundkonverter-0.3.6.ebuild,v 1.2 2007/11/10 08:58:17 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/soundkonverter-0.3.6.ebuild,v 1.3 2008/04/24 17:34:12 drac Exp $
 
 inherit kde eutils qt3
 
@@ -27,6 +27,7 @@ need-kde 3.5
 
 src_unpack() {
 	kde_src_unpack
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {