New commits:
commit 07ebe89b136eca61a4ac4e6a301c3147804e200d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
ardour2: the complete gcc-4.3 fix
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index d7a0bd2..4b38593 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,6 @@
+2008-07-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * gcc43.patch: Use the one from http://hoth.amu.edu.pl/~j_roszkowski/ardour24.tar.gz
+
2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Uncommented optional_depends slv2 now that slv2 0.6.0 is
out.
* DETAILS, PRE_BUILD: Added quotes around directory variables, changed
diff --git a/audio-creation/ardour2/gcc43.patch
b/audio-creation/ardour2/gcc43.patch
index 1125b3e..333577c 100644
--- a/audio-creation/ardour2/gcc43.patch
+++ b/audio-creation/ardour2/gcc43.patch
@@ -1,355 +1,491 @@
-diff -up ardour-2.4/gtk2_ardour/actions.cc.gcc43
ardour-2.4/gtk2_ardour/actions.cc
---- ardour-2.4/gtk2_ardour/actions.cc.gcc43 2008-03-31 08:07:53.000000000
-0400
-+++ ardour-2.4/gtk2_ardour/actions.cc 2008-04-05 15:29:00.000000000 -0400
-@@ -17,6 +17,7 @@
-
- */
+--- ardour-2.4.1/libs/sigc++2/sigc++/signal.h 2008-04-09 23:17:17.000000000
+0200
++++ ardour-2.4.1/libs/sigc++2/sigc++/signal.h-new 2008-05-17
04:38:03.000000000 +0200
+@@ -17,6 +17,12 @@
+ //Compilers, such as SUN Forte C++, that do not allow this also often
+ //do not allow a typedef to have the same name as a class in the
typedef's definition.
+ #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
++
++ #ifdef __GNUC__
++ #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
++ #undef SIGC_TYPEDEF_REDEFINE_ALLOWED
++ #endif
++ #endif
+ #endif
+
+ namespace sigc {
+--- ardour-2.4.1/libs/pbd/base_ui.cc 2008-05-17 04:32:22.000000000 +0200
++++ ardour-2.4.1/libs/pbd/base_ui.cc-new 2008-05-17 04:32:38.000000000
+0200
+@@ -21,6 +21,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <cstring>