[SCM] Audacity debian packaging branch, master, updated. debian/1.3.7-3-47-ge0d8351

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e0d83515171e19042e406cc87db50c54abfc18ac
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Fri Sep 11 10:42:01 2009 +0200

    Add debian/patches/gsocket.patch to fix conflicting GSocket definition.

diff --git a/debian/changelog b/debian/changelog
index 9cba84e..c4c3dcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+audacity (1.3.9-3) unstable; urgency=low
+
+  * Add debian/patches/gsocket.patch to fix conflicting GSocket definition.
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Fri, 11 Sep 2009 10:39:31 +0200
+
 audacity (1.3.9-2) unstable; urgency=low
 
   * Respect locales/$LANG (Closes: #481424, LP: #292168).
diff --git a/debian/patches/gsocket.patch b/debian/patches/gsocket.patch
new file mode 100644
index 0000000..5505d0d
--- /dev/null
+++ b/debian/patches/gsocket.patch
@@ -0,0 +1,26 @@
+Description: Fix conflicting GSocket definition
+ If you try to build audacity with a recent release of GLib (I am
+ using 2.21.6) it will fail building code that links in the
+ wxWidgets GSockets code complaining that GSocket is already defined
+ as a typedef by Glib. This patch is a workaround similar to the
+ way that the following wxWidgets bug #10883 bug is fixed:
+ .
+ http://trac.wxwidgets.org/ticket/10883
+ .
+ Though a better fix might be to split up the code so that the
+ code which needs the glib header files and the code that needs
+ the wxWidgets header files are separated into different files,
+ thus avoiding the issue.
+Origin: vendor: http://sourceforge.net/mailarchive/message.php?msg_name=4AA73303.2020409%40sun.com
+--- audacity-src-1.3.9/src/AudacityApp.cpp-orig	2009-09-05 03:01:32.893559794 -0500
++++ audacity-src-1.3.9/src/AudacityApp.cpp	2009-09-05 03:06:30.243420380 -0500
+@@ -329,7 +329,9 @@ void QuitAudacity()
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ #include <dlfcn.h>
++#define GSocket GlibGSocket
+ #include <gtk/gtk.h>
++#undef GSocket
+ 
+ typedef struct _GnomeProgram GnomeProgram;
+ typedef struct _GnomeModuleInfo GnomeModuleInfo;

-- 
Audacity debian packaging