From c8f14a4f6e37c789df3d336dbc7787769ef34e90 Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Mon, 25 Jul 2011 10:45:47 +0000 Subject: [PATCH] Fix compilation against curl-7.21.7 (bug #376229) Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- media-plugins/vdr-rssreader/ChangeLog | 9 +++++++-- .../files/vdr-rssreader-1.6.4-curl-headers.patch | 12 ++++++++++++ .../vdr-rssreader/vdr-rssreader-1.0.3.ebuild | 5 +++-- .../vdr-rssreader/vdr-rssreader-1.1.4.ebuild | 5 +++-- .../vdr-rssreader/vdr-rssreader-1.6.0.ebuild | 5 +++-- .../vdr-rssreader/vdr-rssreader-1.6.4.ebuild | 7 ++++--- 6 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.4-curl-headers.patch diff --git a/media-plugins/vdr-rssreader/ChangeLog b/media-plugins/vdr-rssreader/ChangeLog index 4cfe644a669f..8649f275596f 100644 --- a/media-plugins/vdr-rssreader/ChangeLog +++ b/media-plugins/vdr-rssreader/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-rssreader -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.8 2010/09/24 00:28:16 hd_brummy Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.9 2011/07/25 10:45:47 angelos Exp $ + + 25 Jul 2011; Christoph Mende vdr-rssreader-1.0.3.ebuild, + vdr-rssreader-1.1.4.ebuild, vdr-rssreader-1.6.0.ebuild, + vdr-rssreader-1.6.4.ebuild, +files/vdr-rssreader-1.6.4-curl-headers.patch: + Fix compilation against curl-7.21.7 (bug #376229) *vdr-rssreader-1.6.4 (24 Sep 2010) diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.4-curl-headers.patch b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.4-curl-headers.patch new file mode 100644 index 000000000000..621f55210e16 --- /dev/null +++ b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.4-curl-headers.patch @@ -0,0 +1,12 @@ +diff --git a/parser.c b/parser.c +index 9fb175b..de684e0 100644 +--- a/parser.c ++++ b/parser.c +@@ -7,7 +7,6 @@ + + #include + #include +-#include + #include + #include + #include "common.h" diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild index ab851a105745..dd6b30e0be03 100644 --- a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild +++ b/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2011 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.0.3.ebuild,v 1.3 2008/04/28 09:09:00 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild,v 1.4 2011/07/25 10:45:47 angelos Exp $ inherit vdr-plugin @@ -20,6 +20,7 @@ DEPEND=">=media-video/vdr-1.3.38 RDEPEND="" PATCHES=("${FILESDIR}/${P}-gentoo.diff" + "${FILESDIR}/${PN}-1.6.4-curl-headers.patch" "${FILESDIR}/${P}-gentoo-rss.diff") src_install() { diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild index 2084394cbe47..d849944d8a9c 100644 --- a/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild +++ b/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2011 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.1.4.ebuild,v 1.2 2008/04/28 09:09:00 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild,v 1.3 2011/07/25 10:45:47 angelos Exp $ inherit vdr-plugin @@ -20,6 +20,7 @@ DEPEND=">=media-video/vdr-1.5.7 RDEPEND="" PATCHES=("${FILESDIR}/${P}-gentoo.diff" + "${FILESDIR}/${PN}-1.6.4-curl-headers.patch" "${FILESDIR}/${P}-gentoo-rss.diff") src_install() { diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.6.0.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.6.0.ebuild index 9c70a5d95471..e02a7e0085bc 100644 --- a/media-plugins/vdr-rssreader/vdr-rssreader-1.6.0.ebuild +++ b/media-plugins/vdr-rssreader/vdr-rssreader-1.6.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 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.0.ebuild,v 1.3 2010/09/24 00:28:16 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.6.0.ebuild,v 1.4 2011/07/25 10:45:47 angelos Exp $ inherit vdr-plugin @@ -20,6 +20,7 @@ DEPEND=">=media-video/vdr-1.6.0 RDEPEND="" PATCHES=("${FILESDIR}/${P}-gentoo.diff" + "${FILESDIR}/${PN}-1.6.4-curl-headers.patch" "${FILESDIR}/${P}-gentoo-rss.diff") src_install() { 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 be6a838faae6..4bdb0a401247 100644 --- a/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild +++ b/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 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.1 2010/09/24 00:28:16 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild,v 1.2 2011/07/25 10:45:47 angelos Exp $ EAPI="2" @@ -21,7 +21,8 @@ DEPEND=">=media-video/vdr-1.6.0 RDEPEND="${DEPEND}" -PATCHES=("${FILESDIR}/${P}-gentoo-rss.diff") +PATCHES=( "${FILESDIR}/${P}-gentoo-rss.diff" + "${FILESDIR}/${P}-curl-headers.patch" ) src_install() { vdr-plugin_src_install -- 2.26.2