From f7499aa87c5542fe6ca602dc21f9b016d638e8bf Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <stahta01@gmail.com>
Date: Mon, 19 Sep 2022 22:34:26 -0400
Subject: [PATCH] wxwidgets3.2: Update to version 3.2.1

---
 ...-wxWidgets-3.2.0-Fix-wxGTK-win-build.patch | 13 ------------
 mingw-w64-wxwidgets3.2/PKGBUILD               | 21 +++----------------
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 mingw-w64-wxwidgets3.2/101-wxWidgets-3.2.0-Fix-wxGTK-win-build.patch

diff --git a/mingw-w64-wxwidgets3.2/101-wxWidgets-3.2.0-Fix-wxGTK-win-build.patch b/mingw-w64-wxwidgets3.2/101-wxWidgets-3.2.0-Fix-wxGTK-win-build.patch
deleted file mode 100644
index c56a53fa5d..0000000000
--- a/mingw-w64-wxwidgets3.2/101-wxWidgets-3.2.0-Fix-wxGTK-win-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
-index 3d6e64586842..0bb7daa65b44 100644
---- a/src/generic/splitter.cpp
-+++ b/src/generic/splitter.cpp
-@@ -80,7 +80,7 @@ static bool IsLive(wxSplitterWindow* wnd)
-     return true; // Mac can't paint outside paint event - always need live mode
- #else
-     // wxClientDC doesn't work with Wayland neither, so check if we're using it.
--    #if defined(__WXGTK3__)
-+    #if defined(__WXGTK3__) && defined(__UNIX__)
-         switch ( wxGetDisplayInfo().type )
-         {
-             case wxDisplayNone:
diff --git a/mingw-w64-wxwidgets3.2/PKGBUILD b/mingw-w64-wxwidgets3.2/PKGBUILD
index 916db9cfd2..244c27eaab 100644
--- a/mingw-w64-wxwidgets3.2/PKGBUILD
+++ b/mingw-w64-wxwidgets3.2/PKGBUILD
@@ -13,8 +13,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-common"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3-libs"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3")
-pkgver=${_wx_basever}.0
-pkgrel=3
+pkgver=${_wx_basever}.1
+pkgrel=1
 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' 'clangarm64')
@@ -37,12 +37,6 @@ options=('strip' 'staticlibs' 'buildflags' '!debug')
 source=(
   https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}${_wx_buildver}/${_realname}-${pkgver}${_wx_buildver}.tar.bz2
 
-  # See https://github.com/wxWidgets/wxWidgets/pull/22651
-  https://github.com/wxWidgets/wxWidgets/commit/0e57ed18518d0417759346541dd3c60e1f3e5e8e.diff
-
-  # https://github.com/wxWidgets/wxWidgets/pull/22633
-  101-wxWidgets-3.2.0-Fix-wxGTK-win-build.patch
-
   # This patch is a MSys2 run-time patch
   001-wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch
 
@@ -52,22 +46,13 @@ source=(
   # This is needed to build clang samples in check step
   010-wxWidgets-3.1.6-Redo-manifest-filename-logic.patch
 )
-sha256sums=('356e9b55f1ae3d58ae1fed61478e9b754d46b820913e3bfbc971c50377c1903a'
-            'b2bf64c484dfd37631ce7faa9d36bbfddd5746ff5679db7c7ee9b85cc0080285'
-            'c9cd9120948a2216e6d3f46538eeacb5235678911b30c48336ee5074e7cf9840'
+sha256sums=('c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66'
             '2b3b183a6a76ad539abc49a41033aa923c13b395c0e55189ba962068781c7135'
             '4a4828f0c9cdc638cffde6a30b5dfb14283719acc9e89e19de8ec2d5a80a5aec'
             'b30100e03f350e14060923781c3c7979735cc81996a13012bef980a23eb3d20b')
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}${_wx_buildver}
 
-  # AUI floatpane drifting on Windows fixed in master PR #22651
-  patch -p1 -i "${srcdir}"/0e57ed18518d0417759346541dd3c60e1f3e5e8e.diff
-
-  # https://github.com/wxWidgets/wxWidgets/pull/22633
-  # PR waiting to be applied
-  patch -p1 -i "${srcdir}"/101-wxWidgets-3.2.0-Fix-wxGTK-win-build.patch
-
   # Fix MSys2 Run-Time wx-config bug.
   patch -p1 -i "${srcdir}"/001-wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch