Fix gcc-4.4 issues, Bug #277409.

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 35 insertions, 7 deletions

diff --git a/media-plugins/vdr-picselshow/ChangeLog b/media-plugins/vdr-picselshow/ChangeLog
index fc9fb5d43832..cb2e7ac571a3 100644
--- a/media-plugins/vdr-picselshow/ChangeLog
+++ b/media-plugins/vdr-picselshow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-picselshow
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-picselshow/ChangeLog,v 1.1 2008/01/13 16:44:54 hd_brummy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-picselshow/ChangeLog,v 1.2 2009/08/10 09:21:38 zzam Exp $
+
+  10 Aug 2009; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-picselshow-0.0.2.ebuild, +files/vdr-picselshow-0.0.2-gcc-4.4.diff:
+  Fix gcc-4.4 issues, Bug #277409.
 
 *vdr-picselshow-0.0.2 (13 Jan 2008)
 
diff --git a/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-gcc-4.4.diff b/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-gcc-4.4.diff
new file mode 100644
index 000000000000..de72e9e5b31e
--- /dev/null
+++ b/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-gcc-4.4.diff
@@ -0,0 +1,23 @@
+diff -ru picselshow-0.0.2-orig/data.c picselshow-0.0.2/data.c
+--- picselshow-0.0.2-orig/data.c	2009-08-10 10:56:14.657708090 +0200
++++ picselshow-0.0.2/data.c	2009-08-10 11:02:12.287665408 +0200
+@@ -453,7 +453,7 @@
+ 
+ bool cFileSource::Action(eAction act)
+ {
+-  static char *str[] = { "mount", "unmount", "eject", "status" };
++  static const char *str[] = { "mount", "unmount", "eject", "status" };
+ 
+   char *cmd = 0;
+   asprintf(&cmd, "%s %s %s", g_szMountScript, str[act], basedir);
+diff -ru picselshow-0.0.2-orig/imagecache.h picselshow-0.0.2/imagecache.h
+--- picselshow-0.0.2-orig/imagecache.h	2009-08-10 10:56:14.654371019 +0200
++++ picselshow-0.0.2/imagecache.h	2009-08-10 11:01:18.421003775 +0200
+@@ -5,6 +5,7 @@
+ #ifndef VDR_IMAGECACHE_HPP
+ #define VDR_IMAGECACHE_HPP
+ 
++#include <sys/types.h>
+ #include <map>
+ #include <vector>
+ #include <string>
diff --git a/media-plugins/vdr-picselshow/vdr-picselshow-0.0.2.ebuild b/media-plugins/vdr-picselshow/vdr-picselshow-0.0.2.ebuild
index ef247b3fba1a..b571e9b56950 100644
--- a/media-plugins/vdr-picselshow/vdr-picselshow-0.0.2.ebuild
+++ b/media-plugins/vdr-picselshow/vdr-picselshow-0.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2003-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-picselshow/vdr-picselshow-0.0.2.ebuild,v 1.1 2008/01/13 16:44:54 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-picselshow/vdr-picselshow-0.0.2.ebuild,v 1.2 2009/08/10 09:21:38 zzam Exp $
 
-inherit vdr-plugin
+inherit vdr-plugin eutils
 
 DESCRIPTION="VDR plugin: picselshow for vdr-music"
 HOMEPAGE="http://www.vdr.glaserei-franz.de/"
@@ -13,8 +13,9 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 IUSE="imagemagick"
 
-PATCHES="${FILESDIR}/${P}-vdr-1.5.x.diff
-	${FILESDIR}/${P}-gentoo.diff"
+PATCHES=("${FILESDIR}/${P}-vdr-1.5.x.diff"
+	"${FILESDIR}/${P}-gcc-4.4.diff"
+	"${FILESDIR}/${P}-gentoo.diff")
 
 DEPEND="imagemagick? ( media-gfx/imagemagick )
 		!imagemagick? ( media-libs/imlib2 )"