aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/qt5-base/portfile.cmake7
-rw-r--r--ports/qt5-base/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/q-/qt5-base.json5
4 files changed, 10 insertions, 6 deletions
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 0d61fd06f..551f328dd 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -11,10 +11,9 @@ if (VCPKG_TARGET_IS_LINUX)
message(WARNING "qt5-base currently requires some packages from the system package manager, see https://doc.qt.io/qt-5/linux-requirements.html")
message(WARNING
[[
-qt5-base for qt5-x11extras requires the following libraries from the system package manager:
- libxkbcommon-x11-dev
-
-These can be installed on Ubuntu systems via apt-get install libxkbcommon-x11-dev.
+qt5-base for qt5-x11extras requires several libraries from the system package manager. Please refer to
+ https://github.com/microsoft/vcpkg/blob/master/scripts/azure-pipelines/linux/provision-image.sh
+ for a complete list of them.
]]
)
endif()
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index c2ba35dd0..72b3f3401 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "qt5-base",
"version-semver": "5.15.2",
- "port-version": 6,
+ "port-version": 7,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index faceac72f..887c8a742 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5010,7 +5010,7 @@
},
"qt5-base": {
"baseline": "5.15.2",
- "port-version": 6
+ "port-version": 7
},
"qt5-canvas3d": {
"baseline": "0",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index 78b2776d2..cf2963fc4 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "0a2e6f5403e24e41109d28db0c2330f8254774f2",
+ "version-semver": "5.15.2",
+ "port-version": 7
+ },
+ {
"git-tree": "96a7bf2a451b16e43b7adda9d0be8f07d853a090",
"version-semver": "5.15.2",
"port-version": 6