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

26 files changed, 325 insertions, 0 deletions

diff --git a/versions/baseline.json b/versions/baseline.json
index d6ee10fef..cbdf4b98a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5036,6 +5036,10 @@
       "baseline": "2.12.0",
       "port-version": 1
     },
+    "qt": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
     "qt-advanced-docking-system": {
       "baseline": "3.6.3",
       "port-version": 1
@@ -5212,10 +5216,106 @@
       "baseline": "5.15.2",
       "port-version": 0
     },
+    "qt5compat": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qt6betablock": {
+      "baseline": "6.2.0-beta",
+      "port-version": 0
+    },
+    "qtactiveqt": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtbase": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtcharts": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtcoap": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtdatavis3d": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtdeclarative": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtdoc": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtimageformats": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
     "qtkeychain": {
       "baseline": "0.11.1",
       "port-version": 0
     },
+    "qtlottie": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtmqtt": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtnetworkauth": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtopcua": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtquick3d": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtquickcontrols2": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtquicktimeline": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtscxml": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtshadertools": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtsvg": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qttools": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qttranslations": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtvirtualkeyboard": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
+    "qtwayland": {
+      "baseline": "6.1.0",
+      "port-version": 0
+    },
     "quadtree": {
       "baseline": "2020-04-13",
       "port-version": 0
diff --git a/versions/q-/qt.json b/versions/q-/qt.json
new file mode 100644
index 000000000..6fd408260
--- /dev/null
+++ b/versions/q-/qt.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "3049962a022e42ab77ecda0b58e6480de6f6a38f",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json
new file mode 100644
index 000000000..5e7f04c28
--- /dev/null
+++ b/versions/q-/qt5compat.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "33d9b2ff872cbc458a0ce0145a30f6f702d1fb58",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qt6betablock.json b/versions/q-/qt6betablock.json
new file mode 100644
index 000000000..90eeda6fa
--- /dev/null
+++ b/versions/q-/qt6betablock.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "d81c3fdd73670a353ebe8be0f2f6bc0397b6d647",
+      "version-semver": "6.2.0-beta",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json
new file mode 100644
index 000000000..3dddf58b0
--- /dev/null
+++ b/versions/q-/qtactiveqt.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "0341fe2cf4a7eafcb0b73f0adbdb37a151bc3000",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
new file mode 100644
index 000000000..0f91c0a00
--- /dev/null
+++ b/versions/q-/qtbase.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c13214dac08887f541c416d36de97a86560d13f5",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json
new file mode 100644
index 000000000..fb8c3b784
--- /dev/null
+++ b/versions/q-/qtcharts.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "1890f3d4b87f50fd6d16ffbc03d5d023762fc58b",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json
new file mode 100644
index 000000000..0e5a7e069
--- /dev/null
+++ b/versions/q-/qtcoap.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "435511150f075d71b1f947e89b1f0d306ffe251e",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json
new file mode 100644
index 000000000..a02ef7197
--- /dev/null
+++ b/versions/q-/qtdatavis3d.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "1d69299b89bc39acbf73afb5353a40f6540a04d2",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json
new file mode 100644
index 000000000..8a000e41b
--- /dev/null
+++ b/versions/q-/qtdeclarative.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "30dd12410732756cf29ae1317de8f029010c9f22",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json
new file mode 100644
index 000000000..a105be68e
--- /dev/null
+++ b/versions/q-/qtdoc.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e77ae101a8432595ff4f428ebbae194f720c2792",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json
new file mode 100644
index 000000000..7f3311091
--- /dev/null
+++ b/versions/q-/qtimageformats.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a663532b7f1e64a346f94c27270c2ae7142780ad",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json
new file mode 100644
index 000000000..75bb5e49c
--- /dev/null
+++ b/versions/q-/qtlottie.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "9a823fe108a9efbcd6cc83f5b7ff283a7500a9fb",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json
new file mode 100644
index 000000000..4df16f480
--- /dev/null
+++ b/versions/q-/qtmqtt.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a13ec187af88d84a53445c1bcb99aa9c60a9966d",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json
new file mode 100644
index 000000000..d2830f3e1
--- /dev/null
+++ b/versions/q-/qtnetworkauth.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e72fbfa1b11b2eb4673afbad3198462602ff7123",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json
new file mode 100644
index 000000000..9e813ae9d
--- /dev/null
+++ b/versions/q-/qtopcua.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "22f34050bedeeaf97c6bb7cc6a556f6190ebf7c3",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json
new file mode 100644
index 000000000..d082884bb
--- /dev/null
+++ b/versions/q-/qtquick3d.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "8bbeae91ec304b0695da0e53b436e05a3ac03050",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json
new file mode 100644
index 000000000..72c024d6f
--- /dev/null
+++ b/versions/q-/qtquickcontrols2.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "601cfca0a0ae61f4737064a5003f5c83736eda30",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json
new file mode 100644
index 000000000..560499dbd
--- /dev/null
+++ b/versions/q-/qtquicktimeline.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "5fc074f13b064d388ee11fa172ea1bccfa3a448c",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json
new file mode 100644
index 000000000..a23051770
--- /dev/null
+++ b/versions/q-/qtscxml.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "015b07e4fe4a948c5c4d00d18c34eeb64c6752f4",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json
new file mode 100644
index 000000000..1bf79fd9d
--- /dev/null
+++ b/versions/q-/qtshadertools.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "40bcf168e248310e309ff201f6e96fa44b13c4e9",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json
new file mode 100644
index 000000000..acced0552
--- /dev/null
+++ b/versions/q-/qtsvg.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c30f32af2bdc755e3c2fcf0a0cc64f23632983bd",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json
new file mode 100644
index 000000000..72450bade
--- /dev/null
+++ b/versions/q-/qttools.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ce742ed3dcd05d27552874077744ce955375390c",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json
new file mode 100644
index 000000000..015c50ae3
--- /dev/null
+++ b/versions/q-/qttranslations.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c452d28bfe0ffaf87dc622761dbd5aa217e938ca",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json
new file mode 100644
index 000000000..b4b488258
--- /dev/null
+++ b/versions/q-/qtvirtualkeyboard.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e267466518c4622bcd79052d2fcd8066da4202e8",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json
new file mode 100644
index 000000000..52174de2b
--- /dev/null
+++ b/versions/q-/qtwayland.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "712d72065cb213eaaf1ce574c6d3fde99a8ff02e",
+      "version-semver": "6.1.0",
+      "port-version": 0
+    }
+  ]
+}