Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (49aff33efe3339e1927cb919e97c5a7b21aeb5f6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (49aff33efe3339e1927cb919e97c5a7b21aeb5f6)
  • Date: Wed, 19 May 2010 02:20:39 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/dbd-interbase/HISTORY | 3
database/dbd-interbase/Makefile.PL.bz2 |binary
perl-cpan/alien-wxwidgets/DEPENDS | 1
perl-cpan/alien-wxwidgets/DETAILS | 4
perl-cpan/alien-wxwidgets/HISTORY | 4
perl-cpan/dbi/DETAILS | 4
perl-cpan/dbi/HISTORY | 3
perl-cpan/file-next/DETAILS | 4
perl-cpan/file-next/HISTORY | 3
perl-cpan/html-parser/DETAILS | 4
perl-cpan/html-parser/HISTORY | 3
perl-cpan/lwp/DETAILS | 4
perl-cpan/lwp/HISTORY | 3
x11-toolkits/wxgtk/DEPENDS | 4
x11-toolkits/wxgtk/DETAILS | 5
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
------------------
19 files changed, 40 insertions(+), 538 deletions(-)

New commits:
commit 49aff33efe3339e1927cb919e97c5a7b21aeb5f6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dbd-interbase - fix build with latest perl

commit ca51329e75fd0d71ff843def6a9dc504731c0f99
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dbi: => 1.611

commit 2703721206fe804554858c78ce36177a1c0392dc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

lwp: => 5.836

commit 5e92ce843f5463169a9833f1b9d7badded574494
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

html-parser: => 3.65

commit 5177921479bafa8252c08e9dd979b413ecb3f12d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

file-next: => 1.06

commit 9c2d2d69bfe78bb1872a5404daad56996d0c8eca
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wxgtk: => 2.8.11

commit 84239262a97e08fae349c3cab3f09eeb9ae4f1cc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

alien-wxwidgets: => 0.51

diff --git a/database/dbd-interbase/HISTORY b/database/dbd-interbase/HISTORY
index 6da9ec7..064e37f 100644
--- a/database/dbd-interbase/HISTORY
+++ b/database/dbd-interbase/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * Makefile.PL.bz2: updated, fix for latest perl
+
2010-01-30 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: firebird => FIREBIRD

diff --git a/database/dbd-interbase/Makefile.PL.bz2
b/database/dbd-interbase/Makefile.PL.bz2
index ffde591..fefd977 100644
Binary files a/database/dbd-interbase/Makefile.PL.bz2 and
b/database/dbd-interbase/Makefile.PL.bz2 differ
diff --git a/perl-cpan/alien-wxwidgets/DEPENDS
b/perl-cpan/alien-wxwidgets/DEPENDS
index 6263eb3..f8ed3cc 100755
--- a/perl-cpan/alien-wxwidgets/DEPENDS
+++ b/perl-cpan/alien-wxwidgets/DEPENDS
@@ -1,2 +1,3 @@
depends perl &&
+depends g++ &&
depends extutils-cbuilder
diff --git a/perl-cpan/alien-wxwidgets/DETAILS
b/perl-cpan/alien-wxwidgets/DETAILS
index acd215a..1aee8d8 100755
--- a/perl-cpan/alien-wxwidgets/DETAILS
+++ b/perl-cpan/alien-wxwidgets/DETAILS
@@ -1,7 +1,7 @@
SPELL=alien-wxwidgets
SNAME=Alien-wxWidgets
- VERSION=0.50
-
SOURCE_HASH=sha512:96508af5d6a7986edfbf51ebd93b2e44660c5f2b0b007a8523df8915be0bd6e8cf4b3df7710f38ba46a8591e06d6a350d6cec497c2e35c4f463fa2f9057702b6
+ VERSION=0.51
+
SOURCE_HASH=sha512:910334756631c47d118afa057450869a3052312556190a99a359ef1946438571e238a552f0fc6ffe76924cb4f4aac77c118a0812b42e2f5cdb265287a7949701
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MB/MBARBON/$SOURCE
diff --git a/perl-cpan/alien-wxwidgets/HISTORY
b/perl-cpan/alien-wxwidgets/HISTORY
index 9936f8b..9364203 100644
--- a/perl-cpan/alien-wxwidgets/HISTORY
+++ b/perl-cpan/alien-wxwidgets/HISTORY
@@ -1,3 +1,7 @@
+2010-05-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.51
+ * DEPENDS: add g++
+
2010-03-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.50

diff --git a/perl-cpan/dbi/DETAILS b/perl-cpan/dbi/DETAILS
index 0d4e3dc..d00e153 100755
--- a/perl-cpan/dbi/DETAILS
+++ b/perl-cpan/dbi/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbi
- VERSION=1.609
-
SOURCE_HASH=sha512:f234eb6d7c739411c5eced4037fcde86f28b9f14043a6d9855254c3f097b2d622a78caa984ee67c5e2f507b942881db964a9089231486676c5ea6d8b671eba3f
+ VERSION=1.611
+
SOURCE_HASH=sha512:65011c2cf8c7031bf4b737475a35b8aeeba68d02b991d4108d706f163906f0038183ab896de5382e557ee76231eecbc7c982fc42c267472970f4211b0ddceb09
SOURCE=DBI-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBI-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/TIMB/$SOURCE
diff --git a/perl-cpan/dbi/HISTORY b/perl-cpan/dbi/HISTORY
index 11f1d01..ba29b00 100644
--- a/perl-cpan/dbi/HISTORY
+++ b/perl-cpan/dbi/HISTORY
@@ -1,3 +1,6 @@
+2010-05-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.611
+
2009-06-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.609

diff --git a/perl-cpan/file-next/DETAILS b/perl-cpan/file-next/DETAILS
index 45adaf9..de43475 100755
--- a/perl-cpan/file-next/DETAILS
+++ b/perl-cpan/file-next/DETAILS
@@ -1,7 +1,7 @@
SPELL=file-next
SPELLX=File-Next
- VERSION=1.02
-
SOURCE_HASH=sha512:ed2521438b449887438b9507cc42a22ecff153d910bf4b90ce6255bcf828cde3be6e6e6e99e8315c16c34ca8c4ce29cb0a7e396d33d0f0e228037d178ccc4883
+ VERSION=1.06
+
SOURCE_HASH=sha512:f21a17f496bc83da556d9f012746891be7f83168854694abf18056c45f3de8d62635064faf894665780511ac5f3e8116c8a5a9a947eb82e2cb1088f195854a51
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://search.cpan.org/~petdance
diff --git a/perl-cpan/file-next/HISTORY b/perl-cpan/file-next/HISTORY
index 2c1c466..bb10d49 100644
--- a/perl-cpan/file-next/HISTORY
+++ b/perl-cpan/file-next/HISTORY
@@ -1,3 +1,6 @@
+2010-05-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.06
+
2009-01-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.02
spell created
diff --git a/perl-cpan/html-parser/DETAILS b/perl-cpan/html-parser/DETAILS
index 2ca92a7..f0499f9 100755
--- a/perl-cpan/html-parser/DETAILS
+++ b/perl-cpan/html-parser/DETAILS
@@ -1,6 +1,6 @@
SPELL=html-parser
- VERSION=3.64
-
SOURCE_HASH=sha512:287caeaaa49d7880b21abc9b0fbd5ae0ab2726f82ba378b0fa417c1ca6927144ef099d5134e26430670dcbd75f03edd8298661daa84bce8990bbaa5408cdf577
+ VERSION=3.65
+
SOURCE_HASH=sha512:873f36abee1c16827de9ad5904e4e3f4e6d7f739a1e69345deb4ea8fcc1cd32e8a706db13e3c51fa2ca1869ec295dd981e524f671ea4e4f547795d1fb74d8623
SOURCE=HTML-Parser-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/HTML-Parser-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GA/GAAS/$SOURCE
diff --git a/perl-cpan/html-parser/HISTORY b/perl-cpan/html-parser/HISTORY
index 38843e3..8bd56ce 100644
--- a/perl-cpan/html-parser/HISTORY
+++ b/perl-cpan/html-parser/HISTORY
@@ -1,3 +1,6 @@
+2010-06=18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.65
+
2010-03-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.64

diff --git a/perl-cpan/lwp/DETAILS b/perl-cpan/lwp/DETAILS
index 2a8af49..98087ec 100755
--- a/perl-cpan/lwp/DETAILS
+++ b/perl-cpan/lwp/DETAILS
@@ -1,6 +1,6 @@
SPELL=lwp
- VERSION=5.834
-
SOURCE_HASH=sha512:46cf4b5b7be139a8d2b2e3c0597bab27a68e05230ffd055bac2a57b86407aa89cf80d5475eada1dbefd1b60968011f3c317f0d1d0931ad2d9a0805e1d8f57c8f
+ VERSION=5.836
+
SOURCE_HASH=sha512:6ad57f56d4181a497dcc481badcd1329ee9b08c0b6487107968d791035285d1790a08d373c16d37326ee04550862bcc79cfa693587515b49928a37d4d1d77033
SOURCE=libwww-perl-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libwww-perl-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GA/GAAS/$SOURCE
diff --git a/perl-cpan/lwp/HISTORY b/perl-cpan/lwp/HISTORY
index 2f5c2fe..3d9cc58 100644
--- a/perl-cpan/lwp/HISTORY
+++ b/perl-cpan/lwp/HISTORY
@@ -1,3 +1,6 @@
+2010-05-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.836
+
2010-03-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.834

diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 2291965..1317a0e 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -2,8 +2,8 @@ depends g++ &&

depends gtk+2 &&

-depends xorg-libs '--with-x --with-libxpm' &&
-
+depends libx11 '--with-x' &&
+depends libxpm '--with-libxpm' &&
# all of the "depends" below strictly speaking are not required, e.g. we can
# use included library by specifying --with-*=builtin, but we want to use the
# system libraries, so we're saying --with-*[=sys] here.
diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index ddd6cf8..0c319f8 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -1,9 +1,8 @@
SPELL=wxgtk
SPELLX=wxGTK
if [[ "$WX_DEV" == "y" ]];then
- VERSION=2.8.10
-
SOURCE_HASH=sha512:3a007846beff1ccc736d267d66793967350d1eaccc1d4707d7a9133cd5215d53158247a5f1882479a30e156ebcd86affe74633da392b295ad890f3819ca6bea5
- SECURITY_PATCH=1
+ VERSION=2.8.11
+
SOURCE_HASH=sha512:25439876fd3641cd469055681f9ec36ca8fe5bf93b15d98513ff82797945aa8b1ac557345475ceee80ec7d053f926c23592d2cc729af2bf4ff99e3bacc5519e8
else
VERSION=2.6.4

SOURCE_HASH=sha512:53b3a1a111288910b18e3743d8e389398bf7e60cddbf0ad609cd72fa4fbd5da2bb9b3b94427ba7ec9d695fb1cbca5fa79a1836a15c652aebf2ae605b1f93f4c5
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 6d46db4..1044668 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,9 @@
+2010-05-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.8.11
+ * PRE_BUILD: don't patch this version
+ * wxgtk-2.8.10-gsocket.patch: deleted
+ * DEPENDS: xorg-libs =< libx11, libxpm
+
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
diff --git a/x11-toolkits/wxgtk/PRE_BUILD b/x11-toolkits/wxgtk/PRE_BUILD
index 91b0154..3b1d034 100755
--- a/x11-toolkits/wxgtk/PRE_BUILD
+++ b/x11-toolkits/wxgtk/PRE_BUILD
@@ -3,7 +3,4 @@ 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
deleted file mode 100644
index 42392c8..0000000
--- a/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
deleted file mode 100644
index 494be86..0000000
--- a/x11-toolkits/wxgtk/wxgtk-2.8.10-gsocket.patch
+++ /dev/null
@@ -1,461 +0,0 @@
-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
-




Archive powered by MHonArc 2.6.24.

Top of Page