rpms/audacity/devel audacity-1.3.8-gsocket-conflict.patch, 1.1, 1.2 audacity.spec, 1.79, 1.80

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	audacity-1.3.8-gsocket-conflict.patch audacity.spec 
Log Message:
another try at working around the GSocket conflict

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

Index: audacity-1.3.8-gsocket-conflict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity-1.3.8-gsocket-conflict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacity-1.3.8-gsocket-conflict.patch	20 Jul 2009 20:15:42 -0000	1.1
+++ audacity-1.3.8-gsocket-conflict.patch	20 Jul 2009 21:44:24 -0000	1.2
@@ -1,22 +1,14 @@
 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 @@
++++ audacity-src-1.3.8/src/AudacityApp.cpp	2009-07-20 23:45:41.000000000 +0200
+@@ -331,7 +331,9 @@
  ///////////////////////////////////////////////////////////////////////////////
  
  #include <dlfcn.h>
 -#include <gtk/gtk.h>
-+/* #include <gtk/gtk.h> */
++/*#include <gtk/gtk.h>*/
++#include <glib/gtypes.h>
++#include <glib-object.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.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- audacity.spec	20 Jul 2009 20:15:42 -0000	1.79
+++ audacity.spec	20 Jul 2009 21:44:25 -0000	1.80
@@ -151,7 +151,7 @@ update-desktop-database &> /dev/null || 
 * 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
+  include less glib headers
 
 * Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.1.beta
 - upgrade to 1.3.8-beta