diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-01-05 04:12:10 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-01-05 04:12:10 (GMT) |
| commit | 7a32ea7c2aaa460fe40f7e225cf06c8add9de1d0 (patch) | |
| tree | 5c2567d52e1d51479191861a9cae591cb8409eaf | |
| parent | 3df3bc1a513d9246c9b4dc4ce0509455e225f539 (diff) | |
| parent | 74f59a59684f40636dea29a371b821e138811318 (diff) | |
| download | mxe-7a32ea7c2aaa460fe40f7e225cf06c8add9de1d0.zip mxe-7a32ea7c2aaa460fe40f7e225cf06c8add9de1d0.tar.gz mxe-7a32ea7c2aaa460fe40f7e225cf06c8add9de1d0.tar.bz2 | |
Merge pull request #113 from schloegl/master
upgrade to wxwidgets 2.9.4 and fix built for x86_64 target
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | src/wxwidgets-1-fixes.patch | 11 | ||||
| -rw-r--r-- | src/wxwidgets.mk | 6 |
3 files changed, 15 insertions, 4 deletions
@@ -2113,7 +2113,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="wxwidgets-package">wxwidgets</td> - <td id="wxwidgets-version">2.8.12</td> + <td id="wxwidgets-version">2.9.4</td> <td id="wxwidgets-website"><a href="http://www.wxwidgets.org/">wxWidgets</a></td> </tr> <tr> diff --git a/src/wxwidgets-1-fixes.patch b/src/wxwidgets-1-fixes.patch new file mode 100644 index 0000000..33329b6 --- /dev/null +++ b/src/wxwidgets-1-fixes.patch @@ -0,0 +1,11 @@ +--- ./src/msw/textctrl.cpp 2013-01-02 21:47:03.000000000 +0100 ++++ ./src/msw/textctrl.cpp 2013-01-02 21:46:53.000000000 +0100 +@@ -992,7 +992,7 @@ + + EDITSTREAM eds; + wxZeroMemory(eds); +- eds.dwCookie = (DWORD)&data; ++ eds.dwCookie = (DWORD_PTR)&data; + eds.pfnCallback = wxRichEditStreamOut; + + ::SendMessage diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index f591692..72eaf0b 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -3,9 +3,9 @@ PKG := wxwidgets $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 39552f3e49341197fea8373824ec609c757e890b -$(PKG)_SUBDIR := wxMSW-$($(PKG)_VERSION) -$(PKG)_FILE := wxMSW-$($(PKG)_VERSION).tar.bz2 +$(PKG)_CHECKSUM := 5a34ddf19d37c741f74652ee847df9568a8b81e1 +$(PKG)_SUBDIR := wxWidgets-$($(PKG)_VERSION) +$(PKG)_FILE := wxWidgets-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/wxwindows/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv libpng jpeg tiff sdl zlib expat |