diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/boinc_SetItemBitmap.patch b/3rdParty/vcpkg_ports/patches/boinc_SetItemBitmap.patch
similarity index 100%
rename from 3rdParty/vcpkg_ports/ports/mac/wxwidgets/boinc_SetItemBitmap.patch
rename to 3rdParty/vcpkg_ports/patches/boinc_SetItemBitmap.patch
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/boinc_SetVisibilityHidden.patch b/3rdParty/vcpkg_ports/patches/boinc_SetVisibilityHidden.patch
similarity index 66%
rename from 3rdParty/vcpkg_ports/ports/mac/wxwidgets/boinc_SetVisibilityHidden.patch
rename to 3rdParty/vcpkg_ports/patches/boinc_SetVisibilityHidden.patch
index b88bc6a395c..f4e1c563ccf 100644
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/boinc_SetVisibilityHidden.patch
+++ b/3rdParty/vcpkg_ports/patches/boinc_SetVisibilityHidden.patch
@@ -1,9 +1,9 @@
 diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
-index 0bc4f934b9..ec703ad19b 100644
+index 0584ecaeb5..3e0f5feb3e 100644
 --- a/build/cmake/init.cmake
 +++ b/build/cmake/init.cmake
-@@ -12,6 +12,9 @@ if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_D
-     set(CMAKE_CXX_STANDARD ${wxBUILD_CXX_STANDARD})
+@@ -18,6 +18,9 @@ else()
+     # CMAKE_CXX_STANDARD not defined.
  endif()
  
 +set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
diff --git a/3rdParty/vcpkg_ports/patches/pcre2.patch b/3rdParty/vcpkg_ports/patches/pcre2.patch
new file mode 100644
index 00000000000..630532be5fb
--- /dev/null
+++ b/3rdParty/vcpkg_ports/patches/pcre2.patch
@@ -0,0 +1,15 @@
+diff --git a/pcre2/vcpkg.json b/pcre2/vcpkg.json
+--- a/pcre2/vcpkg.json
++++ b/pcre2/vcpkg.json
+@@ -14,11 +14,8 @@
+       "name": "vcpkg-cmake-config",
+       "host": true
+     }
+   ],
+-  "default-features": [
+-    "platform-default-features"
+-  ],
+   "features": {
+     "jit": {
+       "description": "Enable support for Just-In-Time compiling regex matchers",
+       "supports": "!emscripten"
diff --git a/3rdParty/vcpkg_ports/patches/wxwidgets.patch b/3rdParty/vcpkg_ports/patches/wxwidgets.patch
new file mode 100644
index 00000000000..970e43bc76a
--- /dev/null
+++ b/3rdParty/vcpkg_ports/patches/wxwidgets.patch
@@ -0,0 +1,24 @@
+diff --git a/wxwidgets/portfile.cmake b/wxwidgets/portfile.cmake
+index f812fd8c5..27e289f2b 100644
+--- a/wxwidgets/portfile.cmake
++++ b/wxwidgets/portfile.cmake
+@@ -12,6 +12,8 @@ vcpkg_from_github(
+         fix-pcre2.patch
+         gtk3-link-libraries.patch
+         sdl2.patch
++        boinc_SetItemBitmap.patch
++        boinc_SetVisibilityHidden.patch
+ )
+ 
+ vcpkg_check_features(
+@@ -75,6 +77,10 @@ vcpkg_cmake_configure(
+         -DwxUSE_UIACTIONSIMULATOR=OFF
+         -DCMAKE_DISABLE_FIND_PACKAGE_GSPELL=ON
+         -DCMAKE_DISABLE_FIND_PACKAGE_MSPACK=ON
++        -DwxBUILD_MONOLITHIC=ON
++        -DwxUSE_DIALUP_MANAGER=ON
++        -DwxUSE_UNICODE=ON
++        -DwxUSE_UNICODE_UTF8=ON
+         ${OPTIONS}
+         "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+         # The minimum cmake version requirement for Cotire is 2.8.12.
diff --git a/3rdParty/vcpkg_ports/ports/mac/.gitkeep b/3rdParty/vcpkg_ports/ports/mac/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/3rdParty/vcpkg_ports/ports/mac/pcre2/no-static-suffix.patch b/3rdParty/vcpkg_ports/ports/mac/pcre2/no-static-suffix.patch
deleted file mode 100644
index 7f41bcd566c..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/pcre2/no-static-suffix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa2181e..3bf5317 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -711,8 +711,8 @@ IF(PCRE2_BUILD_PCRE2_8)
-     SET(targets ${targets} pcre2-posix-static)
- 
-     IF(MSVC)
--      SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8-static)
--      SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix-static)
-+      SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
-+      SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
-     ELSE(MSVC)
-       SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
-       SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
-@@ -777,7 +777,7 @@ IF(PCRE2_BUILD_PCRE2_16)
-     SET(targets ${targets} pcre2-16-static)
- 
-     IF(MSVC)
--      SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16-static)
-+      SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
-     ELSE(MSVC)
-       SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
-     ENDIF(MSVC)
-@@ -829,7 +829,7 @@ IF(PCRE2_BUILD_PCRE2_32)
-     SET(targets ${targets} pcre2-32-static)
- 
-     IF(MSVC)
--      SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32-static)
-+      SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
-     ELSE(MSVC)
-       SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
-     ENDIF(MSVC)
diff --git a/3rdParty/vcpkg_ports/ports/mac/pcre2/pcre2-10.35_fix-uwp.patch b/3rdParty/vcpkg_ports/ports/mac/pcre2/pcre2-10.35_fix-uwp.patch
deleted file mode 100644
index 476dde0f6a4..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/pcre2/pcre2-10.35_fix-uwp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt	2020-05-09 16:43:10.000000000 +0200
-+++ b/CMakeLists.txt	2020-06-03 20:57:17.026182500 +0200
-@@ -619,6 +619,7 @@
- 
- IF(MSVC)
-   ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
-+  add_compile_options(/wd4146)
- ENDIF(MSVC)
- 
- SET(CMAKE_INCLUDE_CURRENT_DIR 1)
diff --git a/3rdParty/vcpkg_ports/ports/mac/pcre2/portfile.cmake b/3rdParty/vcpkg_ports/ports/mac/pcre2/portfile.cmake
deleted file mode 100644
index 08c05364e9b..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/pcre2/portfile.cmake
+++ /dev/null
@@ -1,76 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO PCRE2Project/pcre2
-    REF pcre2-10.40
-    SHA512 098c21d60ecb3bb8449173f50c9ab8e6018fafd5d55548be08b15df37f8e08bcd4f851d75758c4d22505db30a3444bb65783d83cd876c63fdf0de2850815ef93
-    HEAD_REF master
-    PATCHES
-        pcre2-10.35_fix-uwp.patch
-        no-static-suffix.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" INSTALL_PDB)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_STATIC_CRT)
-
-set(JIT ON)
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS")
-    set(JIT OFF)
-endif()
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(JIT OFF)
-endif()
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_STATIC_LIBS=${BUILD_STATIC}
-        -DPCRE2_STATIC_RUNTIME=${BUILD_STATIC_CRT}
-        -DPCRE2_BUILD_PCRE2_8=ON
-        -DPCRE2_BUILD_PCRE2_16=ON
-        -DPCRE2_BUILD_PCRE2_32=ON
-        -DPCRE2_SUPPORT_JIT=${JIT}
-        -DPCRE2_SUPPORT_UNICODE=ON
-        -DPCRE2_BUILD_TESTS=OFF
-        -DPCRE2_BUILD_PCRE2GREP=OFF
-        -DCMAKE_DISABLE_FIND_PACKAGE_Readline=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Editline=ON
-        -DINSTALL_MSVC_PDB=${INSTALL_PDB}
-        -DCMAKE_REQUIRE_FIND_PACKAGE_BZip2=ON
-        -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON
-    )
-
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-
-file(READ "${CURRENT_PACKAGES_DIR}/include/pcre2.h" PCRE2_H)
-if(BUILD_STATIC)
-    string(REPLACE "defined(PCRE2_STATIC)" "1" PCRE2_H "${PCRE2_H}")
-else()
-    string(REPLACE "defined(PCRE2_STATIC)" "0" PCRE2_H "${PCRE2_H}")
-endif()
-file(WRITE "${CURRENT_PACKAGES_DIR}/include/pcre2.h" "${PCRE2_H}")
-
-vcpkg_fixup_pkgconfig()
-
-# The cmake file provided by pcre2 has some problems, so don't use it for now.
-#vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/cmake")
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-if(BUILD_STATIC)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-elseif(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
-    endif()
-endif()
-
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/3rdParty/vcpkg_ports/ports/mac/pcre2/vcpkg.json b/3rdParty/vcpkg_ports/ports/mac/pcre2/vcpkg.json
deleted file mode 100644
index df88f3c5c73..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/pcre2/vcpkg.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "pcre2",
-  "version": "10.40",
-  "port-version": 1,
-  "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
-  "homepage": "https://github.com/PCRE2Project/pcre2",
-  "license": "BSD-3-Clause",
-  "dependencies": [
-    {
-      "name": "bzip2",
-      "default-features": false
-    },
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    },
-    "zlib"
-  ]
-}
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/example/CMakeLists.txt b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/example/CMakeLists.txt
deleted file mode 100644
index 229b7107a07..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/example/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-project(wxwidgets-example)
-
-add_executable(main WIN32 popup.cpp)
-
-find_package(wxWidgets REQUIRED)
-target_compile_definitions(main PRIVATE ${wxWidgets_DEFINITIONS} "$<$<CONFIG:DEBUG>:${wxWidgets_DEFINITIONS_DEBUG}>")
-target_include_directories(main PRIVATE ${wxWidgets_INCLUDE_DIRS})
-target_link_libraries(main PRIVATE ${wxWidgets_LIBRARIES})
-
-add_executable(main2 WIN32 popup.cpp)
-
-find_package(wxWidgets CONFIG REQUIRED)
-target_link_libraries(main2 PRIVATE wx::core wx::base)
-
-option(USE_WXRC "Use the wxrc resource compiler" ON)
-if(USE_WXRC)
-    execute_process(
-        COMMAND "${wxWidgets_wxrc_EXECUTABLE}" --help
-        RESULTS_VARIABLE error_result
-    )
-    if(error_result)
-        message(FATAL_ERROR "Failed to run wxWidgets_wxrc_EXECUTABLE (${wxWidgets_wxrc_EXECUTABLE})")
-    endif()
-endif()
-
-set(PRINT_VARS "" CACHE STRING "Variables to print at the end of configuration")
-foreach(var IN LISTS PRINT_VARS)
-    message(STATUS "${var}:=${${var}}")
-endforeach()
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix-libs-export.patch b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix-libs-export.patch
deleted file mode 100644
index df4b7c26563..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix-libs-export.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
-index b359560..7504458 100644
---- a/build/cmake/config.cmake
-+++ b/build/cmake/config.cmake
-@@ -39,8 +39,14 @@ macro(wx_get_dependencies var lib)
-             else()
-                 # For the value like $<$<CONFIG:DEBUG>:LIB_PATH>
-                 # Or $<$<NOT:$<CONFIG:DEBUG>>:LIB_PATH>
--                string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep})
--                if (NOT dep_name)
-+                if(dep MATCHES "^(.+>):(.+)>$")
-+                    if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_MATCH_1 STREQUAL [[$<$<NOT:$<CONFIG:DEBUG>>]])
-+                        continue()
-+                    elseif(CMAKE_BUILD_TYPE STREQUAL "Release" AND CMAKE_MATCH_1 STREQUAL [[$<$<CONFIG:DEBUG>]])
-+                        continue()
-+                    endif()
-+                    set(dep_name "${CMAKE_MATCH_2}")
-+                else()
-                     set(dep_name ${dep})
-                 endif()
-             endif()
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix-nanosvg.patch b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix-nanosvg.patch
deleted file mode 100644
index fd48cf3f798..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix-nanosvg.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git "a/build/cmake/config.cmake" "b/build/cmake/config.cmake"
-index b68d167dac..5de1fd19ad 100644
---- "a/build/cmake/config.cmake"
-+++ "b/build/cmake/config.cmake"
-@@ -40,6 +40,14 @@ macro(wx_get_dependencies var lib)
-                 else()
-                     get_target_property(dep_name ${dep} OUTPUT_NAME)
-                 endif()
-+                if(NOT dep_name)
-+                    set(prop_suffix)
-+                    if (CMAKE_BUILD_TYPE)
-+                      string(TOUPPER "${CMAKE_BUILD_TYPE}" prop_suffix)
-+                      set(prop_suffix "_${prop_suffix}")
-+                    endif()
-+                    get_target_property(dep_name ${dep} LOCATION${prop_suffix})
-+                endif()
-             else()
-                 # For the value like $<$<CONFIG:DEBUG>:LIB_PATH>
-                 # Or $<$<NOT:$<CONFIG:DEBUG>>:LIB_PATH>
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix-pcre2.patch b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix-pcre2.patch
deleted file mode 100644
index 20063f4418a..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix-pcre2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/build/cmake/modules/FindPCRE2.cmake b/build/cmake/modules/FindPCRE2.cmake
-index a27693a..455675a 100644
---- a/build/cmake/modules/FindPCRE2.cmake
-+++ b/build/cmake/modules/FindPCRE2.cmake
-@@ -24,7 +24,10 @@ set(PCRE2_CODE_UNIT_WIDTH_USED "${PCRE2_CODE_UNIT_WIDTH}" CACHE INTERNAL "")
- 
- find_package(PkgConfig QUIET)
- pkg_check_modules(PC_PCRE2 QUIET libpcre2-${PCRE2_CODE_UNIT_WIDTH})
-+set(PCRE2_LIBRARIES ${PC_PCRE2_LINK_LIBRARIES})
-+set(PCRE2_INCLUDE_DIRS ${PC_PCRE2_INCLUDE_DIRS})
- 
-+if (0)
- find_path(PCRE2_INCLUDE_DIRS
-     NAMES pcre2.h
-     HINTS ${PC_PCRE2_INCLUDEDIR}
-@@ -36,6 +39,7 @@ find_library(PCRE2_LIBRARIES
-     HINTS ${PC_PCRE2_LIBDIR}
-           ${PC_PCRE2_LIBRARY_DIRS}
- )
-+endif()
- 
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE2 REQUIRED_VARS PCRE2_LIBRARIES PCRE2_INCLUDE_DIRS VERSION_VAR PC_PCRE2_VERSION)
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix_include.patch b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix_include.patch
deleted file mode 100644
index e146a2e178e..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/fix_include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h
-index 8c57520e1..54ffb27d2 100644
---- a/src/stc/scintilla/include/Scintilla.h	
-+++ b/src/stc/scintilla/include/Scintilla.h
-@@ -27,7 +27,7 @@ int Scintilla_LinkLexers(void);
- #endif
- 
- // Include header that defines basic numeric types.
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && !defined(__clang__)
- // Older releases of MSVC did not have stdint.h.
- #include <stddef.h>
- #elif defined( __VMS )
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/gtk3-link-libraries.patch b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/gtk3-link-libraries.patch
deleted file mode 100644
index fe2736b2da8..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/gtk3-link-libraries.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/build/cmake/modules/FindGTK3.cmake b/build/cmake/modules/FindGTK3.cmake
-index d2939a1..daf33fe 100644
---- a/build/cmake/modules/FindGTK3.cmake
-+++ b/build/cmake/modules/FindGTK3.cmake
-@@ -47,6 +47,7 @@ include(CheckSymbolExists)
- set(CMAKE_REQUIRED_INCLUDES ${GTK3_INCLUDE_DIRS})
- check_symbol_exists(GDK_WINDOWING_WAYLAND "gdk/gdk.h" wxHAVE_GDK_WAYLAND)
- check_symbol_exists(GDK_WINDOWING_X11 "gdk/gdk.h" wxHAVE_GDK_X11)
-+set(GTK3_LIBRARIES "${GTK3_LINK_LIBRARIES}" CACHE INTERNAL "")
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARIES VERSION_OK)
- 
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/install-layout.patch b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/install-layout.patch
deleted file mode 100644
index e9edfa16760..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/install-layout.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
-index 7182364..4f90430 100644
---- a/build/cmake/functions.cmake
-+++ b/build/cmake/functions.cmake
-@@ -428,7 +428,7 @@ macro(wx_add_library name)
-         set_target_properties(${name} PROPERTIES PROJECT_LABEL ${name_short})
- 
-         # Setup install
--        set(runtime_dir "lib")
-+        set(runtime_dir "bin")
-         if(WIN32 AND NOT WIN32_MSVC_NAMING)
-             # configure puts the .dll in the bin directory
-             set(runtime_dir "bin")
-diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
-index ef28c99..928bc0b 100644
---- a/build/cmake/init.cmake
-+++ b/build/cmake/init.cmake
-@@ -146,7 +146,7 @@ if(WIN32)
-     endif()
- endif()
- 
--if(WIN32_MSVC_NAMING)
-+if(0)
-     if(wxBUILD_SHARED)
-         set(lib_suffix "_dll")
-     else()
-diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
-index 384c683..a662a48 100644
---- a/build/cmake/install.cmake
-+++ b/build/cmake/install.cmake
-@@ -41,7 +41,7 @@ else()
- 
-     install(DIRECTORY DESTINATION "bin")
-     install(CODE "execute_process( \
--        COMMAND ${CMAKE_COMMAND} -E create_symlink \
-+        COMMAND ${CMAKE_COMMAND} -E copy \
-         \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
-         \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
-         )"
-diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
-index dbed8cc..f1da8e3 100644
---- a/build/cmake/utils/CMakeLists.txt
-+++ b/build/cmake/utils/CMakeLists.txt
-@@ -39,7 +39,7 @@ if(wxUSE_XRC)
- 
-         # Don't use wx_install() here to preserve escaping.
-         install(CODE "execute_process( \
--            COMMAND ${CMAKE_COMMAND} -E create_symlink \
-+            COMMAND ${CMAKE_COMMAND} -E copy \
-             \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
-             \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
-             )"
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/nanosvg-ext-depend.patch b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/nanosvg-ext-depend.patch
deleted file mode 100644
index 344c9de4639..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/nanosvg-ext-depend.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in
-index 6ef5a6e..248a701 100644
---- a/build/cmake/wxWidgetsConfig.cmake.in
-+++ b/build/cmake/wxWidgetsConfig.cmake.in
-@@ -1,5 +1,8 @@
- @PACKAGE_INIT@
- 
-+include(CMakeFindDependencyMacro)
-+find_dependency(NanoSVG CONFIG)
-+
- # determine target from compiler, platform and library type
- if(WIN32 AND NOT CYGWIN AND NOT MSYS)
-     if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/portfile.cmake b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/portfile.cmake
deleted file mode 100644
index 21df08a87b1..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/portfile.cmake
+++ /dev/null
@@ -1,200 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO wxWidgets/wxWidgets
-    REF "v${VERSION}"
-    SHA512 8ff645fe7ee97bf6358b3619efd737ef8f9eb0235ca481e921a64d451c45eb9671ee4e2807fea285153bc0bb434266234f6f4ab15f396bb8290f262fa879e9b3
-    HEAD_REF master
-    PATCHES
-        install-layout.patch
-        relocatable-wx-config.patch
-        nanosvg-ext-depend.patch
-        fix-libs-export.patch
-        fix-pcre2.patch
-        gtk3-link-libraries.patch
-        sdl2.patch
-        fix_include.patch
-        fix-nanosvg.patch
-        boinc_SetItemBitmap.patch
-        boinc_SetVisibilityHidden.patch
-)
-
-vcpkg_check_features(
-    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        fonts   wxUSE_PRIVATE_FONTS
-        media   wxUSE_MEDIACTRL
-        sound   wxUSE_SOUND
-        webview wxUSE_WEBVIEW
-        webview wxUSE_WEBVIEW_EDGE
-)
-
-set(OPTIONS_RELEASE "")
-if(NOT "debug-support" IN_LIST FEATURES)
-    list(APPEND OPTIONS_RELEASE "-DwxBUILD_DEBUG_LEVEL=0")
-endif()
-
-set(OPTIONS "")
-if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm"))
-    list(APPEND OPTIONS
-        -DwxUSE_STACKWALKER=OFF
-    )
-endif()
-
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX)
-    list(APPEND OPTIONS -DwxUSE_WEBREQUEST_CURL=OFF)
-else()
-    list(APPEND OPTIONS -DwxUSE_WEBREQUEST_CURL=ON)
-endif()
-
-vcpkg_find_acquire_program(PKGCONFIG)
-
-# This may be set to ON by users in a custom triplet.
-# The use of 'wxUSE_STL' and 'WXWIDGETS_USE_STD_CONTAINERS' (ON or OFF) are not API compatible
-# which is why they must be set in a custom triplet rather than a port feature.
-if(NOT DEFINED WXWIDGETS_USE_STL)
-    set(WXWIDGETS_USE_STL OFF)
-endif()
-
-if(NOT DEFINED WXWIDGETS_USE_STD_CONTAINERS)
-    set(WXWIDGETS_USE_STD_CONTAINERS OFF)
-endif()
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        ${FEATURE_OPTIONS}
-        -DwxUSE_REGEX=sys
-        -DwxUSE_ZLIB=sys
-        -DwxUSE_EXPAT=sys
-        -DwxUSE_LIBJPEG=sys
-        -DwxUSE_LIBPNG=sys
-        -DwxUSE_LIBTIFF=sys
-        -DwxUSE_NANOSVG=sys
-        -DwxUSE_GLCANVAS=ON
-        -DwxUSE_LIBGNOMEVFS=OFF
-        -DwxUSE_LIBNOTIFY=OFF
-        -DwxUSE_SECRETSTORE=OFF
-        -DwxUSE_STL=${WXWIDGETS_USE_STL}
-        -DwxUSE_STD_CONTAINERS=${WXWIDGETS_USE_STD_CONTAINERS}
-        -DwxUSE_UIACTIONSIMULATOR=OFF
-        -DCMAKE_DISABLE_FIND_PACKAGE_GSPELL=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_MSPACK=ON
-        -DwxBUILD_MONOLITHIC=ON
-        -DwxUSE_DIALUP_MANAGER=ON
-        -DwxUSE_UNICODE=ON
-        -DwxUSE_UNICODE_UTF8=ON
-        ${OPTIONS}
-        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
-        # The minimum cmake version requirement for Cotire is 2.8.12.
-        # however, we need to declare that the minimum cmake version requirement is at least 3.1 to use CMAKE_PREFIX_PATH as the path to find .pc.
-        -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
-    OPTIONS_RELEASE
-        ${OPTIONS_RELEASE}
-    MAYBE_UNUSED_VARIABLES
-        CMAKE_DISABLE_FIND_PACKAGE_GSPELL
-        CMAKE_DISABLE_FIND_PACKAGE_MSPACK
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wxWidgets)
-
-# The CMake export is not ready for use: It lacks a config file.
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/lib/cmake
-    ${CURRENT_PACKAGES_DIR}/debug/lib/cmake
-)
-
-set(tools wxrc)
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    list(APPEND tools wxrc-3.2)
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config")
-    if(NOT VCPKG_BUILD_TYPE)
-        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/wx-config")
-    endif()
-endif()
-vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN)
-
-# do the copy pdbs now after the dlls got moved to the expected /bin folder above
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/msvc")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(GLOB_RECURSE INCLUDES "${CURRENT_PACKAGES_DIR}/include/*.h")
-if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h")
-    list(APPEND INCLUDES "${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h")
-endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h")
-    list(APPEND INCLUDES "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h")
-endif()
-foreach(INC IN LISTS INCLUDES)
-    file(READ "${INC}" _contents)
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        string(REPLACE "defined(WXUSINGDLL)" "0" _contents "${_contents}")
-    else()
-        string(REPLACE "defined(WXUSINGDLL)" "1" _contents "${_contents}")
-    endif()
-    # Remove install prefix from setup.h to ensure package is relocatable
-    string(REGEX REPLACE "\n#define wxINSTALL_PREFIX [^\n]*" "\n#define wxINSTALL_PREFIX \"\"" _contents "${_contents}")
-    file(WRITE "${INC}" "${_contents}")
-endforeach()
-
-if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/wx/setup.h")
-    file(GLOB_RECURSE WX_SETUP_H_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/*.h")
-    file(GLOB_RECURSE WX_SETUP_H_FILES_REL "${CURRENT_PACKAGES_DIR}/lib/*.h")
-
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}" "")
-
-        string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/" "" WX_SETUP_H_FILES_REL "${WX_SETUP_H_FILES_REL}")
-        string(REPLACE "/setup.h" "" WX_SETUP_H_REL_RELATIVE "${WX_SETUP_H_FILES_REL}")
-    endif()
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "${CURRENT_PACKAGES_DIR}" "")
-
-        string(REPLACE "${CURRENT_PACKAGES_DIR}/debug/lib/" "" WX_SETUP_H_FILES_DBG "${WX_SETUP_H_FILES_DBG}")
-        string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}")
-    endif()
-
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/setup.h.in" "${CURRENT_PACKAGES_DIR}/include/wx/setup.h" @ONLY)
-endif()
-
-file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config")
-foreach(config IN LISTS configs)
-    vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}" [[${prefix}]])
-endforeach()
-file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/debug/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/wx-config")
-foreach(config IN LISTS configs)
-    vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}/debug" [[${prefix}]])
-endforeach()
-
-# For CMake multi-config in connection with wrapper
-if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h")
-    file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/lib/mswud/wx"
-    )
-endif()
-
-if(NOT "debug-support" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wx/debug.h" "#define wxDEBUG_LEVEL 1" "#define wxDEBUG_LEVEL 0")
-    else()
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wx-3.2/wx/debug.h" "#define wxDEBUG_LEVEL 1" "#define wxDEBUG_LEVEL 0")
-    endif()
-endif()
-
-if("example" IN_LIST FEATURES)
-    file(INSTALL
-        "${CMAKE_CURRENT_LIST_DIR}/example/CMakeLists.txt"
-        "${SOURCE_PATH}/samples/popup/popup.cpp"
-        "${SOURCE_PATH}/samples/sample.xpm"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example"
-    )
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/example/popup.cpp" "../sample.xpm" "sample.xpm")
-endif()
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
-
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/relocatable-wx-config.patch b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/relocatable-wx-config.patch
deleted file mode 100644
index 8a5e7c4d5bc..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/relocatable-wx-config.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/wx-config.in b/wx-config.in
-index 441f88c..b326867 100755
---- a/wx-config.in
-+++ b/wx-config.in
-@@ -91,7 +91,7 @@ EOF
- 
- 
- # Contentious tools determined by configure.
--EGREP="@EGREP@"
-+EGREP="grep -E" # no absolute path from host
- 
- 
- # For the people who know what they want, or think they do:
-@@ -402,8 +402,23 @@ is_cross()  { [ "x@cross_compiling@" = "xyes" ]; }
- 
- 
- # Determine the base directories we require.
--prefix=${input_option_prefix-${this_prefix:-@prefix@}}
--exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
-+vcpkg_prefix=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
-+case "$vcpkg_prefix" in
-+    */lib/wx/config)
-+        vcpkg_prefix=${vcpkg_prefix%/*/*/*}
-+        ;;
-+    */tools/wxwidgets/debug)
-+        vcpkg_prefix=${vcpkg_prefix%/*/*/*}/debug
-+        ;;
-+    */tools/wxwidgets)
-+        vcpkg_prefix=${vcpkg_prefix%/*/*}
-+        ;;
-+esac
-+if [ -n "@MINGW@" -a -n "@CMAKE_HOST_WIN32@" ]; then
-+    vcpkg_prefix=$(cygpath -m "$vcpkg_prefix")
-+fi
-+prefix=${input_option_prefix-${this_prefix:-$vcpkg_prefix}}
-+exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-$prefix}}}
- wxconfdir="@libdir@/wx/config"
- 
- installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
-@@ -940,6 +949,9 @@ prefix=${this_prefix-$prefix}
- exec_prefix=${this_exec_prefix-$exec_prefix}
- 
- includedir="@includedir@"
-+if [ "@CMAKE_BUILD_TYPE@" = "Debug" ] ; then
-+    includedir="${includedir%/debug/include}/include"
-+fi
- libdir="@libdir@"
- bindir="@bindir@"
- 
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/sdl2.patch b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/sdl2.patch
deleted file mode 100644
index 8518d7e8861..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/sdl2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
-index 7bd00d3..d903584 100644
---- a/build/cmake/init.cmake
-+++ b/build/cmake/init.cmake
-@@ -493,7 +493,9 @@ if(wxUSE_GUI)
-     endif()
- 
-     if(wxUSE_SOUND AND wxUSE_LIBSDL AND UNIX AND NOT APPLE)
--        find_package(SDL2)
-+        find_package(SDL2 CONFIG REQUIRED)
-+        set(SDL2_INCLUDE_DIR "" CACHE INTERNAL "")
-+        set(SDL2_LIBRARY SDL2::SDL2 CACHE INTERNAL "")
-         if(NOT SDL2_FOUND)
-             find_package(SDL)
-         endif()
-diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in
-index 248a701..f617dc4 100644
---- a/build/cmake/wxWidgetsConfig.cmake.in
-+++ b/build/cmake/wxWidgetsConfig.cmake.in
-@@ -2,6 +2,9 @@
- 
- include(CMakeFindDependencyMacro)
- find_dependency(NanoSVG CONFIG)
-+if("@wxUSE_LIBSDL@")
-+    find_dependency(SDL2 CONFIG)
-+endif()
- 
- # determine target from compiler, platform and library type
- if(WIN32 AND NOT CYGWIN AND NOT MSYS)
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/setup.h.in b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/setup.h.in
deleted file mode 100644
index b927735b780..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/setup.h.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef _DEBUG
-#include "../../debug/lib/@WX_SETUP_H_DBG_RELATIVE@/setup.h"
-#else
-#include "../../lib/@WX_SETUP_H_REL_RELATIVE@/setup.h"
-#endif
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/usage b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/usage
deleted file mode 100644
index bf1043e8722..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-The package wxwidgets provides CMake targets:
-
-    find_package(wxWidgets CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE wx::core wx::base)
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/vcpkg-cmake-wrapper.cmake b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index a35e04fc2a5..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,81 +0,0 @@
-cmake_policy(PUSH)
-cmake_policy(SET CMP0012 NEW)
-cmake_policy(SET CMP0054 NEW)
-cmake_policy(SET CMP0057 NEW)
-
-get_filename_component(_vcpkg_wx_root "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
-set(wxWidgets_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "")
-set(WX_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "")
-unset(_vcpkg_wx_root)
-
-if(WIN32)
-    # Find all libs with "32" infix which is unknown to FindwxWidgets.cmake
-    function(z_vcpkg_wxwidgets_find_base_library BASENAME)
-        find_library(WX_${BASENAME}d wx${BASENAME}32ud NAMES wx${BASENAME}d PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH)
-        find_library(WX_${BASENAME}  wx${BASENAME}32u  NAMES wx${BASENAME}  PATHS "${wxWidgets_ROOT_DIR}/lib" NO_DEFAULT_PATH REQUIRED)
-    endfunction()
-    function(z_vcpkg_wxwidgets_find_suffix_library BASENAME)
-        foreach(lib IN LISTS ARGN)
-            find_library(WX_${lib}d NAMES wx${BASENAME}32ud_${lib} PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH)
-            find_library(WX_${lib}  NAMES wx${BASENAME}32u_${lib}  PATHS "${wxWidgets_ROOT_DIR}/lib" NO_DEFAULT_PATH)
-        endforeach()
-    endfunction()
-    z_vcpkg_wxwidgets_find_base_library(base)
-    z_vcpkg_wxwidgets_find_suffix_library(base net odbc xml)
-    z_vcpkg_wxwidgets_find_suffix_library(msw core adv aui html media xrc dbgrid gl qa richtext stc ribbon propgrid webview)
-    if(WX_stc AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
-        z_vcpkg_wxwidgets_find_base_library(scintilla)
-    endif()
-    # Force FindwxWidgets.cmake win32 mode for all windows targets built on windows
-    set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}")
-    set(CMAKE_CROSSCOMPILING 0)
-    set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "")
-else()
-    # FindwxWidgets.cmake unix mode, single-config
-    set(_vcpkg_wxconfig "")
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR "Debug" IN_LIST MAP_IMPORTED_CONFIG_${CMAKE_BUILD_TYPE})
-        # Debug
-        set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/debug/lib" CACHE INTERNAL "")
-        file(GLOB _vcpkg_wxconfig LIST_DIRECTORIES false "${wxWidgets_LIB_DIR}/wx/config/*")
-    endif()
-    if(NOT _vcpkg_wxconfig)
-        # Release or fallback
-        set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "")
-        file(GLOB _vcpkg_wxconfig LIST_DIRECTORIES false "${wxWidgets_LIB_DIR}/wx/config/*")
-    endif()
-    set(wxWidgets_CONFIG_EXECUTABLE "${_vcpkg_wxconfig}" CACHE INTERNAL "")
-    unset(_vcpkg_wxconfig)
-endif()
-set(WX_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "")
-
-_find_package(${ARGS})
-
-if(DEFINED _vcpkg_wxwidgets_backup_crosscompiling)
-    set(CMAKE_CROSSCOMPILING "${_vcpkg_wxwidgets_backup_crosscompiling}")
-    unset(_vcpkg_wxwidgets_backup_crosscompiling)
-endif()
-
-if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT "wx::core" IN_LIST wxWidgets_LIBRARIES)
-    find_package(NanoSVG CONFIG QUIET)
-    list(APPEND wxWidgets_LIBRARIES
-        NanoSVG::nanosvg NanoSVG::nanosvgrast
-        )
-endif()
-
-
-if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT "wx::core" IN_LIST wxWidgets_LIBRARIES)
-    find_package(EXPAT QUIET)
-    find_package(JPEG QUIET)
-    find_package(PNG QUIET)
-    find_package(TIFF QUIET)
-    find_package(ZLIB QUIET)
-    list(APPEND wxWidgets_LIBRARIES
-        ${EXPAT_LIBRARIES}
-        ${JPEG_LIBRARIES}
-        ${PNG_LIBRARIES}
-        ${TIFF_LIBRARIES}
-        ${ZLIB_LIBRARIES}
-    )
-endif()
-
-cmake_policy(POP)
diff --git a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/vcpkg.json b/3rdParty/vcpkg_ports/ports/mac/wxwidgets/vcpkg.json
deleted file mode 100644
index aad9fcdc48e..00000000000
--- a/3rdParty/vcpkg_ports/ports/mac/wxwidgets/vcpkg.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "name": "wxwidgets",
-  "version": "3.2.2.1",
-  "port-version": 2,
-  "description": [
-    "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",
-    "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",
-    "Set WXWIDGETS_USE_STD_CONTAINERS in a custom triplet to build with the wxUSE_STD_CONTAINERS build option."
-  ],
-  "homepage": "https://github.com/wxWidgets/wxWidgets",
-  "license": "LGPL-2.0-or-later WITH WxWindows-exception-3.1",
-  "supports": "!uwp",
-  "dependencies": [
-    {
-      "name": "cairo",
-      "default-features": false,
-      "platform": "!windows & !osx & !ios"
-    },
-    {
-      "name": "curl",
-      "default-features": false,
-      "platform": "!windows & !osx"
-    },
-    "expat",
-    {
-      "name": "gtk3",
-      "platform": "!windows & !osx & !ios"
-    },
-    {
-      "name": "libiconv",
-      "platform": "!windows"
-    },
-    "libjpeg-turbo",
-    "libpng",
-    "nanosvg",
-    "opengl",
-    "pcre2",
-    "tiff",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    },
-    "zlib"
-  ],
-  "default-features": [
-    "debug-support",
-    "sound"
-  ],
-  "features": {
-    "debug-support": {
-      "description": "Enable wxWidgets debugging support hooks even for release builds (wxDEBUG_LEVEL 1)"
-    },
-    "example": {
-      "description": "Example source code and CMake project"
-    },
-    "fonts": {
-      "description": "Enable to use the font functionality of wxWidgets",
-      "dependencies": [
-        {
-          "name": "fontconfig",
-          "platform": "!windows & !osx"
-        },
-        {
-          "name": "pango",
-          "platform": "!windows & !osx"
-        }
-      ]
-    },
-    "media": {
-      "description": "Build wxMediaCtrl support",
-      "dependencies": [
-        {
-          "name": "gstreamer",
-          "default-features": false,
-          "platform": "!windows & !osx & !ios"
-        }
-      ]
-    },
-    "sound": {
-      "description": "Build wxSound support",
-      "dependencies": [
-        {
-          "name": "sdl2",
-          "default-features": false,
-          "platform": "!windows & !osx & !ios"
-        }
-      ]
-    },
-    "webview": {
-      "description": "The Edge backend uses Microsoft's Edge WebView2",
-      "dependencies": [
-        "webview2"
-      ]
-    }
-  }
-}
diff --git a/osx/update_vcpkg_manager_universal.sh b/osx/update_vcpkg_manager_universal.sh
index 19fcb4fb823..99fbf767a84 100755
--- a/osx/update_vcpkg_manager_universal.sh
+++ b/osx/update_vcpkg_manager_universal.sh
@@ -6,7 +6,7 @@ if [ ! -d "osx" ]; then
     exit 1
 fi
 
-. $PWD/3rdParty/vcpkg_ports/vcpkg_link.sh
+source $PWD/3rdParty/vcpkg_ports/vcpkg_link.sh
 BUILD_DIR="$PWD/3rdParty/osx"
 VCPKG_PORTS="$PWD/3rdParty/vcpkg_ports"
 VCPKG_ROOT="$BUILD_DIR/vcpkg"
@@ -18,5 +18,18 @@ fi
 
 git -C $VCPKG_ROOT pull
 $VCPKG_ROOT/bootstrap-vcpkg.sh
+
+# delete prev custom ports
+rm -rf $VCPKG_PORTS/ports/mac/*
+
+# create custom ports base on latest ports with patches
+cp -R $VCPKG_ROOT/ports/pcre2 $VCPKG_PORTS/ports/mac
+cp -R $VCPKG_ROOT/ports/wxwidgets $VCPKG_PORTS/ports/mac
+cp $VCPKG_PORTS/patches/boinc_SetItemBitmap.patch $VCPKG_PORTS/patches/boinc_SetVisibilityHidden.patch  $VCPKG_PORTS/ports/mac/wxwidgets
+
+# apply patches
+patch -p1 -d $VCPKG_PORTS/ports/mac -i $VCPKG_PORTS/patches/pcre2.patch
+patch -p1 -d $VCPKG_PORTS/ports/mac -i $VCPKG_PORTS/patches/wxwidgets.patch
+
 $VCPKG_ROOT/vcpkg install  --x-manifest-root=3rdParty/vcpkg_ports/configs/manager/osx --x-install-root=$VCPKG_ROOT/installed/arm64/ --overlay-ports=$VCPKG_PORTS/ports/mac --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=arm64-osx --clean-after-build
 $VCPKG_ROOT/vcpkg install  --x-manifest-root=3rdParty/vcpkg_ports/configs/manager/osx --x-install-root=$VCPKG_ROOT/installed/x64/ --overlay-ports=$VCPKG_PORTS/ports/mac --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-osx --clean-after-build