r7952 - in /vdr/vdr/trunk/debian: .vdr-patches .vdr-patches.multipatch changelog control patches/00list patches/00list.multipatch patches/20_gcc44_ftbfs.dpatch
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Fri Oct 9 20:01:06 UTC 2009
Author: tiber-guest
Date: Fri Oct 9 20:00:38 2009
New Revision: 7952
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7952
Log:
* Fixed FTBFS with gcc 4.4 (Closes: #549380)
* Standards-Version: 3.8.3
Added:
vdr/vdr/trunk/debian/patches/20_gcc44_ftbfs.dpatch
Modified:
vdr/vdr/trunk/debian/.vdr-patches
vdr/vdr/trunk/debian/.vdr-patches.multipatch
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/control
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/00list.multipatch
Modified: vdr/vdr/trunk/debian/.vdr-patches
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/.vdr-patches?rev=7952&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/.vdr-patches (original)
+++ vdr/vdr/trunk/debian/.vdr-patches Fri Oct 9 20:00:38 2009
@@ -1,6 +1,7 @@
debian/patches/81_Make_config.dpatch:dcff6a00ef9474bca19d955d19574009
debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
debian/patches/12_osdbase-maxitems.dpatch:e45d1b62f7d66c3e5d279e3561034107
+debian/patches/20_gcc44_ftbfs.dpatch:310f84b8c27541f3ecec0ce416c21a73
debian/patches/10_dd-record-option.dpatch:58c3a3dbcd9a3ec4b0ee1814f71d1e88
debian/patches/11_sortrecordings.dpatch:9ed4cd1e144ee59dab34d4df4aa9af51
debian/patches/99_dvb-header-fixes.dpatch:ef5dae99f9ce2566d72a393c84e66741
Modified: vdr/vdr/trunk/debian/.vdr-patches.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/.vdr-patches.multipatch?rev=7952&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/.vdr-patches.multipatch (original)
+++ vdr/vdr/trunk/debian/.vdr-patches.multipatch Fri Oct 9 20:00:38 2009
@@ -24,6 +24,7 @@
debian/patches/opt-31-x_reelchannelscan.dpatch:f8c06ac51888248f68badcab8533c2be
debian/patches/81_Make_config.dpatch:dcff6a00ef9474bca19d955d19574009
debian/patches/opt-51_cuttime.dpatch:cfbf0a7934f109148fef4e385c3eb465
+debian/patches/20_gcc44_ftbfs.dpatch:310f84b8c27541f3ecec0ce416c21a73
debian/patches/opt-40_pluginparam.dpatch:9dc3baf2532c9df6e715f0d6c9f7df06
debian/patches/99_dvb-header-fixes.dpatch:ef5dae99f9ce2566d72a393c84e66741
debian/patches/14_cap-memsize.dpatch:7beb9bcecb1bdce4a03c1729acfbbdb3
Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=7952&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Fri Oct 9 20:00:38 2009
@@ -1,12 +1,14 @@
-vdr (1.6.0-12) UNRELEASED; urgency=low
+vdr (1.6.0-12) unstable; urgency=low
[ Thomas Günther ]
* Upgraded make-special-vdr.sh to version 1.3
[ Tobias Grimm ]
* Added Italian debconf translation (Closes: #548798)
-
- -- Tobias Grimm <etobi at debian.org> Sat, 03 Oct 2009 11:03:21 +0200
+ * Fixed FTBFS with gcc 4.4 (Closes: #549380)
+ * Standards-Version: 3.8.3
+
+ -- Tobias Grimm <etobi at debian.org> Fri, 09 Oct 2009 21:55:31 +0200
vdr (1.6.0-11) unstable; urgency=low
Modified: vdr/vdr/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/control?rev=7952&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/control (original)
+++ vdr/vdr/trunk/debian/control Fri Oct 9 20:00:38 2009
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5), dpatch, libjpeg62-dev, libcap2-dev | libcap-dev,
libncursesw5-dev, libfreetype6-dev, libfontconfig-dev, gettext,
txt2man, python, linux-libc-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/
Homepage: http://www.cadsoft.de/vdr/
Modified: vdr/vdr/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list?rev=7952&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list (original)
+++ vdr/vdr/trunk/debian/patches/00list Fri Oct 9 20:00:38 2009
@@ -11,6 +11,7 @@
17_vdr-maintenance-1.6.0-1
18_vdr-maintenance-1.6.0-2
19_dvb-api-v5
+20_gcc44_ftbfs
81_Make_config
82_valgrind
Modified: vdr/vdr/trunk/debian/patches/00list.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list.multipatch?rev=7952&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list.multipatch (original)
+++ vdr/vdr/trunk/debian/patches/00list.multipatch Fri Oct 9 20:00:38 2009
@@ -11,6 +11,7 @@
17_vdr-maintenance-1.6.0-1
18_vdr-maintenance-1.6.0-2
19_dvb-api-v5
+20_gcc44_ftbfs
81_Make_config
82_valgrind
Added: vdr/vdr/trunk/debian/patches/20_gcc44_ftbfs.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/20_gcc44_ftbfs.dpatch?rev=7952&op=file
==============================================================================
--- vdr/vdr/trunk/debian/patches/20_gcc44_ftbfs.dpatch (added)
+++ vdr/vdr/trunk/debian/patches/20_gcc44_ftbfs.dpatch Fri Oct 9 20:00:38 2009
@@ -1,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_gcc44_ftbfs.dpatch copied from Fedora
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS with gcc 4.4
+## DP: http://cvs.fedoraproject.org/viewvc/rpms/vdr/devel/vdr-1.6.0-const.diff?revision=1.1&view=markup
+
+ at DPATCH@
+--- vdr-1.6.0.orig/recording.c
++++ vdr-1.6.0/recording.c
+@@ -509,8 +509,8 @@ cRecording::cRecording(cTimer *Timer, co
+ Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
+ Subtitle = SubtitleBuffer;
+ }
+- char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE);
+- char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
++ const char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE);
++ const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
+ if (macroTITLE || macroEPISODE) {
+ name = strdup(Timer->File());
+ name = strreplace(name, TIMERMACRO_TITLE, Title);
+@@ -551,7 +551,7 @@ cRecording::cRecording(const char *FileN
+ sortBuffer = NULL;
+ fileName = strdup(FileName);
+ FileName += strlen(VideoDirectory) + 1;
+- char *p = strrchr(FileName, '/');
++ const char *p = strrchr(FileName, '/');
+
+ name = NULL;
+ info = new cRecordingInfo;
+@@ -1022,7 +1022,8 @@ void cRecordings::DelByName(const char *
+ if (recording) {
+ cThreadLock DeletedRecordingsLock(&DeletedRecordings);
+ Del(recording, false);
+- char *ext = strrchr(recording->FileName(), '.');
++ // wtf?
++ char *ext = strrchr(const_cast<char*>(recording->FileName()), '.');
+ if (ext) {
+ strncpy(ext, DELEXT, strlen(ext));
+ recording->fileSizeMB = DirSizeMB(recording->FileName());
+--- vdr-1.6.0.orig/svdrp.c
++++ vdr-1.6.0/svdrp.c
+@@ -736,7 +736,7 @@ void cSVDRP::CmdGRAB(const char *Option)
+ char *strtok_next;
+ FileName = strtok_r(p, delim, &strtok_next);
+ // image type:
+- char *Extension = strrchr(FileName, '.');
++ const char *Extension = strrchr(FileName, '.');
+ if (Extension) {
+ if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
+ Jpeg = true;
+@@ -795,16 +795,17 @@ void cSVDRP::CmdGRAB(const char *Option)
+ char RealFileName[PATH_MAX];
+ if (FileName) {
+ if (grabImageDir) {
+- cString s;
+- char *slash = strrchr(FileName, '/');
++ cString s(FileName);
++ FileName = s;
++ const char *slash = strrchr(FileName, '/');
+ if (!slash) {
+ s = AddDirectory(grabImageDir, FileName);
+ FileName = s;
+ }
+ slash = strrchr(FileName, '/'); // there definitely is one
+- *slash = 0;
+- char *r = realpath(FileName, RealFileName);
+- *slash = '/';
++ cString t(s);
++ t.Truncate(slash - FileName);
++ char *r = realpath(t, RealFileName);
+ if (!r) {
+ LOG_ERROR_STR(FileName);
+ Reply(501, "Invalid file name \"%s\"", FileName);
More information about the pkg-vdr-dvb-changes
mailing list