mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
9 Commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
Alexander Neumann
|
3bffe1c049
|
[qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (#11596)
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. * [qt5] update and remove patches * [baseline] skip qt5-canvas3d due to deprecation * [qwt] update to 6.1.4 and fix build issues * [qt5-webengine] remove old patches * [qwt] fix static patch * [qt5-location] add a message that the port has a sprious failure * [qt5-webengine] fix filename of patch * [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors) * [qt5-winextras] depend on qt5-base[core] Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [qt5-base] update latest feature (latest=core) * [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now * [qt5-base] make qt5-base fail to get logs. * [angle] include missing egl sources. * [qt5-base] patch egl detection logic. * [baseline] remove qt-x11extras:x64-linux=fail * [qt5-base] need to be explicit about xcb to build qt5-x11extras * [CI] add necessary system libraries to linux CI * [qt5-base] remove comment to retry on linux * [qt5-base] add static_init patch for MSVC * [qt5-base] refined workaround to not regress linux and osx due to * [paraview] remove unnecessary patches with newer qt versions * [vcpkg/baseline] add webengine back to skip * [vtk] fix missing include regression using patch from upstream * [vtk] fix patch * [qt5-base] replace with patch from upstream * [paraview] use hdf5 1.10 api. * [paraview] bump control * Add more packages to Linux machines. * [qt5-base] forgot to add the patch * Delete 6943.diff Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> |
||
Alexander Neumann
|
28ab0b15cd
|
[Qt5] Update qt to 5.12.8 (#10749)
* make qt5 all features and add the missing qt modules * fix control * qt5 webengine enviromnent setup * copy qtminimal plugin to tools * add opengles3 option for testing * [qt5-imageformats] freeglut is not a dependency on osx * [qt5-base] fontconfig can require iconv on linux and osx * include the jasper fix to get CI coverage? * trying to get ci coverage for qt on osx * Revert "trying to get ci coverage for qt on osx" This reverts commit 8b9b188839ec90c25b54b49d17cf03c50987a49b. * apply the correct ci hack * fix wrapper to include macosx debug suffix * update baseline * first try to fix the Qt5 cmake configs at the root. * fix missing backslash * fix plugin patch * fix qt config patch * remove 90% of fixcmake.py * update baseline * experimental removal of fixcmake.py and dll copying into tools/qt5/bin * fix experimental dll copying. * fix static windows builds * fix static builds * fix plugin copy * add quotes around configuration to make it work * remove dll debug messages * note about the cmake fix * revert fontconfig changes on linux. Make qt.conf relative and not absolute * make qt.conf relative * trying to fix ogre osx ci regression * fix silly path error * Revert "trying to fix ogre osx ci regression" This reverts commit 708d8250d6eae81bb9a030ff7edef22d2ea1e67c. * add ogre:x64-osx=fail to CI baseline * retry on osx * fix configure error. since in qt5-base everything is in the package directory and not in the installed * revert change to ci.baseline * update ci baseline * update Qt Control fields * update qt hashes to 5.12.7 * update baseline update missing hashes update empty include/packages add info for placeholder ports not yet correctly working (e.g. qt5-wayland) * fix linux qt targets not having debug properties. * remove most of the wrapper * actual forgot to commit the prl parser * fix the config a bit differently. have to check linux configs again * add xlib patch. * make qt-base fail to get logs on linux * Need logs from qt5-base * update versions I missed * ws change * lets see if this is enough to make qt5-x11extras happy * add upstream patch. * add newline to patch * ws change to trigger rebuild and maybe get logs on osx failure * need generated cmakescripts to check linkage. * rename cmake files to end on .log so that i can inspect them after CI failure * fix patch * make qt run * androidextras only supports android * qt5-doc will only be build on linux * ws ci trigger due to download failure * WS to retrigger CI due to download failure * add code for debug tools * lets see if we can do it with only the release tools * update baseline * fix create link error on linx * update baseline * revert changes which tried to use release tools only * fix dependencies * add debug qt.conf * add another copyright install * qtdoc does not have any include files * fix wrong copy pasta * update latest port hashes. * make the patches versions dependent * cleanup qt5 control a bit * update qt5-base control for ci run to use latest * fix patches for latest * forgot to commit the portfile changes * fix imageformat dependencies for latest qt * update last hash * fix translations dependencies * get cmake scripts from CI * new patch for creating correct configs * patch precompiled headers away from qt5-webengine * fix patch for 5.12.7. (Patch was for 5.14.1) * trigger CI rebuild * add simple gl path to fix the chormium build error * comment out debug message from prl parser * bump control * update webengine control * update CI to skip webengine. * update baseline * ws change to osg-qt * remove kd-soap from faillist * reset ci baseline to upstream/master * update baseline * fix osg-qt? * skip ms-angle on osx and linux since the normal angle port should be used! * update ci baseline * try adding fontconfig manually * update ci baseline to remove osg-qt for the time being * remove manual library. * remove wrapper and get plugin info also from linux and osx * allow build of complete qt * fix missing parameter in populate plugin. * need more info from CI * fix foreach CI loop * comment out CI code colllection to make a full qt5 ci run * fix qt5-imageformats regression on linux * update baseline * - add patch to find the debug library - manually fix EGL path in Qt5GuiConfigExtras.cmake * bump control * update hashes to 5.14.2 * comment out messages for debugging * bump version in control * fix create cmake patch * add qtmain path corrections for single configuration build. * fix escaping of . in regex * remove one to many \\ * remove latest as a default feature * reenable messages to debug osg-qt issue on osx. * small cmake options details. might need to patch cmakelists.txt if this is not working * remove unnecessary comment * make prl parser silent again. * remove canvas3d from the default features since it has been deprecated and will be removed in the future * fix some remaining absolute paths. * update qt to 5.12.8 * deactivate qt update script * removed merged patch * remove a trailing ws and fix the mqtt hash which was missing before * revert some ws changes * fix version numbers in qt5 metaport |
||
Alexander Neumann
|
bb7ccc4b90
|
[Qt[latest]] Update to 5.14.2 (#10644)
* make qt5 all features and add the missing qt modules * fix control * qt5 webengine enviromnent setup * copy qtminimal plugin to tools * add opengles3 option for testing * [qt5-imageformats] freeglut is not a dependency on osx * [qt5-base] fontconfig can require iconv on linux and osx * include the jasper fix to get CI coverage? * trying to get ci coverage for qt on osx * Revert "trying to get ci coverage for qt on osx" This reverts commit 8b9b188839ec90c25b54b49d17cf03c50987a49b. * apply the correct ci hack * fix wrapper to include macosx debug suffix * update baseline * first try to fix the Qt5 cmake configs at the root. * fix missing backslash * fix plugin patch * fix qt config patch * remove 90% of fixcmake.py * update baseline * experimental removal of fixcmake.py and dll copying into tools/qt5/bin * fix experimental dll copying. * fix static windows builds * fix static builds * fix plugin copy * add quotes around configuration to make it work * remove dll debug messages * note about the cmake fix * revert fontconfig changes on linux. Make qt.conf relative and not absolute * make qt.conf relative * trying to fix ogre osx ci regression * fix silly path error * Revert "trying to fix ogre osx ci regression" This reverts commit 708d8250d6eae81bb9a030ff7edef22d2ea1e67c. * add ogre:x64-osx=fail to CI baseline * retry on osx * fix configure error. since in qt5-base everything is in the package directory and not in the installed * revert change to ci.baseline * update ci baseline * update Qt Control fields * update qt hashes to 5.12.7 * update baseline update missing hashes update empty include/packages add info for placeholder ports not yet correctly working (e.g. qt5-wayland) * fix linux qt targets not having debug properties. * remove most of the wrapper * actual forgot to commit the prl parser * fix the config a bit differently. have to check linux configs again * add xlib patch. * make qt-base fail to get logs on linux * Need logs from qt5-base * update versions I missed * ws change * lets see if this is enough to make qt5-x11extras happy * add upstream patch. * add newline to patch * ws change to trigger rebuild and maybe get logs on osx failure * need generated cmakescripts to check linkage. * rename cmake files to end on .log so that i can inspect them after CI failure * fix patch * make qt run * androidextras only supports android * qt5-doc will only be build on linux * ws ci trigger due to download failure * WS to retrigger CI due to download failure * add code for debug tools * lets see if we can do it with only the release tools * update baseline * fix create link error on linx * update baseline * revert changes which tried to use release tools only * fix dependencies * add debug qt.conf * add another copyright install * qtdoc does not have any include files * fix wrong copy pasta * update latest port hashes. * make the patches versions dependent * cleanup qt5 control a bit * update qt5-base control for ci run to use latest * fix patches for latest * forgot to commit the portfile changes * fix imageformat dependencies for latest qt * update last hash * fix translations dependencies * get cmake scripts from CI * new patch for creating correct configs * patch precompiled headers away from qt5-webengine * fix patch for 5.12.7. (Patch was for 5.14.1) * trigger CI rebuild * add simple gl path to fix the chormium build error * comment out debug message from prl parser * bump control * update webengine control * update CI to skip webengine. * update baseline * ws change to osg-qt * remove kd-soap from faillist * reset ci baseline to upstream/master * update baseline * fix osg-qt? * skip ms-angle on osx and linux since the normal angle port should be used! * update ci baseline * try adding fontconfig manually * update ci baseline to remove osg-qt for the time being * remove manual library. * remove wrapper and get plugin info also from linux and osx * allow build of complete qt * fix missing parameter in populate plugin. * need more info from CI * fix foreach CI loop * comment out CI code colllection to make a full qt5 ci run * fix qt5-imageformats regression on linux * update baseline * - add patch to find the debug library - manually fix EGL path in Qt5GuiConfigExtras.cmake * bump control * update hashes to 5.14.2 * comment out messages for debugging * bump version in control * fix create cmake patch * add qtmain path corrections for single configuration build. * fix escaping of . in regex * remove one to many \\ * remove latest as a default feature * reenable messages to debug osg-qt issue on osx. * small cmake options details. might need to patch cmakelists.txt if this is not working * remove unnecessary comment * make prl parser silent again. * remove canvas3d from the default features since it has been deprecated and will be removed in the future * remove ws change * remove newline and ws * trigger ci test * revert 199a3ef92f83775a61bd0f9beee0c48698bff1b6 * add messages to qt5-webengine and adjust baseline * add jpeg and zlib to JASPER_LIBS Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> |
||
Phil Christensen
|
e62d136128
|
[vcpkg] Add Supports: field. Use contents of triplets instead of names for dependency resolution. (#8601)
* remove unfinished "supports" tag * extract "supports" from control files But do nothing with the value * Start `Supports` documentation * Use Supports in a bunch of control files I only tried matching the already existing logic in the portfile.cmake. * Cmake var provider (#8) * Cmake var provider (#9) * fix windows build (#10) * Add missing files to build * Fix test (#11) * adding hooks for cmake variables in expressions * Adding hooks for 'supports' in CI test * Fix test (#12) * Add overrides to evaluation environment * use "supported" tag in CI testing * cleanup comment * Fix issues with PR * [var_provider] Get library linkage variables from triplet * Fix compilation errors in tests * Add unimplemented functions * Fix unit tests part 1 * Fix issue when buildtrees dir does not exist * Change binary output hash * Fix handling of * feature * Add core feature when using * * Do not add Default-Features when installing 'core' * [vcpkg] WIP. 6 failing tests. * [vcpkg] WIP. 1 failing tests. * [vcpkg] WIP. 0 failing tests. * [vcpkg] Removed 'remove_graph'. 0 failing tests. * [vcpkg] Removed 'install_graph'. 0 failing tests. * [vcpkg] Remove AnyAction; replace with ActionPlan * [vcpkg] Minor cleanup. * [vcpkg][z3][qt5-connectivity][qt5-purchasing] Improve error messages while parsing. Fix a few trivial port issues. * [vcpkg] Work around ICE with MSVC v140 * [vcpkg] Add purge on fail to decompress for CI * [vcpkg] Fix parsing of nested parentheses in qualifiers * [vcpkg] Fix Linux builds (explicit qualification in declaration) * [vcpkg] Fix Build-Depends implying default features. Fix qualified dependencies regression. * [mmx] Add to skip list and full rebuild -- mmx causes problems by installing 'sched.h' * [libpqxx][mqtt-cpp] Prevent installing include/CMakeLists.txt * [cppitertools] Fix installed include namespace (should be include/cppitertools) * [libsoundio] Move headers into soundio/ subdirectory as per original cmake * [ci.baseline] Temporarily skip charls due to conflict with dcmtk * [vcpkg] Add restricted include files post build check -- bump global abi version * [libsoundio] Hotfix stray line in portfile * [vcpkg] Fix regression: CMake information was not being displayed for build-and-install actions * [jsonnet] Fix installation of internal headers; use system nlohmann-json * [grpc][upb] Teach grpc to use packaged upb. Add find_package(upb). Remove inappropriate upb features. * [zfp] Move problematic 'include/bitstream.h' to 'include/zfp/bitstream.h' * [x265] Bump control version to trigger rebuild after zfp conflict * [akali] Disable parallel configure * [dirent][dlfcn-win32][getopt-win32][pthreads] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [ci.baseline] Update baseline for improved upb support * [tgui] Disable parallel configure * [libiconv] Enable VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [aws-sdk-cpp] Disable parallel configure * [vcpkg] Implement policy VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [aws-sdk-cpp] Fix amount of escaping semicolons -- Note: I do not know the root cause requiring this change * [libodb-sqlite] Fix configuring into source directory * [gettext] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [libodb] DISABLE_PARALLEL_CONFIGURE * [vcpkg] Add 'config.h' and 'local.h' to restricted header list * [mcpp] Remove unused and problematic include 'config.h' from installed files * [teemo] Move installed headers into subdirectory to prevent conflicts with x265 * [ci.baseline] Update current OSX. Skip libmesh on all platforms due to heavy conflicts. * [vcpkg] Add 'slice.h' as a restricted header * [osg] Improve accuracy of dependencies (disable some, add some to Depends) * [vcpkg] Skip invoking a subprocess for 0 specs in load_tag_vars * [ci.baseline] Skip mongo-c-driver on osx due to flakiness * [teemo] Fix incorrect include file read * [osg] Fix dependency typo: glut -> freeglut * [vcpkg] Recover some lost performance with the addition of vcpkg_get_tags. A huge performance cost was loading the triplet files over and over; instead, we splice the sources into a macro and load it once, then just call that macro for each port. Remove use of hashing because we aren't cross-process-safe anyway (global static will do instead). * [vcpkg] Change Supports atom 'windows' to include UWP. Improve Supports field documentation. * [vcpkg] Add docs for VCPKG_ENV_PASSTHROUGH and VCPKG_DEP_INFO_OVERRIDE_VARS * Fix typo Co-authored-by: Curtis J Bezault <curtbezault@gmail.com> Co-authored-by: Victor Romero <romerosanchezv@gmail.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com> |
||
Alexander Neumann
|
9b4b5f4ce7 | [Qt] update to 5.12.5 (#8159) | ||
Alexander Neumann
|
96f4487c77 |
[Qt] Update to 5.12.4 (#7667)
* update to 5.12.4 * removed port qt5-modularscripts and split it functionality into more functions into qt5-base * added qt_port_hashes.cmake for simpler upgrade. * added optional VCPKG_QT_HOST_MKSPEC and VCPKG_QT_TARGET_MKSPEC to select QTs build mkspecs from a triplet * qt_<config>.conf are now copied from the build dir instead from the port dir * fixed freetype dependencies. * cleanup of vcpkg_qmake scripts. No strange/unclear replacements anymore. * introduced vcpkg_buildpath_length_warning * changed directory layout of the qt5 installation executables and mkspecs a bit. |
||
JackBoosY
|
800fd63cf3 | [qt5]Fix build failure in linux (#7230) | ||
Lennart Trunk
|
38aeee774a |
[qt5] update to 5.12.3 (#6127)
* update CONTROL files and version variable * fix qt5 linkage in debug * revert target_link_libraries to set_property * revert mqtt to 5.12.1 since 5.12.3 is not released yet * update mqtt to 5.12.3 * update hashes * remove unnecessary patch * fix qmldevtools debug linkage for qt5-tools |
||
Sean Warren
|
98ae960b4b |
Add Qt5 static missing dependencies, fix mac packages (#5680)
* [qt5-macextras] Add qt5-macextras port * [cutelyst2] Fix install on mac * [qt5-purchasing] Add missing dependency on qt5-declarative * [qt5] Ensure we link to required libraries for qt5 static build * [qscintilla] Fix install on mac * [libqglviewer] Fix install paths on mac * [libqglviewer] Fix regressions * [qscintilla] Fix regressions * Bump version numbers * [qt5] restore harfbuzz on osx |