Fix for gcc-4.3. Bug 234784. Thanks to Martin Väth <vaeth@mathematik.uni-wuerzburg.de>.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25.8 i686

5 files changed, 27 insertions, 7 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index b9eef41d33c3..d349db00b58d 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.280 2008/08/19 21:43:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.281 2008/08/31 20:07:45 loki_val Exp $
+
+  31 Aug 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/amarok-1.4.10-gcc-4.3.patch, amarok-1.4.10.ebuild,
+  amarok-1.4.10-r1.ebuild:
+  Fix for gcc-4.3. Bug 234784. Thanks to Martin Väth
+  <vaeth@mathematik.uni-wuerzburg.de>.
 
   19 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   amarok-1.4.10.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 24450930b10d..6b02bdaf523a 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,3 +1,4 @@
+AUX amarok-1.4.10-gcc-4.3.patch 271 RMD160 facfb2796b871f3b3a5cb0c5e2268386950b3801 SHA1 c86f458ba6ae8d5b78a047852f9f2699e6da2908 SHA256 b96e976276f5c87265ecdb62b596f6f2e91c921130b833b0e395f2b50c9fa9cc
 AUX amarok-1.4.7+xine-lib-1.1.8-lastfm.patch 808 RMD160 fcf33e066734fdf14b5b25421093f19282b2f130 SHA1 bf38186111297dc9da5eb00be14ba9772d2ae134 SHA256 5c65d14d2aa8b6739a7a8493f7d4db808c25d56047ff00b7adcd8754ee97e4f2
 AUX amarok-1.4.7-svn148317.patch 538 RMD160 088c06869d98f2bc9de83a8e9e39d0026bc74db1 SHA1 f66e14a0273e68caf9ceb40b8475d35c32bc04e5 SHA256 f159099ec72687ad306c4d386336f0864b4510d5c5b09026cd31401c3ade23ae
 AUX amarok-1.4.9.1-helix+gcc-4.3.patch 435 RMD160 2ebf5155e052d90e027d207820bd4328b75014ea SHA1 af9169a7dd9df1598099acea2e84310d1ec9b1bb SHA256 b35b0c42d19d48fda2385962aeaa132b2cf659ddeebcadc5eae3f6dfe7e44894
@@ -5,11 +6,11 @@ AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435
 DIST amarok-1.4.10.tar.bz2 12812583 RMD160 f86c71dd0459e0cf1ff586cd6de240ca6501cf62 SHA1 cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd SHA256 4b28f86e81447b94d33c35aa0cff65d59d85da74fde2a86c5c7862c048509c9b
 DIST amarok-1.4.8.tar.bz2 12699378 RMD160 b557f6f5f14c304ae82c8d5537263ecc1faa922e SHA1 8051efa40483271fe6b7d229da9b4d7af3142348 SHA256 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
 DIST amarok-1.4.9.1.tar.bz2 12707926 RMD160 9f6e59116292bd33e10c0245bfdbd3a2df319765 SHA1 5473c7d578a4bf2662f977d9239ff0066ee8f159 SHA256 c4a02c3267cd5f3a9ff9efa066f1e0308c2cd903be2d5b24e3d9f75abdc1fa93
-EBUILD amarok-1.4.10-r1.ebuild 3055 RMD160 52d55a76caecc378486b09bf61b8a0d138cdd813 SHA1 afa6c33dfd99b0bc95aaebe386b2238767d4fec1 SHA256 0c4f505bc48e4b7553bc142902149b6fb1afe63e75b9833a999957af293d8844
-EBUILD amarok-1.4.10.ebuild 2986 RMD160 d2677a2bc625f70680a310e1585724f653b3345c SHA1 07028a7b4edb1678edbbcc9f6b5c7a4752ff86a0 SHA256 1a654fa2f2cf2302e2399e9390468dbc1fbea391e2aef91947e460d2a121c27b
+EBUILD amarok-1.4.10-r1.ebuild 3092 RMD160 d70b9dccb9cd14e582697d80f419e9cc8d112560 SHA1 6b9a31df3f2ceaaa413ba06d55b865f0149426b0 SHA256 e9295d57260f7c1b063175197770c3e0a42f1a09ec339c2aee056e50aff31811
+EBUILD amarok-1.4.10.ebuild 3030 RMD160 2e72e10285e8d56932740ca1ac2f2805c9be46aa SHA1 449b3a6bb442d1cd9565fa197d2889d447af8156 SHA256 29b55d449f20700ae756b6deddea68b38f3e1bd262374f665e9018aaa18cfe43
 EBUILD amarok-1.4.8.ebuild 3195 RMD160 ae0a14b0ab7ecaed2de15710bbb8ca7127e4cbc8 SHA1 25a2eb100c29203cb3713e66bf25e5bb2c6d2a4a SHA256 1d56cc2d878de0e7d9afd2c89163a0f221f3c56e3f9c3725d3fe8884a30c19c8
 EBUILD amarok-1.4.9.1-r1.ebuild 3069 RMD160 410163fa1d2049988d3f00c7c86a9eb70b2f1013 SHA1 069b89e7f2320c5280b2862f7bd301a59a9ca7c1 SHA256 173d1a12c7f4d482b173a88d841ae66418fde82854de89cf723775d8b2f05642
 EBUILD amarok-1.4.9.1.ebuild 3016 RMD160 0e525e2ee81f4394ab4989dcca5e3d6d55caa606 SHA1 33474fdd4b643a11d50ec65ebeaebe765ce166a3 SHA256 70c548c4a9c362a682bc25021f818df72622918fcfc57d6ce3f3529af3745fbe
 EBUILD amarok-1.4.9999-r2.ebuild 2968 RMD160 ccdac64d981d96b28355906009cd37fb89ce36b0 SHA1 8530f914a80ac7d988981f996ebcb09055017995 SHA256 f3d3a1311d4614ce983e984fd6b589fcf5027fcb16b47234646b7eb2814e5941
-MISC ChangeLog 45673 RMD160 b1f5d9b62d15543e0802eaa3378c83ebe9317602 SHA1 7eb04ca7fb2ee5963c0548982db3aa29e2c39bbf SHA256 804386b6ca690fee296b2640f2b9acabe35b1cb7fbf1493edb8ec2043f55a1dd
+MISC ChangeLog 45905 RMD160 c3f1c5481dd3a0af80508476b53c7cd712a40d47 SHA1 0085e01222dcde68c1bbf12e5ae14edc4f636b16 SHA256 be325c8fb2b04d4c7253cc2c5864fbf2b4c53ac1276f6aac0437d6e896d7ff95
 MISC metadata.xml 2367 RMD160 50e6c9da14a197696bada51cf955a9c857aa4e83 SHA1 24ad4ac21699e864def9b0251783adc797d472fe SHA256 5248565d5a95ebf8abaec4e48a0a1e1cfa05d0e0595051560232773f339c4b20
diff --git a/media-sound/amarok/amarok-1.4.10-r1.ebuild b/media-sound/amarok/amarok-1.4.10-r1.ebuild
index 8254790a6181..3bd355c1c518 100644
--- a/media-sound/amarok/amarok-1.4.10-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10-r1.ebuild,v 1.1 2008/08/14 21:54:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10-r1.ebuild,v 1.2 2008/08/31 20:07:45 loki_val Exp $
 
 ARTS_REQUIRED="never"
 
@@ -69,7 +69,8 @@ RDEPEND="${RDEPEND}
 	python? ( dev-python/PyQt )
 	daap? ( www-servers/mongrel )"
 
-PATCHES=( "${FILESDIR}/amarok-1.4.9.1-libmtp-0.3.0-API.patch" )
+PATCHES=( "${FILESDIR}/amarok-1.4.9.1-libmtp-0.3.0-API.patch"
+	"${FILESDIR}/${P}-gcc-4.3.patch" )
 
 need-kde 3.5
 
diff --git a/media-sound/amarok/amarok-1.4.10.ebuild b/media-sound/amarok/amarok-1.4.10.ebuild
index 1cd29397efd1..8e9515bcafcf 100644
--- a/media-sound/amarok/amarok-1.4.10.ebuild
+++ b/media-sound/amarok/amarok-1.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10.ebuild,v 1.7 2008/08/19 21:43:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10.ebuild,v 1.8 2008/08/31 20:07:46 loki_val Exp $
 
 ARTS_REQUIRED="never"
 
@@ -69,6 +69,8 @@ RDEPEND="${RDEPEND}
 	python? ( dev-python/PyQt )
 	daap? ( www-servers/mongrel )"
 
+PATCHES=( "${FILESDIR}/${P}-gcc-4.3.patch" )
+
 need-kde 3.5
 
 src_compile() {
diff --git a/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch b/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch
new file mode 100644
index 000000000000..d05e714a9802
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch
@@ -0,0 +1,10 @@
+--- amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp
++++ amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp
+@@ -21,6 +21,7 @@
+ #include <unistd.h>
+ #include <iostream>
+ #include <cstring>
++#include <cstdlib>
+ #include <sys/mman.h>
+ 
+ using namespace std;