[wxwidgets] Merge fix-patch from upstream (#18016)

* [wxwidgets] Merge fix-patch from upstream

Upstream fix: 94b399418c

* [wxwidgets] Merge fix-patch from upstream

Upstream fix: 94b399418c

ports/wxwidgets/fix-build.patch

@@ -1,15 +1,13 @@
-diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt
-index bd6acd8..b5b5780 100644
---- a/build/cmake/lib/stc/CMakeLists.txt
-+++ b/build/cmake/lib/stc/CMakeLists.txt
-@@ -179,7 +179,9 @@ if(wxBUILD_PRECOMP)
-     if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-         set(wxSCINTILLA_PREC_HEADER "${wxSOURCE_DIR}/src/stc/scintilla/include/Scintilla.h")
+diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
+index 06116384c7..f82ff941bb 100644
+--- a/build/cmake/functions.cmake
++++ b/build/cmake/functions.cmake
+@@ -383,7 +383,7 @@ endmacro()
+ # Enable cotire for target, use optional second argument for prec. header
+ macro(wx_target_enable_precomp target_name)
+     target_compile_definitions(${target_name} PRIVATE WX_PRECOMP)
+-    if(NOT ${ARGV1} STREQUAL "")
++    if(${ARGC} GREATER 1 AND NOT ${ARGV1} STREQUAL "")
+         set_target_properties(${target_name} PROPERTIES
+             COTIRE_CXX_PREFIX_HEADER_INIT ${ARGV1})
      endif()
--    wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER})
-+    if (wxSCINTILLA_PREC_HEADER)
-+        wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER})
-+    endif()
- endif()
- 
- wx_add_library(wxstc ${STC_FILES})

ports/wxwidgets/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "wxwidgets",
   "version-semver": "3.1.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.",
   "homepage": "https://github.com/wxWidgets/wxWidgets",
   "supports": "!uwp",

versions/baseline.json

@@ -6514,7 +6514,7 @@
     },
     "wxwidgets": {
       "baseline": "3.1.5",
-      "port-version": 1
+      "port-version": 2
     },
     "x-plane": {
       "baseline": "3.0.3",

versions/w-/wxwidgets.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6fa230bffdee1e7d700570c31e6f08367460c0c9",
+      "version-semver": "3.1.5",
+      "port-version": 2
+    },
     {
       "git-tree": "9140ae8c095ca8906ebf8150016f520fbdcb27d7",
       "version-semver": "3.1.5",