[arch-commits] Commit in wxgtk/trunk (ChangeLog PKGBUILD gsocket.patch overflow.patch)
Eric Bélanger
eric at archlinux.org
Sun May 9 00:49:47 UTC 2010
Date: Saturday, May 8, 2010 @ 20:49:47
Author: eric
Revision: 79883
upgpkg: wxgtk 2.8.11-1
Upstream update, Removed old patches
Modified:
wxgtk/trunk/ChangeLog
wxgtk/trunk/PKGBUILD
Deleted:
wxgtk/trunk/gsocket.patch
wxgtk/trunk/overflow.patch
----------------+
ChangeLog | 6 +++++
PKGBUILD | 35 ++++++++++++++---------------
gsocket.patch | 18 ---------------
overflow.patch | 66 -------------------------------------------------------
4 files changed, 23 insertions(+), 102 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-05-08 18:43:04 UTC (rev 79882)
+++ ChangeLog 2010-05-09 00:49:47 UTC (rev 79883)
@@ -1,3 +1,9 @@
+2010-05-08 Eric Belanger <eric at archlinux.org>
+
+ * wxgtk 2.8.11-1
+ * Upstream update
+ * Removed old patches
+
2010-05-01 Ionut Biru <ibiru at archlinux.org>
* wxgtk 2.8.10.1-7
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-08 18:43:04 UTC (rev 79882)
+++ PKGBUILD 2010-05-09 00:49:47 UTC (rev 79883)
@@ -5,37 +5,36 @@
# with help from J. Santiago Hirschfeld <jsantiagoh at yahoo.com.ar> aka Angelus
pkgname=wxgtk
-pkgver=2.8.10.1
-pkgrel=7
+pkgver=2.8.11
+pkgrel=1
pkgdesc="GTK+ implementation of wxWidgets API for GUI"
arch=('i686' 'x86_64')
url="http://wxwidgets.org"
license=('custom:wxWindows')
-depends=('gtk2' 'mesa' 'gstreamer0.10-base')
-makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'ccache')
+depends=('gtk2' 'gstreamer0.10-base' 'libgl')
+makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'ccache' 'mesa')
options=('ccache') # required to build libwx_gtk2u_mmedia
-#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 \
- overflow.patch gsocket.patch)
-md5sums=('65d5ef166f23fe8b4c67f58df164f93e' '325dba65152bc0cfbc1400a2bf54508e'\
- 'b56113a94125e4f9a3cc2680052bdfde')
-sha1sums=('6598fbafd979a91f20100171fa23a91779f6dc62' '7c4d1d507aad0b7c25a0de55234be42ea3e3f55f'\
- '5b0e985afd77153e8e4b9e14987d4b1a9de53acc')
+#source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
+md5sums=('6040933d200037f90f6aa1c5169e7ec6')
+sha1sums=('e979d9d2b1ee5bd10e90fd00b02f3306327c661a')
build() {
- cd "${srcdir}/wxPython-src-${pkgver}"
-# cd "${srcdir}/wxGTK-${pkgver}"
- patch -p4 < ../overflow.patch || return 1
- patch -p1 < ../gsocket.patch || return 1
- sed -i -e 's:png_check_sig:png_sig_cmp:g' configure
+# cd "${srcdir}/wxPython-src-${pkgver}"
+ cd "${srcdir}/wxGTK-${pkgver}"
./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
--enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \
- --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys|| return 1
+ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys || return 1
make || return 1
make -C locale allmo || return 1
- make DESTDIR="${pkgdir}" install || return 1
cd contrib/src
make || return 1
+}
+
+package() {
+ cd "${srcdir}/wxGTK-${pkgver}"
make DESTDIR="${pkgdir}" install || return 1
+ cd contrib/src
+ make DESTDIR="${pkgdir}" install || return 1
install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
}
Deleted: gsocket.patch
===================================================================
--- gsocket.patch 2010-05-08 18:43:04 UTC (rev 79882)
+++ gsocket.patch 2010-05-09 00:49:47 UTC (rev 79883)
@@ -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"
Deleted: overflow.patch
===================================================================
--- overflow.patch 2010-05-08 18:43:04 UTC (rev 79882)
+++ overflow.patch 2010-05-09 00:49:47 UTC (rev 79883)
@@ -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 */ )
- {
More information about the arch-commits
mailing list