From 2d9a19cc04bee7fefd5c5294bae7fe1cf11f8967 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Mon, 25 Nov 2024 22:01:20 +0100 Subject: [PATCH] qtbase: don't require pcre2's default features (#42321) Co-authored-by: Billy Robert O'Neal III --- ports/qtbase/vcpkg.json | 11 +++++++++-- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index de2c184479..f55aeebd51 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.8.0", + "port-version": 1, "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, @@ -10,7 +11,10 @@ "name": "libb2", "platform": "!windows" }, - "pcre2", + { + "name": "pcre2", + "default-features": false + }, { "name": "qtbase", "host": true, @@ -379,7 +383,10 @@ "pcre2": { "description": "Enable PCRE2 support", "dependencies": [ - "pcre2" + { + "name": "pcre2", + "default-features": false + } ] }, "png": { diff --git a/versions/baseline.json b/versions/baseline.json index 92dad28767..e001d159cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7550,7 +7550,7 @@ }, "qtbase": { "baseline": "6.8.0", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.8.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 1ff3a3b87f..18903c7db3 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "572380eee3c59c2656423fac304568537b7358d3", + "version": "6.8.0", + "port-version": 1 + }, { "git-tree": "b5025594fddc343bba86dadf4159d41a7e1bac13", "version": "6.8.0",