diff options
| -rw-r--r-- | src/wxwidgets-1-png.patch | 39 | ||||
| -rw-r--r-- | src/wxwidgets.mk | 4 |
2 files changed, 2 insertions, 41 deletions
diff --git a/src/wxwidgets-1-png.patch b/src/wxwidgets-1-png.patch deleted file mode 100644 index 640c00e..0000000 --- a/src/wxwidgets-1-png.patch +++ /dev/null @@ -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;
- }
-
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index aaa93c3..b9cad12 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -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/ |