[vdr-tvguideng] Rebuilt for vdr-2.4.0 Add tvguideng_235.diff

commit 9cdb31c5db8e0dd62e3dd92bfb3366d8442fbd80 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Tue Apr 24 22:10:48 2018 +0200 Rebuilt for vdr-2.4.0 Add tvguideng_235.diff tvguideng-vdr_2.4.0_compat.patch | 233 --------------------------------------- tvguideng_235.diff | 49 ++++++++ vdr-tvguideng.spec | 5 +- 3 files changed, 52 insertions(+), 235 deletions(-) --- diff --git a/tvguideng_235.diff b/tvguideng_235.diff new file mode 100644 index 0000000..bfcc146 --- /dev/null +++ b/tvguideng_235.diff @@ -0,0 +1,49 @@ +Index: b/channelgroups.h +=================================================================== +--- a/channelgroups.h ++++ b/channelgroups.h +@@ -16,6 +16,19 @@ + int channelStop; + string name; + public: ++ cChannelGroup(const cChannelGroup &ChannelGroup) ++ { ++ *this = ChannelGroup; ++ }; ++ cChannelGroup& operator= (const cChannelGroup &ChannelGroup) ++ { ++ this->id = ChannelGroup.id; ++ this->channelStart = ChannelGroup.channelStart; ++ this->channelStop = ChannelGroup.channelStop; ++ this->name = ChannelGroup.name; ++ ++ return *this; ++ }; + cChannelGroup(string name, int id); + virtual ~cChannelGroup(void); + int GetId(void) { return id; }; +Index: b/switchtimer.h +=================================================================== +--- a/switchtimer.h ++++ b/switchtimer.h +@@ -11,6 +11,20 @@ + tChannelID channelID; + int switchMinsBefore; + int announceOnly; ++ cSwitchTimer(const cSwitchTimer &SwitchTimer) ++ { ++ *this = SwitchTimer; ++ }; ++ cSwitchTimer& operator= (const cSwitchTimer &SwitchTimer) ++ { ++ this->eventID = SwitchTimer.eventID; ++ this->startTime = SwitchTimer.startTime; ++ this->channelID = SwitchTimer.channelID; ++ this->switchMinsBefore = SwitchTimer.switchMinsBefore; ++ this->announceOnly = SwitchTimer.announceOnly; ++ ++ return *this; ++ }; + cSwitchTimer(void); + cSwitchTimer(const cEvent* Event); + bool Parse(const char *s); diff --git a/vdr-tvguideng.spec b/vdr-tvguideng.spec index 5d2562c..4a7002d 100644 --- a/vdr-tvguideng.spec +++ b/vdr-tvguideng.spec @@ -10,7 +10,8 @@ URL: http://projects.vdr-developer.org/projects/plg-tvguideng Source0: https://projects.vdr-developer.org/git/vdr-plugin-tvguideng.git/snapshot/... # https://projects.vdr-developer.org/issues/2427 Patch0: %{pname}-gcc6.patch -Patch1: tvguideng-vdr_2.4.0_compat.patch +# https://www.vdr-portal.de/index.php?attachment/41876-tvguideng-235-diff/ +Patch1: tvguideng_235.diff BuildRequires: vdr-devel >= 2.0.0 BuildRequires: libskindesignerapi-devel @@ -48,7 +49,7 @@ make install DESTDIR=%{buildroot} %changelog * Thu Apr 19 2018 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 0.3.0-6 - Rebuilt for vdr-2.4.0 -- Add tvguideng-vdr_2.4.0_compat.patch +- Add tvguideng_235.diff * Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 0.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild