From 820eb2536c0bd0ccdf7c96ef46c218260939c3bd Mon Sep 17 00:00:00 2001
From: arch1t3cht <arch1t3cht@gmail.com>
Date: Wed, 22 Jan 2025 01:02:04 +0100
Subject: [PATCH] Bump minimum wxWidgets version to 3.2.2

This is what Debian stable currently ships. Bumping to 3.2.2 in
particular brings a lot of improvements for high DPI support, which will
be necessary for upcoming commits.
---
 meson.build                | 12 ++++--------
 meson_options.txt          |  2 +-
 subprojects/wxWidgets.wrap |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/meson.build b/meson.build
index 19a49fdfed..9d4763a22a 100644
--- a/meson.build
+++ b/meson.build
@@ -127,11 +127,7 @@ endif
 
 deps += dependency('zlib')
 
-wx_minver = '>=' + get_option('wx_version')
-if host_machine.system() == 'darwin'
-    wx_minver = '>=3.1.0'
-endif
-wx_dep = dependency('wxWidgets', version: wx_minver,
+wx_dep = dependency('wxWidgets', version: '>=' + get_option('wx_version'),
                     required: false,
                     modules: ['std', 'stc', 'gl'])
 
@@ -148,10 +144,10 @@ else
     endif
 
     opt_var = cmake.subproject_options()
-    opt_var.set_override_option('cpp_std', 'c++14')
+    opt_var.set_override_option('cpp_std', 'c++20')
     opt_var.add_cmake_defines({
         'wxBUILD_INSTALL': false,
-        'wxBUILD_PRECOMP': false,       # otherwise breaks project generation w/ meson
+        'wxBUILD_PRECOMP': 'OFF',       # otherwise breaks project generation w/ meson
         'wxBUILD_SHARED': build_shared,
 
         'wxUSE_WEBVIEW': false,         # breaks build on linux
@@ -263,7 +259,7 @@ if host_machine.system() == 'windows' and cc.has_header('dwrite_3.h')
 endif
 
 if host_machine.system() == 'darwin'
-    frameworks_dep = dependency('appleframeworks', modules : ['CoreText', 'CoreFoundation', 'AppKit', 'Carbon', 'IOKit'])
+    frameworks_dep = dependency('appleframeworks', modules : ['CoreText', 'CoreFoundation', 'AppKit', 'Carbon', 'IOKit', 'QuartzCore'])
     deps += frameworks_dep
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 1c29cd3b33..f46373529d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -16,7 +16,7 @@ option('csri', type: 'feature', description: 'CSRI support')
 option('system_luajit', type: 'boolean', value: false, description: 'Force using system luajit')
 option('local_boost', type: 'boolean', value: false, description: 'Force using locally compiled Boost')
 
-option('wx_version', type: 'string', value: '3.0.0', description: 'The minimum wxWidgets version to use')
+option('wx_version', type: 'string', value: '3.2.2', description: 'The minimum wxWidgets version to use')
 
 option('credit', type: 'string', value: '', description: 'Build credit shown in program title')
 option('official_release', type: 'boolean', value: false, description: 'Set on official builds')
diff --git a/subprojects/wxWidgets.wrap b/subprojects/wxWidgets.wrap
index 949a03927c..e6947e6a92 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.1.4
+revision = v3.2.2
 clone-recursive = true