← Back to branch summary

~ubuntu-branches/ubuntu/vivid/wxwidgets2.8/vivid

« back to all changes in this revision

Viewing changes to debian/patches/fix-FTBFS.patch

  • Committer: Bazaar Package Importer
  • Author(s): Devid Antonio Filoni
  • Date: 2010-07-20 01:55:41 UTC
  • Revision ID: james.westby@ubuntu.com-20100720015541-f4j0v8g28tdvp9xj
Tags: 2.8.11.0-0ubuntu2
https://launchpad.net/bugs/559822
https://launchpad.net/bugs/379573
* Merge *some* changes from Debian package (version 2.8.10.1-3). This should
  make merges easier. Also fixes LP: #559822. Also merged several patches.
* Remove debian/patches/editra_pixmaps.dpatch patch, we don't ship editra
  anymore.
* Remove files which broke update-alternatives (LP: #379573).
* Switch to format 3.0 (quilt).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-FTBFS.patch
 
1
http://trac.wxwidgets.org/changeset/61009
 
2
http://trac.wxwidgets.org/ticket/10883
 
3
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549770
 
4
 
 
5
--- a/src/gtk/gsockgtk.cpp
 
6
+++ b/src/gtk/gsockgtk.cpp
 
7
@@ -15,8 +15,13 @@
 
8
 #include <stdlib.h>
 
9
 #include <stdio.h>
 
10
 
 
11
+// newer versions of glib define its own GSocket but we unfortunately use this
 
12
+// name in our own (semi-)public header and so can't change it -- rename glib
 
13
+// one instead
 
14
+#define GSocket GlibGSocket
 
15
 #include <gdk/gdk.h>
 
16
 #include <glib.h>
 
17
+#undef GSocket
 
18
 
 
19
 #include "wx/gsocket.h"
 
20
 #include "wx/unix/gsockunx.h"