[SCM] audacity/master: Fix build failure with Glib 2.31.20.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Thu Mar 8 16:51:02 UTC 2012


The following commit has been merged in the master branch:
commit 2a8da675f4bc7c4263d3d2a03000ab66e80398fa
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Mar 8 16:47:53 2012 +0100

    Fix build failure with Glib 2.31.20.

diff --git a/debian/patches/fix-glib-include-error.patch b/debian/patches/fix-glib-include-error.patch
new file mode 100644
index 0000000..1bb21e4
--- /dev/null
+++ b/debian/patches/fix-glib-include-error.patch
@@ -0,0 +1,16 @@
+Description: Glib 2.31.20 does not allow to include glib/gtypes.h directly any
+ more. Instead glib.h needs to be included.
+Author: Benjamin Drung <bdrung at debian.org>
+Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=484
+
+--- a/src/AudacityApp.cpp
++++ b/src/AudacityApp.cpp
+@@ -406,7 +406,7 @@
+  * Happily we can avoid the hack, as we only need some of the headers, not
+  * the full GTK headers
+  */
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glib-object.h>
+ 
+ typedef struct _GnomeProgram GnomeProgram;
diff --git a/debian/patches/series b/debian/patches/series
index 10f170a..6f12e31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ disable-dynamic-ffmpeg.patch
 disable-dynamic-lame.patch
 label-region-relation.patch
 additional-mime-types.patch
+fix-glib-include-error.patch

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list