Add patch to build with GCC 4.3.

Package-Manager: portage-2.1.5_rc6

4 files changed, 66 insertions, 9 deletions

diff --git a/media-sound/transkode/ChangeLog b/media-sound/transkode/ChangeLog
index e5d015b664a6..15d8ad98f818 100644
--- a/media-sound/transkode/ChangeLog
+++ b/media-sound/transkode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/transkode
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/ChangeLog,v 1.8 2007/07/21 19:07:49 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/ChangeLog,v 1.9 2008/04/24 11:22:48 flameeyes Exp $
+
+  24 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/transkode-0.6+gcc-4.3.patch, transkode-0.6-r1.ebuild:
+  Add patch to build with GCC 4.3.
 
 *transkode-0.6-r1 (21 Jul 2007)
 
diff --git a/media-sound/transkode/Manifest b/media-sound/transkode/Manifest
index 5390c3d057c8..4c63f6c08308 100644
--- a/media-sound/transkode/Manifest
+++ b/media-sound/transkode/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX transkode-0.6+gcc-4.3.patch 1187 RMD160 9fdaf7fcd33ebbdbe6c0eb666366be9bf1902bab SHA1 4ecb9f41e1d10911c988f61f3a6019b6f25095bf SHA256 deb4456cdc96a13de7559a660900557d9c3480908218cc48c5d4f476ef8b88cf
 AUX transkode-0.6-wavpack-options-fix.patch 618 RMD160 d434e889be88ac313cd3c3f654ffc1b6aab960ad SHA1 d0cf776fe5057c323aef1c55dc44b8957c8b6b36 SHA256 d022e8c16940ead177106ac16d90001c99f82720220c0018e8038086f71350ae
 AUX transkode-0.6-wvunpack-options-fix.patch 517 RMD160 5aab4363f834ae171b11df51f810d4e1b91ca001 SHA1 325e8c500489d07376e46ad1fd7f109bc5e4229f SHA256 2daff1bed25e30d9a548c7be1e931ea61122c03f2f73ba2c5856d6f24a521f86
 DIST transkode-0.6.tar.bz2 871042 RMD160 86d082c1d56d915d20083d9e897477b12abc9ff0 SHA1 33636a8caddf55696a31a2e39c49b9c411bae841 SHA256 2538063f735c4a4d9f9b379b37073970a255c8328eb487fa06c69ffe8ff83e67
 DIST transkode-0.6b2.tar.bz2 803534 RMD160 9b55935045cad67bebee69589d131c076a2b2bb8 SHA1 36601cf0ee877a08f51614f6fbfd289e922f456b SHA256 7f447c37b9c7db1afc45294ab4f11cbc369b718e372345089b72f5f28d99cc9d
-EBUILD transkode-0.6-r1.ebuild 1477 RMD160 3790b985c4fb23c761799bd100294c0831de077c SHA1 7d2803db9cac4669e532e39a7b4bd9d6217aa30b SHA256 1063a41fdb870c60659dfe3b10a62ced355be1923ab49f111fe8775cadd08437
+EBUILD transkode-0.6-r1.ebuild 1509 RMD160 d302091a039d2351c2c2e501a945816234715fb8 SHA1 f876c3b8d09e75b52e80febefa0d0de63956560c SHA256 670ed11e088a173e260fc24a5d9627dc63b394afce34c8a7af45d92b3bb6d5d5
 EBUILD transkode-0.6.ebuild 1358 RMD160 8a3e690b74e1d7df7b0a06641259b9a69cfb54a2 SHA1 2633685806efd3c323daa8ddf78f9ef0d1c873a3 SHA256 393aaa69aec39098990329b4568efe63e386ad7c69106fc458ea2afc268f6c77
 EBUILD transkode-0.6_beta2.ebuild 1149 RMD160 0e6b0f6154ad145f66035063bc3520ee6efabaae SHA1 270cc61c1e65f55d18f70852f855919217188d2e SHA256 dda29a6dc0b99ac4e40c1202dea42a2f0dcea9641a05cb44a25b467e5d6581fe
-MISC ChangeLog 1787 RMD160 bba0fb2f4a8bb55981723cfc10933d0e2046117b SHA1 d8baee08bf788f4fbe3160b8f9be1a0ce1f04e97 SHA256 651ed6c0c01d2e61c94baeb5e40d3bfc574a2b0950284fb853364969da82f3cc
+MISC ChangeLog 1938 RMD160 b056535048396d61bc8de0659bbd258a7c1cf94b SHA1 ffd1a74acae56e5d6524f62898d943743ed2bb41 SHA256 63f93db3d0c7b535bf86f5b565757e8c32e38d5ae26d0f7b09f9eb71cb054582
 MISC metadata.xml 175 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 SHA1 53b99ea5fccaad7ef2442059a91878a36714594b SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgQbY8ACgkQAiZjviIA2XgpAACfbRbvrpGjbPKM1ztpn9uuaIY1
+LBwAniyrnxhot7Is3NoQ2as9RTscRUKm
+=T7EJ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/transkode/files/transkode-0.6+gcc-4.3.patch b/media-sound/transkode/files/transkode-0.6+gcc-4.3.patch
new file mode 100644
index 000000000000..d6bc9a160a55
--- /dev/null
+++ b/media-sound/transkode/files/transkode-0.6+gcc-4.3.patch
@@ -0,0 +1,39 @@
+Index: transkode-0.6/src/common/commondefs.cpp
+===================================================================
+--- transkode-0.6.orig/src/common/commondefs.cpp
++++ transkode-0.6/src/common/commondefs.cpp
+@@ -33,6 +33,8 @@
+ 	#include <unistd.h>
+ #endif
+ 
++#include <cstdlib>
++
+ /**
+  * GeneralOpt
+ */
+Index: transkode-0.6/src/configdialog/streamsettings.ui.h
+===================================================================
+--- transkode-0.6.orig/src/configdialog/streamsettings.ui.h
++++ transkode-0.6/src/configdialog/streamsettings.ui.h
+@@ -42,6 +42,8 @@
+ #include <kmessagebox.h>
+ #include <klocale.h>
+ 
++#include <cstdlib>
++
+ void StreamSettings::cleanUpRippedStreams()
+ {
+ 	if ( KMessageBox::warningContinueCancel(
+Index: transkode-0.6/src/plugins/qprocesswrapper.cpp
+===================================================================
+--- transkode-0.6.orig/src/plugins/qprocesswrapper.cpp
++++ transkode-0.6/src/plugins/qprocesswrapper.cpp
+@@ -28,6 +28,8 @@
+ #include <qtimer.h>
+ #include <qregexp.h>
+ 
++#include <cstdlib>
++
+ QProcessWrapper::QProcessWrapper( int priority, int comm, QObject* parent, const char* name ):
+ 	QProcess( parent, name ),
+ 	m_priority( priority ),
diff --git a/media-sound/transkode/transkode-0.6-r1.ebuild b/media-sound/transkode/transkode-0.6-r1.ebuild
index c30ad7b69f51..fd5613929350 100644
--- a/media-sound/transkode/transkode-0.6-r1.ebuild
+++ b/media-sound/transkode/transkode-0.6-r1.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/transkode/transkode-0.6-r1.ebuild,v 1.1 2007/07/21 19:07:49 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/transkode-0.6-r1.ebuild,v 1.2 2008/04/24 11:22:48 flameeyes Exp $
 
 ARTS_REQUIRED="never"
 
@@ -27,12 +27,15 @@ RDEPEND="${RDEPEND}
 
 need-kde 3.5
 
+PATCHES=(
+	"${FILESDIR}/${P}-wavpack-options-fix.patch"
+	"${FILESDIR}/${P}-wvunpack-options-fix.patch"
+	"${FILESDIR}/${P}+gcc-4.3.patch"
+	)
+
 src_compile() {
 	local myconf="$(use_enable amarok amarokscript)"
 
-	epatch "${FILESDIR}/${P}-wavpack-options-fix.patch"
-	epatch "${FILESDIR}/${P}-wvunpack-options-fix.patch"
-
 	kde_src_compile
 }