From e8bc75b57dc5a5b1fa48aa834894cca4584a856c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 24 Jan 2022 02:18:05 -0800 Subject: [PATCH] [nanovg] Remove vcpkg_fail_port_install. (#22750) There was no supports expression so there was ci.baseline.txt impact. In support of https://github.com/microsoft/vcpkg/pull/21502 --- ports/nanovg/portfile.cmake | 2 -- ports/nanovg/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 4 ++-- versions/n-/nanovg.json | 5 +++++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ports/nanovg/portfile.cmake b/ports/nanovg/portfile.cmake index 6a838808bb..5df6def4e6 100644 --- a/ports/nanovg/portfile.cmake +++ b/ports/nanovg/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO memononen/nanovg diff --git a/ports/nanovg/vcpkg.json b/ports/nanovg/vcpkg.json index 39e3cd017f..b5f854527f 100644 --- a/ports/nanovg/vcpkg.json +++ b/ports/nanovg/vcpkg.json @@ -1,9 +1,10 @@ { "name": "nanovg", - "version-string": "2019-8-30", - "port-version": 4, + "version-date": "2019-08-30", + "port-version": 5, "description": "NanoVG is small antialiased vector graphics rendering library for OpenGL.", "homepage": "https://github.com/memononen/nanovg", + "supports": "!uwp", "dependencies": [ "stb" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fb5229f897..886be5cac9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -890,8 +890,6 @@ nanorange:x64-windows=fail nanorange:x64-windows-static=fail nanorange:x64-windows-static-md=fail nanorange:x86-windows=fail -nanovg:arm-uwp=fail -nanovg:x64-uwp=fail nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail ngspice:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 127760547c..a5d439fa3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4677,8 +4677,8 @@ "port-version": 2 }, "nanovg": { - "baseline": "2019-8-30", - "port-version": 4 + "baseline": "2019-08-30", + "port-version": 5 }, "nativefiledialog": { "baseline": "2022-01-20", diff --git a/versions/n-/nanovg.json b/versions/n-/nanovg.json index 3393bb25fd..56718be730 100644 --- a/versions/n-/nanovg.json +++ b/versions/n-/nanovg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ea125c3f4f9b665a744cd0738c8a11837106f05", + "version-date": "2019-08-30", + "port-version": 5 + }, { "git-tree": "016ef1232ccb3f452530283711be418b33c28e17", "version-string": "2019-8-30",