Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5170e03688963b0c509015424301bb73c3507783
commit 5170e03688963b0c509015424301bb73c3507783
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Sep 17 18:45:44 2008 +0200
cdrdao-1.2.2-2-i686
fix build with gcc-4.3
diff --git a/source/multimedia/cdrdao/FrugalBuild
b/source/multimedia/cdrdao/FrugalBuild
index d4b294e..3948ada 100644
--- a/source/multimedia/cdrdao/FrugalBuild
+++ b/source/multimedia/cdrdao/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=cdrdao
pkgver=1.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="Records audio/data CD-Rs in disk-at-once (DAO) mode"
makedepends=('pccts')
depends=('libmad' 'lame' 'libstdc++' 'libao' 'libvorbis' 'cdrtools')
@@ -12,8 +12,9 @@ groups=('multimedia')
archs=('i686' 'x86_64')
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
-url="http://cdrdao.sourceforge.net/";
-sha1sums=('2699e56e00342c1fa2a3815ed02418fe964b276b')
+source=($source cdrdao-1.2.2-gcc43.patch)
+sha1sums=('2699e56e00342c1fa2a3815ed02418fe964b276b' \
+ '4dd068df0a6978e6dae8395dd07ba88b76455301')
build()
{
diff --git a/source/multimedia/cdrdao/cdrdao-1.2.2-gcc43.patch
b/source/multimedia/cdrdao/cdrdao-1.2.2-gcc43.patch
new file mode 100644
index 0000000..f6707a9
--- /dev/null
+++ b/source/multimedia/cdrdao/cdrdao-1.2.2-gcc43.patch
@@ -0,0 +1,73 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 09-gcc-3.4.dpatch by Matthias Klose <[EMAIL PROTECTED]>
+##
+## DP: Fix build failures with g++-4.3 (Closes: #455309).
+
[EMAIL PROTECTED]@
+
+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()
+ {
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
