summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorMichael Hanson <hansonorders@verizon.net>2010-11-20 00:16:15 (GMT)
committerMichael Hanson <hansonorders@verizon.net>2010-11-20 00:16:15 (GMT)
commitdad5dbc91553c4d9c669047cda3defab678b3b44 (patch)
treee5b61b6929e06864b0f3dcffbd7b099eb8871a97 /abs
parent02e7d2d3414c66890be1454c202f877174eeba5a (diff)
downloadlinhes_pkgbuild-dad5dbc91553c4d9c669047cda3defab678b3b44.zip
linhes_pkgbuild-dad5dbc91553c4d9c669047cda3defab678b3b44.tar.gz
linhes_pkgbuild-dad5dbc91553c4d9c669047cda3defab678b3b44.tar.bz2
wxgtk: housekeeping I forgot to do
Diffstat (limited to 'abs')
-rw-r--r--abs/extra/wxgtk/ChangeLog40
-rw-r--r--abs/extra/wxgtk/gsocket.patch18
-rw-r--r--abs/extra/wxgtk/overflow.patch66
3 files changed, 0 insertions, 124 deletions
diff --git a/abs/extra/wxgtk/ChangeLog b/abs/extra/wxgtk/ChangeLog
deleted file mode 100644
index ac2030d..0000000
--- a/abs/extra/wxgtk/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-2009-10-20 Eric Belanger <eric@archlinux.org>
-
- * wxgtk 2.8.10.1-5
- * Added mediactrl support (close FS#15377)
- * Added glib2 build patch
- * Improved description
-
-2009-07-11 Eric Belanger <eric@archlinux.org>
-
- * wxgtk 2.8.10.1-4
- * Added security fix (close FS#15469)
-
-2009-05-21 Eric Belanger <eric@archlinux.org>
-
- * wxgtk 2.8.10.1-1
- * Upstream update
-
-2009-05-05 Eric Belanger <eric@archlinux.org>
-
- * wxgtk 2.8.10-1
- * Upstream update
-
-2009-03-06 Eric Belanger <eric@archlinux.org>
-
- * wxgtk 2.8.9.2-1
- * Upstream update
- * Switched to wxpython source tarball
-
-2008-09-26 Eric Belanger <eric@archlinux.org>
-
- * wxgtk 2.8.9-1
- * Upstream update
- * Added mediactrl support (close FS#11220)
-
-2008-07-05 Eric Belanger <eric@archlinux.org>
-
- * wxgtk 2.8.8-1
- * Upstream update
- * Enabled gnomeprint - needed for wxpython to build
- * Added ChangeLog
diff --git a/abs/extra/wxgtk/gsocket.patch b/abs/extra/wxgtk/gsocket.patch
deleted file mode 100644
index 0f1fc7b..0000000
--- a/abs/extra/wxgtk/gsocket.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: 2.8/src/gtk/gsockgtk.cpp
-===================================================================
---- 2.8/src/gtk/gsockgtk.cpp (revision 60599)
-+++ 2.8/src/gtk/gsockgtk.cpp (working copy)
-@@ -15,8 +15,13 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+// newer versions of glib define its own GSocket but we unfortunately use this
-+// name in our own (semi-)public header and so can't change it -- rename glib
-+// one instead
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
-
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
diff --git a/abs/extra/wxgtk/overflow.patch b/abs/extra/wxgtk/overflow.patch
deleted file mode 100644
index 543bdff..0000000
--- a/abs/extra/wxgtk/overflow.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp
-===================================================================
---- /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp (revision 53479)
-+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp (revision 60875)
-@@ -569,5 +569,7 @@
- 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;
-@@ -576,9 +578,5 @@
- {
- 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;
-- }
- }
-
-Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp
-===================================================================
---- /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 48694)
-+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 60876)
-@@ -262,5 +262,4 @@
-
- uint32 w, h;
-- uint32 npixels;
- uint32 *raster;
-
-@@ -276,7 +275,18 @@
- samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
-
-- npixels = w * h;
--
-- raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-+ // guard against integer overflow during multiplication which could result
-+ // in allocating a too small buffer and then overflowing it
-+ const double bytesNeeded = w * h * sizeof(uint32);
-+ if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-+ {
-+ if ( verbose )
-+ wxLogError( _("TIFF: Image size is abnormally big.") );
-+
-+ TIFFClose(tif);
-+
-+ return false;
-+ }
-+
-+ raster = (uint32*) _TIFFmalloc( bytesNeeded );
-
- if (!raster)
-Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp
-===================================================================
---- /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 60876)
-+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 60897)
-@@ -277,5 +277,5 @@
- // guard against integer overflow during multiplication which could result
- // in allocating a too small buffer and then overflowing it
-- const double bytesNeeded = w * h * sizeof(uint32);
-+ const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
- if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
- {