Mercurial > mxe-octave
changeset 4414:1d38ed8aafbd
wxwidgets: update to v3.0.3
* dist-files.mk: remove wxwidgets-1-c++11-related-fixes.patch
* src/wxwidgets.mk: update version, checksum
* src/wxwidgets-1-c++11-related-fixes.patch: removed file
author | John D |
---|---|
date | Wed, 12 Jul 2017 11:14:23 -0400 |
parents | d9eba31bd16b |
children | 29a1845890bd |
files | dist-files.mk src/wxwidgets-1-c++11-related-fixes.patch src/wxwidgets.mk |
diffstat | 3 files changed, 3 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Tue Jul 11 15:07:23 2017 -0400 +++ b/dist-files.mk Wed Jul 12 11:14:23 2017 -0400 @@ -695,7 +695,6 @@ winpcap.mk \ wt-1-fixes.patch \ wt.mk \ - wxwidgets-1-c++11-related-fixes.patch \ wxwidgets-test.cpp \ wxwidgets.mk \ x11.mk \
--- a/src/wxwidgets-1-c++11-related-fixes.patch Tue Jul 11 15:07:23 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -From: Boris Pek <tehnick-8@mail.ru> -Date: Thu, 05 May 2016 19:11:19 +0300 -Subject: [PATCH] fix build with GCC >= 6.x - -diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx ---- a/src/stc/scintilla/src/Editor.cxx -+++ b/src/stc/scintilla/src/Editor.cxx -@@ -10,6 +10,7 @@ - #include <stdio.h> - #include <ctype.h> - #include <assert.h> -+#include <math.h> - - #include <string> - #include <vector> -@@ -5841,9 +5842,9 @@ - } - - static bool Close(Point pt1, Point pt2) { -- if (abs(pt1.x - pt2.x) > 3) -+ if (fabs(pt1.x - pt2.x) > 3) - return false; -- if (abs(pt1.y - pt2.y) > 3) -+ if (fabs(pt1.y - pt2.y) > 3) - return false; - return true; - }
--- a/src/wxwidgets.mk Tue Jul 11 15:07:23 2017 -0400 +++ b/src/wxwidgets.mk Wed Jul 12 11:14:23 2017 -0400 @@ -3,11 +3,11 @@ PKG := wxwidgets $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.2 -$(PKG)_CHECKSUM := 6461eab4428c0a8b9e41781b8787510484dea800 +$(PKG)_VERSION := 3.0.3 +$(PKG)_CHECKSUM := 3525306c926e208d9b0272aaa9c091b8c7264e5b $(PKG)_SUBDIR := wxWidgets-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/wxwindows/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/wxWidgets/wxWidgets/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := libiconv libpng jpeg tiff sdl zlib expat define $(PKG)_UPDATE