vdr/vdr/debian/patches 01_gcc3.4-FTBFS-fix.dpatch 00list

[Thomas Schmidt]

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

Modified Files:
	00list 
Added Files:
	01_gcc3.4-FTBFS-fix.dpatch 
Log Message:
fix FTBFS with gcc 3.4 (closes #262744)

Index: 00list
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/00list,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 00list	1 Aug 2004 10:43:48 -0000	1.5
+++ 00list	2 Aug 2004 10:56:52 -0000	1.6
@@ -1,4 +1,5 @@
 01_vdr_1.2.6-3.1.diff.gz
+01_gcc3.4-FTBFS-fix
 02_Makefile-CFGDIR
 03_cmdsubmenu
 

--- NEW FILE: 01_gcc3.4-FTBFS-fix.dpatch ---
#! /bin/sh -e
## 01_gcc3.4-FTBFS-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix for a FTBFS-Bug with gcc 3.4 (#262744)

if [ $# -lt 1 ]; then
    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"

case "$1" in
    -patch) patch -p1 ${patch_opts} < $0;;
    -unpatch) patch -R -p1 ${patch_opts} < $0;;
    *)
        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
        exit 1;;
esac

exit 0

@DPATCH@
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-08-02 12:51:07.000000000 +0200
@@ -137,7 +137,7 @@
   bool Save(void)
   {
     bool result = true;
-    T *l = (T *)First();
+    T *l = (T *)this->First();
     cSafeFile f(fileName);
     if (f.Open()) {
        while (l) {
diff -urNad /home/chelli/vdr/cvs/vdr/vdr/plugin.c vdr/plugin.c
--- /home/chelli/vdr/cvs/vdr/vdr/plugin.c	2004-05-14 12:32:19.000000000 +0200
+++ vdr/plugin.c	2004-08-02 12:51:07.000000000 +0200
@@ -162,7 +162,7 @@
   const char *error = dlerror();
   if (!error) {
      void *(*creator)(void);
-     (void *)creator = dlsym(handle, "VDRPluginCreator");
+     creator = (void*(*)())dlsym(handle, "VDRPluginCreator");
      if (!(error = dlerror()))
         plugin = (cPlugin *)creator();
      }