diff --git a/ports/wxwidgets/fix-cmake-msvc-naming.patch b/ports/wxwidgets/fix-cmake-msvc-naming.patch deleted file mode 100644 index ddf135d641..0000000000 --- a/ports/wxwidgets/fix-cmake-msvc-naming.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index a35328f354..e1bb9424e3 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -14,7 +14,7 @@ include(CMakePrintHelpers) - - # Use the MSVC/makefile naming convention, or the configure naming convention, - # this is the same check as used in FindwxWidgets. --if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING) -+if(MSVC OR (WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING)) - set(WIN32_MSVC_NAMING 1) - else() - set(WIN32_MSVC_NAMING 0) diff --git a/ports/wxwidgets/install-layout.patch b/ports/wxwidgets/install-layout.patch index e39810efa6..3a8b545903 100644 --- a/ports/wxwidgets/install-layout.patch +++ b/ports/wxwidgets/install-layout.patch @@ -1,39 +1,46 @@ -diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index e76dff6..eb4edc0 100644 ---- a/build/cmake/init.cmake -+++ b/build/cmake/init.cmake -@@ -156,7 +156,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/build/cmake/init.cmake b/build/cmake/init.cmake +index f044d22d4d..a78b9aa1e9 100644 +--- a/build/cmake/init.cmake ++++ b/build/cmake/init.cmake +@@ -200,12 +200,12 @@ endif() + + if(WIN32_MSVC_NAMING) + if(wxBUILD_SHARED) +- set(lib_suffix "_dll") ++ # set(lib_suffix "_dll") + else() +- set(lib_suffix "_lib") ++ # set(lib_suffix "_lib") + endif() + +- set(wxPLATFORM_LIB_DIR "${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}${lib_suffix}") ++ # set(wxPLATFORM_LIB_DIR "${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}${lib_suffix}") + + # Generator expression to not create different Debug and Release directories + set(GEN_EXPR_DIR "$<1:/>") +diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake +index a373983043..2e1ace7bf9 100644 +--- a/build/cmake/install.cmake ++++ b/build/cmake/install.cmake +@@ -63,7 +63,7 @@ else() + + install(DIRECTORY DESTINATION "bin") + install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ ++ COMMAND ${CMAKE_COMMAND} -E copy \ + \"\$ENV{DESTDIR}${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 15f4339ef9..f93849e025 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 \ + \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \ + \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ + )" diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index eeeb636d95..8c42132db0 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets REF "v${VERSION}" - SHA512 a6704b54b6535a3a66b036c2563753575fc01bf735ec7f9cae6600390554f95f28cb50041fc3570f149924f4a3d99771fecdfa2d1ccdf12496cf8a2cf763b96b + SHA512 8ad17582c4ba721ffe76ada4bb8bd7bc4b050491220aca335fd0506a51354fb789d5bc3d965f0f459dc81784d6427c88272e2acc2099cddf73730231b5a16f62 HEAD_REF master PATCHES install-layout.patch @@ -12,7 +12,6 @@ vcpkg_from_github( fix-pcre2.patch gtk3-link-libraries.patch sdl2.patch - fix-cmake-msvc-naming.patch # v3.3.0-only, can be replaced with conditional `-DwxBUILD_WIN32_MSVC_NAMING=ON` in v3.3.1 ) # Submodule dependencies diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index adf7c13531..132f4fe37d 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wxwidgets", - "version": "3.3.0", + "version": "3.3.1", "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.", diff --git a/versions/baseline.json b/versions/baseline.json index b4d56ec495..c1646ca5dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10349,7 +10349,7 @@ "port-version": 0 }, "wxwidgets": { - "baseline": "3.3.0", + "baseline": "3.3.1", "port-version": 0 }, "wyhash": { diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 2f228d39d4..9f8d9a9dc9 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42070e5c6991073f4b9a5477d9fb2b9d1267008e", + "version": "3.3.1", + "port-version": 0 + }, { "git-tree": "b35b0e865377d0a6bd4e53f439f54475a85caf94", "version": "3.3.0",