Mercurial > mxe-octave

changeset 1716:d9063b46f9dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package wxwidgets
author Mark Brand <mabrand@mabrand.nl>
date Mon, 28 Mar 2011 12:47:39 +0200
parents 5c96fd471117
children eb3e1558bf24
files src/wxwidgets-1-png.patch src/wxwidgets.mk
diffstat 2 files changed, 2 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/src/wxwidgets-1-png.patch	Mon Mar 28 01:07:36 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-http://trac.wxwidgets.org/changeset/67009
-Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp
-===================================================================
---- a/src/common/imagpng.cpp (revision 60875)
-+++ b/src/common/imagpng.cpp (revision 67009)
-@@ -530,5 +530,5 @@
-                           (
-                             PNG_LIBPNG_VER_STRING,
--                            (voidp) NULL,
-+                            NULL,
-                             wx_png_error,
-                             wx_png_warning
-@@ -587,14 +587,17 @@
-     if (color_type == PNG_COLOR_TYPE_PALETTE)
-     {
--        const size_t ncolors = info_ptr->num_palette;
-+        int ncolors = 0;
-+        png_colorp palette;
-+        png_get_PLTE( png_ptr, info_ptr, &palette, &ncolors);
-         unsigned char* r = new unsigned char[ncolors];
-         unsigned char* g = new unsigned char[ncolors];
-         unsigned char* b = new unsigned char[ncolors];
--
--        for (size_t j = 0; j < ncolors; j++)
-+        int j;
-+
-+        for (j = 0; j < ncolors; j++)
-         {
--            r[j] = info_ptr->palette[j].red;
--            g[j] = info_ptr->palette[j].green;
--            b[j] = info_ptr->palette[j].blue;
-+            r[j] = palette[j].red;
-+            g[j] = palette[j].green;
-+            b[j] = palette[j].blue;
-         }
- 
--- a/src/wxwidgets.mk	Mon Mar 28 01:07:36 2011 +0200
+++ b/src/wxwidgets.mk	Mon Mar 28 12:47:39 2011 +0200
@@ -4,8 +4,8 @@
 # wxWidgets
 PKG             := wxwidgets
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.11
-$(PKG)_CHECKSUM := fa31e7fdb972baa28d89a7196391a9c1371e5f0e
+$(PKG)_VERSION  := 2.8.12
+$(PKG)_CHECKSUM := 39552f3e49341197fea8373824ec609c757e890b
 $(PKG)_SUBDIR   := wxMSW-$($(PKG)_VERSION)
 $(PKG)_FILE     := wxMSW-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.wxwidgets.org/