Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (5f49a782cab646a9eef4dbdf47b9ce9474c3bce9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (5f49a782cab646a9eef4dbdf47b9ce9474c3bce9)
  • Date: Wed, 9 Sep 2009 07:08:15 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

x11-toolkits/wxgtk/DETAILS | 1
x11-toolkits/wxgtk/HISTORY | 6
x11-toolkits/wxgtk/PRE_BUILD | 3
x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch | 59 ++
x11-toolkits/wxgtk/wxgtk-2.8.10-gsocket.patch | 461
++++++++++++++++++
5 files changed, 530 insertions(+)

New commits:
commit 9a102e4e30da7c6ba8031f5bf26db3f9b043b1bf
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/wxgtk: fixed security issue (CVE-2009-2369)

commit 506ee571d258f58e7aae16021f104def15e20996
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/wxgtk: added patch to make the spell compile again

diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index 5479a48..ddd6cf8 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -3,6 +3,7 @@
if [[ "$WX_DEV" == "y" ]];then
VERSION=2.8.10

SOURCE_HASH=sha512:3a007846beff1ccc736d267d66793967350d1eaccc1d4707d7a9133cd5215d53158247a5f1882479a30e156ebcd86affe74633da392b295ad890f3819ca6bea5
+ SECURITY_PATCH=1
else
VERSION=2.6.4

SOURCE_HASH=sha512:53b3a1a111288910b18e3743d8e389398bf7e60cddbf0ad609cd72fa4fbd5da2bb9b3b94427ba7ec9d695fb1cbca5fa79a1836a15c652aebf2ae605b1f93f4c5
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index acb1001..6d46db4 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,9 @@
+2009-09-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, wxgtk-2.8.10-gsocket.patch: added patch to make
+ the spell compile with our version of glib
+ * PRE_BUILD, wxGTK-2.8.10.1-CVE-2009-2369.patch, DETAILS:
+ added patch that fixes CVE-2009-2369, set SECURITY_PATCH=1
+
2009-06-08 Treeve Jelbert <treeve AT sourcemage.org>
* PROVIDES: added
* CONFLICTS: add wxgtk-new
diff --git a/x11-toolkits/wxgtk/PRE_BUILD b/x11-toolkits/wxgtk/PRE_BUILD
index 3b1d034..91b0154 100755
--- a/x11-toolkits/wxgtk/PRE_BUILD
+++ b/x11-toolkits/wxgtk/PRE_BUILD
@@ -3,4 +3,7 @@ cd $SOURCE_DIRECTORY &&

if [[ $WX_DEV != y ]]; then
patch -p1 < $SPELL_DIRECTORY/debdiff.patch
+else
+ patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.8.10.1-CVE-2009-2369.patch &&
+ patch -p1 < ${SPELL_DIRECTORY}/wxgtk-2.8.10-gsocket.patch
fi
diff --git a/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch
b/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch
new file mode 100644
index 0000000..42392c8
--- /dev/null
+++ b/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch
@@ -0,0 +1,59 @@
+diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp
wxPython-src-2.8.10.1/src/common/imagpng.cpp
+--- wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp 2008-05-11
22:26:45.000000000 -0600
++++ wxPython-src-2.8.10.1/src/common/imagpng.cpp 2009-07-18
19:54:13.128547627 -0600
+@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image,
+ if (!image->Ok())
+ goto error;
+
+- lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned
char *)) );
++ // initialize all line pointers to NULL to ensure that they can be
safely
++ // free()d if an error occurs before all of them could be allocated
++ lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
+ if ( !lines )
+ goto error;
+
+ for (i = 0; i < height; i++)
+ {
+ if ((lines[i] = (unsigned char *)malloc( (size_t)(width *
(sizeof(unsigned char) * 4)))) == NULL)
+- {
+- for ( unsigned int n = 0; n < i; n++ )
+- free( lines[n] );
+ goto error;
+- }
+ }
+
+ png_read_image( png_ptr, lines );
+diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp
wxPython-src-2.8.10.1/src/common/imagtiff.cpp
+--- wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp 2007-09-21
14:27:05.000000000 -0600
++++ wxPython-src-2.8.10.1/src/common/imagtiff.cpp 2009-07-18
19:54:35.801832862 -0600
+@@ -261,7 +261,6 @@ bool wxTIFFHandler::LoadFile( wxImage *i
+ }
+
+ uint32 w, h;
+- uint32 npixels;
+ uint32 *raster;
+
+ TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
+@@ -275,9 +274,20 @@ bool wxTIFFHandler::LoadFile( wxImage *i
+ (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
+ samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
+
+- npixels = w * h;
++ // guard against integer overflow during multiplication which could
result
++ // in allocating a too small buffer and then overflowing it
++ const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
++ if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
++ {
++ if ( verbose )
++ wxLogError( _("TIFF: Image size is abnormally big.") );
++
++ TIFFClose(tif);
++
++ return false;
++ }
+
+- raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
++ raster = (uint32*) _TIFFmalloc( bytesNeeded );
+
+ if (!raster)
+ {
diff --git a/x11-toolkits/wxgtk/wxgtk-2.8.10-gsocket.patch
b/x11-toolkits/wxgtk/wxgtk-2.8.10-gsocket.patch
new file mode 100644
index 0000000..494be86
--- /dev/null
+++ b/x11-toolkits/wxgtk/wxgtk-2.8.10-gsocket.patch
@@ -0,0 +1,461 @@
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/checklst.cpp
wxGTK-2.8.10/src/gtk/checklst.cpp
+--- wxGTK-2.8.10.orig/src/gtk/checklst.cpp 2009-09-09 13:00:26.444051291
+0200
++++ wxGTK-2.8.10/src/gtk/checklst.cpp 2009-09-09 13:09:57.719509230 +0200
+@@ -17,7 +17,9 @@
+ #include "wx/gtk/private.h"
+ #include "wx/gtk/treeentry_gtk.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+
+
//-----------------------------------------------------------------------------
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/colour.cpp
wxGTK-2.8.10/src/gtk/colour.cpp
+--- wxGTK-2.8.10.orig/src/gtk/colour.cpp 2009-09-09 13:00:26.296233293
+0200
++++ wxGTK-2.8.10/src/gtk/colour.cpp 2009-09-09 13:10:05.992841830 +0200
+@@ -14,7 +14,9 @@
+
+ #include "wx/gtk/private.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+
+
//-----------------------------------------------------------------------------
+ // wxColour
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/dcmemory.cpp
wxGTK-2.8.10/src/gtk/dcmemory.cpp
+--- wxGTK-2.8.10.orig/src/gtk/dcmemory.cpp 2009-09-09 13:00:26.299566494
+0200
++++ wxGTK-2.8.10/src/gtk/dcmemory.cpp 2009-09-09 13:10:14.689507541 +0200
+@@ -12,7 +12,9 @@
+
+ #include "wx/dcmemory.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+
+
//-----------------------------------------------------------------------------
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/dcscreen.cpp
wxGTK-2.8.10/src/gtk/dcscreen.cpp
+--- wxGTK-2.8.10.orig/src/gtk/dcscreen.cpp 2009-09-09 13:00:26.479942581
+0200
++++ wxGTK-2.8.10/src/gtk/dcscreen.cpp 2009-09-09 13:10:26.484662954 +0200
+@@ -16,7 +16,9 @@
+ #include "wx/window.h"
+ #endif
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/dialog.cpp
wxGTK-2.8.10/src/gtk/dialog.cpp
+--- wxGTK-2.8.10.orig/src/gtk/dialog.cpp 2009-09-09 13:00:26.410098837
+0200
++++ wxGTK-2.8.10/src/gtk/dialog.cpp 2009-09-09 13:10:38.459921951 +0200
+@@ -20,7 +20,9 @@
+
+ #include "wx/evtloop.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/gsockgtk.cpp
wxGTK-2.8.10/src/gtk/gsockgtk.cpp
+--- wxGTK-2.8.10.orig/src/gtk/gsockgtk.cpp 2009-09-09 13:00:26.296233293
+0200
++++ wxGTK-2.8.10/src/gtk/gsockgtk.cpp 2009-09-09 13:10:47.456063068 +0200
+@@ -15,8 +15,10 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/listbox.cpp
wxGTK-2.8.10/src/gtk/listbox.cpp
+--- wxGTK-2.8.10.orig/src/gtk/listbox.cpp 2009-09-09 13:00:26.463316585
+0200
++++ wxGTK-2.8.10/src/gtk/listbox.cpp 2009-09-09 13:10:58.601494018 +0200
+@@ -32,7 +32,9 @@
+ #include "wx/tooltip.h"
+ #endif
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/mdi.cpp wxGTK-2.8.10/src/gtk/mdi.cpp
+--- wxGTK-2.8.10.orig/src/gtk/mdi.cpp 2009-09-09 13:00:26.296233293 +0200
++++ wxGTK-2.8.10/src/gtk/mdi.cpp 2009-09-09 13:11:10.309501948 +0200
+@@ -23,8 +23,10 @@
+ #include "wx/notebook.h"
+ #include "wx/gtk/private.h"
+
++#define GSocket GlibGSocket
+ #include <glib.h>
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include "wx/gtk/win_gtk.h"
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/pen.cpp wxGTK-2.8.10/src/gtk/pen.cpp
+--- wxGTK-2.8.10.orig/src/gtk/pen.cpp 2009-09-09 13:00:26.487482771 +0200
++++ wxGTK-2.8.10/src/gtk/pen.cpp 2009-09-09 13:11:22.560018111 +0200
+@@ -16,7 +16,9 @@
+ #include "wx/colour.h"
+ #endif
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+
+
//-----------------------------------------------------------------------------
+ // wxPen
+diff -Naupr wxGTK-2.8.10.orig/src/gtk/popupwin.cpp
wxGTK-2.8.10/src/gtk/popupwin.cpp
+--- wxGTK-2.8.10.orig/src/gtk/popupwin.cpp 2009-09-09 13:00:26.452899826
+0200
++++ wxGTK-2.8.10/src/gtk/popupwin.cpp 2009-09-09 13:11:31.290815154 +0200
+@@ -20,7 +20,9 @@
+ #include "wx/cursor.h"
+ #endif // WX_PRECOMP
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/bitmap.cpp
wxGTK-2.8.10/src/gtk1/bitmap.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/bitmap.cpp 2009-09-09 13:00:23.832900225
+0200
++++ wxGTK-2.8.10/src/gtk1/bitmap.cpp 2009-09-09 13:06:11.866198603 +0200
+@@ -23,7 +23,9 @@
+
+ #include "wx/filefn.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/brush.cpp
wxGTK-2.8.10/src/gtk1/brush.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/brush.cpp 2009-09-09 13:00:23.370005417
+0200
++++ wxGTK-2.8.10/src/gtk1/brush.cpp 2009-09-09 13:06:24.132864099 +0200
+@@ -16,7 +16,9 @@
+ #include "wx/colour.h"
+ #endif
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+
+
//-----------------------------------------------------------------------------
+ // wxBrush
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/checklst.cpp
wxGTK-2.8.10/src/gtk1/checklst.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/checklst.cpp 2009-09-09 13:00:24.749566738
+0200
++++ wxGTK-2.8.10/src/gtk1/checklst.cpp 2009-09-09 13:06:36.083053141 +0200
+@@ -15,7 +15,9 @@
+ #include "wx/checklst.h"
+ #include "wx/gtk1/private.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+
+
//-----------------------------------------------------------------------------
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/clipbrd.cpp
wxGTK-2.8.10/src/gtk1/clipbrd.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/clipbrd.cpp 2009-09-09 13:00:23.339566955
+0200
++++ wxGTK-2.8.10/src/gtk1/clipbrd.cpp 2009-09-09 13:06:49.169938590 +0200
+@@ -20,8 +20,10 @@
+ #include "wx/dataobj.h"
+ #endif
+
++#define GSocket GlibGSocket
+ #include <glib.h>
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+
+
//-----------------------------------------------------------------------------
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/colour.cpp
wxGTK-2.8.10/src/gtk1/colour.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/colour.cpp 2009-09-09 13:00:23.689566774
+0200
++++ wxGTK-2.8.10/src/gtk1/colour.cpp 2009-09-09 13:06:59.551548662 +0200
+@@ -18,7 +18,9 @@
+
+ #include "wx/gtk1/private.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkprivate.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/cursor.cpp
wxGTK-2.8.10/src/gtk1/cursor.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/cursor.cpp 2009-09-09 13:00:23.379566682
+0200
++++ wxGTK-2.8.10/src/gtk1/cursor.cpp 2009-09-09 13:07:08.097026441 +0200
+@@ -17,7 +17,9 @@
+ #include "wx/utils.h"
+ #endif // WX_PRECOMP
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+
+
//-----------------------------------------------------------------------------
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dataobj.cpp
wxGTK-2.8.10/src/gtk1/dataobj.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/dataobj.cpp 2009-09-09 13:00:25.807886309
+0200
++++ wxGTK-2.8.10/src/gtk1/dataobj.cpp 2009-09-09 13:07:17.808666606 +0200
+@@ -23,7 +23,9 @@
+ #include "wx/mstream.h"
+ #include "wx/uri.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+
+ //-------------------------------------------------------------------------
+ // global data
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dcclient.cpp
wxGTK-2.8.10/src/gtk1/dcclient.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/dcclient.cpp 2009-09-09 13:00:24.700932560
+0200
++++ wxGTK-2.8.10/src/gtk1/dcclient.cpp 2009-09-09 13:07:29.259524380 +0200
+@@ -28,7 +28,9 @@
+
+ #include "wx/gtk1/win_gtk.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkprivate.h>
+ #include <gtk/gtk.h>
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dc.cpp wxGTK-2.8.10/src/gtk1/dc.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/dc.cpp 2009-09-09 13:00:24.672899840 +0200
++++ wxGTK-2.8.10/src/gtk1/dc.cpp 2009-09-09 13:07:39.036190063 +0200
+@@ -12,7 +12,9 @@
+
+ #include "wx/dc.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+
+
//-----------------------------------------------------------------------------
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dcmemory.cpp
wxGTK-2.8.10/src/gtk1/dcmemory.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/dcmemory.cpp 2009-09-09 13:00:24.236764536
+0200
++++ wxGTK-2.8.10/src/gtk1/dcmemory.cpp 2009-09-09 13:07:50.597700851 +0200
+@@ -12,7 +12,9 @@
+
+ #include "wx/dcmemory.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+
+
//-----------------------------------------------------------------------------
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dcscreen.cpp
wxGTK-2.8.10/src/gtk1/dcscreen.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/dcscreen.cpp 2009-09-09 13:00:25.832899863
+0200
++++ wxGTK-2.8.10/src/gtk1/dcscreen.cpp 2009-09-09 13:08:07.866187647 +0200
+@@ -16,7 +16,9 @@
+ #include "wx/window.h"
+ #endif
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dialog.cpp
wxGTK-2.8.10/src/gtk1/dialog.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/dialog.cpp 2009-09-09 13:00:24.271183641
+0200
++++ wxGTK-2.8.10/src/gtk1/dialog.cpp 2009-09-09 13:08:18.880334529 +0200
+@@ -20,7 +20,9 @@
+
+ #include "wx/evtloop.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/frame.cpp
wxGTK-2.8.10/src/gtk1/frame.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/frame.cpp 2009-09-09 13:00:23.336233390
+0200
++++ wxGTK-2.8.10/src/gtk1/frame.cpp 2009-09-09 13:12:46.792888514 +0200
+@@ -30,7 +30,9 @@
+ #include "wx/statusbr.h"
+ #endif // WX_PRECOMP
+
++#define GSocket GlibGSocket
+ #include <glib.h>
++#undef GSocket
+ #include "wx/gtk1/private.h"
+
+ #include <gdk/gdkkeysyms.h>
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/gsockgtk.cpp
wxGTK-2.8.10/src/gtk1/gsockgtk.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/gsockgtk.cpp 2009-09-09 13:00:23.689566774
+0200
++++ wxGTK-2.8.10/src/gtk1/gsockgtk.cpp 2009-09-09 13:08:36.662851137 +0200
+@@ -15,8 +15,10 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/listbox.cpp
wxGTK-2.8.10/src/gtk1/listbox.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/listbox.cpp 2009-09-09 13:00:25.782900228
+0200
++++ wxGTK-2.8.10/src/gtk1/listbox.cpp 2009-09-09 13:08:47.052849741 +0200
+@@ -29,7 +29,9 @@
+ #include "wx/tooltip.h"
+ #endif
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/mdi.cpp wxGTK-2.8.10/src/gtk1/mdi.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/mdi.cpp 2009-09-09 13:00:23.800739946 +0200
++++ wxGTK-2.8.10/src/gtk1/mdi.cpp 2009-09-09 13:08:56.206812100 +0200
+@@ -23,8 +23,10 @@
+ #include "wx/notebook.h"
+ #include "wx/gtk1/private.h"
+
++#define GSocket GlibGSocket
+ #include <glib.h>
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include "wx/gtk1/win_gtk.h"
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/minifram.cpp
wxGTK-2.8.10/src/gtk1/minifram.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/minifram.cpp 2009-09-09 13:00:24.819844793
+0200
++++ wxGTK-2.8.10/src/gtk1/minifram.cpp 2009-09-09 13:09:07.377676869 +0200
+@@ -22,7 +22,9 @@
+ #include "wx/gtk1/win_gtk.h"
+ #include "wx/gtk1/private.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gdk/gdkprivate.h>
+ #include <gdk/gdkx.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/pen.cpp wxGTK-2.8.10/src/gtk1/pen.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/pen.cpp 2009-09-09 13:00:25.866325248 +0200
++++ wxGTK-2.8.10/src/gtk1/pen.cpp 2009-09-09 13:09:15.342846791 +0200
+@@ -16,7 +16,9 @@
+ #include "wx/colour.h"
+ #endif
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+
+
//-----------------------------------------------------------------------------
+ // wxPen
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/popupwin.cpp
wxGTK-2.8.10/src/gtk1/popupwin.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/popupwin.cpp 2009-09-09 13:00:24.956567244
+0200
++++ wxGTK-2.8.10/src/gtk1/popupwin.cpp 2009-09-09 13:09:24.590053283 +0200
+@@ -20,7 +20,9 @@
+ #include "wx/cursor.h"
+ #endif // WX_PRECOMP
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/settings.cpp
wxGTK-2.8.10/src/gtk1/settings.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/settings.cpp 2009-09-09 13:00:23.756233537
+0200
++++ wxGTK-2.8.10/src/gtk1/settings.cpp 2009-09-09 13:09:33.916908007 +0200
+@@ -20,7 +20,9 @@
+
+ #include "wx/fontutil.h"
+
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkprivate.h>
+ #include <gtk/gtk.h>
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/tbargtk.cpp
wxGTK-2.8.10/src/gtk1/tbargtk.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/tbargtk.cpp 2009-09-09 13:00:25.832899863
+0200
++++ wxGTK-2.8.10/src/gtk1/tbargtk.cpp 2009-09-09 13:13:02.026157608 +0200
+@@ -27,7 +27,9 @@
+ #include "wx/frame.h"
+ #endif
+
++#define GSocket GlibGSocket
+ #include <glib.h>
++#undef GSocket
+ #include "wx/gtk1/private.h"
+
+ //
----------------------------------------------------------------------------
+diff -Naupr wxGTK-2.8.10.orig/src/gtk1/toplevel.cpp
wxGTK-2.8.10/src/gtk1/toplevel.cpp
+--- wxGTK-2.8.10.orig/src/gtk1/toplevel.cpp 2009-09-09 13:00:25.807886309
+0200
++++ wxGTK-2.8.10/src/gtk1/toplevel.cpp 2009-09-09 13:13:10.386249880 +0200
+@@ -37,8 +37,10 @@
+ #include "wx/gtk1/private.h"
+ #include "wx/evtloop.h"
+
++#define GSocket GlibGSocket
+ #include <glib.h>
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <gdk/gdkx.h>
+diff -Naupr wxGTK-2.8.10.orig/src/unix/fontutil.cpp
wxGTK-2.8.10/src/unix/fontutil.cpp
+--- wxGTK-2.8.10.orig/src/unix/fontutil.cpp 2009-09-09 13:00:27.852899602
+0200
++++ wxGTK-2.8.10/src/unix/fontutil.cpp 2009-09-09 13:11:46.569498482 +0200
+@@ -390,7 +390,9 @@ bool wxGetNativeFontEncoding(wxFontEncod
+ // known not to work at least with Sun CC 6.01
+ #include <time.h>
+
++ #define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++ #undef GSocket
+ #endif
+
+
+diff -Naupr wxGTK-2.8.10.orig/src/unix/taskbarx11.cpp
wxGTK-2.8.10/src/unix/taskbarx11.cpp
+--- wxGTK-2.8.10.orig/src/unix/taskbarx11.cpp 2009-09-09 13:00:27.871904636
+0200
++++ wxGTK-2.8.10/src/unix/taskbarx11.cpp 2009-09-09 13:11:58.949669771
+0200
+@@ -76,7 +76,9 @@
+ //
----------------------------------------------------------------------------
+
+ #if defined(__WXGTK__)
++ #define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++ #undef GSocket
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #define GetDisplay() GDK_DISPLAY()
+diff -Naupr wxGTK-2.8.10.orig/src/unix/utilsx11.cpp
wxGTK-2.8.10/src/unix/utilsx11.cpp
+--- wxGTK-2.8.10.orig/src/unix/utilsx11.cpp 2009-09-09 13:00:28.375125570
+0200
++++ wxGTK-2.8.10/src/unix/utilsx11.cpp 2009-09-09 13:12:10.642829304 +0200
+@@ -36,7 +36,9 @@
+ #endif
+
+ #ifdef __WXGTK__
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
++#undef GSocket
+ #include <gdk/gdkx.h>
+ #endif
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (5f49a782cab646a9eef4dbdf47b9ce9474c3bce9), Florian Franzmann, 09/09/2009

Archive powered by MHonArc 2.6.24.

Top of Page