From 50ccc8f8a830481ddecd77ca0cdd0d0c91cd83a4 Mon Sep 17 00:00:00 2001 From: Jörg Bornkessel Date: Thu, 21 Jun 2012 13:23:14 +0000 Subject: eapi=4; vdr-plugin-2.eclass; gcc-4.7 compile fix on #421961 (Portage version: 2.1.10.11/cvs/Linux i686) --- media-plugins/vdr-rssreader/ChangeLog | 6 +++++- .../vdr-rssreader/files/vdr-rssreader-1.6.4_gcc-4.7.diff | 16 ++++++++++++++++ media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild | 11 ++++++----- 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.4_gcc-4.7.diff (limited to 'media-plugins') diff --git a/media-plugins/vdr-rssreader/ChangeLog b/media-plugins/vdr-rssreader/ChangeLog index 9bfbe4dc2fa5..80b5f5f4d43d 100644 --- a/media-plugins/vdr-rssreader/ChangeLog +++ b/media-plugins/vdr-rssreader/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-rssreader # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.10 2012/02/07 00:26:02 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.11 2012/06/21 13:23:14 hd_brummy Exp $ + + 21 Jun 2012; Joerg Bornkessel + vdr-rssreader-1.6.4.ebuild, +files/vdr-rssreader-1.6.4_gcc-4.7.diff: + eapi=4; vdr-plugin-2.eclass; gcc-4.7 compile fix on #421961 07 Feb 2012; Joerg Bornkessel -vdr-rssreader-1.0.3.ebuild, -files/vdr-rssreader-1.0.3-gentoo.diff, diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.4_gcc-4.7.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.4_gcc-4.7.diff new file mode 100644 index 000000000000..85f4a0dc1e9f --- /dev/null +++ b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.4_gcc-4.7.diff @@ -0,0 +1,16 @@ +gcc-4.7 compilefix +https://bugs.gentoo.org/show_bug.cgi?id=421961 +signed-of-by: Joerg Bornkessel (21/06/2012) + +diff -Naur rssreader-1.6.4.orig/menu.c rssreader-1.6.4/menu.c +--- rssreader-1.6.4.orig/menu.c 2012-06-21 15:12:03.000000000 +0200 ++++ rssreader-1.6.4/menu.c 2012-06-21 15:13:29.000000000 +0200 +@@ -159,7 +159,7 @@ + :cOsdMenu(tr("Select RSS item")) + { + for (cItem *rssItem = Parser.Items.First(); rssItem; rssItem = Parser.Items.Next(rssItem)) +- Add(new cOsdItem(rssItem->GetTitle())); ++ this->Add(new cOsdItem(rssItem->GetTitle())); + SetHelp(NULL, "<<", ">>", NULL); + Display(); + } diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild index 12d2f879621a..9d2ede2acddd 100644 --- a/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild +++ b/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild,v 1.3 2012/02/07 00:26:02 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild,v 1.4 2012/06/21 13:23:14 hd_brummy Exp $ -EAPI="3" +EAPI="4" -inherit vdr-plugin +inherit vdr-plugin-2 DESCRIPTION="VDR Plugin: RSS feed reader" HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/" @@ -22,10 +22,11 @@ DEPEND=">=media-video/vdr-1.6.0 RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-gentoo-rss.diff" - "${FILESDIR}/${P}-curl-headers.patch" ) + "${FILESDIR}/${P}-curl-headers.patch" + "${FILESDIR}/${P}_gcc-4.7.diff" ) src_install() { - vdr-plugin_src_install + vdr-plugin-2_src_install insinto /etc/vdr/plugins/rssreader doins "${S}/rssreader/rssreader.conf" -- cgit v1.2.3-65-gdbad