Commit Graph

10 Commits

Author SHA1 Message Date
Alexander Neumann
8e926cc06c
[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-20 12:55:41 -08:00
Daniele Lupo
a8f5147bbc
[qt5-base] mysql plugin added (#15170)
* qt5-base: added mysql plugin.

* Fixed netcdf patch.

* Build only on windows.

* mysql plugin as module

The MySQL plugin for QT now is a module of qt5-base

* Update ports/qt5-base/portfile.cmake

Co-authored-by: Daniele Lupo <daniele.lupo@log-in.it>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2021-01-11 20:49:05 -08:00
Alexander Neumann
aa0ffba768
[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 02:10:11 -07:00
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>
2020-07-08 15:34:35 -07:00
Alexander Neumann
3b275f5138
[qt5-base] fix static init fiasco and fix debug dll's not being copied (#12153) 2020-06-29 16:33:19 -07:00
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 8b9b188839.

* 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 708d8250d6.

* 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 199a3ef92f

* add messages to qt5-webengine and adjust baseline

* add jpeg and zlib to JASPER_LIBS

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2020-04-23 21:19:45 -07:00
Alexander Neumann
941d546454
[qt5-base, qt5-imageformat] fix issues on osx (#9705)
* [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 8b9b188839.

* 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 708d8250d6.

* 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

* bump control

* update baseline

* ws change to osg-qt

* 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.
2020-04-09 17:08:01 -07:00
Alexander Neumann
359661a227
[qt5-base] Fix EGL absolute path on Linux (#10641)
* - add patch to find the debug library
- manually fix EGL path in Qt5GuiConfigExtras.cmake

* bump control
2020-04-06 14:03:16 -07:00
Alexander Neumann
f8165f7270 [qt5-base] Fix Qt5 linux build and be a bit less flaky in CI (#9260)
* Fix static qt5 builds and ignore system qmake
closes #9234 and #9239

* fix angle conflict and icu dependency

* add egl-registry as a dependency

* remove space

* adding spaces resolved the problem

* move files only if they exist

* Update the Wrapper to use the Postgres target

fixes some observed linkage issues

* update baseline

* add fontconfig on linux so CI is less flaky in a full rebuild

* fix linkage dependent qt5-imageformats libs

* Fix Wrapper for Linux and add other platform libs to Qt5::Core

* fix plugin properties in cmake files

* fix cmake files.

* fix missing plugin qminimal deployment into tools dir

* change wrapper slightly

* UNIX also means APPLE so it needs to be excluded

* fix the static windows build

* mark the parts of fixcmake which require further work to work with single configuration builds

* Update ci.baseline.txt

make qt5-tools pass for CI testing

* fix last regression

* break auto fontconfig in configure script to fix qt5-tools

* update baseline

* enable verbose to debug ci

* try to help it instead of breaking it

* completly link icu

* try to fix fontconfig configure

* fix configure call. cannot be called with a list!

* remove invalid line from patch

* force icu and reduce the required icu libs according to the configure script

* fix icu linkage

* add more icu dependencies and names for windows

* add more icu libs. Seems like all are needed

* fix typo

* print icu libs in debug

* check releasenames

* try again

* change link order

* add icu to wrapper

* fix typo

* patch icu configure for static windows builds

* add other icu libraries to the icu patch

* fix icu in x64-windows-static

* update baseline. VTK builds in local WSL so it should work in CI

* update VTK control to force rebuild

* remove qt5-tools=pass from baseline

* remove qcustomplot:x64-linux=fail from baseline

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-01-06 12:36:51 -08:00
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.
2019-09-12 10:07:21 -07:00