reopen 667203 tags 667203 + patch thanks wrong bug number in unrelated patch
diff -Nru hydrogen-0.9.6~beta1/debian/changelog hydrogen-0.9.6~beta1/debian/changelog --- hydrogen-0.9.6~beta1/debian/changelog 2012-02-18 16:47:27.000000000 +0000 +++ hydrogen-0.9.6~beta1/debian/changelog 2012-05-04 06:29:48.000000000 +0000 @@ -1,3 +1,10 @@ +hydrogen (0.9.6~beta1-2.1) unstable; urgency=low + + * Non maintainer upload. + * Fix build failure with GCC 4.7. Closes: #667203. + + -- Matthias Klose <[email protected]> Fri, 04 May 2012 08:29:08 +0200 + hydrogen (0.9.6~beta1-2) unstable; urgency=low * Replace rsvg with rsvg-convert to convert SVG to PNG image (LP: #935170): diff -Nru hydrogen-0.9.6~beta1/debian/patches/ftbfs-gcc-4.7.diff hydrogen-0.9.6~beta1/debian/patches/ftbfs-gcc-4.7.diff --- hydrogen-0.9.6~beta1/debian/patches/ftbfs-gcc-4.7.diff 1970-01-01 00:00:00.000000000 +0000 +++ hydrogen-0.9.6~beta1/debian/patches/ftbfs-gcc-4.7.diff 2012-05-04 06:42:19.000000000 +0000 @@ -0,0 +1,46 @@ +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 +@@ -32,6 +32,7 @@ + #ifdef WIN32 + #include <windows.h> + #endif ++#include <unistd.h> + + #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 +@@ -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 +@@ -21,6 +21,7 @@ + */ + + #include <assert.h> ++#include <unistd.h> + #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 +@@ -20,6 +20,7 @@ + * + */ + ++#include <unistd.h> + #include <hydrogen/version.h> + #include <hydrogen/hydrogen.h> + #include <hydrogen/playlist.h> diff -Nru hydrogen-0.9.6~beta1/debian/patches/series hydrogen-0.9.6~beta1/debian/patches/series --- hydrogen-0.9.6~beta1/debian/patches/series 2012-02-18 14:41:36.000000000 +0000 +++ hydrogen-0.9.6~beta1/debian/patches/series 2012-05-04 06:29:53.000000000 +0000 @@ -2,3 +2,4 @@ 1001_rubberband_path.patch 1005_name_shouldnt_repeat_genericname.patch 1006_porttime.patch +ftbfs-gcc-4.7.diff
