mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:28:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[wxwidgets] Update to 3.2.6 (#41415)

Browse Source
This commit is contained in:
jim wang 2024-10-09 18:00:53 +00:00 committed by GitHub
parent da5b6383d7
commit 0104b799f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/wxwidgets/nanosvg-ext-depend.patch
View File

@ -1,5 +1,5 @@
diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in 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 --- a/build/cmake/wxWidgetsConfig.cmake.in
+++ b/build/cmake/wxWidgetsConfig.cmake.in +++ b/build/cmake/wxWidgetsConfig.cmake.in
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
@ -8,6 +8,6 @@ index 6ef5a6e..248a701 100644
+include(CMakeFindDependencyMacro) +include(CMakeFindDependencyMacro)
+find_dependency(NanoSVG CONFIG) +find_dependency(NanoSVG CONFIG)
+ +
# determine target from compiler, platform and library type cmake_policy(PUSH)
if(WIN32 AND NOT CYGWIN AND NOT MSYS) # Set policies to prevent warnings
if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) if(POLICY CMP0072)

2
ports/wxwidgets/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO wxWidgets/wxWidgets REPO wxWidgets/wxWidgets
REF "v${VERSION}" REF "v${VERSION}"
SHA512 6d92635f88fc7b0ee52ef996f87d79d9af34428e2cb4469134b74514135b87b42acbc515c0d2d1e1ff5265b8383c9783ce58655bd410fa9215cfc7a8d528aa87 SHA512 0834cb1f4f2e294b721abeef659f696156b9a7474a6a770197f2295a598cce5547671634036a96739b063bb6482f5cb0092b5f704dc5ceb1c002c4e1782df197
HEAD_REF master HEAD_REF master
PATCHES PATCHES
install-layout.patch install-layout.patch

10
ports/wxwidgets/sdl2.patch
View File

@ -1,8 +1,8 @@
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake 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 --- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake +++ b/build/cmake/init.cmake
@@ -493,7 +493,9 @@ if(wxUSE_GUI) @@ -530,7 +530,9 @@ if(wxUSE_GUI)
endif() endif()
if(wxUSE_SOUND AND wxUSE_LIBSDL AND UNIX AND NOT APPLE) if(wxUSE_SOUND AND wxUSE_LIBSDL AND UNIX AND NOT APPLE)
@ -14,7 +14,7 @@ index 7bd00d3..d903584 100644
find_package(SDL) find_package(SDL)
endif() endif()
diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in 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 --- a/build/cmake/wxWidgetsConfig.cmake.in
+++ b/build/cmake/wxWidgetsConfig.cmake.in +++ b/build/cmake/wxWidgetsConfig.cmake.in
@@ -2,6 +2,9 @@ @@ -2,6 +2,9 @@
@ -25,5 +25,5 @@ index 248a701..f617dc4 100644
+ find_dependency(SDL2 CONFIG) + find_dependency(SDL2 CONFIG)
+endif() +endif()
# determine target from compiler, platform and library type cmake_policy(PUSH)
if(WIN32 AND NOT CYGWIN AND NOT MSYS) # Set policies to prevent warnings

3
ports/wxwidgets/vcpkg.json
View File

@ -1,7 +1,6 @@
{ {
"name": "wxwidgets", "name": "wxwidgets",
"version": "3.2.5", "version": "3.2.6",
"port-version": 3,
"description": [ "description": [
"Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "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_STL in a custom triplet to build with the wxUSE_STL build option.",

4
versions/baseline.json
View File

@ -9641,8 +9641,8 @@
"port-version": 0 "port-version": 0
}, },
"wxwidgets": { "wxwidgets": {
"baseline": "3.2.5", "baseline": "3.2.6",
"port-version": 3 "port-version": 0
}, },
"wyhash": { "wyhash": {
"baseline": "2023-12-03", "baseline": "2023-12-03",

5
versions/w-/wxwidgets.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "bb7e54e4bab9652768a7a7d6f2cf37171e48b7cd",
"version": "3.2.6",
"port-version": 0
},
{ {
"git-tree": "98b2c9fc10fef8e61d3b43cc6b7b37ef72eac355", "git-tree": "98b2c9fc10fef8e61d3b43cc6b7b37ef72eac355",
"version": "3.2.5", "version": "3.2.5",