diff options
| author | cnbatch <cnbatch@gmail.com> | 2021-05-21 15:36:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 00:36:51 -0700 |
| commit | eed75c0ad57c9e41537f4006debca6cdd7021f25 (patch) | |
| tree | 3ca22a8957beec6f5bc5d37cee6ada63e54d99c4 | |
| parent | 2e9b73fc8b736e13a5df780eaae11305822c2f19 (diff) | |
| download | vcpkg-eed75c0ad57c9e41537f4006debca6cdd7021f25.tar.gz vcpkg-eed75c0ad57c9e41537f4006debca6cdd7021f25.zip | |
[wxwidgets] Merge fix-patch from upstream (#18016)
* [wxwidgets] Merge fix-patch from upstream
Upstream fix: https://github.com/wxWidgets/wxWidgets/commit/94b399418cf37df6934ae3defbec8626af2cd965
* [wxwidgets] Merge fix-patch from upstream
Upstream fix: https://github.com/wxWidgets/wxWidgets/commit/94b399418cf37df6934ae3defbec8626af2cd965
| -rw-r--r-- | ports/wxwidgets/fix-build.patch | 26 | ||||
| -rw-r--r-- | ports/wxwidgets/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/w-/wxwidgets.json | 5 |
4 files changed, 19 insertions, 16 deletions
diff --git a/ports/wxwidgets/fix-build.patch b/ports/wxwidgets/fix-build.patch index 06e693c3c..e47bc97e6 100644 --- a/ports/wxwidgets/fix-build.patch +++ b/ports/wxwidgets/fix-build.patch @@ -1,15 +1,13 @@ -diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt -index bd6acd8..b5b5780 100644 ---- a/build/cmake/lib/stc/CMakeLists.txt -+++ b/build/cmake/lib/stc/CMakeLists.txt -@@ -179,7 +179,9 @@ if(wxBUILD_PRECOMP) - if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") - set(wxSCINTILLA_PREC_HEADER "${wxSOURCE_DIR}/src/stc/scintilla/include/Scintilla.h") +diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake +index 06116384c7..f82ff941bb 100644 +--- a/build/cmake/functions.cmake ++++ b/build/cmake/functions.cmake +@@ -383,7 +383,7 @@ endmacro() + # Enable cotire for target, use optional second argument for prec. header + macro(wx_target_enable_precomp target_name) + target_compile_definitions(${target_name} PRIVATE WX_PRECOMP) +- if(NOT ${ARGV1} STREQUAL "") ++ if(${ARGC} GREATER 1 AND NOT ${ARGV1} STREQUAL "") + set_target_properties(${target_name} PROPERTIES + COTIRE_CXX_PREFIX_HEADER_INIT ${ARGV1}) endif() -- wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER}) -+ if (wxSCINTILLA_PREC_HEADER) -+ wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER}) -+ endif() - endif() - - wx_add_library(wxstc ${STC_FILES}) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 0b08098df..c7464fe14 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wxwidgets", "version-semver": "3.1.5", - "port-version": 1, + "port-version": 2, "description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.", "homepage": "https://github.com/wxWidgets/wxWidgets", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index e53c59fc4..6c470abd3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6514,7 +6514,7 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 1 + "port-version": 2 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 0e85fc33b..72eaf1357 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "6fa230bffdee1e7d700570c31e6f08367460c0c9", + "version-semver": "3.1.5", + "port-version": 2 + }, + { "git-tree": "9140ae8c095ca8906ebf8150016f520fbdcb27d7", "version-semver": "3.1.5", "port-version": 1 |