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

[wxwidgets] update version to v3.2.1 (#26774)

Browse Source 
* [wxwidgets] update version to v3.2.1

* update version

* format patch

* overwrite version
This commit is contained in:
Frank 2022-09-14 07:31:27 +08:00 committed by GitHub
parent 23905f6f86
commit 999825f5cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/wxwidgets/fix-libs-export.patch
View File

@ -1,5 +1,5 @@
diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
index 52ae69d3f6..f261d5d262 100644
index b359560..7504458 100644
--- a/build/cmake/config.cmake
+++ b/build/cmake/config.cmake
@@ -39,8 +39,14 @@ macro(wx_get_dependencies var lib)

26
ports/wxwidgets/install-layout.patch
View File

@ -1,8 +1,8 @@
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 32bd959..74f31ed 100644
index 7182364..4f90430 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -418,7 +418,7 @@ macro(wx_add_library name)
@@ -428,7 +428,7 @@ macro(wx_add_library name)
set_target_properties(${name} PROPERTIES PROJECT_LABEL ${name_short})
# Setup install
@ -12,7 +12,7 @@ index 32bd959..74f31ed 100644
# configure puts the .dll in the bin directory
set(runtime_dir "bin")
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 3ff14ab..7bd00d3 100644
index ef28c99..928bc0b 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -146,7 +146,7 @@ if(WIN32)
@ -25,28 +25,28 @@ index 3ff14ab..7bd00d3 100644
set(lib_suffix "_dll")
else()
diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
index 84cb9f5..e2f460a 100644
index 384c683..a662a48 100644
--- a/build/cmake/install.cmake
+++ b/build/cmake/install.cmake
@@ -48,7 +48,7 @@ else()
@@ -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} \
${CMAKE_INSTALL_PREFIX}/bin/wx-config \
\"${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 d6b3465..870897b 100644
index dbed8cc..f1da8e3 100644
--- a/build/cmake/utils/CMakeLists.txt
+++ b/build/cmake/utils/CMakeLists.txt
@@ -38,7 +38,7 @@ if(wxUSE_XRC)
endif()
@@ -39,7 +39,7 @@ if(wxUSE_XRC)
wx_install(CODE "execute_process( \
# 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} \
${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
\"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
)"

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

@ -15,14 +15,14 @@ index 401bf48..b9e4b57 100644
continue()
endif()
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index 49c536a..5630526 100644
index 2b120e5..26651f9 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -114,7 +114,7 @@ wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_
wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)")
wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)")
wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)")
-wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG")
-wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG" DEFAULT builtin)
+wx_add_thirdparty_library(wxUSE_NANOSVG unofficial-nanosvg "use NanoSVG for rasterizing SVG")
wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF)

4
ports/wxwidgets/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wxWidgets/wxWidgets
REF v3.2.0
SHA512 0bb40ccab51f5e83a38feeaf462c9d1852f821d19592328327f829890d89a3abb2a991c43cdbac55da8f5ee40aab8bd5fea6abcd052198302770292f92f9f9ad
REF 97e99707c5d2271a70cb686720b48dbf34ced496 # v3.2.1
SHA512 b47d3f4560f0ba24e95ce4fba0a807cc47807df57d54b70e22a34a5a15fc1e35ccedf1938203046c8950db9115ed09cb66fa1ca30b2e5f1b4c0d529a812497c4
HEAD_REF master
PATCHES
install-layout.patch

3
ports/wxwidgets/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "wxwidgets",
"version": "3.2.0",
"port-version": 2,
"version": "3.2.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.",

4
versions/baseline.json
View File

@ -7813,8 +7813,8 @@
"port-version": 0
},
"wxwidgets": {
"baseline": "3.2.0",
"port-version": 2
"baseline": "3.2.1",
"port-version": 0
},
"x-plane": {
"baseline": "3.0.3",

5
versions/w-/wxwidgets.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a113e248e95bf2305a91b4d7c2a93579cc911b15",
"version": "3.2.1",
"port-version": 0
},
{
"git-tree": "39e102a05ff8b8e2f8a137b1f3bbe8e44f88a8ad",
"version": "3.2.0",