This PR adds a patch from upstream that fixes C++20 support. [In C++20,
template parameters from the class template are no longer allowed in
constructors and destructors
declarations](https://eel.is/c++draft/diff.cpp17#class-2). The Qhull C++
headers have a few instances of these, and don't compile under compliant
C++20 (or later). Specifically, since version 11, GCC generates an error
diagnostic.
[While this has been fixed in the
upstream](https://github.com/qhull/qhull/pull/122), the slow Qhull
release cycle means it might be quite a while longer until a new
official release it available. It's already been a year and a half since
the fix, [and the next release is still in
alpha](https://github.com/qhull/qhull/wiki#qhull-81-alpha3-20230102)
with no clear timeline. As C++20 becomes more mainstream, I believe it's
important to ensure support for this library.
On MS Windows qt5-webengine fails to build in a context where protobuf
from vcpkg is also used because it includes the vcpkg supplied version
of protobuf headers when building the Qt part of the code in
qt5-webengine, against the internal copy of Chromium which has used its
older copy of protobuf to generate the headers. The build failure seen
is this:
FAILED: obj/QtWebEngineCore/browser_message_filter_qt.obj
...
...
C:\vcpkgroot\qt5-webengine\x64-windows-dbg\src\core\debug\gen\net/third_party/quiche/src/quic/core/proto/cached_network_parameters.pb.h(17):
fatal error C1189: #error: This file was generated by an older version
of protoc which is
To work around this issue we ensure that the path to the chromium
provided version of protobuf is included before the path to the vcpkg
provided includes residing in:
C:/vcpkgroot/qt5-webengine/x64-windows-dbg/include
Fixes#12150Fixes#27932Fixes#34452
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
These are dependencies that must otherwise be provided by the operating
system. libdbus-1.so, at least on some Linux distributions, depends on
other system provided libraries like liblz4.so, libzstd.so, and
liblzma.so. It was necessary to cherry-pick two patches for the chromium
embedded in qtwebengine to make it build with ICU 74.
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
Fixes#36821.
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
* [poly2tri ]Switch to maintained repo and adjust description
* Rename to jhasse-poly2tri
* Also update version and fix header installation.
* Remove double nested headers.
---------
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [qtbase] patch CVE-2023-51714
* [qtbase] regenerate version info
* bump version db
* update version db
---------
Co-authored-by: Javier Matos Denizac <javiermat@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Fix ICU support option
* update version
* [libxml2] Fix ICU support option
* format vcpkg.json
* update version
* Add qtwebengine depend on libxml2[icu]
* update version
* update version
* update feature
* update version
---------
Co-authored-by: vzhli17 <v-zhli17@microsoft.com>
* [quill] Update to 3.4.0
* [quill] Update version files
* [quill] Fix version tag
* [quill] Update version files
* [quill] Enable android build
* [quill] Update version files
* [quill] Disable thread name support on android build
* [quill] Update version files
* [Qt] Update to 6.6.0
* fix patch in qtbase
* add tmp port to get qtwebengine logs
* remove dep in tmp port
* Fix CMAKE_BUILD_TYPE being hijacked by qt scripts.
* Fix qtwebengine build?
* add another script to be fixed
* remove path to cmake
* fix qtgrpc
* looks like the variable is defined somewhere.
* avoid aliasing only if the target exists
* try different aliasing fix
* fix patch
* Dep stuff
* reenable atomics
* reenable librt
* remove tmp
* v db
* v db
* add vulkan-header as a dependency
* v db
* also needs libs
* v db
* add a comment to remember me not to touch this again
* v db
* [assimp] Update to 5.3.0
* Remove <utf8.h> from public include
* [assimp] fix pkg-config for static builds
* [qt5-3d] Use pkgconfig to find assimp
* [assimp] -llibassimp -> -lassimp
* [assimp] Update to 5.3.1
Under normal circumstances, things can't be removed from the version database, because that breaks outstanding references to those versions. However, these entries can't be parsed in the first place which means nobody can be depending on them being there. (Usually this comes from accidentally merging PRs that add multiple versions, such as 8184c5e06chttps://github.com/microsoft/vcpkg/pull/31859 )
This was detected using new output from https://github.com/microsoft/vcpkg-tool/pull/1210
C:\Dev\vcpkg\versions\a-\abseil.json: error: failed to execute: "C:\Program Files\Git\cmd\git.exe" "--git-dir=C:\Dev\vcpkg\.git" "--work-tree=C:\Dev\vcpkg\buildtrees\versioning_\versions\abseil\2209360b556a40cf034551f6f9063456eac63986_83008.tmp" -c core.autocrlf=false read-tree -m -u 2209360b556a40cf034551f6f9063456eac63986
error: git failed with exit code: (128).
fatal: failed to unpack tree object 2209360b556a40cf034551f6f9063456eac63986
note: while checking out port abseil with git tree 2209360b556a40cf034551f6f9063456eac63986
note: while validating version: 20230125.3#2
C:\Dev\vcpkg\versions\a-\abseil.json: C:\Dev\vcpkg\buildtrees\versioning_\versions\abseil\28fa609b06eec70bb06e61891e94b94f35f7d06e\vcpkg.json: error: $.features: mismatched type: expected a set of features
note: while validating version: 2020-03-03#7
C:\Dev\vcpkg\versions\a-\async-mqtt.json: error: failed to execute: "C:\Program Files\Git\cmd\git.exe" "--git-dir=C:\Dev\vcpkg\.git" "--work-tree=C:\Dev\vcpkg\buildtrees\versioning_\versions\async-mqtt\61071a18dc0dc629c374fa016b81473e04a28ff1_83008.tmp" -c core.autocrlf=false read-tree -m -u 61071a18dc
error: git failed with exit code: (128).
fatal: failed to unpack tree object 61071a18dc
note: while checking out port async-mqtt with git tree 61071a18dc
note: while validating version: 1.0.8
C:\Dev\vcpkg\versions\b-\blend2d.json: C:\Dev\vcpkg\buildtrees\versioning_\versions\blend2d\ffce764b880d8cc24e3b00328aa3861f15bae91d\vcpkg.json: error: $.features: mismatched type: expected a set of features
note: while validating version: beta_2020-07-31
C:\Dev\vcpkg\versions\b-\blend2d.json: C:\Dev\vcpkg\buildtrees\versioning_\versions\blend2d\03a43f03eb0cab95aac27a77b71273fc4aa2e94d\vcpkg.json: error: $.features: mismatched type: expected a set of features
note: while validating version: beta_2020-07-09
C:\Dev\vcpkg\versions\e-\elfio.json: error: The version database declares 3.8 as version, but 19659f0b36 declares it as version-string. Versions must be unique, even if they are declared with different schemes.
note: run:
vcpkg x-add-version elfio --overwrite-version
to overwrite the scheme declared in the version database with that declared in the port.
C:\Dev\vcpkg\versions\f-\flashlight-text.json: error: failed to execute: "C:\Program Files\Git\cmd\git.exe" "--git-dir=C:\Dev\vcpkg\.git" "--work-tree=C:\Dev\vcpkg\buildtrees\versioning_\versions\flashlight-text\6386901fa48bce946fdc5775a1c1b784e0a97175_83008.tmp" -c core.autocrlf=false read-tree -m -u 6386901fa4
error: git failed with exit code: (128).
fatal: failed to unpack tree object 6386901fa4
note: while checking out port flashlight-text with git tree 6386901fa4
note: while validating version: 0.0.3
C:\Dev\vcpkg\versions\l-\libwebp.json: C:\Dev\vcpkg\buildtrees\versioning_\versions\libwebp\a05e0de81085231df86f6902aba1e0a364e2ca7b\CONTROL:1:94: error: invalid character in feature name (must be lowercase, digits, '-', or '*')
on expression: libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, simd, cwebp, dwebp], libwebp[vwebp_sdl] (!osx), libwebp[extras] (!osx)
^
note: while validating version: 1.1.0
C:\Dev\vcpkg\versions\l-\libwebp.json: C:\Dev\vcpkg\buildtrees\versioning_\versions\libwebp\5066566c98bc1913b678347c4cbae0a6aff4cf2d\CONTROL:1:94: error: invalid character in feature name (must be lowercase, digits, '-', or '*')
on expression: libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, simd, cwebp, dwebp], libwebp[vwebp_sdl] (!osx), libwebp[extras] (!osx)
^
note: while validating version: 1.0.3-1
C:\Dev\vcpkg\versions\l-\libwebp.json: C:\Dev\vcpkg\buildtrees\versioning_\versions\libwebp\6ff3a23b154fad821db2d8236bf9d0382f0229cf\CONTROL:1:94: error: invalid character in feature name (must be lowercase, digits, '-', or '*')
on expression: libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, simd, cwebp, dwebp], libwebp[vwebp_sdl, extras] (!osx)
^
note: while validating version: 1.0.3
C:\Dev\vcpkg\versions\o-\opencolorio.json: error: failed to execute: "C:\Program Files\Git\cmd\git.exe" "--git-dir=C:\Dev\vcpkg\.git" "--work-tree=C:\Dev\vcpkg\buildtrees\versioning_\versions\opencolorio\9569944b76966b78bec5ef83672899acd7e4febe_83008.tmp" -c core.autocrlf=false read-tree -m -u 9569944b76
error: git failed with exit code: (128).
fatal: failed to unpack tree object 9569944b76
note: while checking out port opencolorio with git tree 9569944b76
note: while validating version: 2.1.2
C:\Dev\vcpkg\versions\q-\qscintilla.json: error: failed to execute: "C:\Program Files\Git\cmd\git.exe" "--git-dir=C:\Dev\vcpkg\.git" "--work-tree=C:\Dev\vcpkg\buildtrees\versioning_\versions\qscintilla\b5942c0b0a6d9131bc4ad9a1dde662f809a6d965_83008.tmp" -c core.autocrlf=false read-tree -m -u b5942c0b0a6d9131bc4ad9a1dde662f809a6d965
error: git failed with exit code: (128).
fatal: failed to unpack tree object b5942c0b0a6d9131bc4ad9a1dde662f809a6d965
note: while checking out port qscintilla with git tree b5942c0b0a6d9131bc4ad9a1dde662f809a6d965
note: while validating version: 2.13.4
C:\Dev\vcpkg\versions\r-\robin-map.json: error: The version database declares 0.6.3 as version-semver, but 84f1433234 declares it as version-string. Versions must be unique, even if they are declared with different schemes.
note: run:
vcpkg x-add-version robin-map --overwrite-version
to overwrite the scheme declared in the version database with that declared in the port.
C:\Dev\vcpkg\versions\v-\vcpkg-cmake-get-vars.json: error: failed to execute: "C:\Program Files\Git\cmd\git.exe" "--git-dir=C:\Dev\vcpkg\.git" "--work-tree=C:\Dev\vcpkg\buildtrees\versioning_\versions\vcpkg-cmake-get-vars\c6eb09f11e34173a4bfc31252d02d6aea6c25d8f_83008.tmp" -c core.autocrlf=false read-tree -m -u c6eb09f11e
error: git failed with exit code: (128).
fatal: failed to unpack tree object c6eb09f11e
note: while checking out port vcpkg-cmake-get-vars with git tree c6eb09f11e
note: while validating version: 2023-04-13
* Fix broken version constraints.
C:\Dev\vcpkg\ports\kinectsdk1\vcpkg.json: error: the "version>=" constraint to vcpkg-tool-lessmsi names version 1.10#1 which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg. Consider removing the version constraint or choosing a value declared in C:\Dev\vcpkg\versions\v-\vcpkg-tool-lessmsi.json.
C:\Dev\vcpkg\ports\kinectsdk2\vcpkg.json: error: the "version>=" constraint to vcpkg-tool-lessmsi names version 1.10#1 which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg. Consider removing the version constraint or choosing a value declared in C:\Dev\vcpkg\versions\v-\vcpkg-tool-lessmsi.json.
C:\Dev\vcpkg\ports\matroska\vcpkg.json: error: the "version>=" constraint to ebml names version 1.4.3 which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg. Consider removing the version constraint or choosing a value declared in C:\Dev\vcpkg\versions\e-\ebml.json.
C:\Dev\vcpkg\ports\openvino\vcpkg.json: error: the "version>=" constraint to protobuf names version 3.20.3 which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg. Consider removing the version constraint or choosing a value declared in C:\Dev\vcpkg\versions\p-\protobuf.json.
note: the dependency is in the feature named onnx.
C:\Dev\vcpkg\ports\openvino\vcpkg.json: error: the "version>=" constraint to protobuf names version 3.20.3 which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg. Consider removing the version constraint or choosing a value declared in C:\Dev\vcpkg\versions\p-\protobuf.json.
note: the dependency is in the feature named onnx.
C:\Dev\vcpkg\ports\openvino\vcpkg.json: error: the "version>=" constraint to protobuf names version 3.20.3 which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg. Consider removing the version constraint or choosing a value declared in C:\Dev\vcpkg\versions\p-\protobuf.json.
note: the dependency is in the feature named paddle.
C:\Dev\vcpkg\ports\openvino\vcpkg.json: error: the "version>=" constraint to protobuf names version 3.20.3 which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg. Consider removing the version constraint or choosing a value declared in C:\Dev\vcpkg\versions\p-\protobuf.json.
note: the dependency is in the feature named paddle.
C:\Dev\vcpkg\ports\openvino\vcpkg.json: error: the "version>=" constraint to protobuf names version 3.20.3 which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg. Consider removing the version constraint or choosing a value declared in C:\Dev\vcpkg\versions\p-\protobuf.json.
note: the dependency is in the feature named tensorflow.
C:\Dev\vcpkg\ports\openvino\vcpkg.json: error: the "version>=" constraint to protobuf names version 3.20.3 which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg. Consider removing the version constraint or choosing a value declared in C:\Dev\vcpkg\versions\p-\protobuf.json.
note: the dependency is in the feature named tensorflow.
C:\Dev\vcpkg\ports\qtvirtualkeyboard\vcpkg.json: error: the dependency t9write does not exist in the version database; does that port exist?
note: the dependency is in the feature named t9write.
* Remove entries from the baseline that do not exist.
* [qt5-webengine] remove build_3.with_missing_stdbool_include.patch from qt5-webengine
* [qt5-webengine] remove workaround-msvc2022-ice.patch from qt5-webengine
* [qt5-webengine] increase port version number
* [qt5-webengine] updated versions to include qt5-webengine port version 5.15.10#1
* Xbox triplets should not support ports with only copyleft licenses
* Reverted ports that build with xbox currently
* Fix conflict and rebase
* Update baseline
* Update baseline
* fix glib2 no found
* update version
* update version
* update version
* update version
* update version
* update version
* update version
* update version
* update verion
* update verion
* merge master
* version
* fix new error
* update version
* update version
* update version
* Update qtbase.json
---------
Co-authored-by: Jim Wang (Beyondsoft Corporation) <v-wangjim@microsoft.com>