From a5663fa1c7e1837af88c02c95c9f829d60042d9c Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 28 Jul 2013 22:48:08 +1000
Subject: [PATCH] package wxwidgets: enable mingw-w64 builds

---
 src/wxwidgets-1-fixes.patch | 19 +++++++++++++++++++
 src/wxwidgets.mk            | 10 ++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/wxwidgets-1-fixes.patch

diff --git a/src/wxwidgets-1-fixes.patch b/src/wxwidgets-1-fixes.patch
new file mode 100644
index 00000000..70b7d770
--- /dev/null
+++ b/src/wxwidgets-1-fixes.patch
@@ -0,0 +1,19 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -ur wxWidgets-2.9.5.orig/src/msw/textentry.cpp wxWidgets-2.9.5/src/msw/textentry.cpp
+--- wxWidgets-2.9.5.orig/src/msw/textentry.cpp	2013-07-28 20:06:55.000000000 +1000
++++ wxWidgets-2.9.5/src/msw/textentry.cpp	2013-07-28 20:51:37.000000000 +1000
+@@ -34,7 +34,11 @@
+ #include "wx/textcompleter.h"
+ #include "wx/dynlib.h"
+ 
+-#include <initguid.h>
++#ifdef __MINGW64_VERSION_MAJOR
++    #define DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) EXTERN_C const GUID DECLSPEC_SELECTANY name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } }
++#else
++    #include <initguid.h>
++#endif
+ 
+ #include "wx/msw/private.h"
+ 
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk
index 61d29f84..500f2e90 100644
--- a/src/wxwidgets.mk
+++ b/src/wxwidgets.mk
@@ -105,5 +105,11 @@ define $(PKG)_BUILD
     $($(PKG)_TEST)
 endef
 
-$(PKG)_BUILD_i686-w64-mingw32 =
-$(PKG)_BUILD_x86_64-w64-mingw32 =
+define $(PKG)_BUILD_UNICODE_ONLY
+    $($(PKG)_PRE_CONFIGURE)
+    $($(PKG)_BUILD_UNICODE)
+    $($(PKG)_TEST)
+endef
+
+$(PKG)_BUILD_i686-w64-mingw32   = $($(PKG)_BUILD_UNICODE_ONLY)
+$(PKG)_BUILD_x86_64-w64-mingw32 = $($(PKG)_BUILD_UNICODE_ONLY)