vdr/vdr/debian/patches 03_cmdsubmenu.dpatch

[Thomas Schmidt]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches
In directory haydn:/tmp/cvs-serv18881/vdr/vdr/debian/patches

Modified Files:
	03_cmdsubmenu.dpatch 
Log Message:
corrected email-adress; changed cmdsubmenu-patch to compile with gcc 3.3.3

Index: 03_cmdsubmenu.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/03_cmdsubmenu.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 03_cmdsubmenu.dpatch	23 May 2004 21:43:10 -0000	1.1
+++ 03_cmdsubmenu.dpatch	25 May 2004 10:26:48 -0000	1.2
@@ -23,18 +23,9 @@
 exit 0
 
 @DPATCH@
---- vdr-1.2.6.orig/Makefile	Thu Oct  9 11:42:01 2003
-+++ vdr-1.2.6/Makefile	Thu Oct  9 01:57:24 2003
-@@ -51,6 +53,7 @@
-
- DEFINES += -DREMOTE_$(REMOTE)
-
-+DEFINES += -DCMD_SUBMENUS
- DEFINES += -D_GNU_SOURCE
-
- DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
---- vdr-1.2.6.orig/config.c	Thu Oct  9 11:42:01 2003
-+++ vdr-1.2.6/config.c	Thu Oct  9 00:14:17 2003
+diff -urNad /home/chelli/vdr/cvs/vdr/vdr/config.c vdr/config.c
+--- /home/chelli/vdr/cvs/vdr/vdr/config.c	2004-05-14 12:32:15.000000000 +0200
++++ vdr/config.c	2004-05-25 12:04:18.000000000 +0200
 @@ -27,18 +27,29 @@
  {
    title = command = NULL;
@@ -65,12 +56,10 @@
       int l = p - s;
       if (l > 0) {
          title = MALLOC(char, l + 1);
-@@ -83,6 +94,76 @@
-      esyslog("ERROR: can't open pipe for command '%s'", cmd);
-   free(cmdbuf);
+@@ -85,6 +96,76 @@
    return result;
-+}
-+
+ }
+ 
 +int cCommand::getIndent ()
 +{
 +  return nIndent;
@@ -116,7 +105,7 @@
 +
 +// --- cCommands -------------------------------------------------------
 +
-+void cCommands::Add(cListObject *Object, cListObject *After = NULL)
++void cCommands::Add(cListObject *Object, cListObject *After)
 +{
 +  cCommand *c = (cCommand *) Object;
 +  cCommand *cParent;
@@ -139,12 +128,15 @@
 +    }
 +  }
 +  cConfig<cCommand>::Add (Object, After);
- }
- 
++}
++
  // -- cSVDRPhost -------------------------------------------------------------
---- vdr-1.2.6.orig/config.h	Thu Oct  9 11:42:01 2003
-+++ vdr-1.2.6/config.h	Thu Oct  9 01:28:20 2003
-@@ -33,11 +33,15 @@
+ 
+ cSVDRPhost::cSVDRPhost(void)
+diff -urNad /home/chelli/vdr/cvs/vdr/vdr/config.h vdr/config.h
+--- /home/chelli/vdr/cvs/vdr/vdr/config.h	2004-05-14 12:32:15.000000000 +0200
++++ vdr/config.h	2004-05-25 12:03:22.000000000 +0200
+@@ -32,11 +32,15 @@
  
  #define MaxFileName 256
  
@@ -160,7 +152,7 @@
    static char *result;
  public:
    cCommand(void);
-@@ -46,6 +50,12 @@
+@@ -45,6 +49,12 @@
    const char *Title(void) { return title; }
    bool Confirm(void) { return confirm; }
    const char *Execute(const char *Parameters = NULL);
@@ -173,7 +165,7 @@
    };
  
  typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
-@@ -222,7 +232,11 @@
+@@ -156,7 +166,11 @@
    }
    };
  
@@ -186,18 +178,30 @@
  
  class cSVDRPhosts : public cConfig<cSVDRPhost> {
  public:
---- vdr-1.2.6.orig/menu.c	Thu Oct  9 11:42:01 2003
-+++ vdr-1.2.6/menu.c	Thu Oct  9 01:39:01 2003
+diff -urNad /home/chelli/vdr/cvs/vdr/vdr/Makefile vdr/Makefile
+--- /home/chelli/vdr/cvs/vdr/vdr/Makefile	2004-05-25 12:03:21.000000000 +0200
++++ vdr/Makefile	2004-05-25 12:03:22.000000000 +0200
+@@ -49,6 +49,7 @@
+ 
+ DEFINES += -DREMOTE_$(REMOTE)
+ 
++DEFINES += -DCMD_SUBMENUS
+ DEFINES += -D_GNU_SOURCE
+ 
+ DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+diff -urNad /home/chelli/vdr/cvs/vdr/vdr/menu.c vdr/menu.c
+--- /home/chelli/vdr/cvs/vdr/vdr/menu.c	2004-05-14 12:32:19.000000000 +0200
++++ vdr/menu.c	2004-05-25 12:03:22.000000000 +0200
 @@ -28,6 +28,8 @@
- #include "timers.h"
  #include "transfer.h"
  #include "videodir.h"
-+
-+/* #include "dvbsub.h" */
- 
- #include <malloc.h>//TK
  
-@@ -1744,6 +1745,16 @@
++/* #include "dvbsub.h" */
++
+ #define MENUTIMEOUT     120 // seconds
+ #define MAXWAIT4EPGINFO   3 // seconds
+ #define MODETIMEOUT       3 // seconds
+@@ -1518,6 +1520,16 @@
    if (command) {
       char *buffer = NULL;
       bool confirmed = true;
@@ -214,7 +218,7 @@
       if (command->Confirm()) {
          asprintf(&buffer, "%s?", command->Title());
          confirmed = Interface->Confirm(buffer);
-@@ -1759,7 +1770,11 @@
+@@ -1533,7 +1545,11 @@
             return AddSubMenu(new cMenuText(command->Title(), Result, fontFix));
          return osEnd;
          }
@@ -226,8 +230,9 @@
    return osContinue;
  }
  
---- vdr-1.2.6.orig/tools.h	Thu Oct  9 11:42:01 2003
-+++ vdr-1.2.6/tools.h	Thu Oct  9 00:14:17 2003
+diff -urNad /home/chelli/vdr/cvs/vdr/vdr/tools.h vdr/tools.h
+--- /home/chelli/vdr/cvs/vdr/vdr/tools.h	2004-05-14 12:32:20.000000000 +0200
++++ vdr/tools.h	2004-05-25 12:03:22.000000000 +0200
 @@ -158,7 +158,7 @@
    cListBase(void);
  public: