Commit Graph

70 Commits

Author SHA1 Message Date
nicole mazzuca
1c2af99415
[vcpkg format-manifest] Add convert-control flag (#12471)
* [vcpkg format-manifest] initial convert-control attempt

TODO: manifest comments! we should keep $directives

* Finalize x-format-manifest

First, fix Json::parse -- "\c", for any c, was incorrectly parsed.
It would emit the escaped character, and then parse the character, so
that `\b` would give you { '\b', 'b' }.

Second, canonicalize source paragraphs as we're parsing them. This found
an error in qt5 -- The `declarative` feature was listed twice, and we
now catch it, so I removed the second paragraph.

Add PlatformExpression::complexity to allow ordering platform
expressions in a somewhat reasonable way.

Notes:
  - We allow `all_modules` as a feature name for back-compat with
    paraview
  - In order to actually convert CONTROL to vcpkg.json, we'd need to
    rename the qt5 `default` feature.
  - We need to add support for $directives in x-format-manifest

* fix qt5 port

* format

* fix compile

* fix tests for canonicalization

* Clean up code

* add error message for nothing to format

* add extra_info field

* add `const X&` overloads for `Object::insert[_or_replace]`

* fix compile

* simple CRs

* add tests

* format

* Fix mosquitto port file

also unmerge a line

* fail the tests on malformed manifest

* fix format_all

* fix coroutine port-version

* format manifests
2020-08-02 10:08:07 -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
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 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

* 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
2020-04-24 15:04:51 -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
7ca4891fa4 [Qt] feature latest to build 5.13.1 (#8212)
* Introduce latest feature to build Qt 5.13.1
2019-09-23 14:47:08 -07:00
Alexander Neumann
9b4b5f4ce7 [Qt] update to 5.12.5 (#8159) 2019-09-16 12:37:55 -07: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
Phil Christensen
bacc1efa5c
[qt5] bump CONTROL version 2019-08-13 14:57:08 -07:00
sjdrc
56d3aa5d02
[qt5]Only build qt5-activeqt on windows 2019-08-11 18:29:07 +10:00
pravic
18b029a5e3 [WIP] Add a Homepage URL entry for vcpkg ports (#2933)
* [vcpkg] Add "Homepage" field to the CONTROL files.
2019-06-15 16:54:47 -07:00
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
2019-05-08 15:15:26 -07:00
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
2019-03-26 10:46:40 -07:00
Maurice Kalinowski
3d2db597ce [qt5-mqtt] new port Qtmqtt (#5736) (#5737)
* [qt5-modularscripts] Split build steps

When building modules not available from the vendor download side, the
build process stays the same. Create two functions, one for accessing
the sources, the other for compilation.

* [qtmqtt] Add new port (#5736)
2019-03-22 01:08:50 -07:00
Lennart Trunk
473e803451 [qt5] Update to 5.12.1 and add some missing modules (#5293)
* Update qt5-base to 5.12.1

* update qt5-declarative to 5.12.1

* update qt5-modularscripts for 5.12.1

* update qt5-3d to 5.12.1

* update qt5-activeqt to 5.12.1

* add qt5-connectivity

* update qt5-charts to 5.12.1

* update qt5-datavis3d to 5.12.1

* update qt5-gamepad to 5.12.1

* update qt5-graphicaleffects to 5.12.1

* update qt5-imageformats to 5.12.1

* add qt5-location

* update qt5-multimedia to 5.12.1

* update qt5-networkauth to 5.12.1

* add qt5-purchasing

* update qt5-quickcontrols to 5.12.1

* update qt5-quickcontrols2 to 5.12.1

* add qt5-remoteobjects

* update qt5-script to 5.12.1

* update qt5-scxml to 5.12.1

* add qt5-sensors

* update qt5-serialport to 5.12.1

* update qt5-speech to 5.12.1

* update qt5-svg to 5.12.1

* update qt5-tools to 5.12.1

* update qt5-virtualkeyboard to 5.12.1

* add qt5-webchannel

* update qt5-websockets to 5.12.1

* update qt5-winextras to 5.12.1

* update qt5-xmlpatterns to 5.12.1

* update framework port to 5.12.1 and include the new modules

* fix building qt5-base on linux

* [qt5] Remove non-alphanumerical ASCII chars from dependencies
2019-02-22 14:57:40 -08:00
Lennart Trunk
13ec61a842 [qt5] update to QT5.12 (#4991)
* update qt5-base to 5.12

* update modules to 5.12 (qt5-declarative and dependents don't work yet)

* fix qt5-declarative for 5.12 and some hashes.

* add qt5-declarative as dependency for qt5-graphicaleffects
2019-01-16 14:54:59 -08:00
Alexander Neumann
4aba36cd38 Qt version bump 5.11.2 (#4629)
* Qt 5.11.2 version bump

* removed unecessary qt patch

* fix wrong hash for qt5-networkauth
2018-11-07 14:49:47 -08:00
Markus Heß
2107d0b051 add qt5-graphicaleffects 2018-02-12 18:13:17 +01:00
Markus Heß
c1f8dadafe add qt5-quickcontrols port 2018-02-12 18:12:10 +01:00
Markus Heß
bae3fac1cd add qt5-quickcontrols2 2018-02-12 16:45:29 +01:00
Barath Kannan
ca9ff199d6 append hyphen to qt5 module names 2018-01-18 10:02:56 +11:00
Barath Kannan
fe94a33bfe qt5 network auth module 2017-12-31 08:25:28 +11:00
Barath Kannan
d8f0ea9999 resolve merge conflicts 2017-12-27 16:57:43 +11:00
Robert Schumacher
db40d19f3d [qt5] Add atlmfc to dependencies on windows due to tlbase.h inclusion. Fixes #2344. 2017-12-21 12:02:08 -08:00
Barath Kannan
22e9a2b25d change serial module name 2017-12-15 07:15:38 +11:00
Robert Schumacher
eec26f68fc [qt5] Reduce duplication in modular build by extracting qt5modularscripts 2017-11-20 17:07:03 -08:00
Barath Kannan
890a81bebc remove old qt5 2017-10-16 00:41:48 +11:00
ShinNoNoir
6d98ee5d9c [qt5] Bump version to reflect fixcmake.py fix 2017-09-19 17:25:06 +02:00
ShinNoNoir
956ced64d3 [qt5] Update fixcmake.py for new manual-link directory 2017-09-19 17:24:06 +02:00
Raynor Vliegendhart
304a1561cb [qt5] Bump version to reflect change in which .libs are linked 2017-09-06 08:03:45 +02:00
Raynor Vliegendhart
cd8c8af8e8 [qt5] Do not link all .lib files
This commit moves a few .lib files to subfolders to prevent them from
automatically getting linked:

Qt5Bootstrap (dbg):
This lib is linked against a release version of the CRT and is only
meant for release builds. For debug builds, this lib should not be
linked at all.

qtmain (rel), qtmaind (dbg),
Qt5AxServer (rel), Qt5AxServerd (dbg):
These libs are mutually exclusive. The user either links against
qtmain(d) for desktop applications or against Qt5AxServer(d) for ActiveX
servers.

See https://github.com/Microsoft/vcpkg/issues/1442 for more information.
2017-09-06 07:54:32 +02:00
Robert Schumacher
17cb5b9c34 [qt5] Bump version to include tool dependency copying. 2017-08-04 14:38:56 -07:00
Mikhail Paulyshka
04af706671 [qt5] copy tools dependencies 2017-08-03 10:09:35 +03:00
Robert Schumacher
b33632943c [qt5] Fastfail static builds 2017-07-03 19:08:24 -07:00
Robert Schumacher
576044e612 Merge pull request #1218 from bagong/qt5-private-headers
Qt5: Add private header paths in cmake config files via patch
2017-06-06 15:01:39 -07:00
Robert Schumacher
7b4d83c444 [qt5] Add check for long path. 2017-06-06 11:39:00 -07:00
Bagong
3f2f920a96 Add private header paths in cmake config files via patch 2017-06-05 11:34:31 +02:00
Robert Schumacher
faaa71baa0 [qt5] Use _CL_ to add /utf-8 to all compiler lines.
Fixes #1092.
Fixes #1037.
Fixes #1024.
2017-05-15 20:14:21 -07:00
Robert Schumacher
50af29ade6 [qt5] Restore trailing spaces to uncorrupt patches. 2017-04-28 01:35:31 -07:00
Tobias Kohlbau
5a32a97de1 [qt5] bumped to qt5.8
Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
2017-04-27 15:39:59 +02:00
Robert Schumacher
558d54dd4e [qt5] Add qtdeploy.ps1 to enhance applocal.ps1 when Qt is in use. 2017-03-31 06:35:23 -07:00
Steffen André Langnes
a81ac6282e [qt5] Configure without -no-style-* parameters
Removed the parameters for Windows styles because they prevent proper style rendering (defaults to Windows 9x style).

Removed the parameter for the fusion style for consistency.
2017-03-29 22:57:43 +02:00
Robert Schumacher
f17fd50a62 [qt5] Enable opengl desktop to support QWT 2017-03-20 16:20:02 -07:00
Robert Schumacher
e3d9627757 [qt5] Fix regression from dd6d1aa5. When building a static triplet, repeat the build on failure. 2017-03-06 17:52:25 -08:00
Robert Schumacher
df4d385d3d [qt5] Further reduce regressions.
Fix issue where generated cmake points at the wrong tools folder.
2017-02-24 16:00:05 -08:00
Robert Schumacher
e4ff363f5c [qt5] Reduce number of skipped components. 2017-02-23 19:01:01 -08:00
Robert Schumacher
dd6d1aa560 [qt5] Exercise full control over build configuration.
Bumps version to 5.7.1-2

This fixes several issues:
- Prevents a hang for user input during the build.
- Moves the tools into a subdirectory so their DLLs do not interfere with other packages.
- Adds the currently installed DLLs to the path so that tools compiled during the build can be run.
- Uses our system's copy of double-conversion.
- No longer uses looped builds; I haven't seen issues since the update to JOM 1.1.2
- Works around an issue with Qt5Bootstrap (QTBUG-55499)

Regressions to fix:
- Disables many subcomponents
2017-02-23 03:34:21 -08:00
Robert Schumacher
116b1b8c66 Reorder path alterations to generally append instead of prepend.
This solves the issue where some software bundles (git) provide multiple executables in the same folder, which can override other desired programs (link.exe).
2017-02-08 17:39:31 -08:00
Silvio Traversaro
fc8228a79b [qt5] Fix tabs/spaces mismatch 2017-01-06 23:04:20 +01:00
Silvio Traversaro
95ff552b85 [qt5] Avoid printing warnings for problems in applying"confguration patches"
The `QUIET` option for `vcpkg_apply_patches` was added in f4c34bb42d . 
Fixes https://github.com/Microsoft/vcpkg/issues/411 .
2017-01-06 23:02:19 +01:00
Silvio Traversaro
614320e007 [qt5] Bump version 2016-12-29 10:59:48 +01:00