summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-06-26 08:03:47 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-06-26 08:03:47 +0000
commitfcc40b4df357141ba5e2aadab16028c3ff6d0185 (patch)
tree97eae49e8ef9e66cac34014cb8cb3b1b55d1394b /media-plugins/vdr-rssreader
parentUndo previous change. (diff)
downloadgentoo-2-fcc40b4df357141ba5e2aadab16028c3ff6d0185.tar.gz
gentoo-2-fcc40b4df357141ba5e2aadab16028c3ff6d0185.tar.bz2
gentoo-2-fcc40b4df357141ba5e2aadab16028c3ff6d0185.zip
Added patch to compile with vdr-1.5.3 and up.
(Portage version: 2.1.3_rc5)
Diffstat (limited to 'media-plugins/vdr-rssreader')
-rw-r--r--media-plugins/vdr-rssreader/ChangeLog6
-rw-r--r--media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-vdr-1.5.3.diff58
-rw-r--r--media-plugins/vdr-rssreader/vdr-rssreader-1.0.1.ebuild6
3 files changed, 67 insertions, 3 deletions
diff --git a/media-plugins/vdr-rssreader/ChangeLog b/media-plugins/vdr-rssreader/ChangeLog
index 765230f0801d..290b9c0e229e 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.2 2007/03/13 12:32:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.3 2007/06/26 08:03:47 zzam Exp $
+
+ 26 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+ +files/vdr-rssreader-1.0.1-vdr-1.5.3.diff, vdr-rssreader-1.0.1.ebuild:
+ Added patch to compile with vdr-1.5.3 and up.
13 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
vdr-rssreader-1.0.1.ebuild:
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-vdr-1.5.3.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-vdr-1.5.3.diff
new file mode 100644
index 000000000000..7c2f244065e7
--- /dev/null
+++ b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-vdr-1.5.3.diff
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_rssreader-1.0.1-1.5.3.dpatch by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/rssreader-1.0.1-1.5.3.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.3.
+
+@DPATCH@
+--- rssreader-1.0.1/parser.c
++++ rssreader-1.0.1/parser.c
+@@ -51,7 +51,11 @@ void cItem::SetDate(const char *str)
+ char tmp[SHORT_TEXT_LEN];
+ memset(tmp, 0, sizeof(tmp));
+
++#if APIVERSNUM >= 10503
++ charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", cCharSetConv::SystemCharacterTable());
++#else
+ charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", I18nCharSets()[Setup.OSDLanguage]);
++#endif
+ compactspace(tmp);
+ debug("cItem::SetDate(): Date: '%s'", tmp);
+ strn0cpy(date, tmp, sizeof(tmp));
+@@ -62,7 +66,11 @@ void cItem::SetTitle(const char *str)
+ char tmp[SHORT_TEXT_LEN];
+ memset(tmp, 0, sizeof(tmp));
+
++#if APIVERSNUM >= 10503
++ charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", cCharSetConv::SystemCharacterTable());
++#else
+ charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", I18nCharSets()[Setup.OSDLanguage]);
++#endif
+ compactspace(tmp);
+ striphtml(tmp);
+ htmlcharconv(tmp);
+@@ -75,7 +83,11 @@ void cItem::SetLink(const char *str)
+ char tmp[SHORT_TEXT_LEN];
+ memset(tmp, 0, sizeof(tmp));
+
++#if APIVERSNUM >= 10503
++ charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", cCharSetConv::SystemCharacterTable());
++#else
+ charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", I18nCharSets()[Setup.OSDLanguage]);
++#endif
+ compactspace(tmp);
+ debug("cItem::SetLink(): '%s'", tmp);
+ strn0cpy(link, tmp, sizeof(tmp));
+@@ -86,7 +98,11 @@ void cItem::SetDescription(const char *s
+ char tmp[LONG_TEXT_LEN];
+ memset(tmp, 0, sizeof(tmp));
+
++#if APIVERSNUM >= 10503
++ charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", cCharSetConv::SystemCharacterTable());
++#else
+ charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", I18nCharSets()[Setup.OSDLanguage]);
++#endif
+ compactspace(tmp);
+ striphtml(tmp);
+ htmlcharconv(tmp);
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.1.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.0.1.ebuild
index 3f5cb7717a18..7739479ad892 100644
--- a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.1.ebuild
+++ b/media-plugins/vdr-rssreader/vdr-rssreader-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.1.ebuild,v 1.2 2007/03/13 12:32:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.0.1.ebuild,v 1.3 2007/06/26 08:03:47 zzam Exp $
inherit vdr-plugin
@@ -19,7 +19,9 @@ DEPEND=">=media-video/vdr-1.3.38
RDEPEND=""
-PATCHES="${FILESDIR}/${P}-gentoo.diff ${FILESDIR}/${P}-gentoo-rss.diff"
+PATCHES="${FILESDIR}/${P}-gentoo.diff
+ ${FILESDIR}/${P}-gentoo-rss.diff
+ ${FILESDIR}/${P}-vdr-1.5.3.diff"
src_install() {
vdr-plugin_src_install