diff options
| author | Dawid Wróbel <me@dawidwrobel.com> | 2021-04-28 20:53:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 17:53:01 -0700 |
| commit | 7f1708740708b7fd912af5c0ade23a3b48712ce1 (patch) | |
| tree | b59ad9ebc149a0e8dfde846656f5fa19ec998239 | |
| parent | 2a90d45fad8ae949233eca16946d1e9942bd8f22 (diff) | |
| download | vcpkg-7f1708740708b7fd912af5c0ade23a3b48712ce1.tar.gz vcpkg-7f1708740708b7fd912af5c0ade23a3b48712ce1.zip | |
qt5-base: misleading list of system packages required (#16280)
* qt5-base: misleading list of system packages reqd
qt5-base requires many more packages present than just a mere
libxkbcommon-x11-dev currently suggested. Let's instead point users
to thezure provision script, which a complete and an up-to-date list
of them.
* [qt5-base] bump version
* update version record
* Update ports/qt5-base/vcpkg.json
* Update versions/q-/qt5-base.json
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/qt5-base/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/q-/qt5-base.json | 5 |
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 |