rpms/audacity/devel audacity-1.3.8-gsocket-conflict.patch, NONE, 1.1 audacity.spec, 1.78, 1.79

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20525

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.8-gsocket-conflict.patch 
Log Message:
There may be more like this in the code, but I currently cannot do
local builds in Rawhide to check it.

* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.2.beta
- glib2 2.21.1's gio in Rawhide F-12 introduces a GSocket that
  conflicts with wxGTK's GSocket class (gsocket.h): as a work-around,
  include gtk/gtk.h first and undefine GSocket


audacity-1.3.8-gsocket-conflict.patch:
 AudacityApp.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE audacity-1.3.8-gsocket-conflict.patch ---
diff -Nur audacity-src-1.3.8-orig/src/AudacityApp.cpp audacity-src-1.3.8/src/AudacityApp.cpp
--- audacity-src-1.3.8-orig/src/AudacityApp.cpp	2009-07-16 05:27:35.000000000 +0200
+++ audacity-src-1.3.8/src/AudacityApp.cpp	2009-07-20 22:18:14.000000000 +0200
@@ -21,6 +21,9 @@
 #include <vld.h>
 #endif
 
+#include <gtk/gtk.h>
+#undef GSocket
+
 #include "Audacity.h" // This should always be included first
 
 #include <wx/defs.h>
@@ -331,7 +334,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <dlfcn.h>
-#include <gtk/gtk.h>
+/* #include <gtk/gtk.h> */
 
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- audacity.spec	20 Jul 2009 19:55:16 -0000	1.78
+++ audacity.spec	20 Jul 2009 20:15:42 -0000	1.79
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.8
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -17,6 +17,7 @@ Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
 Patch2: audacity-1.3.8-libdir.patch
+Patch3: audacity-1.3.8-gsocket-conflict.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
 Patch7: audacity-1.3.8-audiodevdefaults.patch
 
@@ -67,6 +68,7 @@ do
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
+%patch3 -p1 -b .gsocket-conflict
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
@@ -146,6 +148,11 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.2.beta
+- glib2 2.21.1's gio in Rawhide F-12 introduces a GSocket that
+  conflicts with wxGTK's GSocket class (gsocket.h): as a work-around,
+  include gtk/gtk.h first and undefine GSocket
+
 * Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.1.beta
 - upgrade to 1.3.8-beta
 - BR taglib-devel