diff --git a/ports/wxwidgets/nanosvg-ext-depend.patch b/ports/wxwidgets/nanosvg-ext-depend.patch index 344c9de463..5b7a139a53 100644 --- a/ports/wxwidgets/nanosvg-ext-depend.patch +++ b/ports/wxwidgets/nanosvg-ext-depend.patch @@ -1,5 +1,5 @@ diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in -index 6ef5a6e..248a701 100644 +index b251109..60cf762 100644 --- a/build/cmake/wxWidgetsConfig.cmake.in +++ b/build/cmake/wxWidgetsConfig.cmake.in @@ -1,5 +1,8 @@ @@ -8,6 +8,6 @@ index 6ef5a6e..248a701 100644 +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) + cmake_policy(PUSH) + # Set policies to prevent warnings + if(POLICY CMP0072) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index ea2b2768ab..f812fd8c58 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 6d92635f88fc7b0ee52ef996f87d79d9af34428e2cb4469134b74514135b87b42acbc515c0d2d1e1ff5265b8383c9783ce58655bd410fa9215cfc7a8d528aa87 + SHA512 0834cb1f4f2e294b721abeef659f696156b9a7474a6a770197f2295a598cce5547671634036a96739b063bb6482f5cb0092b5f704dc5ceb1c002c4e1782df197 HEAD_REF master PATCHES install-layout.patch diff --git a/ports/wxwidgets/sdl2.patch b/ports/wxwidgets/sdl2.patch index 8518d7e886..511775ccc7 100644 --- a/ports/wxwidgets/sdl2.patch +++ b/ports/wxwidgets/sdl2.patch @@ -1,8 +1,8 @@ diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index 7bd00d3..d903584 100644 +index 5447d33..f5440b4 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake -@@ -493,7 +493,9 @@ if(wxUSE_GUI) +@@ -530,7 +530,9 @@ if(wxUSE_GUI) endif() if(wxUSE_SOUND AND wxUSE_LIBSDL AND UNIX AND NOT APPLE) @@ -14,7 +14,7 @@ index 7bd00d3..d903584 100644 find_package(SDL) endif() diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in -index 248a701..f617dc4 100644 +index 60cf762..202a8c3 100644 --- a/build/cmake/wxWidgetsConfig.cmake.in +++ b/build/cmake/wxWidgetsConfig.cmake.in @@ -2,6 +2,9 @@ @@ -25,5 +25,5 @@ index 248a701..f617dc4 100644 + find_dependency(SDL2 CONFIG) +endif() - # determine target from compiler, platform and library type - if(WIN32 AND NOT CYGWIN AND NOT MSYS) + cmake_policy(PUSH) + # Set policies to prevent warnings diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 632d677e55..3aa47b2007 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wxwidgets", - "version": "3.2.5", - "port-version": 3, + "version": "3.2.6", "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 34e87febc7..c389b698d1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9641,8 +9641,8 @@ "port-version": 0 }, "wxwidgets": { - "baseline": "3.2.5", - "port-version": 3 + "baseline": "3.2.6", + "port-version": 0 }, "wyhash": { "baseline": "2023-12-03", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index a9b7f9c07c..d9673fe738 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb7e54e4bab9652768a7a7d6f2cf37171e48b7cd", + "version": "3.2.6", + "port-version": 0 + }, { "git-tree": "98b2c9fc10fef8e61d3b43cc6b7b37ef72eac355", "version": "3.2.5",