Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[wxwidgets] Update to v3.3.0 (#46473)

This commit is contained in:
RippeR37 2025-07-31 02:52:39 +02:00 committed by GitHub
parent ff3274405d
commit 897ba2ab4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 76 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/plplot/portfile.cmake
View File

@ -36,6 +36,7 @@ vcpkg_find_acquire_program(PKGCONFIG)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCMAKE_CXX_STANDARD=11
-DDEFAULT_NO_BINDINGS=ON
-DDEFAULT_NO_QT_DEVICES=ON
-DENABLE_cxx=ON

2
ports/plplot/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "plplot",
"version-semver": "5.15.0",
"port-version": 5,
"port-version": 6,
"description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.",
"homepage": "https://plplot.sourceforge.net/",
"license": null,

2
ports/wxwidgets/example/CMakeLists.txt
View File

@ -5,6 +5,7 @@ project(wxwidgets-example)
add_executable(main WIN32 popup.cpp)
find_package(wxWidgets REQUIRED)
target_compile_features(main PRIVATE cxx_std_11)
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})
@ -13,6 +14,7 @@ add_executable(main2 WIN32 popup.cpp)
find_package(wxWidgets CONFIG REQUIRED)
target_link_libraries(main2 PRIVATE wx::core wx::base)
target_compile_features(main2 PRIVATE cxx_std_11)
option(USE_WXRC "Use the wxrc resource compiler" ON)
if(USE_WXRC)

13
ports/wxwidgets/fix-cmake-msvc-naming.patch Normal file
View File

@ -0,0 +1,13 @@
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)

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

@ -10,4 +10,4 @@ index b251109..60cf762 100644
+
cmake_policy(PUSH)
# Set policies to prevent warnings
if(POLICY CMP0072)
if(POLICY CMP0057)

44
ports/wxwidgets/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wxWidgets/wxWidgets
REF "v${VERSION}"
SHA512 6ee71c6a61431097dd0cb4618d8eba67be2c7ae76d9ed33f5da35c3f4077070f052994f3bd9396dcce4eb2fd8de8f484dc0eee1c3befcfe132717a4a23999fcc
SHA512 a6704b54b6535a3a66b036c2563753575fc01bf735ec7f9cae6600390554f95f28cb50041fc3570f149924f4a3d99771fecdfa2d1ccdf12496cf8a2cf763b96b
HEAD_REF master
PATCHES
install-layout.patch
@ -12,8 +12,27 @@ 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
vcpkg_from_github(
OUT_SOURCE_PATH lexilla_SOURCE_PATH
REPO wxWidgets/lexilla
REF "27c20a6ae5eebf418debeac0166052ed6fb653bc"
SHA512 7e5de7f664509473b691af8261fca34c2687772faca7260eeba5f2984516e6f8edf88c27192e056c9dda996e2ad2c20f6d1dff1c4bd2f3c0d74852cb50ca424a
HEAD_REF wx
)
file(COPY "${lexilla_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/stc/lexilla")
vcpkg_from_github(
OUT_SOURCE_PATH scintilla_SOURCE_PATH
REPO wxWidgets/scintilla
REF "0b90f31ced23241054e8088abb50babe9a44ae67"
SHA512 db1f3007f4bd8860fad0817b6cf87980a4b713777025128cf5caea8d6d17b6fafe23fd22ff6886d7d5a420f241d85b7502b85d7e52b4ddb0774edc4b0a0203e7
HEAD_REF wx
)
file(COPY "${scintilla_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/stc/scintilla")
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
@ -51,11 +70,18 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
endif()
if("webview" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
list(APPEND OPTIONS -DwxUSE_WEBVIEW_EDGE_STATIC=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.
# The use of 'WXWIDGETS_USE_STD_CONTAINERS' (ON or OFF) is not API compatible
# which is why it must be set in a custom triplet rather than a port feature.
# For backwards compatibility, we also replace 'wxUSE_STL' (which no longer
# exists) with 'wxUSE_STD_STRING_CONV_IN_WXSTRING' which still exists and was
# set by `wxUSE_STL` previously.
if(NOT DEFINED WXWIDGETS_USE_STL)
set(WXWIDGETS_USE_STL OFF)
endif()
@ -75,10 +101,11 @@ vcpkg_cmake_configure(
-DwxUSE_LIBPNG=sys
-DwxUSE_LIBTIFF=sys
-DwxUSE_NANOSVG=sys
-DwxUSE_LIBWEBP=sys
-DwxUSE_GLCANVAS=ON
-DwxUSE_LIBGNOMEVFS=OFF
-DwxUSE_LIBNOTIFY=OFF
-DwxUSE_STL=${WXWIDGETS_USE_STL}
-DwxUSE_STD_STRING_CONV_IN_WXSTRING=${WXWIDGETS_USE_STL}
-DwxUSE_STD_CONTAINERS=${WXWIDGETS_USE_STD_CONTAINERS}
-DwxUSE_UIACTIONSIMULATOR=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_GSPELL=ON
@ -107,7 +134,7 @@ file(REMOVE_RECURSE
set(tools wxrc)
if(NOT VCPKG_TARGET_IS_WINDOWS)
list(APPEND tools wxrc-3.2)
list(APPEND tools wxrc-3.3)
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)
@ -122,6 +149,11 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/msvc")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/mswu")
if(VCPKG_BUILD_TYPE STREQUAL "release")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/mswud")
endif()
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")
@ -181,7 +213,7 @@ 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")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wx-3.3/wx/debug.h" "#define wxDEBUG_LEVEL 1" "#define wxDEBUG_LEVEL 0")
endif()
endif()

10
ports/wxwidgets/vcpkg-cmake-wrapper.cmake
View File

@ -9,15 +9,15 @@ 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
# Find all libs with "33" 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)
find_library(WX_${BASENAME}d wx${BASENAME}33ud NAMES wx${BASENAME}d PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(WX_${BASENAME} wx${BASENAME}33u 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)
find_library(WX_${lib}d NAMES wx${BASENAME}33ud_${lib} PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(WX_${lib} NAMES wx${BASENAME}33u_${lib} PATHS "${wxWidgets_ROOT_DIR}/lib" NO_DEFAULT_PATH)
endforeach()
endfunction()
z_vcpkg_wxwidgets_find_base_library(base)

3
ports/wxwidgets/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "wxwidgets",
"version": "3.2.8.1",
"version": "3.3.0",
"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.",
@ -31,6 +31,7 @@
},
"libjpeg-turbo",
"libpng",
"libwebp",
"nanosvg",
"opengl",
{

3
scripts/ci.feature.baseline.txt
View File

@ -400,8 +400,6 @@ platform-folders:x64-uwp=fail
plibsys:arm-uwp=fail
plibsys:x64-uwp=fail
plplot:arm-uwp=fail
plplot:arm64-windows=fail
plplot:x64-uwp=fail
pmdk:arm-uwp=fail
pmdk:arm64-windows=fail
pmdk:x64-linux=fail
@ -1646,6 +1644,7 @@ pdal-c:x64-uwp = cascade
pdal(uwp) = cascade
pixel:arm64-uwp = cascade
pixel:x64-uwp = cascade
plplot:x64-uwp = cascade
plplot[x11]:arm64-windows = cascade
plplot[x11]:x64-windows = cascade
plplot[x11]:x64-windows-static = cascade

4
versions/baseline.json
View File

@ -7418,7 +7418,7 @@
},
"plplot": {
"baseline": "5.15.0",
"port-version": 5
"port-version": 6
},
"plustache": {
"baseline": "0.4.0",
@ -10345,7 +10345,7 @@
"port-version": 0
},
"wxwidgets": {
"baseline": "3.2.8.1",
"baseline": "3.3.0",
"port-version": 0
},
"wyhash": {

5
versions/p-/plplot.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ef971221d6b1595dcc331b0f2c2adbd0ab260aee",
"version-semver": "5.15.0",
"port-version": 6
},
{
"git-tree": "658102e460a970de4035cbd46f6cc22901023a18",
"version-semver": "5.15.0",

5
versions/w-/wxwidgets.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b35b0e865377d0a6bd4e53f439f54475a85caf94",
"version": "3.3.0",
"port-version": 0
},
{
"git-tree": "62da1c2339492b299d1efac6f8a585547aeeabcd",
"version": "3.2.8.1",