r7981 - in /vdr/vdr-plugin-epgsearch/trunk/debian: changelog patches/00list patches/03_gcc-4.4.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Mon Oct 26 19:30:57 2009
New Revision: 7981

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7981
Log:
Added gcc 4.4 fix

Added:
    vdr/vdr-plugin-epgsearch/trunk/debian/patches/03_gcc-4.4.dpatch
Modified:
    vdr/vdr-plugin-epgsearch/trunk/debian/changelog
    vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/changelog?rev=7981&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/changelog Mon Oct 26 19:30:57 2009
@@ -1,3 +1,9 @@
+vdr-plugin-epgsearch (0.9.24-6) unstable; urgency=low
+
+  * Added gcc 4.4 fix
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 26 Oct 2009 20:30:37 +0100
+
 vdr-plugin-epgsearch (0.9.24-5) unstable; urgency=low
 
   * Standards-Version: 3.8.3

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list?rev=7981&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list Mon Oct 26 19:30:57 2009
@@ -1,2 +1,3 @@
 01_debian-defaults
 02_gcc-4.3
+03_gcc-4.4

Added: vdr/vdr-plugin-epgsearch/trunk/debian/patches/03_gcc-4.4.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/patches/03_gcc-4.4.dpatch?rev=7981&op=file
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/patches/03_gcc-4.4.dpatch (added)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/patches/03_gcc-4.4.dpatch Mon Oct 26 19:30:57 2009
@@ -1,0 +1,85 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_gcc-4.4.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-epgsearch-0.9.24~/epgsearchsvdrp.c vdr-plugin-epgsearch-0.9.24/epgsearchsvdrp.c
+--- vdr-plugin-epgsearch-0.9.24~/epgsearchsvdrp.c	2008-04-13 20:53:44.000000000 +0200
++++ vdr-plugin-epgsearch-0.9.24/epgsearchsvdrp.c	2009-10-26 20:27:07.000000000 +0100
+@@ -742,12 +742,13 @@
+    {
+       if (*Option) 
+       {
+-         char* pipePos = strchr(Option, '|');
++         const char* pipePos = strchr(Option, '|');
+          if (pipePos)
+          {
+-            *pipePos = 0;
+-            const char* oldName = Option;
+-            const char* newName = pipePos+1;
++            int index = pipePos - Option;
++            char* oldName = strdup(Option);
++            *(oldName + index) = 0;
++            const char* newName = oldName + index + 1;
+             if (strlen(oldName) > 0 && strlen(newName) > 0)
+             {
+                cChannelGroup *changrp = ChannelGroups.GetGroupByName(Option);
+@@ -769,15 +770,18 @@
+                   }
+                   ChannelGroups.Save();
+                   SearchExts.Save();
++                  free(oldName);
+                   return cString::sprintf("renamed channel group '%s' to '%s'", oldName, newName);
+ 
+                }		    
+                else
+                {
++                  free(oldName);
+                   ReplyCode = 901;
+                   return cString::sprintf("channel group '%s' not defined", Option);
+                }
+             }
++            free(oldName);
+          }
+          ReplyCode = 901;
+          return cString("Error in channel group parameters");	
+diff -urNad vdr-plugin-epgsearch-0.9.24~/epgsearchtools.c vdr-plugin-epgsearch-0.9.24/epgsearchtools.c
+--- vdr-plugin-epgsearch-0.9.24~/epgsearchtools.c	2008-04-13 20:53:42.000000000 +0200
++++ vdr-plugin-epgsearch-0.9.24/epgsearchtools.c	2009-10-26 20:27:07.000000000 +0100
+@@ -743,7 +743,7 @@
+    while(tmp)
+    {
+       // extract a single line
+-      char* lf = strchr(tmp, '\n');
++      const char* lf = strchr(tmp, '\n');
+       char* line = NULL;
+       if (lf)
+ 	line = strndup(tmp, lf-tmp);
+diff -urNad vdr-plugin-epgsearch-0.9.24~/menu_dirselect.c vdr-plugin-epgsearch-0.9.24/menu_dirselect.c
+--- vdr-plugin-epgsearch-0.9.24~/menu_dirselect.c	2008-04-13 20:53:44.000000000 +0200
++++ vdr-plugin-epgsearch-0.9.24/menu_dirselect.c	2009-10-26 20:27:07.000000000 +0100
+@@ -83,7 +83,7 @@
+ 	return 1;
+     do
+     {
+-	char* pos = strchr(szDir, '~');
++	const char* pos = strchr(szDir, '~');
+ 	if (pos)
+ 	{
+ 	    iLevel++;
+diff -urNad vdr-plugin-epgsearch-0.9.24~/searchtimer_thread.c vdr-plugin-epgsearch-0.9.24/searchtimer_thread.c
+--- vdr-plugin-epgsearch-0.9.24~/searchtimer_thread.c	2008-04-28 18:22:31.000000000 +0200
++++ vdr-plugin-epgsearch-0.9.24/searchtimer_thread.c	2009-10-26 20:27:28.000000000 +0100
+@@ -565,8 +565,8 @@
+    if (!isempty(aux))
+    {
+       tmpaux = strdup(aux);
+-      char* begin = strstr(aux, "<epgsearch>");
+-      char* end = strstr(aux, "</epgsearch>");
++      const char* begin = strstr(aux, "<epgsearch>");
++      const char* end = strstr(aux, "</epgsearch>");
+       if (begin && end)
+       {
+          if (begin == aux) strcpy(tmpaux, ""); else strn0cpy(tmpaux, aux, begin-aux+1);