Re: [vdr] multiple patching trouble

Am 21.06.2010 09:28, schrieb martinez:

I've taken vanilla vdr 1.7.15 and applied the extensions patch V3 (see link following) [...] and finally I try your patch (with --dry-run )

patch -p1 --dry-run < ../patches/event_1.7.15_patch [...] 2 out of 9 hunks FAILED -- saving rejects to file menu.c.rej

Just by looking at both patches, these two updates seem to conflict:

Hunk 4: @@ -1123,6 +1248,8 @@ static void SetCurrentChannel(int ChannelNr) { currentChannel = ChannelNr; } static const cEvent *ScheduleEvent(void); virtual eOSState ProcessKey(eKeys Key); + virtual const cEvent* GetEvent(int Nr) const; + virtual int GetEventCount() const; };

int cMenuWhatsOn::currentChannel = 0;

... and from extensions patch:

@@ -1369,13 +1662,21 @@ static void SetCurrentChannel(int ChannelNr) { currentChannel = ChannelNr; } static const cEvent *ScheduleEvent(void); virtual eOSState ProcessKey(eKeys Key); +#ifdef USE_GRAPHTFT + virtual const char* MenuKind() { return now ? "MenuWhatsOnNow" : "MenuWhatsOnNext"; } + virtual void Display(void); +#endif /* GRAPHTFT */ };

int cMenuWhatsOn::currentChannel = 0;

So after applying both patches with the two failed hunks, add the two new lines manually. The same applies to hunk 7:

@@ -1290,6 +1427,8 @@ cMenuSchedule(void); virtual ~cMenuSchedule(); virtual eOSState ProcessKey(eKeys Key); + virtual const cEvent* GetEvent(int Nr) const; + virtual int GetEventCount() const; };

cMenuSchedule::cMenuSchedule(void)

There's another part of GraphTFT conflicting here. Just do it the same way.

Cheers,

Udo