From 4502f70650ba658e741f9d9dde991f7c3323c41f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 23 Nov 2021 16:13:12 -0800 Subject: [PATCH] [plplot] Correct control of wxwidgets probably broken by https://github.com/microsoft/vcpkg/pull/21303/ This caused wxwidgets to get set on as far as the upstream build system cares if wxwidgets was built first regardless of the feature setting, which broke in CI with unresolved external symbol errors in wxwidgets' internals. --- ports/plplot/portfile.cmake | 3 ++- ports/plplot/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/plplot.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index da70bbe4e67665..0c79cd4e78c9a9 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -18,7 +18,8 @@ vcpkg_from_sourceforge( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - wxwidgets BUILD_with_wxwidgets + wxwidgets PLD_wxwidgets + wxwidgets ENABLE_wxwidgets ) vcpkg_cmake_configure( diff --git a/ports/plplot/vcpkg.json b/ports/plplot/vcpkg.json index 6f7197318014ea..90fdd47fa1ec7b 100644 --- a/ports/plplot/vcpkg.json +++ b/ports/plplot/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plplot", "version-semver": "5.13.0", - "port-version": 12, + "port-version": 13, "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.", "dependencies": [ "bzip2", diff --git a/versions/baseline.json b/versions/baseline.json index 82b68d032eecef..46f7bb13664b41 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5278,7 +5278,7 @@ }, "plplot": { "baseline": "5.13.0", - "port-version": 12 + "port-version": 13 }, "plustache": { "baseline": "0.4.0", diff --git a/versions/p-/plplot.json b/versions/p-/plplot.json index ca58d2291f3270..fbdef1b9c0e2ae 100644 --- a/versions/p-/plplot.json +++ b/versions/p-/plplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3cf98f0e002ea3b2f196af0c43a8a4cc885255c", + "version-semver": "5.13.0", + "port-version": 13 + }, { "git-tree": "81172e3761f2638245de863b13d8e13cbf08188d", "version-semver": "5.13.0",