Author: ken
Date: 2008-11-21 12:06:56 -0700 (Fri, 21 Nov 2008)
New Revision: 2007

Added:
   trunk/cdrdao/cdrdao-1.2.2-gcc43-1.patch
   trunk/cdrdao/cdrdao-1.2.2-sigc-1.patch
Log:
Build fixes for cdrdao.

Added: trunk/cdrdao/cdrdao-1.2.2-gcc43-1.patch
===================================================================
--- trunk/cdrdao/cdrdao-1.2.2-gcc43-1.patch                             (rev 0)
+++ trunk/cdrdao/cdrdao-1.2.2-gcc43-1.patch     2008-11-21 19:06:56 UTC (rev 
2007)
@@ -0,0 +1,31 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2008-11-21
+Initial Package Version: 1.2.2
+Upstream Status: unknown
+Origin: fedora
+Description: Allows it to compile with gcc-4.3
+ I also had to pass '--without-xdao --without-lame' which is how fedora build 
it,
+as there are similar issues somewhere else in the package.
+
+diff -up cdrdao-1.2.2/trackdb/FormatConverter.cc.gcc43 
cdrdao-1.2.2/trackdb/FormatConverter.cc
+--- cdrdao-1.2.2/trackdb/FormatConverter.cc.gcc43      2008-02-18 
13:17:53.000000000 +0100
++++ cdrdao-1.2.2/trackdb/FormatConverter.cc    2008-02-18 13:18:11.000000000 
+0100
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef HAVE_AO
+ #include <ao/ao.h>
+ #endif
+diff -up cdrdao-1.2.2/trackdb/TempFileManager.cc.gcc43 
cdrdao-1.2.2/trackdb/TempFileManager.cc
+--- cdrdao-1.2.2/trackdb/TempFileManager.cc.gcc43      2005-04-22 
04:01:46.000000000 +0200
++++ cdrdao-1.2.2/trackdb/TempFileManager.cc    2008-02-18 13:14:14.000000000 
+0100
+@@ -24,6 +24,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <string.h>
+ 
+ #define DEFAULT_TEMP_PATH "/tmp/"
+ 

Added: trunk/cdrdao/cdrdao-1.2.2-sigc-1.patch
===================================================================
--- trunk/cdrdao/cdrdao-1.2.2-sigc-1.patch                              (rev 0)
+++ trunk/cdrdao/cdrdao-1.2.2-sigc-1.patch      2008-11-21 19:06:56 UTC (rev 
2007)
@@ -0,0 +1,23 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2008-11-21
+Initial Package Version: 1.2.2
+Upstream Status: unknown
+Origin: Mandriva
+Description: Allows it to compile with gcc-4.2.
+
+Purpose: fix build issue, 'SigC has not been declared'.
+Originally from Adam Williamson at mandriva, via Ichiro Nakai at momonga
+linux, and google.
+
+diff -Naur cdrdao-1.2.2.orig/xdao/xcdrdao.cc cdrdao-1.2.2/xdao/xcdrdao.cc
+--- cdrdao-1.2.2.orig/xdao/xcdrdao.cc  2005-05-03 10:50:17.000000000 +0100
++++ cdrdao-1.2.2/xdao/xcdrdao.cc       2007-10-19 23:57:08.000000000 +0100
+@@ -136,7 +136,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);
+ 

-- 
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to