Skip to content

Commit 999825f

Browse files
authored
[wxwidgets] update version to v3.2.1 (#26774)
* [wxwidgets] update version to v3.2.1 * update version * format patch * overwrite version
1 parent 23905f6 commit 999825f

File tree

7 files changed

+26
-22
lines changed

7 files changed

+26
-22
lines changed

Diff for: ports/wxwidgets/fix-libs-export.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
2-
index 52ae69d3f6..f261d5d262 100644
2+
index b359560..7504458 100644
33
--- a/build/cmake/config.cmake
44
+++ b/build/cmake/config.cmake
55
@@ -39,8 +39,14 @@ macro(wx_get_dependencies var lib)

Diff for: ports/wxwidgets/install-layout.patch

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
2-
index 32bd959..74f31ed 100644
2+
index 7182364..4f90430 100644
33
--- a/build/cmake/functions.cmake
44
+++ b/build/cmake/functions.cmake
5-
@@ -418,7 +418,7 @@ macro(wx_add_library name)
5+
@@ -428,7 +428,7 @@ macro(wx_add_library name)
66
set_target_properties(${name} PROPERTIES PROJECT_LABEL ${name_short})
77

88
# Setup install
@@ -12,7 +12,7 @@ index 32bd959..74f31ed 100644
1212
# configure puts the .dll in the bin directory
1313
set(runtime_dir "bin")
1414
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
15-
index 3ff14ab..7bd00d3 100644
15+
index ef28c99..928bc0b 100644
1616
--- a/build/cmake/init.cmake
1717
+++ b/build/cmake/init.cmake
1818
@@ -146,7 +146,7 @@ if(WIN32)
@@ -25,28 +25,28 @@ index 3ff14ab..7bd00d3 100644
2525
set(lib_suffix "_dll")
2626
else()
2727
diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
28-
index 84cb9f5..e2f460a 100644
28+
index 384c683..a662a48 100644
2929
--- a/build/cmake/install.cmake
3030
+++ b/build/cmake/install.cmake
31-
@@ -48,7 +48,7 @@ else()
31+
@@ -41,7 +41,7 @@ else()
3232

3333
install(DIRECTORY DESTINATION "bin")
3434
install(CODE "execute_process( \
3535
- COMMAND ${CMAKE_COMMAND} -E create_symlink \
3636
+ COMMAND ${CMAKE_COMMAND} -E copy \
37-
${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \
38-
${CMAKE_INSTALL_PREFIX}/bin/wx-config \
37+
\"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
38+
\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
3939
)"
4040
diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
41-
index d6b3465..870897b 100644
41+
index dbed8cc..f1da8e3 100644
4242
--- a/build/cmake/utils/CMakeLists.txt
4343
+++ b/build/cmake/utils/CMakeLists.txt
44-
@@ -38,7 +38,7 @@ if(wxUSE_XRC)
45-
endif()
44+
@@ -39,7 +39,7 @@ if(wxUSE_XRC)
4645

47-
wx_install(CODE "execute_process( \
46+
# Don't use wx_install() here to preserve escaping.
47+
install(CODE "execute_process( \
4848
- COMMAND ${CMAKE_COMMAND} -E create_symlink \
4949
+ COMMAND ${CMAKE_COMMAND} -E copy \
50-
${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \
51-
${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
50+
\"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
51+
\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
5252
)"

Diff for: ports/wxwidgets/nanosvg-ext-depend.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ index 401bf48..b9e4b57 100644
1515
continue()
1616
endif()
1717
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
18-
index 49c536a..5630526 100644
18+
index 2b120e5..26651f9 100644
1919
--- a/build/cmake/options.cmake
2020
+++ b/build/cmake/options.cmake
2121
@@ -114,7 +114,7 @@ wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_
2222
wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)")
2323
wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)")
2424
wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)")
25-
-wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG")
25+
-wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG" DEFAULT builtin)
2626
+wx_add_thirdparty_library(wxUSE_NANOSVG unofficial-nanosvg "use NanoSVG for rasterizing SVG")
2727

2828
wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF)

Diff for: ports/wxwidgets/portfile.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
vcpkg_from_github(
22
OUT_SOURCE_PATH SOURCE_PATH
33
REPO wxWidgets/wxWidgets
4-
REF v3.2.0
5-
SHA512 0bb40ccab51f5e83a38feeaf462c9d1852f821d19592328327f829890d89a3abb2a991c43cdbac55da8f5ee40aab8bd5fea6abcd052198302770292f92f9f9ad
4+
REF 97e99707c5d2271a70cb686720b48dbf34ced496 # v3.2.1
5+
SHA512 b47d3f4560f0ba24e95ce4fba0a807cc47807df57d54b70e22a34a5a15fc1e35ccedf1938203046c8950db9115ed09cb66fa1ca30b2e5f1b4c0d529a812497c4
66
HEAD_REF master
77
PATCHES
88
install-layout.patch

Diff for: ports/wxwidgets/vcpkg.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "wxwidgets",
3-
"version": "3.2.0",
4-
"port-version": 2,
3+
"version": "3.2.1",
54
"description": [
65
"Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",
76
"Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",

Diff for: versions/baseline.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7813,8 +7813,8 @@
78137813
"port-version": 0
78147814
},
78157815
"wxwidgets": {
7816-
"baseline": "3.2.0",
7817-
"port-version": 2
7816+
"baseline": "3.2.1",
7817+
"port-version": 0
78187818
},
78197819
"x-plane": {
78207820
"baseline": "3.0.3",

Diff for: versions/w-/wxwidgets.json

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "a113e248e95bf2305a91b4d7c2a93579cc911b15",
5+
"version": "3.2.1",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "39e102a05ff8b8e2f8a137b1f3bbe8e44f88a8ad",
510
"version": "3.2.0",

0 commit comments

Comments
 (0)