From 81b3fda352d6fa8c90fcc57711937adb46636f1f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 11:50:19 +0100 Subject: [PATCH 01/35] updating qt stuff to 6.2.2 --- ports/qt/vcpkg.json | 5 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtbase/cmake/qt_port_details.cmake | 86 +++++++++++++----------- ports/qtbase/vcpkg.json | 3 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtconnectivity/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtlocation/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtmultimedia/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 2 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtremoteobjects/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtsensors/vcpkg.json | 2 +- ports/qtserialbus/vcpkg.json | 2 +- ports/qtserialport/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/portfile.cmake | 4 +- ports/qttools/vcpkg.json | 2 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- ports/qtwebchannel/vcpkg.json | 2 +- ports/qtwebengine/portfile.cmake | 2 +- ports/qtwebengine/vcpkg.json | 2 +- ports/qtwebsockets/vcpkg.json | 2 +- ports/qtwebview/vcpkg.json | 2 +- 37 files changed, 88 insertions(+), 76 deletions(-) diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 67a6953fa2a407..b2613d79b1e4d9 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt", "homepage": "https://www.qt.io/", "dependencies": [ @@ -14,6 +14,7 @@ "textcodec" ] }, + "qtapplicationmanager", { "name": "qtbase", "default-features": false @@ -30,6 +31,7 @@ "qtconnectivity", "qtdatavis3d", "qtdeclarative", + "qtdeviceutilities", "qtdoc", { "name": "qtimageformats", @@ -40,6 +42,7 @@ "webp" ] }, + "qtinterfaceframework", { "name": "qtlocation", "default-features": false, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 2bad0cc3babb76..9fb7dd896ba1ab 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index d173af83d39e45..d87b4228f5fe01 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "ActiveQt", "homepage": "https://www.qt.io/", "supports": "windows", diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index ba6695374657e9..736d0a5e34c2a9 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -1,11 +1,17 @@ -set(QT_VERSION 6.2.1) +set(QT_VERSION 6.2.2) if(PORT MATCHES "qtquickcontrols2") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") return() endif() -set(QT_GIT_TAG v${QT_VERSION}) + +### Setting up the git tag. +set(QT_GIT_TAG "v${QT_VERSION}") +if(PORT MATCHES "qtdeviceutilities|qtlocation|qtinterfaceframework|qtapplicationmanager") + # So much for consistency .... + set(QT_GIT_TAG "${QT_VERSION}") +endif() #set(QT_UPDATE_VERSION TRUE) if(QT_UPDATE_VERSION) @@ -34,7 +40,7 @@ set(QT_PORTS qt ## New in 6.1 qtactiveqt qtdatavis3d - #qtdeviceutils + qtdeviceutilities qtlottie qtscxml qtvirtualkeyboard @@ -51,48 +57,52 @@ set(QT_PORTS qt qtwebengine qtwebsockets qtwebview + qtinterfaceframework ) foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF fbdf50b6c6f69ab88d7a53dfb3ab35e2b49a9664) -set(qtshadertools_REF 73deb667b27451340cafc20ead3aeb4ea84a5246) -set(qtdeclarative_REF 3419dd06c5928e292e0c25692427632e124eefea) -set(qt5compat_REF 3f69f4b1e7d07756b9de7629ec22e1c68265c88a) -set(qttools_REF 8e1f1f6e906095a8f2d5ebbf85443e2407d4e07c) # Additional refs in portfile due to submodule -set(qtcoap_REF 1c0bb10d86b43c4b3860cd4526087e644d3f4b07) -set(qtdoc_REF 040ef9a76b5f79d3cf5e42849d5f49a51522dc0f) -set(qtimageformats_REF bd8b167280addfb9b2ee0d493d6cf7b31c03e574) -set(qtmqtt_REF 610543f328127c68ab39960ded51649ad41d3bd4) -set(qtnetworkauth_REF 1987896634a2c4ac23842b366b4704f0b1396de7) -set(qtopcua_REF ae441a8fff3603e7d21957a09a0b3014669bbb0b) -set(qtquicktimeline_REF 6ba89379c0859622d71f75486b8d872cc4a709ca) -set(qtquick3d_REF 7e30ae5f8b6f3c28a2ee2df3788846fc67ec3c1c) -set(qtsvg_REF 30ad9d119079f486817e60025eceffdc0745ffcf) -set(qttranslations_REF 6d297398a2f9b0f7cf67de63369ca7b75ed60034) -set(qtwayland_REF bea7e0ee35211873c90987c905e3fd68d41df4da) -# set(qtquickcontrols2_REF 0) # Moved into qtdeclarative since Qt 6.2 +set(qtbase_REF 61fbf7596beda0178e213a7ba945bc0314153366) +set(qtshadertools_REF 3ce1b25b413aef98a68c0b05305a6849bb558889) +set(qtdeclarative_REF f4cbbe999d912b2c66fffc8b7bf11b59fd92a178) +set(qt5compat_REF e38a2b4653780317feed0d0f7c0adb2964ed674c) +set(qttools_REF f779b0439e3984f592320c0e5b3ba52f3627c07b) # Additional refs in portfile due to submodule +set(qtcoap_REF fe7ea10937ece3b19fc7d909790e1bfec23c363f) +set(qtdoc_REF aeb34a71d6f93b3ddb438e52c3f4d963e8c51ab9) +set(qtimageformats_REF 02a3365745ceb3cdcc27b2dd6f80300f5c03f6f4) +set(qtmqtt_REF deff6a3853c9a09e18fa05ae9aa6c5868ba2d1b7) +set(qtnetworkauth_REF 470a295fcb61e37640e00c75be1870a3b1cb227e) +set(qtopcua_REF b8e9b695c71d73e21ac489136fca1c2991ebea78) +set(qtquicktimeline_REF 7c74c9025c8c5f390f5a19ec9bd1d0d4fc36cee2) +set(qtquick3d_REF 8a06b1c9e69c2b83fff313bab4cdc463b6c55b8c) +set(qtsvg_REF 414fe3bc0f77704c9184ee1039ffea82de8b6c0b) +set(qttranslations_REF a8b48341570242a700fd61abf16ef106b4b4d8b2) +set(qtwayland_REF b6d7b9d5dea396b1454b4e204f37a66e3da39150) ### New in 6.1 -set(qtactiveqt_REF 1b710fa0b5e054189b62e2e7fe32fcf1bec0b081) -set(qtcharts_REF 78a74a1fcdc4329c054691021a65ff00dcd09ebb) -set(qtdatavis3d_REF bec62cdb6f800087fd92085984fde389e9091e13) -#set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF 9c72963a986d921e5c1cbdca6638fa17c9f8fa45) -set(qtscxml_REF 069fb385a21e2f844adeb74fbb06849ef5422c7d) -set(qtvirtualkeyboard_REF b6fe68874ed8ff86202320435a743521a245c515) +set(qtactiveqt_REF 9d373846d2f0073f530b1e714afeb76cf039df94) +set(qtcharts_REF b74fa4205af2f6be69ec1a233aaee28f1eb6b838) +set(qtdatavis3d_REF e5ee7c79d3e6845267691c0074ae3aa286cbe904) +set(qtdeviceutilities_REF df77ef89d3b1cbeda9996702e0a26a9a58c9f467) #missing tag +set(qtlottie_REF 6c16cfae5f39bf1047f73ae99bbe7d99c79f5179) +set(qtscxml_REF 6dd18cdf4d24d159f7114b8b31a81d95a24f3ca2) +set(qtvirtualkeyboard_REF 7473762116f3c0bdfc5d8e4d55137013ea082eaf) ### New in 6.2 -set(qtconnectivity_REF e910b93cc161930748260626b414b7f4241e6d58) -set(qtlocation_REF 70c3948264d5e6e3bc9be4f0e5d8fdae8b821a08) -set(qtmultimedia_REF 64bc1b00b2979866d577eb57fd118ae497cf6391) -set(qtremoteobjects_REF 8876b4e07174b7fe3124de74002730684b1d0d82) -set(qtsensors_REF 8a949e9314682e6940f1b38f30f5d5f3fd1d6260) -set(qtserialbus_REF 709110461a843a9a0236f3cde27414157a088235) -set(qtserialport_REF d8b40852053623d44e8a07f4c208ace27dcde925) -set(qtwebchannel_REF c93ddec0eb35707fafd209bee8472fd6ee4a3cb6) -set(qtwebengine_REF b879b3ed6b4bb7d6951cf430d5e9b49898fe6c9a) # Additional refs in portfile due to submodule -set(qtwebsockets_REF 68a4c96964935ada5ae1ca323713b4e3862f010f) -set(qtwebview_REF 7ef6e31dd2ead012f941ddcaf30e5d4c2abf693b) +set(qtconnectivity_REF a723287f639e81a3253f6c0923475da5294a3342) +set(qtserialport_REF 6a92ae54a27d6fc40e5f44332a7d7d49999a8643) +set(qtmultimedia_REF 6a55ffc411f6ea73d45a7109d54c5cca1a482930) +set(qtremoteobjects_REF cc1fd1722180b8a46994c7c751ea4b3b7ab30c58) +set(qtsensors_REF ba5da0a367fa2f11b577ba226bea488eda7dd499) +set(qtserialbus_REF 125631af95d958d55b7b0789dfe64e0d1f7d0122) +set(qtlocation_REF 6db775f6d9d72cf8ee9d66333b8424e74be1e352) +set(qtwebchannel_REF e55fa2e085466238e24d53abf4fc9ede7a7590e4) +set(qtwebengine_REF ad19d22d3aa5d692b4988f2ffb88868232e6fc0c) # Additional refs in portfile due to submodule +set(qtwebsockets_REF 18c452968b3c3ad6c1e1b6512ebd96e9f895c571) +set(qtwebview_REF eb5a94f20e77a9639b07ae3d59c9d67529ffed66) +### New in Qt 6.2.2 +set(qtapplicationmanager_REF 1009f73d1f5c07947cdc2318150279ad43fc4b04) +set(qtqtinterfaceframework_REF 118fa138186144cf2d802405255f08662ed76d43) + if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index a89e7b5bad1f25..09a3cc76676282 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version-semver": "6.2.1", - "port-version": 1, + "version-semver": "6.2.2", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index ba4875fa046163..656af8d7bd7a31 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "QtCharts module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 0c2763ae3834cb..bfc5a5e67892cd 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index 0c5bc2fd0d50e8..6000fb93a3d1ed 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index b6acb274fd3bf6..58676c730aa91f 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index c8fe1ff3014690..521309f8f41f1f 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 2832c14acd269d..9d34e178d781e4 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index d50ef714aadae1..9cd632955d5ec8 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index c375ccb84bda7e..a2feee3a85e365 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Location", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 1488f0144868c6..48439d76a436ac 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 24a9ec196d648c..3d23d35f635a59 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index fe4f81bd71a138..105b978dbbfe85 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index f2e57c09338ee4..71dec2b1a97cee 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 90bb9f9c1dda71..5bc808ba0aaa9a 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 6b9e50596e9fdb..bee045845eb653 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 5a996169561127..dfe29bf4be15eb 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 8f3a1798728fba..403c2f0cdfe182 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 6eb9b452d85886..5adabc0a252e53 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index 041a2e15f4ecb9..385c166252f002 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index d1752c40145f1c..1e7f7117ef0b29 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index f72e900c345642..9fbdfecfacdfc5 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 759742b7009714..7457fed6cd3ee4 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 6bded3bf4a1f91..dd82567a7a9799 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt SVG", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index 835e7ffce63238..e6fb2f48633144 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -77,7 +77,7 @@ endif() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git - REF 6af5648d1208ed5760d74bd060c74ffa2bcfef6b + REF 4931b7aa30f256c20573d283561aa432fecf8f38 FETCH_REF master HEAD_REF master ) @@ -85,7 +85,7 @@ vcpkg_from_git( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH_LITEHTML REPO litehtml/litehtml - REF db7f59d5886fd50f84d48720c79dc2e6152efa83 + REF 6236113734bb0a28467e5999e86fdd2834be8e01 SHA512 6beed53f8b779359eb2d08495547f9b4e3d02b70d68e035e6c188f009a283e630b3961caa472ce045799a9ef82e1cd6b3c63d8534e6e8127441944f4837a0352 HEAD_REF master ) diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index f59f733cea234e..ddccd4ccc7794f 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 17aea5fee8062d..b4c528fdaa763f 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Translations", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index c712e0f673c214..79e635460a31fd 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 149505b3d084f7..320d78ea99bd9e 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "supports": "!windows", diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index 2d5bb8722ba831..1c710aaec51564 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index 0f3370cb1635ff..d5f71158cd9a7a 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -73,7 +73,7 @@ endif() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE URL git://code.qt.io/qt/qtwebengine-chromium.git - REF 6b7b3f1bf9f41c3ae7afc359c90c3cc80687f004 + REF 39aa0ea99a30c9c15fb3640fe9a2638982548c0b ) ##### qt_install_submodule diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 71faea0ffe1e64..e0280bec315059 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "supports": "!static & !((arm | x86) & windows)", diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index c2274ce1c13385..89ac9917a6254c 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index aebc8c27e76e86..1dbeb269feb602 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version-semver": "6.2.1", + "version-semver": "6.2.2", "description": "Qt Web View", "homepage": "https://www.qt.io/", "dependencies": [ From fb036a199ae5ab7bfb39c5668963f837b49c8bd4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 11:50:43 +0100 Subject: [PATCH 02/35] add missing modules for 6.2.2 --- ports/qtapplicationmanager/portfile.cmake | 13 +++++++ ports/qtapplicationmanager/vcpkg.json | 21 +++++++++++ ports/qtdeviceutilities/portfile.cmake | 13 +++++++ ports/qtdeviceutilities/vcpkg.json | 16 +++++++++ ports/qtinterfaceframework/portfile.cmake | 43 +++++++++++++++++++++++ ports/qtinterfaceframework/vcpkg.json | 25 +++++++++++++ 6 files changed, 131 insertions(+) create mode 100644 ports/qtapplicationmanager/portfile.cmake create mode 100644 ports/qtapplicationmanager/vcpkg.json create mode 100644 ports/qtdeviceutilities/portfile.cmake create mode 100644 ports/qtdeviceutilities/vcpkg.json create mode 100644 ports/qtinterfaceframework/portfile.cmake create mode 100644 ports/qtinterfaceframework/vcpkg.json diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake new file mode 100644 index 00000000000000..975bf122fdd530 --- /dev/null +++ b/ports/qtapplicationmanager/portfile.cmake @@ -0,0 +1,13 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +set(TOOL_NAMES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json new file mode 100644 index 00000000000000..6cf8906969ade3 --- /dev/null +++ b/ports/qtapplicationmanager/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "qtapplicationmanager", + "version-semver": "6.2.2", + "description": "Qt component for application lifecycle management", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtwayland", + "default-features": false, + "platform": "!windows" + } + ] +} diff --git a/ports/qtdeviceutilities/portfile.cmake b/ports/qtdeviceutilities/portfile.cmake new file mode 100644 index 00000000000000..975bf122fdd530 --- /dev/null +++ b/ports/qtdeviceutilities/portfile.cmake @@ -0,0 +1,13 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +set(TOOL_NAMES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json new file mode 100644 index 00000000000000..bc8e21d47a31e0 --- /dev/null +++ b/ports/qtdeviceutilities/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qtdeviceutilities", + "version-semver": "6.2.2", + "description": "Utils for Boot2Qt", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qttools", + "default-features": false + } + ] +} diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake new file mode 100644 index 00000000000000..def2534b466310 --- /dev/null +++ b/ports/qtinterfaceframework/portfile.cmake @@ -0,0 +1,43 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES "") +set(TOOL_NAMES "") + +#[submodule "src/3rdparty/qface"] +# path = src/3rdparty/qface +# url = ../qtinterfaceframework-qface.git +#[submodule "src/3rdparty/taglib/taglib"] # Is in vcpkg +# path = src/3rdparty/taglib/taglib +# url = ../qtinterfaceframework-taglib.git +# branch = upstream/master + +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH_QFACE + URL git://code.qt.io/qt/qtinterfaceframework-qface.git + REF 4f4027b4bb677eafad0bfb2593226b71ee2c98e6 + FETCH_REF master + HEAD_REF master +) + +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() +file(COPY "${SOURCE_PATH_QFACE}/" DESTINATION "${SOURCE_PATH}/src/3rdparty/qface") + +if(_qis_DISABLE_NINJA) + set(_opt DISABLE_NINJA) +endif() + +qt_cmake_configure(${_opt} + OPTIONS ${FEATURE_OPTIONS} + OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + +vcpkg_install_cmake(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json new file mode 100644 index 00000000000000..0e6f2e400421d9 --- /dev/null +++ b/ports/qtinterfaceframework/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "qtinterfaceframework", + "version-semver": "6.2.2", + "description": "Qt Interface Framework", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtmultimedia", + "default-features": false + }, + { + "name": "qtremoteobjects", + "default-features": false + }, + { + "name": "qttools", + "default-features": false + }, + "taglib" + ] +} From 61d2525ae6a8a9e49387f8604f58be0afc279fc8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 12:23:21 +0100 Subject: [PATCH 03/35] remove patch from qtbase --- ports/qtbase/cocoa.patch | 15 --------------- ports/qtbase/portfile.cmake | 1 - 2 files changed, 16 deletions(-) delete mode 100644 ports/qtbase/cocoa.patch diff --git a/ports/qtbase/cocoa.patch b/ports/qtbase/cocoa.patch deleted file mode 100644 index 7242ff9ee38540..00000000000000 --- a/ports/qtbase/cocoa.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h -index 5d4b6d6a71..cc7193d8b7 100644 ---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h -+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h -@@ -43,6 +43,7 @@ - #include - #include - -+#include - #include - - QT_BEGIN_NAMESPACE --- -cgit v1.2.1 - diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 12233c0e5e1f23..60a2472544a5c2 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -17,7 +17,6 @@ set(${PORT}_PATCHES fix_cmake_build.patch harfbuzz.patch fix_egl.patch - cocoa.patch ) if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) From 76ab33bb4576cb07db85de4e2da9919c8c61c271 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 15:05:41 +0100 Subject: [PATCH 04/35] add qtpositioning --- ports/qtbase/cmake/qt_port_details.cmake | 4 ++++ ports/qtlocation/vcpkg.json | 3 ++- ports/qtpositioning/portfile.cmake | 12 ++++++++++++ ports/qtpositioning/vcpkg.json | 20 ++++++++++++++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 ports/qtpositioning/portfile.cmake create mode 100644 ports/qtpositioning/vcpkg.json diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 736d0a5e34c2a9..38fc8960ae667c 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -47,6 +47,7 @@ set(QT_PORTS qt qtcharts ## New in 6.2 qtconnectivity + qtpositioning qtlocation qtmultimedia qtremoteobjects @@ -57,7 +58,9 @@ set(QT_PORTS qt qtwebengine qtwebsockets qtwebview + ## New in 6.2.2 qtinterfaceframework + qtapplicationmanager ) foreach(_port IN LISTS QT_PORTS) @@ -99,6 +102,7 @@ set(qtwebchannel_REF e55fa2e085466238e24d53abf4fc9ede7a7590e4) set(qtwebengine_REF ad19d22d3aa5d692b4988f2ffb88868232e6fc0c) # Additional refs in portfile due to submodule set(qtwebsockets_REF 18c452968b3c3ad6c1e1b6512ebd96e9f895c571) set(qtwebview_REF eb5a94f20e77a9639b07ae3d59c9d67529ffed66) +set(qtpositioning_REF 1294c29be50fa5cdf2d78afffac0451f7b4bc16a) ### New in Qt 6.2.2 set(qtapplicationmanager_REF 1009f73d1f5c07947cdc2318150279ad43fc4b04) set(qtqtinterfaceframework_REF 118fa138186144cf2d802405255f08662ed76d43) diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index a2feee3a85e365..70156ed04d941f 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -15,7 +15,8 @@ "dbus" ], "platform": "linux" - } + }, + "qtpositioning" ], "features": { "nmea": { diff --git a/ports/qtpositioning/portfile.cmake b/ports/qtpositioning/portfile.cmake new file mode 100644 index 00000000000000..72ab6db9a2c3b6 --- /dev/null +++ b/ports/qtpositioning/portfile.cmake @@ -0,0 +1,12 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json new file mode 100644 index 00000000000000..3c37780b034620 --- /dev/null +++ b/ports/qtpositioning/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "qtpositioning", + "version-semver": "6.2.2", + "description": "Qt Positioning", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtdeclarative", + "default-features": false, + }, + { + "name": "qtserialport", + "default-features": false, + } + ] +} From a3e21846bfe703a2d31b998a6e50aa7eed94bcb0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 15:08:40 +0100 Subject: [PATCH 05/35] add qml feature --- ports/qtpositioning/portfile.cmake | 6 ++++++ ports/qtpositioning/vcpkg.json | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ports/qtpositioning/portfile.cmake b/ports/qtpositioning/portfile.cmake index 72ab6db9a2c3b6..01c76c93571456 100644 --- a/ports/qtpositioning/portfile.cmake +++ b/ports/qtpositioning/portfile.cmake @@ -1,6 +1,12 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" ) diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 3c37780b034620..feea04f0573b56 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -8,13 +8,20 @@ "name": "qtbase", "default-features": false }, - { - "name": "qtdeclarative", - "default-features": false, - }, { "name": "qtserialport", "default-features": false, } - ] + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } } From 84fa61b2eea53fb2aa6ceb1c13462c8ad689b7de Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 15:18:24 +0100 Subject: [PATCH 06/35] add supports statement --- ports/qtdeviceutilities/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index bc8e21d47a31e0..4f0cc8ea1c16a1 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -3,6 +3,7 @@ "version-semver": "6.2.2", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", + "supports": "linux", "dependencies": [ { "name": "qtdeclarative", From b16afbffdfdac08ee55286c2e5f2d9f72486ab9b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 15:20:28 +0100 Subject: [PATCH 07/35] small ref change --- ports/qtinterfaceframework/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index def2534b466310..d87f6915c45fff 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -16,8 +16,8 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_QFACE URL git://code.qt.io/qt/qtinterfaceframework-qface.git REF 4f4027b4bb677eafad0bfb2593226b71ee2c98e6 - FETCH_REF master - HEAD_REF master + FETCH_REF upstream/master + HEAD_REF upstream/master ) qt_download_submodule(PATCHES ${${PORT}_PATCHES}) From cc56b862ad36e96057dcf13f6b096118d5d73ce6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 15:51:08 +0100 Subject: [PATCH 08/35] fix hash --- ports/qttools/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index e6fb2f48633144..999f2552b3b521 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -86,7 +86,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH_LITEHTML REPO litehtml/litehtml REF 6236113734bb0a28467e5999e86fdd2834be8e01 - SHA512 6beed53f8b779359eb2d08495547f9b4e3d02b70d68e035e6c188f009a283e630b3961caa472ce045799a9ef82e1cd6b3c63d8534e6e8127441944f4837a0352 + SHA512 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc HEAD_REF master ) From 977d0b02e6965494d93832b47a5829ca53a5cc8b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 17:51:35 +0100 Subject: [PATCH 09/35] remove , --- ports/qtpositioning/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index feea04f0573b56..f477ef1185a7ec 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -10,7 +10,7 @@ }, { "name": "qtserialport", - "default-features": false, + "default-features": false } ], "features": { From aba76591ca7adb84540416cd9c2121eaed32ee62 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 20:50:16 +0100 Subject: [PATCH 10/35] qtlocation is now emtpy --- ports/qtlocation/portfile.cmake | 39 +++++++++++++++++---------------- ports/qtlocation/vcpkg.json | 26 +--------------------- 2 files changed, 21 insertions(+), 44 deletions(-) diff --git a/ports/qtlocation/portfile.cmake b/ports/qtlocation/portfile.cmake index 6bb133bb07bdee..15fa294cde72d4 100644 --- a/ports/qtlocation/portfile.cmake +++ b/ports/qtlocation/portfile.cmake @@ -1,23 +1,24 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +message(STATUS "Upstream decided to split this into qtpositioning and qtlocation. qtlocation however is currently empty!") +# set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +# include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES) +# set(${PORT}_PATCHES) +# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +# FEATURES +# INVERTED_FEATURES + # "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort + # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6Network +# ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort - "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6Network -) +# list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" + # "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" +# ) -list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) +# qt_install_submodule(PATCHES ${${PORT}_PATCHES} + # CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + # CONFIGURE_OPTIONS_RELEASE + # CONFIGURE_OPTIONS_DEBUG + # ) diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index 70156ed04d941f..0f68cb54b66ffd 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -17,29 +17,5 @@ "platform": "linux" }, "qtpositioning" - ], - "features": { - "nmea": { - "description": "Build with nmea", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - }, - "qtserialport" - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } + ] } From 4988b9692f37512c6086aa1e4fd0cad1aaa79f5d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 21:43:05 +0100 Subject: [PATCH 11/35] get as list of files --- ports/qtdeviceutilities/portfile.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/qtdeviceutilities/portfile.cmake b/ports/qtdeviceutilities/portfile.cmake index 975bf122fdd530..7b3b5bca481eda 100644 --- a/ports/qtdeviceutilities/portfile.cmake +++ b/ports/qtdeviceutilities/portfile.cmake @@ -11,3 +11,6 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) + +file(GLOB_RECURSE BIN_FILES "${CURRENT_PACKAGES_DIR}/bin/*") +message(STATUS "BIN_FILES:${BIN_FILES}") \ No newline at end of file From fa59ae852ad8d1473272b8f67af8d2b02ecc1d0c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 21:53:47 +0100 Subject: [PATCH 12/35] fix error in manifest --- ports/qt/vcpkg.json | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index b2613d79b1e4d9..2ad963bbf4a00a 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -43,14 +43,6 @@ ] }, "qtinterfaceframework", - { - "name": "qtlocation", - "default-features": false, - "features": [ - "nmea", - "qml" - ] - }, { "name": "qtlottie", "default-features": false, @@ -75,6 +67,13 @@ "qml" ] }, + { + "name": "qtpositioning", + "default-features": false, + "features": [ + "qml" + ] + }, { "name": "qtquick3d", "default-features": false From 26c43fa34c3d55741b43773afa641d98ddd35dbe Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 22:06:10 +0100 Subject: [PATCH 13/35] add tool name --- ports/qtdeviceutilities/portfile.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/qtdeviceutilities/portfile.cmake b/ports/qtdeviceutilities/portfile.cmake index 7b3b5bca481eda..f83d1fd6f0d8be 100644 --- a/ports/qtdeviceutilities/portfile.cmake +++ b/ports/qtdeviceutilities/portfile.cmake @@ -3,7 +3,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES) -set(TOOL_NAMES) +set(TOOL_NAMES settingsui) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} @@ -11,6 +11,3 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) - -file(GLOB_RECURSE BIN_FILES "${CURRENT_PACKAGES_DIR}/bin/*") -message(STATUS "BIN_FILES:${BIN_FILES}") \ No newline at end of file From 040a6b4c4430d947f6bdf9c9e047c1b948a51295 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 22:36:59 +0100 Subject: [PATCH 14/35] fix qtapplication? --- ports/qtapplicationmanager/bump-cmake-version.patch | 11 +++++++++++ ports/qtapplicationmanager/portfile.cmake | 6 +++++- ports/qtapplicationmanager/vcpkg.json | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ports/qtapplicationmanager/bump-cmake-version.patch diff --git a/ports/qtapplicationmanager/bump-cmake-version.patch b/ports/qtapplicationmanager/bump-cmake-version.patch new file mode 100644 index 00000000000000..31b99c71d204ff --- /dev/null +++ b/ports/qtapplicationmanager/bump-cmake-version.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2236c0..904c5b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + +-cmake_minimum_required(VERSION 3.16) ++cmake_minimum_required(VERSION 3.19) + + include(.cmake.conf) + project(QtApplicationManager # special case diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 975bf122fdd530..e2280a21d544b8 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -1,13 +1,17 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES) +set(${PORT}_PATCHES bump-cmake-version.patch) set(TOOL_NAMES) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS + -DINPUT_libarchive=system + -DINPUT_libyaml=system + -DFEATURE_am_system_libyaml=ON + -DFEATURE_am_system_libarchive=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 6cf8906969ade3..d4eccfe4bb8841 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -4,6 +4,8 @@ "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "dependencies": [ + "libyaml", + "libarchive", { "name": "qtbase", "default-features": false From 5a47994c58cc40180195342e44f05b328616faf8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 22:38:19 +0100 Subject: [PATCH 15/35] print bin files --- ports/qtapplicationmanager/portfile.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index e2280a21d544b8..89ab72574bc418 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -15,3 +15,6 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) + +file(GLOB_RECURSE BIN_FILES "${CURRENT_PACKAGES_DIR}/bin/*") +message(STATUS "BIN_FILES:${BIN_FILES}") \ No newline at end of file From aa89ea034368d8238af9a60e1b277019134d10f7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 23:11:50 +0100 Subject: [PATCH 16/35] fix qtapplicationmanager --- ports/qtapplicationmanager/portfile.cmake | 13 ++++- .../qtapplicationmanager/wrapper-fixes.patch | 56 +++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 ports/qtapplicationmanager/wrapper-fixes.patch diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 89ab72574bc418..bf39ffc6e33ac0 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -1,9 +1,18 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES bump-cmake-version.patch) +set(${PORT}_PATCHES + bump-cmake-version.patch + wrapper-fixes.patch + ) -set(TOOL_NAMES) +set(TOOL_NAMES appman + appman-controller + appman-dumpqmltypes + appman-packager + appman-qmltestrunner + package-uploader + ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} diff --git a/ports/qtapplicationmanager/wrapper-fixes.patch b/ports/qtapplicationmanager/wrapper-fixes.patch new file mode 100644 index 00000000000000..058df841892fd7 --- /dev/null +++ b/ports/qtapplicationmanager/wrapper-fixes.patch @@ -0,0 +1,56 @@ +diff --git a/cmake/FindWrapLibArchive.cmake b/cmake/FindWrapLibArchive.cmake +index 67e4ce0..887b766 100644 +--- a/cmake/FindWrapLibArchive.cmake ++++ b/cmake/FindWrapLibArchive.cmake +@@ -16,3 +16,24 @@ add_library(WrapLibArchive::WrapLibArchive INTERFACE IMPORTED) + target_link_libraries(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_LIBRARIES}) + target_include_directories(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_INCLUDE_DIRS}) + set(WrapLibArchive_FOUND TRUE) ++if(TARGET BZip2::BZip2) ++ set_property(TARGET BZip2::BZip2 PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET Threads::Threads) ++ set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET OpenSSL::Crypto) ++ set_property(TARGET OpenSSL::Crypto PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET zstd::libzstd) ++ set_property(TARGET zstd::libzstd PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET zstd::libzstd_shared) ++ set_property(TARGET zstd::libzstd_shared PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET zstd::libzstd_static) ++ set_property(TARGET zstd::libzstd_static PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET ZLIB::ZLIB) ++ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) ++endif() +diff --git a/cmake/FindWrapLibYaml.cmake b/cmake/FindWrapLibYaml.cmake +index 1dab912..c09e97f 100644 +--- a/cmake/FindWrapLibYaml.cmake ++++ b/cmake/FindWrapLibYaml.cmake +@@ -10,10 +10,17 @@ pkg_check_modules(pc_libyaml yaml-0.1 IMPORTED_TARGET) + + + if (NOT pc_libyaml_FOUND) +- set(WrapLibYaml_FOUND FALSE) +- return() ++ find_package(yaml) ++ if(yaml_FOUND) ++ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) ++ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${yaml_LIBRARIES}) ++ else() ++ set(WrapLibYaml_FOUND FALSE) ++ return() ++ endif() ++else() ++ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) ++ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES}) + endif() +- +-add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) +-target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES}) + set(WrapLibYaml_FOUND TRUE) ++ From 1139f1e9c4f3af85c7420ce47a5440a3d8890bb4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 23:11:56 +0100 Subject: [PATCH 17/35] format --- ports/qt/vcpkg.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 2ad963bbf4a00a..78d8df10ceabe6 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -43,6 +43,13 @@ ] }, "qtinterfaceframework", + { + "name": "qtpositioning", + "default-features": false, + "features": [ + "qml" + ] + }, { "name": "qtlottie", "default-features": false, @@ -67,13 +74,6 @@ "qml" ] }, - { - "name": "qtpositioning", - "default-features": false, - "features": [ - "qml" - ] - }, { "name": "qtquick3d", "default-features": false From 31e2803962975b5f585adaa8e20d960926fb705e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 23:33:54 +0100 Subject: [PATCH 18/35] set policy --- ports/qtapplicationmanager/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index bf39ffc6e33ac0..ae2d142de0ad99 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -25,5 +25,4 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS_DEBUG ) -file(GLOB_RECURSE BIN_FILES "${CURRENT_PACKAGES_DIR}/bin/*") -message(STATUS "BIN_FILES:${BIN_FILES}") \ No newline at end of file +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) #Debug tracing libraries are only build if CMAKE_BUILD_TYPE is equal to Debug From 469c61c3838d3ae5daa304b6e35037bb6a86ee9f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 2 Dec 2021 23:34:57 +0100 Subject: [PATCH 19/35] fix git fetch --- ports/qtinterfaceframework/portfile.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index d87f6915c45fff..2c90dd5d56ffb9 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -12,13 +12,18 @@ set(TOOL_NAMES "") # url = ../qtinterfaceframework-taglib.git # branch = upstream/master +set(VCPKG_USE_HEAD_VERSION ON) # Won't work without it +#set(UPDATE_PORT_GIT_OPTIONS +# HEAD_REF "2.0.5") + vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_QFACE URL git://code.qt.io/qt/qtinterfaceframework-qface.git REF 4f4027b4bb677eafad0bfb2593226b71ee2c98e6 FETCH_REF upstream/master - HEAD_REF upstream/master + HEAD_REF 2.0.5 ) +set(VCPKG_USE_HEAD_VERSION OFF) qt_download_submodule(PATCHES ${${PORT}_PATCHES}) if(QT_UPDATE_VERSION) From b32cfaa02e31f2d1266ff9b116eb7f20ca72ab23 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 10:17:49 +0100 Subject: [PATCH 20/35] fix ref variable --- ports/qtbase/cmake/qt_port_details.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 38fc8960ae667c..963fc1ee8413c1 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -105,7 +105,7 @@ set(qtwebview_REF eb5a94f20e77a9639b07ae3d59c9d67529ffed66) set(qtpositioning_REF 1294c29be50fa5cdf2d78afffac0451f7b4bc16a) ### New in Qt 6.2.2 set(qtapplicationmanager_REF 1009f73d1f5c07947cdc2318150279ad43fc4b04) -set(qtqtinterfaceframework_REF 118fa138186144cf2d802405255f08662ed76d43) +set(qtinterfaceframework_REF 118fa138186144cf2d802405255f08662ed76d43) if(QT_UPDATE_VERSION) From d8c359e6587c7f07d654b91b05404c54ebcedd28 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 10:27:11 +0100 Subject: [PATCH 21/35] fix pc files for taglib closes #21834 --- ports/taglib/portfile.cmake | 29 +++++++++++++++++------------ ports/taglib/vcpkg.json | 1 + 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index bce8b1f869eb57..f7a18e0980c874 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -7,37 +7,42 @@ vcpkg_from_github( PATCHES msvc-disable-deprecated-warnings.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILD_SHARED_LIBS OFF) -elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(BUILD_SHARED_LIBS ON) -endif() - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(WINRT_OPTIONS -DHAVE_VSNPRINTF=1 -DPLATFORM_WINRT=1) endif() vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS ${WINRT_OPTIONS} ) vcpkg_install_cmake() +set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/taglib.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib") + vcpkg_replace_string("${pcfile}" " -lz" "") +endif() +set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/taglib.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib") + vcpkg_replace_string("${pcfile}" " -lz" "") +endif() vcpkg_fixup_pkgconfig() # remove the debug/include files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # copyright file -file(COPY ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/taglib) -file(COPY ${SOURCE_PATH}/COPYING.MPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/taglib) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL ${CURRENT_PACKAGES_DIR}/share/taglib/copyright) +file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright") # remove bin directory for static builds (taglib creates a cmake batch file there) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() + diff --git a/ports/taglib/vcpkg.json b/ports/taglib/vcpkg.json index f3f7239ced4d9b..03ffc7881fc17d 100644 --- a/ports/taglib/vcpkg.json +++ b/ports/taglib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "taglib", "version-semver": "1.12.0", + "port-version": 1, "description": "TagLib Audio Meta-Data Library", "homepage": "https://taglib.org/", "license": "LGPL-2.1 OR MPL-1.1", From 9aa4c80780dde6640f8ba2db0c1db0efb22c00ea Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 10:32:45 +0100 Subject: [PATCH 22/35] fix qtinterfaceframework --- .../fix-taglib-search.patch | 13 +++ ports/qtinterfaceframework/portfile.cmake | 89 ++++++++++++++----- 2 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 ports/qtinterfaceframework/fix-taglib-search.patch diff --git a/ports/qtinterfaceframework/fix-taglib-search.patch b/ports/qtinterfaceframework/fix-taglib-search.patch new file mode 100644 index 00000000000000..b8027bdf6ab6c0 --- /dev/null +++ b/ports/qtinterfaceframework/fix-taglib-search.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindWrapSystemTagLib.cmake b/cmake/FindWrapSystemTagLib.cmake +index e82d2c1a9..14463c791 100644 +--- a/cmake/FindWrapSystemTagLib.cmake ++++ b/cmake/FindWrapSystemTagLib.cmake +@@ -4,7 +4,7 @@ if(TARGET WrapSystemTagLib::WrapSystemTagLib) + set(WrapSystemTagLib_FOUND ON) + return() + endif() +- ++unset(PKG_CONFIG_EXECUTABLE CACHE) + find_package(PkgConfig) + + pkg_check_modules(TagLib taglib IMPORTED_TARGET) diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index 2c90dd5d56ffb9..d14e515a8cf865 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -1,42 +1,83 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES "") -set(TOOL_NAMES "") - -#[submodule "src/3rdparty/qface"] -# path = src/3rdparty/qface -# url = ../qtinterfaceframework-qface.git -#[submodule "src/3rdparty/taglib/taglib"] # Is in vcpkg -# path = src/3rdparty/taglib/taglib -# url = ../qtinterfaceframework-taglib.git -# branch = upstream/master - -set(VCPKG_USE_HEAD_VERSION ON) # Won't work without it -#set(UPDATE_PORT_GIT_OPTIONS -# HEAD_REF "2.0.5") - -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH_QFACE - URL git://code.qt.io/qt/qtinterfaceframework-qface.git - REF 4f4027b4bb677eafad0bfb2593226b71ee2c98e6 - FETCH_REF upstream/master - HEAD_REF 2.0.5 -) -set(VCPKG_USE_HEAD_VERSION OFF) +function(vcpkg_get_python_package PYTHON_DIR ) # From mesa + cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") + + if(NOT _vgpp_PYTHON_EXECUTABLE) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") + endif() + if(NOT _vgpp_PACKAGES) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") + endif() + if(NOT _vgpp_PYTHON_DIR) + get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) + endif() + + if (WIN32) + set(PYTHON_OPTION "") + else() + set(PYTHON_OPTION "--user") + endif() + + if("${_vgpp_PYTHON_DIR}" MATCHES "${DOWNLOADS}") # inside vcpkg + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_from_github( + OUT_SOURCE_PATH PYFILE_PATH + REPO pypa/get-pip + REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 + SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a + HEAD_REF master + ) + execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) + endif() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) + endforeach() + else() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) + endforeach() + endif() + if(NOT VCPKG_TARGET_IS_WINDOWS) + execute_process(COMMAND pip3 install ${_vgpp_PACKAGES}) + endif() + else() # outside vcpkg + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND ${_vgpp_PYTHON_EXECUTABLE} -c "import ${_package}" RESULT_VARIABLE HAS_ERROR) + if(HAS_ERROR) + message(FATAL_ERROR "Python package '${_package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${_vgpp_PACKAGES}") + endif() + endforeach() + endif() +endfunction() + +set(${PORT}_PATCHES fix-taglib-search.patch) # Strictly this is only required if qt does not use pkg-config since it forces it to off. +set(TOOL_NAMES + ifmedia-simulation-server + ifvehiclefunctions-simulation-server + ) qt_download_submodule(PATCHES ${${PORT}_PATCHES}) if(QT_UPDATE_VERSION) return() endif() -file(COPY "${SOURCE_PATH_QFACE}/" DESTINATION "${SOURCE_PATH}/src/3rdparty/qface") if(_qis_DISABLE_NINJA) set(_opt DISABLE_NINJA) endif() +vcpkg_find_acquire_program(PKGCONFIG) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") +vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}/Scripts") +vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES virtualenv qface) + qt_cmake_configure(${_opt} OPTIONS ${FEATURE_OPTIONS} + "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) From 8245b115283a729d497b0da9373d522e68666229 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 10:37:51 +0100 Subject: [PATCH 23/35] format manifest --- ports/qt/vcpkg.json | 14 +++++++------- ports/qtapplicationmanager/vcpkg.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 78d8df10ceabe6..2ad963bbf4a00a 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -43,13 +43,6 @@ ] }, "qtinterfaceframework", - { - "name": "qtpositioning", - "default-features": false, - "features": [ - "qml" - ] - }, { "name": "qtlottie", "default-features": false, @@ -74,6 +67,13 @@ "qml" ] }, + { + "name": "qtpositioning", + "default-features": false, + "features": [ + "qml" + ] + }, { "name": "qtquick3d", "default-features": false diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index d4eccfe4bb8841..ba65303b7f760c 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -4,8 +4,8 @@ "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "dependencies": [ - "libyaml", "libarchive", + "libyaml", { "name": "qtbase", "default-features": false From 30fd28d86e90d891d5e0ddd9f3781b83f33172ef Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 10:38:33 +0100 Subject: [PATCH 24/35] version stuff --- versions/baseline.json | 88 ++++++++++++++++----------- versions/q-/qt.json | 5 ++ versions/q-/qt5compat.json | 5 ++ versions/q-/qtactiveqt.json | 5 ++ versions/q-/qtapplicationmanager.json | 9 +++ versions/q-/qtbase.json | 5 ++ versions/q-/qtcharts.json | 5 ++ versions/q-/qtcoap.json | 5 ++ versions/q-/qtconnectivity.json | 5 ++ versions/q-/qtdatavis3d.json | 5 ++ versions/q-/qtdeclarative.json | 5 ++ versions/q-/qtdeviceutilities.json | 9 +++ versions/q-/qtdoc.json | 5 ++ versions/q-/qtimageformats.json | 5 ++ versions/q-/qtinterfaceframework.json | 9 +++ versions/q-/qtlocation.json | 5 ++ versions/q-/qtlottie.json | 5 ++ versions/q-/qtmqtt.json | 5 ++ versions/q-/qtmultimedia.json | 5 ++ versions/q-/qtnetworkauth.json | 5 ++ versions/q-/qtopcua.json | 5 ++ versions/q-/qtpositioning.json | 9 +++ versions/q-/qtquick3d.json | 5 ++ versions/q-/qtquicktimeline.json | 5 ++ versions/q-/qtremoteobjects.json | 5 ++ versions/q-/qtscxml.json | 5 ++ versions/q-/qtsensors.json | 5 ++ versions/q-/qtserialbus.json | 5 ++ versions/q-/qtserialport.json | 5 ++ versions/q-/qtshadertools.json | 5 ++ versions/q-/qtsvg.json | 5 ++ versions/q-/qttools.json | 5 ++ versions/q-/qttranslations.json | 5 ++ versions/q-/qtvirtualkeyboard.json | 5 ++ versions/q-/qtwayland.json | 5 ++ versions/q-/qtwebchannel.json | 5 ++ versions/q-/qtwebengine.json | 5 ++ versions/q-/qtwebsockets.json | 5 ++ versions/q-/qtwebview.json | 5 ++ versions/t-/taglib.json | 5 ++ 40 files changed, 263 insertions(+), 36 deletions(-) create mode 100644 versions/q-/qtapplicationmanager.json create mode 100644 versions/q-/qtdeviceutilities.json create mode 100644 versions/q-/qtinterfaceframework.json create mode 100644 versions/q-/qtpositioning.json diff --git a/versions/baseline.json b/versions/baseline.json index 2e84594fe13d92..dc13857ca46107 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5493,7 +5493,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5673,7 +5673,7 @@ "port-version": 1 }, "qt5compat": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qt6betablock": { @@ -5681,39 +5681,51 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.2.1", + "baseline": "6.2.2", + "port-version": 0 + }, + "qtapplicationmanager": { + "baseline": "6.2.2", "port-version": 0 }, "qtbase": { - "baseline": "6.2.1", - "port-version": 1 + "baseline": "6.2.2", + "port-version": 0 }, "qtcharts": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtcoap": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.2.1", + "baseline": "6.2.2", + "port-version": 0 + }, + "qtdeviceutilities": { + "baseline": "6.2.2", "port-version": 0 }, "qtdoc": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtimageformats": { - "baseline": "6.2.1", + "baseline": "6.2.2", + "port-version": 0 + }, + "qtinterfaceframework": { + "baseline": "6.2.2", "port-version": 0 }, "qtkeychain": { @@ -5725,31 +5737,35 @@ "port-version": 0 }, "qtlocation": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtlottie": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtmqtt": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtopcua": { - "baseline": "6.2.1", + "baseline": "6.2.2", + "port-version": 0 + }, + "qtpositioning": { + "baseline": "6.2.2", "port-version": 0 }, "qtquick3d": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtquickcontrols2": { @@ -5757,67 +5773,67 @@ "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtscxml": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtsensors": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtserialbus": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtserialport": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtshadertools": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtsvg": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qttools": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qttranslations": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtwayland": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtwebengine": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "qtwebview": { - "baseline": "6.2.1", + "baseline": "6.2.2", "port-version": 0 }, "quadtree": { @@ -6622,7 +6638,7 @@ }, "taglib": { "baseline": "1.12.0", - "port-version": 0 + "port-version": 1 }, "taocpp-json": { "baseline": "2020-09-14", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 222b019eb75560..d4d94c2afc4d99 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5c16e5a474beb03060095dbe9bf2f98e8d1483f", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "21c442fd3e940a2ee9a83377da9a8e902539b51b", "version-semver": "6.2.1", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 4127070ebeef79..612a20c908f8e4 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "766a30524747e5382462c57836e5a8a6a67a1b86", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "aab367de0f2bfab12d47c09e3a5baf3a04be6d1b", "version-semver": "6.2.1", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index c2a537cd25cd34..fe62210cc4a654 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "adbc35d451c9ac13adbd23980b1609bce61e3dd9", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "9b4f9c648d93abf2dc5547a0c966f268809eeb58", "version-semver": "6.2.1", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json new file mode 100644 index 00000000000000..73f802c9f052fd --- /dev/null +++ b/versions/q-/qtapplicationmanager.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f3a6283ee22db9aa91c5dda7a4f5c5790886e949", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index bdef4075f17e76..ce35abda751aeb 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c314a6af00c3a57bbd887c834cc0b5f80bfd65fc", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "700e8c2e47b2d044d1623ea5062e15ac6cc9a970", "version-semver": "6.2.1", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index f04891f67050b2..3aea539e5d467d 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fd0c04f1b0758cb38a161d2ec6a9b8757bb243c", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "68535daef3629a70ff0e5a347580f747aa075070", "version-semver": "6.2.1", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 19dc1a4e84139c..94fc0ad497f6e8 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fdd3a57eee65ddaa5bd2c83ece98efcc0a6e7e5", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "1397bf94a76801daaec069dbbc790dc45957ccaa", "version-semver": "6.2.1", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index 495095c425c007..07c97c090320c0 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f62102338302645f71d4b060100dee977a5c744", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "0ed1e678661df3b938f67e6d9f8d68e62f8f75b6", "version-semver": "6.2.1", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 84326f72687404..629662cd5234a2 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be38aa1f2d19491f9195779ab9bc5cf9469e2d46", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "64b4f2709811c4ab542a8534645e0ffdb1ffffe7", "version-semver": "6.2.1", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 7c01db2c48c004..08efac7398d46b 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4f31e8cfbb1e6c504ad8089e92e234b03a96679", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "3abe1c5e7e0fee7e89e99635bb1c7b4136854c2e", "version-semver": "6.2.1", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json new file mode 100644 index 00000000000000..3fafa7c451a29f --- /dev/null +++ b/versions/q-/qtdeviceutilities.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f6122e9d022e0d407e75f0af4b1faafa926f40cf", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index d59e821311be94..d8395b0d4d8722 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "585382ff1e60120a0cf35e8b22e1b8152b83fa1d", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "d2640b87a1d668eeb0021bb55e7957f3d0d507e0", "version-semver": "6.2.1", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 53b64a4d1e8222..6cd7915667f3a6 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "038c5575e3e47c1512381b63138896df5fd713b6", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "e500b15fc978066e6c781d3d7f54867b31c8a77c", "version-semver": "6.2.1", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json new file mode 100644 index 00000000000000..bb79e66e73021a --- /dev/null +++ b/versions/q-/qtinterfaceframework.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "897eb6b2fb187cd3dcc4a9a730160642b132ea3c", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index d47c7da968359c..923349954612b4 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d931a7ce122989a7d7740e0c196e736fa8caa3c3", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "7aeba7169d9ebb502e2fb276d36eaf0b562cefd7", "version-semver": "6.2.1", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 3cfd7661848c4a..913afec220838b 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f23eead56f7491312b8b16fe1729aa1e808598d", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "73dbf3d8520fa5aba164701b37217ec55dbfc16d", "version-semver": "6.2.1", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 2d5529578339b1..baf41523e1a7b7 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab25c644271573b1106cea249b17740ff645a0dd", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "07e0bf2df2183ec6fb51a6f8d11a1ec3fb27a499", "version-semver": "6.2.1", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 1b1b88ae1bb1c6..17d86028647503 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ddf67ffb4169c0c1d2a8e3b0cc317101fd2dfd95", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "e5a5554e1e9e997f82d4a90933b6a2edd2d0a2b0", "version-semver": "6.2.1", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 1597acf14c2556..918613cf4c05c6 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6a02544f81615f1628e9f75af57af10697d51b0", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "5aa75624c0e5b7b13380a7c7b6f0a8cc4deec8d8", "version-semver": "6.2.1", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index bfd34c00c5bdd3..ad08cb2cbbbc80 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45d2bb4f558ea5cd5d321d92bd9d361cb53acb49", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "e9e3856e0b345b9b27921eadc6d45115fe70fa26", "version-semver": "6.2.1", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json new file mode 100644 index 00000000000000..a118162cb06bae --- /dev/null +++ b/versions/q-/qtpositioning.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9e9bfb4dd17aa86cfcd5c80f0725c585ec140670", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 37d7349628d563..0b57faccc133b8 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81a5365f84b789b91715504392ce6e8b09b8702b", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "4431f13552a344e856d7c1486d1cd0b51649b372", "version-semver": "6.2.1", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 6641925220d3b6..4dec0d20d9bea2 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43a873627defa053a83b64a73f4deb978a55cdcb", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "8721d7b3901d80a38f30a05a27a9f111356611b5", "version-semver": "6.2.1", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 693022765967aa..e3fac5b7c1e711 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "caa274f1cb2a4e59d44aa9a22f039c040cf8823d", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "68c5454488b9c71989413817c7be02e3f758b11d", "version-semver": "6.2.1", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index d3d192acfb2a9b..e09c37e7d1bcba 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "011114ad3a3f710f7229eef99eb75cb0a061fbe1", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "f614e8155cd17d2720c1d8ad027b6655fbd5a744", "version-semver": "6.2.1", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 1976e9a50d83ad..8c7413e2ad9288 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d712603b6a1fd9781f0ecd55bed2a905256a1c14", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "1aa5854f556f4f448a406daf6fe368a91a5a0b15", "version-semver": "6.2.1", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index d2358241227e37..00f085fae7dc34 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f038e84c8f9b127bc7998328e546ca7fb4e7553", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "ce2504f7bda386450268832846376a48529bce73", "version-semver": "6.2.1", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 2e2d6c06cb3069..4adffa4a62be49 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "791608d6a9d95afa77b8db4a13a8f75928626926", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "ce4ab156356f3dcfe3fabbaf3f447ebbcd83972a", "version-semver": "6.2.1", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 686e1e19eaaac6..dbb0c5d89d721e 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70e894d24707b42dd208c14f491cf3164caf22f9", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "e5831c09c8eaf4936eaef1c9a52079fc4e9ffa0f", "version-semver": "6.2.1", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index e6678ab5b7b7d2..bb7af3ff778997 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6c1c34779691c0150e573246351f00b6fe1126f", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "aa7f5015760b1bc7f653f30b170c1201a437cd86", "version-semver": "6.2.1", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index abdb043533e369..a5e6a74ada64db 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "655cd4b3e9d57ebee9768c2ab0d1d4936b409c02", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "eb472063be2d7b507cb027c217564f9288b24482", "version-semver": "6.2.1", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index be4b26011c338a..02da4f846f96e1 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51a188d5a80a0a9a3b5ec6319bfd0710e82d1769", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "9bf7f8aa0d90f72017d2e47f1a5628a93265b824", "version-semver": "6.2.1", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index c3dfc66c4edcb6..77a4c00f169307 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bc69668572f2a83bf742b8b10ec3085f159d513", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "8b26db2df575c2b7a0341c7aaea9b88ee4e017b2", "version-semver": "6.2.1", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 04bc447168b401..6d2d94cae8052d 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7df54bd36afd381966e0b082e49154b1eb818bf0", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "5801a51524f383c98f98da3d085cad1ecc338ca6", "version-semver": "6.2.1", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 295bc65590faa1..7189456e101483 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3f7068b76b91006bd426b173fe5e723ca6364c4", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "963ccd119990c7c3ae09e323da25a38b4893df78", "version-semver": "6.2.1", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 6d86411f0c3572..de6edd8461b7f2 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a3f041f2f3f5fdb5e1304efbae7ae0e9abbef79", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "4c69c49d9fe8599dd22538d9cef12e09cb29778e", "version-semver": "6.2.1", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 912080de8a6622..48668376aaf951 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e051a024f04ac4bbb3700a022df3dfb85c35267d", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "1c23c3b938eaf83f287a460d95695732a4b784d3", "version-semver": "6.2.1", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index fbb56bc088125f..18245903b16a4a 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a500d15808d3698a95eedf1aa1362442e8cc9576", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "04d26846445cac21376cf3b80264394fb6a83778", "version-semver": "6.2.1", diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index 205aae2a5235fa..4c463e5a2da4c5 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d14774690f0692baa62237a6ee67f8aa7e7974f9", + "version-semver": "1.12.0", + "port-version": 1 + }, { "git-tree": "c4559ad74a4b1757cc6f7b11abce3b6c4cab66c7", "version-semver": "1.12.0", From ad5838eeda2529f8c250f13708348e900bc5d1c8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 11:19:53 +0100 Subject: [PATCH 25/35] fix qtapplicationmanager --- ports/qtapplicationmanager/portfile.cmake | 45 ++++++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index ae2d142de0ad99..390118a636567a 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -14,15 +14,48 @@ set(TOOL_NAMES appman package-uploader ) -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() + +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) +qt_cmake_configure(${_opt} + OPTIONS -DINPUT_libarchive=system -DINPUT_libyaml=system -DFEATURE_am_system_libyaml=ON -DFEATURE_am_system_libarchive=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) + OPTIONS_DEBUG + OPTIONS_RELEASE) + +### Need to fix one post-build.bat; Couldn't find the place where it gets generated! +if(VCPKG_TARGET_IS_WINDOWS) + set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE) + if(EXISTS "${scriptfile}") + vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin") + endif() +endif() +vcpkg_install_cmake(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + +# Switch to a more complicated script due to the one post-build script which needed fixing after configure. +# If somebody finds out how/where post-build.bat gets generated please fix it there instead. +#qt_install_submodule(PATCHES ${${PORT}_PATCHES} +# TOOL_NAMES ${TOOL_NAMES} +# CONFIGURE_OPTIONS +# --trace-expand +# -DINPUT_libarchive=system +# -DINPUT_libyaml=system +# -DFEATURE_am_system_libyaml=ON +# -DFEATURE_am_system_libarchive=ON +# CONFIGURE_OPTIONS_RELEASE +# CONFIGURE_OPTIONS_DEBUG +# ) set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) #Debug tracing libraries are only build if CMAKE_BUILD_TYPE is equal to Debug From ae1c7efa106cb1b618476e2d7ab53708ad2e8568 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 11:20:25 +0100 Subject: [PATCH 26/35] fix version --- versions/q-/qtapplicationmanager.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 73f802c9f052fd..9f16e5ffe21fbe 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f3a6283ee22db9aa91c5dda7a4f5c5790886e949", + "git-tree": "7aa9faa3ddc8fe96dd148c538585efac84c762c0", "version-semver": "6.2.2", "port-version": 0 } From 36405ba2dbf8d41dd8eae477577d032a6eca2604 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 12:38:59 +0100 Subject: [PATCH 27/35] make qt buildable for static windows builds. --- ports/qt/vcpkg.json | 29 ++++++++++++++++++++++++----- ports/qtwebview/vcpkg.json | 1 + 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 2ad963bbf4a00a..cabac8ad5130bc 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -31,7 +31,11 @@ "qtconnectivity", "qtdatavis3d", "qtdeclarative", - "qtdeviceutilities", + { + "name": "qtdeviceutilities", + "default-features": false, + "platform": "linux" + }, "qtdoc", { "name": "qtimageformats", @@ -55,11 +59,18 @@ "name": "qtmultimedia", "default-features": false, "features": [ - "gstreamer", "qml", "widgets" ] }, + { + "name": "qtmultimedia", + "default-features": false, + "features": [ + "gstreamer" + ], + "platform": "!(static & windows)" + }, "qtnetworkauth", { "name": "qtopcua", @@ -129,7 +140,8 @@ "geolocation", "spellchecker", "webchannel" - ] + ], + "platform": "!static" }, { "name": "qtwebsockets", @@ -142,9 +154,16 @@ "name": "qtwebview", "default-features": false, "features": [ - "qml", - "webengine" + "qml" ] + }, + { + "name": "qtwebview", + "default-features": false, + "features": [ + "webengine" + ], + "platform": "!static" } ], "default-features": [ diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 1dbeb269feb602..47ccd00068d246 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -24,6 +24,7 @@ }, "webengine": { "description": "Build with Webengine", + "supports": "!static", "dependencies": [ { "name": "qtwebengine", From 8f476aafe85b36b57fec194ad89698842ab2448c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 12:39:28 +0100 Subject: [PATCH 28/35] version corrections --- versions/q-/qt.json | 2 +- versions/q-/qtwebview.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/q-/qt.json b/versions/q-/qt.json index d4d94c2afc4d99..90bb7506e593e0 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f5c16e5a474beb03060095dbe9bf2f98e8d1483f", + "git-tree": "0270bf15601be63bc4e72bee1edc44e1241cbbfc", "version-semver": "6.2.2", "port-version": 0 }, diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 18245903b16a4a..1907ce928d6bd9 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a500d15808d3698a95eedf1aa1362442e8cc9576", + "git-tree": "ef310559b2cef5f8dd1e2eee6c2f52c3942d0f26", "version-semver": "6.2.2", "port-version": 0 }, From 0037ddb2589c7ccb31e5f4cdc473a4a5c6b43311 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 16:13:40 +0100 Subject: [PATCH 29/35] add extra paths; otherwise it breaks out of the buildtree --- ports/qtinterfaceframework/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index d14e515a8cf865..d9cf907a4468ee 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -75,6 +75,8 @@ vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}/Scripts") vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES virtualenv qface) +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) qt_cmake_configure(${_opt} OPTIONS ${FEATURE_OPTIONS} "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. From 99010e078f0dbd09fcf72e380520d852dbc1d952 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 16:14:05 +0100 Subject: [PATCH 30/35] version stuff. --- versions/q-/qtinterfaceframework.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index bb79e66e73021a..b79316e0ff8131 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "897eb6b2fb187cd3dcc4a9a730160642b132ea3c", + "git-tree": "31a47004f272b96a946e01f7acd28cd444fa44c2", "version-semver": "6.2.2", "port-version": 0 } From dc89bac718c173f477361e5dd7de17b15293dcc1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 3 Dec 2021 23:58:03 +0100 Subject: [PATCH 31/35] trying to fix qtapplicationmanager --- ports/qtapplicationmanager/portfile.cmake | 1 + ports/qtapplicationmanager/vcpkg.json | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 390118a636567a..b5641e696569a2 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -11,6 +11,7 @@ set(TOOL_NAMES appman appman-dumpqmltypes appman-packager appman-qmltestrunner + appman-launcher-qml package-uploader ) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index ba65303b7f760c..ab43313507076c 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -6,6 +6,11 @@ "dependencies": [ "libarchive", "libyaml", + { + "name": "qtapplicationmanager", + "host": true, + "default-features": false + }, { "name": "qtbase", "default-features": false From b9890df08305ccfbf27b24471b7fe52a766243ce Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 4 Dec 2021 07:40:20 +0100 Subject: [PATCH 32/35] add supports field --- ports/qtapplicationmanager/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index ab43313507076c..cc84f15a362664 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -3,6 +3,7 @@ "version-semver": "6.2.2", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", + "supports" : "!(windows&arm)" "dependencies": [ "libarchive", "libyaml", From 6df7e5456ecabc0c346093529162b2887b8d3875 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 4 Dec 2021 12:23:12 +0100 Subject: [PATCH 33/35] fix cross case --- ports/qtinterfaceframework/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index d9cf907a4468ee..ce2fdc2e3e94e8 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -89,3 +89,7 @@ qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) qt_install_copyright("${SOURCE_PATH}") +if(NOT VCPKG_CROSSCOMPILING) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ifcodegen") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ifcodegen" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/ifcodegen") +endif() From 0532fbb8b6f98170d00148fd9b8479a297e69d16 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 4 Dec 2021 12:26:12 +0100 Subject: [PATCH 34/35] fix stuff --- ports/qtapplicationmanager/vcpkg.json | 2 +- ports/qtinterfaceframework/vcpkg.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index cc84f15a362664..ab51564a234860 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -3,7 +3,7 @@ "version-semver": "6.2.2", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", - "supports" : "!(windows&arm)" + "supports": "!(windows & arm)", "dependencies": [ "libarchive", "libyaml", diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index 0e6f2e400421d9..89d42b18d921e0 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -8,6 +8,11 @@ "name": "qtdeclarative", "default-features": false }, + { + "name": "qtinterfaceframework", + "host": true, + "default-features": false + }, { "name": "qtmultimedia", "default-features": false From 44f6fbf8e76d084498d1b6fee0ac9b727a6c7e13 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 4 Dec 2021 12:27:31 +0100 Subject: [PATCH 35/35] version stuff --- versions/q-/qtapplicationmanager.json | 2 +- versions/q-/qtinterfaceframework.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 9f16e5ffe21fbe..141a3cd0e615bf 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7aa9faa3ddc8fe96dd148c538585efac84c762c0", + "git-tree": "ca033ed7578b002c1ce195d879c622333231d159", "version-semver": "6.2.2", "port-version": 0 } diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index b79316e0ff8131..6e2cc2fd63cf60 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "31a47004f272b96a946e01f7acd28cd444fa44c2", + "git-tree": "cf3fdd99f01775fe030233d5526e5e3069e3e813", "version-semver": "6.2.2", "port-version": 0 }