patches/wxwidgets-04-gsocket.diff
author yippi
Wed, 09 Sep 2009 04:15:34 +0000
changeset 2149 ff132d1e16d9
permissions -rw-r--r--
2009-09-08 Brian Cameron <[email protected]> * SFEtaglib.spec: Bump to 1.5. * SFEwxwidgets.spec, patches/wxwidgets-04-gsocket.diff: Add gsocket patch to address building issue when building with recent GLib libraries. See wxwidgets bug #10883. * SFEaudacity.spec, patches/audacity-04-Tmacro.diff, patches/audacity-06-gsocket.diff: Bump to 1.3.9. Rework Tmacro patch and add needed gsocket patch to address building issue when building with recent GLib libraries. Audacity now depends on SFEtaglib, and no longer on SFElibsamplerate.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2149
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     1
--- wxWidgets-2.8.10/src/gtk/gsockgtk.cpp-orig	2009-09-05 02:22:27.629408064 -0500
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     2
+++ wxWidgets-2.8.10/src/gtk/gsockgtk.cpp	2009-09-05 02:41:11.180272937 -0500
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     3
@@ -15,8 +15,10 @@
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     4
 #include <stdlib.h>
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     5
 #include <stdio.h>
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     6
 
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     7
+#define GSocket GlibGSocket
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     8
 #include <gdk/gdk.h>
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     9
 #include <glib.h>
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    10
+#undef GSocket
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    11
 
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    12
 #include "wx/gsocket.h"
ff132d1e16d9 2009-09-08 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    13
 #include "wx/unix/gsockunx.h"