From 502295d686d874f90404f328355f999974ce7d60 Mon Sep 17 00:00:00 2001
From: 0tkl <118708188+0tkl@users.noreply.github.com>
Date: Fri, 6 Jun 2025 21:31:03 +0800
Subject: [PATCH 1/4] bump wxWidgets to 3.3.0

---
 subprojects/wxWidgets.wrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subprojects/wxWidgets.wrap b/subprojects/wxWidgets.wrap
index e6947e6a92..9d9ae1f729 100644
--- a/subprojects/wxWidgets.wrap
+++ b/subprojects/wxWidgets.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
 directory = wxWidgets
 url = https://github.com/wxWidgets/wxWidgets.git
-revision = v3.2.2
+revision = v3.3.0
 clone-recursive = true

From f0bff18c0983c5d151570cd4246e5b5e40433633 Mon Sep 17 00:00:00 2001
From: 0tkl <118708188+0tkl@users.noreply.github.com>
Date: Fri, 6 Jun 2025 23:29:00 +0800
Subject: [PATCH 2/4] link to wxlexilla on wxW 3.3 ...

link to libpng on wxW 3.3 + OSX
---
 meson.build | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meson.build b/meson.build
index b79c9e7fe5..48973a46e9 100644
--- a/meson.build
+++ b/meson.build
@@ -166,12 +166,22 @@ else
         wx.dependency('wxscintilla')
     ]
 
+    if get_option('wx_version').version_compare('>=3.3.0')
+        deps += [
+            wx.dependency('wxlexilla'),
+        ]
+    endif
+
     if host_machine.system() == 'windows' or host_machine.system() == 'darwin'
         deps += [
             wx.dependency('wxpng'),
         ]
     endif
 
+    if host_machine.system() == 'darwin' and get_option('wx_version').version_compare('>=3.3.0')
+        deps += dependency('libpng')
+    endif
+
     if host_machine.system() == 'windows'
         deps += [
             wx.dependency('wxzlib'),

From ee1cb9dcc01b0d087e13594ef6456e6f551f30aa Mon Sep 17 00:00:00 2001
From: 0tkl <118708188+0tkl@users.noreply.github.com>
Date: Sat, 7 Jun 2025 00:25:40 +0800
Subject: [PATCH 3/4] Update ci.yml

---
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 836c3b2f67..e09f58e9a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,6 +34,7 @@ jobs:
               -Dfribidi:tests=false
               -Dfribidi:docs=false
               -Dlibass:fontconfig=disabled
+              -Dwx_version='3.3.0'
           #- {
           #  name: Windows MinGW,
           #  os: windows-latest,
@@ -55,13 +56,13 @@ jobs:
             name: macOS Debug,
             os: macos-13,
             buildtype: debugoptimized,
-            args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2
+            args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 -Dwx_version='3.3.0'
           }
           - {
             name: macOS Release,
             os: macos-13,
             buildtype: release,
-            args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2
+            args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 -Dwx_version='3.3.0'
           }
 
     steps:

From e66345b8366e107bc94b12b340c322ab2eb4222b Mon Sep 17 00:00:00 2001
From: 0tkl <118708188+0tkl@users.noreply.github.com>
Date: Wed, 13 Aug 2025 12:01:13 +0800
Subject: [PATCH 4/4] bump wxWidgets to 3.3.1

---
 subprojects/wxWidgets.wrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subprojects/wxWidgets.wrap b/subprojects/wxWidgets.wrap
index 9d9ae1f729..493400a9f1 100644
--- a/subprojects/wxWidgets.wrap
+++ b/subprojects/wxWidgets.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
 directory = wxWidgets
 url = https://github.com/wxWidgets/wxWidgets.git
-revision = v3.3.0
+revision = v3.3.1
 clone-recursive = true