Fix compilation with gcc-4.3. Bug #251185.

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27-gentoo-r1 i686

4 files changed, 46 insertions, 6 deletions

diff --git a/media-plugins/vdr-amarok/ChangeLog b/media-plugins/vdr-amarok/ChangeLog
index d3fad598552d..b1a416832c55 100644
--- a/media-plugins/vdr-amarok/ChangeLog
+++ b/media-plugins/vdr-amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-amarok
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/ChangeLog,v 1.2 2007/12/19 14:06:37 hd_brummy Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/ChangeLog,v 1.3 2008/12/17 14:15:34 zzam Exp $
+
+  17 Dec 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-amarok-0.0.2-gcc4.3.patch, vdr-amarok-0.0.2.ebuild:
+  Fix compilation with gcc-4.3. Bug #251185.
 
   19 Dec 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-amarok-0.0.2.ebuild:
diff --git a/media-plugins/vdr-amarok/Manifest b/media-plugins/vdr-amarok/Manifest
index dce12038e148..f09301c597d6 100644
--- a/media-plugins/vdr-amarok/Manifest
+++ b/media-plugins/vdr-amarok/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX vdr-amarok-0.0.2-gcc4.3.patch 828 RMD160 4b4ef6f7feee4a32736db264a01126381084df7c SHA1 d26e54098ec664e60f17fc805009bacd82d7e0e9 SHA256 e6346d63914a91cc124e9c5994f040348c4c829bbb1e36b9283e06d777a5a718
 DIST vdr-amarok-0.0.2.tar.bz2 51816 RMD160 393827e9566d26b93da4fc6a5dc4860ab4674d6c SHA1 c5a22ff55bb0366965aa5a360191d1cfdc17fde2 SHA256 b96b6845eba17d500eeccc85f97cc0480e057801657133302ed7271167372a91
-EBUILD vdr-amarok-0.0.2.ebuild 658 RMD160 dc0a5d3c78e2c752f9faab501aacaa3674f71cac SHA1 a6a310c1bba7e03c5ff5cfd1d9b512079d72c378 SHA256 5d5ca22cf3443cef94bbe225588dda08bf373c35cd0d127ec190cdeeada0123f
-MISC ChangeLog 496 RMD160 37af965004adea8cb42242c35077b6d4c746e95b SHA1 6c07d8b1bd2edf1e01f84d7bc4aa9ad12079c949 SHA256 8b7a7214a4d7d2336b50ee5f213f089374f5c4bc8cc13a71d0fecc5af5a11880
+EBUILD vdr-amarok-0.0.2.ebuild 696 RMD160 b930f02e52108756146f78081cfca6115bce5bd5 SHA1 d3ca10627f163e9eb2eaa008a7cd976b1e45f25d SHA256 3ab65352a3098119c62ae1f0a0439b7ca2a09a58209fb5a9c2eb401de38db4cc
+MISC ChangeLog 655 RMD160 e7681119ac1768b857d5c36e4a7d2ff5e3673746 SHA1 626692635e9cf9808c8c4528437cdb0e24ae51e4 SHA256 6ec170dee0aed910c2599184ebc93a7797b0c6d809e4d210b704a17b1f03bc51
 MISC metadata.xml 258 RMD160 3978316b72989b0150dd21a2ba1f2449a158ebc9 SHA1 4ed083cc2156c1d9ea22136d69bcdd9da3d758b9 SHA256 1d6292676863287cee09b69ba35f3ea7546ed6718a3fea1d326deae735dadf64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklJCZgACgkQt2vP6XvVdOeqqwCfeC0aK7CWGrldxqEooxW9uFi/
+xQgAnRKXDFjcjyLpW/EDrpgh1eKjcKnQ
+=R12h
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch b/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch
new file mode 100644
index 000000000000..313453e24b54
--- /dev/null
+++ b/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch
@@ -0,0 +1,23 @@
+diff -ru amarok-0.0.2-orig/menuAmarok.cpp amarok-0.0.2/menuAmarok.cpp
+--- amarok-0.0.2-orig/menuAmarok.cpp	2008-12-17 15:06:48.487227787 +0100
++++ amarok-0.0.2/menuAmarok.cpp	2008-12-17 15:07:39.700550051 +0100
+@@ -720,7 +720,7 @@
+ 
+ 
+ // unfortunately these playlists are not managed by the amarok DB in v1.4 or older
+-char *AMAROK_STATIC_PLAYLISTS []=
++const char *AMAROK_STATIC_PLAYLISTS []=
+     {
+         "50 Random Tracks",
+         "All Collection",
+diff -ru amarok-0.0.2-orig/Sockets.cpp amarok-0.0.2/Sockets.cpp
+--- amarok-0.0.2-orig/Sockets.cpp	2008-12-17 15:06:48.487227787 +0100
++++ amarok-0.0.2/Sockets.cpp	2008-12-17 15:07:20.357219764 +0100
+@@ -20,6 +20,7 @@
+ #ifndef WIN32
+ // this is for Linux
+ #include <unistd.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --git a/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild b/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild
index 949e4af52ea9..bd9779777a1c 100644
--- a/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild
+++ b/media-plugins/vdr-amarok/vdr-amarok-0.0.2.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-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild,v 1.3 2007/12/19 14:06:37 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild,v 1.4 2008/12/17 14:15:34 zzam Exp $
 
 inherit vdr-plugin
 
@@ -15,6 +15,8 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.0"
 
+PATCHES=("${FILESDIR}/${P}-gcc4.3.patch")
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst