mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-10 16:57:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1a1f31ce26
vcpkg/ports/qt5-base/patches/zstdd.patch

17 lines
451 B
Diff
Raw Normal View History

[qt5] Update to 5.15.1 (#13477) * update everything. Let ci test if just updating is enough * fix some minor version details. * remove upstream patch * add zstdd patch and do not remove zlib since it is required for bootstrapping * add mqtt hash * webengine hash * add fixup pkgconfig to assimp * add assimp to qt-3d (still requires zlib fix) * setup pkg-config for qt * fix psql detection in configure * fix build details * fix assimp library nameing * -rpath option is not available for static builds * move config log somewhere where CI can catch it. * move logs only if they exists * append bzip2 qt-3d * break qt3d again to get logs * retry qt3d * remove qt-3d failure. everything ok now * add assistent patch for qt5-tools not building qthelp * remove unnecessary qt5-webengine patches * Remove PSQL_TYPES * [qt5-3d] remove irrxml as a assimp dep * remove unnecessary patch * fix qt-3d on windows * fix qt5-3d linux Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-10-17 17:10:11 +08:00
diff --git a/configure.json b/configure.json
index 50d69b740..7149e6803 100644
--- a/configure.json
+++ b/configure.json
[qt5] Update to 5.15.2 (#14678) * [qt5] Update to 5.15.2 (mqtt currently missing git tag) * deactivate update of ports * update version * reduce port version * fix typo * fix patch for linux missing pthread * fix qt5-tools * fix qt5-webengine * add xcb-util to linux provisioning script * fix version numbers * fix other typo * remove new hashes file * fix latest version info * switch to vcpkg_from_git adjust vcpkg_from_git to handle tags. add OUT_REF for vcpkg_from_git to enable scriptable update of ports * regenerate docs * [vcpkg_from_git] new options TAG and OUT_REF - TAG github tag to checkout - OUT_REF github commit id related to tag or ref (useable for automatic updates of ports if used with a version tag) * Apply suggestions from code review Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * additional changes due to CR * regenerate docs * Remove 'Port-Version:0' from qt5-location Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * add all those versions * fix versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2021-01-21 04:55:41 +08:00
@@ -182,7 +182,10 @@
[qt5] Update to 5.15.1 (#13477) * update everything. Let ci test if just updating is enough * fix some minor version details. * remove upstream patch * add zstdd patch and do not remove zlib since it is required for bootstrapping * add mqtt hash * webengine hash * add fixup pkgconfig to assimp * add assimp to qt-3d (still requires zlib fix) * setup pkg-config for qt * fix psql detection in configure * fix build details * fix assimp library nameing * -rpath option is not available for static builds * move config log somewhere where CI can catch it. * move logs only if they exists * append bzip2 qt-3d * break qt3d again to get logs * retry qt3d * remove qt-3d failure. everything ok now * add assistent patch for qt5-tools not building qthelp * remove unnecessary qt5-webengine patches * Remove PSQL_TYPES * [qt5-3d] remove irrxml as a assimp dep * remove unnecessary patch * fix qt-3d on windows * fix qt5-3d linux Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-10-17 17:10:11 +08:00
},
"sources": [
{ "type": "pkgConfig", "args": "libzstd >= 1.3" },
- "-lzstd"
+ "-lzstd",
[qt5] Update to 5.15.2 (#14678) * [qt5] Update to 5.15.2 (mqtt currently missing git tag) * deactivate update of ports * update version * reduce port version * fix typo * fix patch for linux missing pthread * fix qt5-tools * fix qt5-webengine * add xcb-util to linux provisioning script * fix version numbers * fix other typo * remove new hashes file * fix latest version info * switch to vcpkg_from_git adjust vcpkg_from_git to handle tags. add OUT_REF for vcpkg_from_git to enable scriptable update of ports * regenerate docs * [vcpkg_from_git] new options TAG and OUT_REF - TAG github tag to checkout - OUT_REF github commit id related to tag or ref (useable for automatic updates of ports if used with a version tag) * Apply suggestions from code review Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * additional changes due to CR * regenerate docs * Remove 'Port-Version:0' from qt5-location Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * add all those versions * fix versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2021-01-21 04:55:41 +08:00
+ "-lzstdd",
+ "-lzstd -pthread",
+ "-lzstdd -pthread"
[qt5] Update to 5.15.1 (#13477) * update everything. Let ci test if just updating is enough * fix some minor version details. * remove upstream patch * add zstdd patch and do not remove zlib since it is required for bootstrapping * add mqtt hash * webengine hash * add fixup pkgconfig to assimp * add assimp to qt-3d (still requires zlib fix) * setup pkg-config for qt * fix psql detection in configure * fix build details * fix assimp library nameing * -rpath option is not available for static builds * move config log somewhere where CI can catch it. * move logs only if they exists * append bzip2 qt-3d * break qt3d again to get logs * retry qt3d * remove qt-3d failure. everything ok now * add assistent patch for qt5-tools not building qthelp * remove unnecessary qt5-webengine patches * Remove PSQL_TYPES * [qt5-3d] remove irrxml as a assimp dep * remove unnecessary patch * fix qt-3d on windows * fix qt5-3d linux Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-10-17 17:10:11 +08:00
]
},
"dbus": {
Reference in New Issue Copy Permalink