[vdr] Resurrect channel+epg patch.

[Ville Skyttä]

commit cbcdcd12bbb390c4cf96b9a51c4f8aafc6942373
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Feb 15 21:30:55 2011 +0200

    Resurrect channel+epg patch.

 vdr-channel+epg.patch |   28 ++++++++++++++--------------
 vdr.spec              |    7 ++++---
 2 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/vdr-channel+epg.patch b/vdr-channel+epg.patch
index c5b1a3b..9315b1c 100644
--- a/vdr-channel+epg.patch
+++ b/vdr-channel+epg.patch
@@ -1,26 +1,26 @@
---- vdr-1.3.15/menu.c.old	2004-11-19 20:54:29.000000000 +0100
-+++ vdr-1.3.15/menu.c	2004-11-19 20:58:47.000000000 +0100
-@@ -368,11 +368,21 @@
+diff -up vdr-1.6.0/menu.c~ vdr-1.6.0/menu.c
+--- vdr-1.6.0/menu.c~	2008-03-16 13:15:28.000000000 +0200
++++ vdr-1.6.0/menu.c	2011-02-15 00:39:42.267224859 +0200
+@@ -399,11 +399,20 @@ int cMenuChannelItem::Compare(const cLis
  void cMenuChannelItem::Set(void)
  {
-   char *buffer = NULL;
+   cString buffer;
 +  const cEvent *Event = NULL;
    if (!channel->GroupSep()) {
 +     cSchedulesLock SchedulesLock;
 +     const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
 +     const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
-+     if (Schedule) {
-+       Event = Schedule->GetPresentEvent();
-+     }
++     if (Schedule)
++        Event = Schedule->GetPresentEvent();
 +
       if (sortMode == csmProvider)
--        asprintf(&buffer, "%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name());
-+        asprintf(&buffer, "%d\t%s - %s %c%s%c", channel->Number(), channel->Provider(), channel->Name(),
-+			  Event ? '(' : ' ',Event ? Event->Title() : "", Event ? ')' : ' ');
+-        buffer = cString::sprintf("%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name());
++        buffer = cString::sprintf("%d\t%s - %s %c%s%c", channel->Number(), channel->Provider(), channel->Name(),
++                                  Event ? '(' : ' ', Event ? Event->Title() : "", Event ? ')' : ' ');
       else
--        asprintf(&buffer, "%d\t%s", channel->Number(), channel->Name());
-+        asprintf(&buffer, "%d\t%s %c%s%c", channel->Number(), channel->Name(),
-+			  Event ? '(' : ' ',Event ? Event->Title() : "", Event ? ')' : ' ');
+-        buffer = cString::sprintf("%d\t%s", channel->Number(), channel->Name());
++        buffer = cString::sprintf("%d\t%s %c%s%c", channel->Number(), channel->Name(),
++                                  Event ? '(' : ' ', Event ? Event->Title() : "", Event ? ')' : ' ');
       }
    else
-      asprintf(&buffer, "---\t%s ----------------------------------------------------------------", channel->Name());
+      buffer = cString::sprintf("---\t%s ----------------------------------------------------------------", channel->Name());
diff --git a/vdr.spec b/vdr.spec
index 19ee34e..6d49a71 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -56,7 +56,6 @@ Source13:       %{name}-timercmds.conf
 Source14:       %{name}-shutdown.sh
 Source15:       %{name}-moveto.sh
 Source16:       %{name}-CHANGES.package.old
-# TODO
 Patch0:         %{name}-channel+epg.patch
 # TODO
 Patch1:         http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
@@ -191,8 +190,7 @@ order to use this plugin.
 
 %prep
 %setup -q
-# TODO: does not apply
-#patch0 -p1
+%patch0 -p1
 %patch1 -p1
 # TODO: does not apply
 #patch -F 0 -i debian/patches/02_plugin_missing.dpatch
@@ -540,6 +538,9 @@ fi
 %endif # plugins
 
 %changelog
+* Tue Feb 15 2011 Ville Skyttä <ville.skytta at iki.fi>
+- Resurrect channel+epg patch.
+
 * Tue Feb  8 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-37
 - Backport V4L2 patch from VDR 1.7.x to fix build with recent kernel headers.