From 28da03422e727f0b3383019812a1bbc22827328f Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sun, 12 Feb 2023 13:41:43 -0500 Subject: [PATCH] Move up vcpkg baseline and kicad-vcpkg repo to get wx 3.2.2 --- vcpkg-configuration.json | 4 ++-- vcpkg.json | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 606edc786d..fb3ed61b7b 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -3,13 +3,13 @@ "default-registry": { "kind": "git", "repository": "https://github.com/microsoft/vcpkg", - "baseline": "eaf5e9023dee2e97aec87bebaa39a16b28c310b8" + "baseline": "36fb23307e10cc6ffcec566c46c4bb3f567c82c6" }, "registries": [ { "kind": "git", "repository": "https://gitlab.com/kicad/packaging/kicad-vcpkg-registry.git", - "baseline": "583838d5f68355c8a170c8545fee1854dc89fe76", + "baseline": "a5f6c93d41190d8dd011553c9f5df0dbaf8387a0", "packages": [ "python3", "wxpython", "wxwidgets", "ngspice" ] } ] diff --git a/vcpkg.json b/vcpkg.json index d2428cc7e1..af98e3309a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "kicad", - "version": "6.99", + "version": "7.99", "license": "GPL-2.0+", "dependencies": [ "boost", @@ -30,19 +30,15 @@ }, { "name": "wxwidgets", - "version": "3.2.1#0" + "version": "3.2.2#0" }, { "name": "wxpython", - "version": "4.2.0#3" + "version": "4.2.0#4" }, { "name": "ngspice", "version": "39" - }, - { - "name": "curl", - "version": "7.83.1" } ] }