Commit Graph

8 Commits

Author SHA1 Message Date
Alexander Neumann
ce9c857d28
[Qt] Update to 6.2.2 and add missing modules (#21818)
* updating qt stuff to 6.2.2

* add missing modules for 6.2.2

* remove patch from qtbase

* add qtpositioning

* add qml feature

* add supports statement

* small ref change

* fix hash

* remove ,

* qtlocation is now emtpy

* get as list of files

* fix error in manifest

* add tool name

* fix qtapplication?

* print bin files

* fix qtapplicationmanager

* format

* set policy

* fix git fetch

* fix ref variable

* fix pc files for taglib
closes #21834

* fix qtinterfaceframework

* format manifest

* version stuff

* fix qtapplicationmanager

* fix version

* make qt buildable for static windows builds.

* version corrections

* add extra paths; otherwise it breaks out of the buildtree

* version stuff.

* trying to fix qtapplicationmanager

* add supports field

* fix cross case

* fix stuff

* version stuff
2021-12-06 20:46:28 -08:00
Dawid Wróbel
c32ccbb34c
[qt] Fix missing Cocoa include (#21056)
* [qt] Fix missing Cocoa include

Fixes both Qt6 and Qt5 ports.

Applies patch from:
https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547

Fixes #21055

* [qt] Update versions
2021-11-10 18:13:48 -08:00
Alexander Neumann
063d5fd9de
[Qt6] Update qt 6.2.1 (#21037)
* [Qt] Update to 6.2.1

* add changes from qtbase in the vcpkg-qmake PR into this PR. (So I don't invalidate everybody in the other PR)

* [skip actions] fix qtbase and format of vcpkg.json

* remove outdated patch

* remove patches and add alsa feature.

* version stuff
2021-11-04 15:29:53 -07:00
Alexander Neumann
1d4128f08e
[qt] Fix qtmultimedia with gstreamer on windows (#20555)
* apply patches to make qtmultimedia work with gestreamer on windows

* version stuff

* remove libnice from ci.baseline

* move gstreamer on osx as fail to baseline

* add supports field to qtmultimedia. Qt does not officially support x86 on windows

* version stuff

* remove duplicated patch

* version stuff

* add upstream patch to fix x86-windows

* [skip actions] version stuff
2021-10-11 11:03:50 -07:00
Alexander Neumann
35bfef7084
[Qt 6.2] Update Qt6 to 6.2 (#18687)
* [qt6] Update to 6.1.1

* version stuff

* fix empty dir

* update version

* fix casing in qtbase

* [libpq] add secure32.lib on windows

* add clang-cl fix

* version stuff

* fix flag removal by adding a space

* version stuff

* make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q

* fix libpq wrapper opensll linkage on linux

* use policy to fix dependent ports

* version stuff

* use upstream patch

* version stuff

* fix source_location with clang-cl

* version stuff

* add all new modules

* add all modules to the qt port

* push all the ports

* fix patch

* update ports

* split qt_install_submodule into smaller functions

* add qlitehtml submodule to qttools

* update a few ports before moving to beta

* update vcpkg.json and refs and fix issue with update

* fix dependencies

* remove patch

* update to 6.2

* add nodejs to vcpkg_find_acquire_program for qtwebengine

* format manifest.

* fix webengine and see if it builds.

* apply format diff

* add patch

* fix arm builds

* fix linux gcc 7.5 build error

* fix patch

* bump version in qtbase otherwise CI seems to resuse the wrong version

* fix webengine release build

* try fixing gcc 7.5 build

* revert gcc 7.5 fixes since they broke osx

* revert gcc 7.5 fixes since they broke osx

* fix qtimageformats.

* actually enable new qt6 builds.

* fix search path for nodejs.

* fix the webengine patch again.

* fix wrong binary name

* revisit all dependencies

* revisit webengine features and build settings

* more feature stuff

* remove qt6betablock and more features review for qt 6.2

* add missing qt prefix.

* format manifest

* fix ci issues

* format manifest.

* add node on osx.

* install node on linux

* fix a typo and a disable another find_package

* fix mingw build issues and switch to not using tag

* use CMAKE_HOST_WIN32 instead

* update ref

* fix core configure error

* fix mingw case.

* fix script installation

* remove qmake helper scrpt

* delete debug folder if empty

* add vcpkg-tool-nodejs

* revert changes in the pipeline scripts

* adjust qtwebengine to the changes

* format manifest and revert doc changes

* fix message and logic

* fix hashes and make host only port

* fix hash again?

* qttools add linguist feature for crossbuilds

* fix dependency

* add thread and future to concurrent feature

* add assistant as a required host feature
(somebody should tell Qt not to do that)

* fix dependency.

* [skip ci] not a host dep?!?

* [skip ci] debuging

* [skip ci] more debug messages

* [skip ci] try always redownloading

* [skip ci] fix hash und skip hash for redownloading once

* [skip ci] comment out skip sha and redownload

* add vcpkg_fixup_pkgconfig to libvpx

* qtwebengine requires qml and quick

* fix manifest format

* qtwebengine does not support static builds!

* remove unnecessary parts of the patch

* update to beta2

* add some " and a message in update mode

* [skip ci] remove old and reorder patches

* [skip ci] add qtpaths6

* [skip actions] fix webengine patch

* [skip actions] fix a few submodule refs

* [skip actions] fix qtwebengine

* [skip actions] remove qml feature from webengine in qt metaport

* qtdeclarative raise minimum cmake version

* use the tree id instead?

* [skip actions] raise minimum cmake version in qtquick3d

* fix fetching of unadvertised commit ids

* revert changes to vcpkg_from_git

* revert doc changes

* [skip actions] use the new FETCH_REF

* [skip actiosn] remove raise of minimum version to retry with new cmake version

* [skip actions] update to beta3

* revert removal of patch

* update to beta4
remove qtquickcontrols2 deps

* fix missing \

* [skip actions] fix gstreamer feature on windows

* [skip actions]
remove outdated patches
format qtmultimedia

* [skip actions] update to rc1

* [skip actions] remove patch for now

* update refs

* [skip actions] comment patch to try another patch in qtmultimedia

* x86 is not supported by qtwebengine (at least one of its internal third party deps fails due to x64 intrinsics.)

* Finalize for 6.2 release.
Open issues: QtWebengine and cross builds.

* version stuff

* fix semver in qtquickcontrols.

* version stuff

* revise qtwebengine supports expression

* update version
2021-09-30 13:03:56 -07:00
Alexander Neumann
8a07b5df24
[Qt6] Update to 6.1.2 (#18787)
* update qt to 6.1.2

* version stuff
2021-07-06 13:43:23 -07:00
Alexander Neumann
33d9cd45ff
[Qt6] Update to 6.1.1 (#18320)
* [qt6] Update to 6.1.1

* version stuff

* fix empty dir

* update version

* fix casing in qtbase

* [libpq] add secure32.lib on windows

* add clang-cl fix

* version stuff

* fix flag removal by adding a space

* version stuff

* make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q

* fix libpq wrapper opensll linkage on linux

* use policy to fix dependent ports

* version stuff

* use upstream patch

* version stuff

* fix source location for clang-cl

* version stuff

* remove ws change

* version stuff
2021-06-21 13:45:33 -07:00
Alexander Neumann
36000a1085
[Qt6|6.1.0] Add new ports. (#14333)
* wip commit

* refactor openssl ports.

* fix issues due to the file movement

* qt build succesful.

* qtbase finished?

* add qttools and qtdeclarative

* add EntryPoints to fixup_cmake_targets

* add todo

* more config fixup

* correct entrypoint and remove winmain

* format manifest

* fix module issues

* add extra vars

* make qtdeclarative work (x64-windows). -static has problems

* some extra cleanup tools start building

* refactor code to use common script across ports

* remove patch applied twice

* remove copy pasta

* add remaining qt6 ports

* fix a few details

* fix the rest

* format manifests

* add features to qt5compat.

* small modification to directories

* copy plugins

* a bit of cleanup

* smaller fixes

* format manifest

* fix_linux_configure_issue

* adding linux features.

* dont use quotes around INSTALL_ vars to fix linux build

* fix script install on linux

* remove bin if empty on all platforms otherwise let vcpkg throw an error

* fix syncqt path

* fix assimp feature

* try to figure you ci failures

* fix manifest format

* change the head ref to dev
add three required upstream cmake patches
allow single config builds

* fix typo

* switch to use FEATURE_ instead of QT_FEATURE

* [ZSTD] Update to 1.4.5

* [zstd] fix wrong assert to fix uwp regressions

* always install *.pc file. Correct -l flag in pc file

* remove any changes to vcpkg_copy_tools

* fix orc regression

* fix arrow regressions

* fix zstd target suffix

* fix orc zstd linkage

* fix find_package(ZSTD)

* fix icu linkage in harfbuzz

* install zstd dlls.

* skip qt5-base in ci to test qtbase due to conflicts

* fix the patch due to a replacement error

* add a way for vcpkg_from_github to only download the source archive and return the archive file name.

* update everything to beta4.
maybe qtdeclarative:x64-windows-static works now?

* remove outdated patches

* Print the failed condition

* more debug messages

* fix condition patch

* update to beta5

* update vcpkg_from_git to support tags and make output of ref possible.

* update ports

* add missing qt ports, fix qtbase build

* regenerate docs

* fix typo

* fix imageformats webp

* fix qtdeclarative static builds msvc

* more fixes

* make the rest of qt build succesfully. (only tested x64-windows)

* format manifest.

* [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)

* fix importprefix in qml plugin targets in static builds

* fix static qttools build on windows

* move qml plugin fix into qtbase

* try fixing staqtic build issues.

* make comment in qtquickcontrols2

* dont promote targets

* fix missing limits include

* fix patch

* pass options in qtopcua

* fix freetype linkage

* fix freetype a bit different

* fix promotion patch

* fix freetype wrapper without "

* fix typo in patch

* enable build of qtopcua

* format manifest for ci to run

* retry promotion

* try again but explicity not promote Threads::Threads

* push patch

* [fontconfig] add vcpkg cmake wrapper.

* fix empty statement in the wrapper

* show files in bin if any

* Apply suggestions from code review

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* additional changes due to CR

* regenerate docs

* qdoc is build if llvm is present.

* fix merge issues

* fix wayland deps

* add qt5-base to skip for static-md

* format manifest.

* update all qt ports. Lets see which patches need to be fixed/removed

* fix some regressions by removing patches no longer necessary.
(needs further cleanup to actually remove the patches)

* fix qtopcua

* make qttools build on osx

* fix dependency of qttranslations

* fix qtwayland

* fix typo

* fix case

* adjust ci baseline for qtwayland on osx due to missing system libs.

* create directory before rename

* trying to make osx work

* create the directory and move the files

* move the removing outside the foreach ....

* update to 6.0.2

* remove some outdated patches

* qt 6.1.0-beta1 ci testing

* remove unused patches

* fix a few issues with qt 6.1.0-beta1
qtvirtualkeyboard needs some features.
+ need to install cmake wrappers from qtimageformats.
+ move QtAxServer to manual-link

* Fix missing qt cmake wrappers for qttools and qtshadertools.

* block qt beta ports in CI

* turn off beta build in CI

* remove outdated patches

* skip qt6 beta ports in CI

* [gettext] add feature tools.

* switch hunspell to configure_make for pc files

* switch to manifest

* hunspell remove port debug and add comment about tools

* setup qtvirtualkeyboard features.

* fix manifest format CI

* only run wayland on linux

* disable pthread detection in gettext on windows

* fix hunspell host dependency

* formant manifest

* - add qt6 prefix
- add qt.conf.in
- make qtbase depend on itself (host dependency)
and see what breaks.

* cannot add qt6 to bin folder currently.

* try the prefix method
- add tools-path to vcpkg_fixup_cmake_targets
- add destination to vcpkg_copy_tools

* feature refinement

* fix tools issues

* update baseline

* more feature refinement.

* be less noise in logs

* update version in gettext
format-manifest.

* add version details

* move on to qt version 6.0.3

* build cmake test port against qt6

* move qt5 includes into include/qt5

* ws change in cmake to force rebuild

* version stuff

* add plugin_config patch

* version stuff

* use upstream plugin patch for 6.1

* version stuff

* update to qt 6.1.0-beta3

* add alignment patch

* fix hunspell include path

* make the patch depend on architecture

* add qbittorrent as a test port

* downgrade qbittorrent a bit so that in can run in CI

* remove bin in static builds

* remove debug folder completly (since it is empty)

* copy additional deps required by qtshadertools and qtdeclarative in qtbase to avoid issues with binary chaching.

* fix logic

* try upstream alignment patch

* update baseline

* add feature options to qt5compat

* update to qt 6.1.0

* version stuff

* fix qt.conf (for release builds only)

* fix install of missing FindX modules in qtimageformats which where supposed to be fixed upstream but aren't

* remove unnecessary patch

* version stuff

* fix some qt.conf stuff

* install some wrappers for debug builds.

* fine tuning qt.conf

* fix debug windeployqt install but somebody is linking release icudt in debug

* fix arm crossbuilds on windows

* remove tools default line

* version stuff

* add missing host dependencies.

* fix windeploy target correctly for debug

* fix cmake arm builds.

* some batch improvements

* run qmake.debug.bat for debug builds.

* version stuff

* unconditionally include the patch in qtvirtualkeyboard

* version stuff

* more host dependencies

* version stuff

* more host deps

* version stuff

* fix qtactiveqt

* version stuff

* suppress batch skript output

* version stuff

* Apply CR changes

* version stuff

* newline attack

* update qbittorrent test port and newline...

* version stuff again

* switch to version-semver

* version stuff

* remove qbittorrent test_port because
- easier than rewriting history
- qt6svg usage will probably be tested by paraview/vtk in the future

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-06-01 11:05:59 -07:00