[SCM] hydrogen/master: Add header to doko's patch.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue May 8 18:44:10 UTC 2012
The following commit has been merged in the master branch:
commit fb14a4281c874e9708a8411a80747e1cffd6b933
Author: Alessio Treglia <alessio at debian.org>
Date: Tue May 8 11:24:46 2012 -0700
Add header to doko's patch.
Git-Dch: Ignore
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
index 0e7ddb2..fa117db 100644
--- a/debian/patches/ftbfs-gcc-4.7.diff
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -1,7 +1,16 @@
-Index: hydrogen-0.9.6~beta1/src/core/src/IO/portmidi_driver.cpp
-===================================================================
---- hydrogen-0.9.6~beta1.orig/src/core/src/IO/portmidi_driver.cpp 2011-01-16 08:47:33.000000000 +0000
-+++ hydrogen-0.9.6~beta1/src/core/src/IO/portmidi_driver.cpp 2012-05-04 06:30:32.631749914 +0000
+Description: Fix missing #includes to avoid build failures with GCC 4.7
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667203
+Author: Matthias Klose <doko at debian.org>
+Forwarded: no
+---
+ src/core/src/IO/portmidi_driver.cpp | 1 +
+ src/gui/src/MainForm.cpp | 1 +
+ src/gui/src/SongEditor/SongEditor.cpp | 1 +
+ src/tests/xml.cpp | 1 +
+ 4 files changed, 4 insertions(+)
+
+--- hydrogen.orig/src/core/src/IO/portmidi_driver.cpp
++++ hydrogen/src/core/src/IO/portmidi_driver.cpp
@@ -32,6 +32,7 @@
#ifdef WIN32
#include <windows.h>
@@ -10,20 +19,16 @@ Index: hydrogen-0.9.6~beta1/src/core/src/IO/portmidi_driver.cpp
#ifdef H2CORE_HAVE_PORTMIDI
-Index: hydrogen-0.9.6~beta1/src/tests/xml.cpp
-===================================================================
---- hydrogen-0.9.6~beta1.orig/src/tests/xml.cpp 2011-07-22 07:34:28.000000000 +0000
-+++ hydrogen-0.9.6~beta1/src/tests/xml.cpp 2012-05-04 06:34:03.971757784 +0000
+--- hydrogen.orig/src/tests/xml.cpp
++++ hydrogen/src/tests/xml.cpp
@@ -1,4 +1,5 @@
+#include <unistd.h>
#include <hydrogen/helpers/filesystem.h>
#include <hydrogen/basics/drumkit.h>
-Index: hydrogen-0.9.6~beta1/src/gui/src/SongEditor/SongEditor.cpp
-===================================================================
---- hydrogen-0.9.6~beta1.orig/src/gui/src/SongEditor/SongEditor.cpp 2011-10-24 10:31:06.000000000 +0000
-+++ hydrogen-0.9.6~beta1/src/gui/src/SongEditor/SongEditor.cpp 2012-05-04 06:35:06.819760122 +0000
+--- hydrogen.orig/src/gui/src/SongEditor/SongEditor.cpp
++++ hydrogen/src/gui/src/SongEditor/SongEditor.cpp
@@ -21,6 +21,7 @@
*/
@@ -32,10 +37,8 @@ Index: hydrogen-0.9.6~beta1/src/gui/src/SongEditor/SongEditor.cpp
#include <algorithm>
#include <memory>
-Index: hydrogen-0.9.6~beta1/src/gui/src/MainForm.cpp
-===================================================================
---- hydrogen-0.9.6~beta1.orig/src/gui/src/MainForm.cpp 2011-12-04 16:23:30.000000000 +0000
-+++ hydrogen-0.9.6~beta1/src/gui/src/MainForm.cpp 2012-05-04 06:42:17.055776123 +0000
+--- hydrogen.orig/src/gui/src/MainForm.cpp
++++ hydrogen/src/gui/src/MainForm.cpp
@@ -20,6 +20,7 @@
*
*/
--
hydrogen packaging
More information about the pkg-multimedia-commits
mailing list