[SCM] ardour/master: Drop gcc-4.7 patch
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Mon Jun 25 16:07:17 UTC 2012
The following commit has been merged in the master branch:
commit f3eb7d0725487572146963ff58337caabec0f9cc
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Mon Jun 25 17:57:58 2012 +0200
Drop gcc-4.7 patch
Applied upstream
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
deleted file mode 100644
index e882bc9..0000000
--- a/debian/patches/ftbfs-gcc-4.7.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix FTBFS with GCC 4.7.
-Author: Matthias Klose <doko at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667101
-Forwarded: no
----
- libs/pbd/path.cc | 1 +
- libs/rubberband/src/main.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
---- ardour.orig/libs/pbd/path.cc
-+++ ardour/libs/pbd/path.cc
-@@ -17,6 +17,7 @@
- */
-
- #include <cerrno>
-+#include <unistd.h>
-
- #include <glib.h>
- #include <glib/gstdio.h>
---- ardour.orig/libs/rubberband/src/main.cpp
-+++ ardour/libs/rubberband/src/main.cpp
-@@ -21,6 +21,7 @@
- #include <time.h>
- #include <cstdlib>
- #include <cstring>
-+#include <unistd.h>
- #include "sysutils.h"
-
- #ifdef __MSVC__
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list