diff options
author | Arkadiusz MiĆkiewicz | 2008-11-01 13:18:35 (GMT) |
---|---|---|
committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
commit | 19e484b21215bc109f40bcfa1347eb534d002094 (patch) | |
tree | 8e083e76ce2d9db4e4b975c32ed82b7cd08bde2e | |
parent | 3366e68b9342bf4ece547fa94fc6d71dd545b5db (diff) | |
download | cdrdao-19e484b21215bc109f40bcfa1347eb534d002094.zip cdrdao-19e484b21215bc109f40bcfa1347eb534d002094.tar.gz |
- new/updated
Changed files:
cdrdao-gcc4.patch -> 1.3
cdrdao-sigc.patch -> 1.1
-rw-r--r-- | cdrdao-gcc4.patch | 73 | ||||
-rw-r--r-- | cdrdao-sigc.patch | 12 |
2 files changed, 85 insertions, 0 deletions
diff --git a/cdrdao-gcc4.patch b/cdrdao-gcc4.patch index 29e7884..2bc929b 100644 --- a/cdrdao-gcc4.patch +++ b/cdrdao-gcc4.patch @@ -21,3 +21,76 @@ diff -Nur cdrdao-1.2.0.org/trackdb/FormatConverter.h cdrdao-1.2.0/trackdb/Format // Quick abstract class declarations. Format converters should derive // their own FormatSupport and FormatSupportManager. +#!/bin/sh /usr/share/dpatch/dpatch-run +## 09-gcc-3.4.dpatch by Matthias Klose <doko@debian.org> +## +## DP: Fix build failures with g++-4.3 (Closes: #455309). + +@DPATCH@ + +diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatConverter.cc cdrdao-1.2.2/trackdb/FormatConverter.cc +--- cdrdao-1.2.2.orig/trackdb/FormatConverter.cc 2005-05-10 00:55:28.000000000 +0000 ++++ cdrdao-1.2.2/trackdb/FormatConverter.cc 2008-03-07 11:14:07.000000000 +0000 +@@ -22,6 +22,7 @@ + #include <ao/ao.h> + #endif + #include <fstream> ++#include <cstring> + + #include "config.h" + #include "util.h" +diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatOgg.cc cdrdao-1.2.2/trackdb/FormatOgg.cc +--- cdrdao-1.2.2.orig/trackdb/FormatOgg.cc 2005-04-22 02:01:46.000000000 +0000 ++++ cdrdao-1.2.2/trackdb/FormatOgg.cc 2008-03-07 11:14:07.000000000 +0000 +@@ -18,6 +18,7 @@ + */ + + #include <stdio.h> ++#include <cstring> + + #include "util.h" + #include "FormatOgg.h" +diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatMp3.cc cdrdao-1.2.2/trackdb/FormatMp3.cc +--- cdrdao-1.2.2.orig/trackdb/FormatMp3.cc 2005-09-24 20:28:43.000000000 +0000 ++++ cdrdao-1.2.2/trackdb/FormatMp3.cc 2008-03-07 11.14.07.000000000 +0000 +@@ -25,6 +25,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <fcntl.h> ++#include <cstring> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/mman.h> +diff -Naurp cdrdao-1.2.2.orig/trackdb/TempFileManager.cc cdrdao-1.2.2/trackdb/TempFileManager.cc +--- cdrdao-1.2.2.orig/trackdb/TempFileManager.cc 2005-04-22 02:01:46.000000000 +0000 ++++ cdrdao-1.2.2/trackdb/TempFileManager.cc 2008-03-07 11:14:07.000000000 +0000 +@@ -24,6 +24,7 @@ + #include <sys/stat.h> + #include <unistd.h> + #include <fcntl.h> ++#include <cstring> + + #define DEFAULT_TEMP_PATH "/tmp/" + +diff -Naurp cdrdao-1.2.2.orig/xdao/AudioCDProject.cc cdrdao-1.2.2/xdao/AudioCDProject.cc +--- cdrdao-1.2.2.orig/xdao/AudioCDProject.cc 2006-09-18 10:42:26.000000000 +0000 ++++ cdrdao-1.2.2/xdao/AudioCDProject.cc 2008-03-07 11:15:26.000000000 +0000 +@@ -18,6 +18,7 @@ + */ + + #include <assert.h> ++#include <cstring> + #include <gtkmm.h> + #include <libgnome/gnome-i18n.h> + +diff -Naurp cdrdao-1.2.2.orig/xdao/TextEdit.cc cdrdao-1.2.2/xdao/TextEdit.cc +--- cdrdao-1.2.2.orig/xdao/TextEdit.cc 2004-02-12 01:13:32.000000000 +0000 ++++ cdrdao-1.2.2/xdao/TextEdit.cc 2008-03-07 11:14:07.000000000 +0000 +@@ -21,6 +21,7 @@ + + #include <stddef.h> + #include <ctype.h> ++#include <cstring> + + TextEdit::TextEdit(const char *sample) : Gtk::Entry() + { diff --git a/cdrdao-sigc.patch b/cdrdao-sigc.patch new file mode 100644 index 0000000..12731c0 --- /dev/null +++ b/cdrdao-sigc.patch @@ -0,0 +1,12 @@ +http://cdrdao.cvs.sourceforge.net/cdrdao/cdrdao/xdao/xcdrdao.cc?r1=1.30&r2=1.31&view=patch +--- xdao/xcdrdao.cc 2007/08/15 14:24:49 1.30 ++++ xdao/xcdrdao.cc 2007/09/11 08:58:42 1.31 +@@ -144,7 +144,7 @@ + installSignalHandler(SIGCHLD, signalHandler); + + // setup periodic GUI updates +- Glib::signal_timeout().connect(SigC::slot(&guiUpdatePeriodic), 2000); ++ Glib::signal_timeout().connect(sigc::ptr_fun(&guiUpdatePeriodic), 2000); + + installSignalHandler(SIGPIPE, SIG_IGN); + |