diff --git a/mingw-w64-wxWidgets3.1/023-wxWidgets-3.1.2-setup-wxUSE_GRAPHICS_DIRECT2D.patch b/mingw-w64-wxWidgets3.1/023-wxWidgets-3.1.2-setup-wxUSE_GRAPHICS_DIRECT2D.patch
deleted file mode 100644
index 9748a4cf26..0000000000
--- a/mingw-w64-wxWidgets3.1/023-wxWidgets-3.1.2-setup-wxUSE_GRAPHICS_DIRECT2D.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From b206fab883c3063f393908afac6e00591ca05f9d Mon Sep 17 00:00:00 2001
-From: Tim Stahlhut <stahta01@gmail.com>
-Date: Fri, 31 May 2019 00:44:59 -0400
-Subject: Setup wxUSE_GRAPHICS_DIRECT2D
-
----
- build/cmake/setup.h.in     | 2 +-
- include/wx/gtk/setup.h     | 2 +-
- include/wx/msw/setup.h     | 2 +-
- include/wx/msw/setup_inc.h | 2 +-
- setup.h.in                 | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
-index 2b5c6a29a1..244f695500 100644
---- a/build/cmake/setup.h.in
-+++ b/build/cmake/setup.h.in
-@@ -668,7 +668,7 @@
- 
- #define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
- 
--#if defined(_MSC_VER) && _MSC_VER >= 1600
-+#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) )
-     #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
- #else
-     #cmakedefine01 wxUSE_GRAPHICS_DIRECT2D
-diff --git a/include/wx/gtk/setup.h b/include/wx/gtk/setup.h
-index 8355fbf4b3..0358364736 100644
---- a/include/wx/gtk/setup.h
-+++ b/include/wx/gtk/setup.h
-@@ -1580,7 +1580,7 @@
- // Recommended setting: 1 for faster and better quality graphics under Windows
- // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
- // systems will fall back on using GDI+).
--#if defined(_MSC_VER) && _MSC_VER >= 1600
-+#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) )
-     #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
- #else
-     #define wxUSE_GRAPHICS_DIRECT2D 0
-diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
-index 22ba9acf3b..46a3825b0c 100644
---- a/include/wx/msw/setup.h
-+++ b/include/wx/msw/setup.h
-@@ -1580,7 +1580,7 @@
- // Recommended setting: 1 for faster and better quality graphics under Windows
- // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
- // systems will fall back on using GDI+).
--#if defined(_MSC_VER) && _MSC_VER >= 1600
-+#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) )
-     #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
- #else
-     #define wxUSE_GRAPHICS_DIRECT2D 0
-diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h
-index c764432c9d..eca28b9486 100644
---- a/include/wx/msw/setup_inc.h
-+++ b/include/wx/msw/setup_inc.h
-@@ -30,7 +30,7 @@
- // Recommended setting: 1 for faster and better quality graphics under Windows
- // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
- // systems will fall back on using GDI+).
--#if defined(_MSC_VER) && _MSC_VER >= 1600
-+#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) )
-     #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
- #else
-     #define wxUSE_GRAPHICS_DIRECT2D 0
-diff --git a/setup.h.in b/setup.h.in
-index b2491c00df..ea2a32b1da 100644
---- a/setup.h.in
-+++ b/setup.h.in
-@@ -668,7 +668,7 @@
- 
- #define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
- 
--#if defined(_MSC_VER) && _MSC_VER >= 1600
-+#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) )
-     #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
- #else
-     #define wxUSE_GRAPHICS_DIRECT2D 0
--- 
diff --git a/mingw-w64-wxWidgets3.1/PKGBUILD b/mingw-w64-wxWidgets3.1/PKGBUILD
index 336f3fc4f2..1002f251c8 100644
--- a/mingw-w64-wxWidgets3.1/PKGBUILD
+++ b/mingw-w64-wxWidgets3.1/PKGBUILD
@@ -19,7 +19,7 @@ _wx_buildver=
 pkgbase=mingw-w64-${_basename}${_wx_basever}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}${_wx_basever}"
 pkgver=${_wx_basever}.5
-pkgrel=4
+pkgrel=5
 pkgdesc="A C++ library that lets developers create applications for Windows, Linux and UNIX (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -33,6 +33,7 @@ makedepends=(
   "${MINGW_PACKAGE_PREFIX}-libtiff"
 )
 options=('strip' 'staticlibs' 'buildflags' '!debug')
+#options=('!strip' 'staticlibs' 'buildflags' '!debug') # Best options for debugging CodeLite crashes
 source=(
   https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}${_wx_buildver}/${_basename}-${pkgver}${_wx_buildver}.tar.bz2
 
@@ -41,14 +42,10 @@ source=(
 
   # the wxTeam rejected this patch
   005-wxWidgets-3.1.3-Remove-WX_LIBS_STATIC-from-m4.patch
-
-  # Patches that I hope to have added to git master branch
-  023-wxWidgets-3.1.2-setup-wxUSE_GRAPHICS_DIRECT2D.patch
 )
 sha256sums=('d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224'
             '7c3b8f6ba275a448a5e82d64c4914acd5aefb8bbb952389688f3e7167a787c56'
-            '4a4828f0c9cdc638cffde6a30b5dfb14283719acc9e89e19de8ec2d5a80a5aec'
-            '760d45a284b56c0cd87c834cd7346e70c11ada51035a3ff7f6984fceccfdb932')
+            '4a4828f0c9cdc638cffde6a30b5dfb14283719acc9e89e19de8ec2d5a80a5aec')
 prepare() {
   cd "${srcdir}"/${_basename}-${pkgver}${_wx_buildver}
 
@@ -58,8 +55,6 @@ prepare() {
   # This patch is not really needed; but, WX_LIBS_STATIC does not work correctly under MSys2
   # Removed it to see if anything breaks or if anything is fixed.
   patch -p1 -i "${srcdir}"/005-wxWidgets-3.1.3-Remove-WX_LIBS_STATIC-from-m4.patch
-
-  patch -p1 -i "${srcdir}"/023-wxWidgets-3.1.2-setup-wxUSE_GRAPHICS_DIRECT2D.patch
 }
 
 build() {
@@ -87,13 +82,18 @@ build() {
   #   --disable-mediactrl
   ####
 
-# Remove the -O and -g options to avoid configuration warnings
-# from the normal settings found in /etc/makepkg_mingw??.conf
-  unset CFLAGS
-  unset CXXFLAGS
-  CFLAGS="-march=${CARCH} -mtune=generic -pipe"
-  CXXFLAGS="-march=${CARCH} -mtune=generic -pipe"
-  #echo "CXXFLAGS := ${CXXFLAGS}"
+  if check_option "buildflags" "y"; then
+  # Remove the -O and -ggdb options to avoid configuration warnings
+  # from the normal settings found in /etc/makepkg_mingw??.conf
+
+    CXXFLAGS=${CXXFLAGS/-Og }
+    CXXFLAGS=${CXXFLAGS/-O2 }
+    CXXFLAGS=${CXXFLAGS/-ggdb }
+
+    CFLAGS=${CFLAGS/-Og }
+    CFLAGS=${CFLAGS/-O2 }
+    CFLAGS=${CFLAGS/-ggdb }
+  fi
 
   local -a _debug_options=()
 
@@ -190,6 +190,13 @@ package() {
   cd "${srcdir}"/build-${CARCH}-shared
   make DESTDIR="${pkgdir}" install
 
+  # Replace real full path with psuedo full path;
+  # this seems to be needed sometime, but not always.
+  local MINGW_PREFIX_WIN=$(cygpath -am ${MINGW_PREFIX})
+  sed -s "s|-L${MINGW_PREFIX_WIN}/lib|-L${MINGW_PREFIX}/lib|g" -i "${pkgdir}${MINGW_PREFIX}/bin/wx-config"
+  sed -s "s|-L${MINGW_PREFIX_WIN}/lib|-L${MINGW_PREFIX}/lib|g" -i "${pkgdir}${MINGW_PREFIX}/lib/wx/config/msw-unicode-${_wx_basever}"
+  sed -s "s|-L${MINGW_PREFIX_WIN}/lib|-L${MINGW_PREFIX}/lib|g" -i "${pkgdir}${MINGW_PREFIX}/lib/wx/config/msw-unicode-static-${_wx_basever}"
+
   # Rename files
   mv ${pkgdir}${MINGW_PREFIX}/bin/wx-config{,-${_wx_basever}}
   mv ${pkgdir}${MINGW_PREFIX}/share/aclocal/wxwin.m4 ${pkgdir}${MINGW_PREFIX}/share/aclocal/wxwin${_wx_basever}.m4