From b0d9d516272c599145009c4c28b779a678fc97f8 Mon Sep 17 00:00:00 2001 From: Carsten Grimm <97085459+carsten-grimm-at-ipolog@users.noreply.github.com> Date: Thu, 30 May 2024 19:48:16 +0200 Subject: [PATCH] [qt5] update to 5.15.14 (#38967) Fixes #38962. Fixes #38966. - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. Changes: * update Qt5 to 5.15.14 following [these instructions](https://github.com/microsoft/vcpkg/pull/24660#issuecomment-1124329485). * added patch for CVE-2024-36048 to `qt5-networkauth`. * removed patch for CVE-2023-32762 from `qt5-base` as Qt 5.15.14 is no longer affected. * removed patch for CVE-2023-33285 from `qt5-base` as Qt 5.15.14 is no longer affected. * removed patch for CVE-2023-32573 from `qt5-svg` as Qt 5.15.14 is no longer affected. --- ports/qt5-3d/vcpkg.json | 3 +- ports/qt5-activeqt/vcpkg.json | 3 +- ports/qt5-androidextras/vcpkg.json | 3 +- ports/qt5-base/cmake/qt_port_hashes.cmake | 84 ++++----- .../patches/CVE-2023-32762-qtbase-5.15.diff | 13 -- .../patches/CVE-2023-33285-qtbase-5.15.diff | 68 -------- ports/qt5-base/portfile.cmake | 2 - ports/qt5-base/vcpkg.json | 3 +- ports/qt5-charts/vcpkg.json | 3 +- ports/qt5-connectivity/vcpkg.json | 3 +- ports/qt5-datavis3d/vcpkg.json | 3 +- ports/qt5-declarative/vcpkg.json | 3 +- ports/qt5-doc/vcpkg.json | 3 +- ports/qt5-gamepad/vcpkg.json | 3 +- ports/qt5-graphicaleffects/vcpkg.json | 3 +- ports/qt5-imageformats/vcpkg.json | 3 +- ports/qt5-location/vcpkg.json | 3 +- ports/qt5-macextras/vcpkg.json | 3 +- ports/qt5-mqtt/vcpkg.json | 3 +- ports/qt5-multimedia/vcpkg.json | 3 +- .../CVE-2024-36048-qtnetworkauth-5.15.diff | 53 ++++++ ports/qt5-networkauth/portfile.cmake | 5 +- ports/qt5-networkauth/vcpkg.json | 3 +- ports/qt5-purchasing/vcpkg.json | 3 +- ports/qt5-quickcontrols/vcpkg.json | 3 +- ports/qt5-quickcontrols2/vcpkg.json | 3 +- ports/qt5-remoteobjects/vcpkg.json | 3 +- ports/qt5-script/vcpkg.json | 3 +- ports/qt5-scxml/vcpkg.json | 3 +- ports/qt5-sensors/vcpkg.json | 3 +- ports/qt5-serialbus/vcpkg.json | 3 +- ports/qt5-serialport/vcpkg.json | 2 +- ports/qt5-speech/vcpkg.json | 3 +- ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff | 32 ---- ports/qt5-svg/portfile.cmake | 1 - ports/qt5-svg/vcpkg.json | 3 +- ports/qt5-tools/vcpkg.json | 3 +- ports/qt5-translations/vcpkg.json | 3 +- ports/qt5-virtualkeyboard/vcpkg.json | 3 +- ports/qt5-wayland/vcpkg.json | 3 +- ports/qt5-webchannel/vcpkg.json | 3 +- ports/qt5-webengine/vcpkg.json | 3 +- ports/qt5-webglplugin/vcpkg.json | 3 +- ports/qt5-websockets/vcpkg.json | 3 +- ports/qt5-webview/vcpkg.json | 3 +- ports/qt5-winextras/vcpkg.json | 3 +- ports/qt5-x11extras/vcpkg.json | 3 +- ports/qt5-xmlpatterns/vcpkg.json | 3 +- ports/qt5/vcpkg.json | 3 +- versions/baseline.json | 162 +++++++++--------- versions/q-/qt5-3d.json | 5 + versions/q-/qt5-activeqt.json | 5 + versions/q-/qt5-androidextras.json | 5 + versions/q-/qt5-base.json | 5 + versions/q-/qt5-charts.json | 5 + versions/q-/qt5-connectivity.json | 5 + versions/q-/qt5-datavis3d.json | 5 + versions/q-/qt5-declarative.json | 5 + versions/q-/qt5-doc.json | 5 + versions/q-/qt5-gamepad.json | 5 + versions/q-/qt5-graphicaleffects.json | 5 + versions/q-/qt5-imageformats.json | 5 + versions/q-/qt5-location.json | 5 + versions/q-/qt5-macextras.json | 5 + versions/q-/qt5-mqtt.json | 5 + versions/q-/qt5-multimedia.json | 5 + versions/q-/qt5-networkauth.json | 5 + versions/q-/qt5-purchasing.json | 5 + versions/q-/qt5-quickcontrols.json | 5 + versions/q-/qt5-quickcontrols2.json | 5 + versions/q-/qt5-remoteobjects.json | 5 + versions/q-/qt5-script.json | 5 + versions/q-/qt5-scxml.json | 5 + versions/q-/qt5-sensors.json | 5 + versions/q-/qt5-serialbus.json | 5 + versions/q-/qt5-serialport.json | 5 + versions/q-/qt5-speech.json | 5 + versions/q-/qt5-svg.json | 5 + versions/q-/qt5-tools.json | 5 + versions/q-/qt5-translations.json | 5 + versions/q-/qt5-virtualkeyboard.json | 5 + versions/q-/qt5-wayland.json | 5 + versions/q-/qt5-webchannel.json | 5 + versions/q-/qt5-webengine.json | 5 + versions/q-/qt5-webglplugin.json | 5 + versions/q-/qt5-websockets.json | 5 + versions/q-/qt5-webview.json | 5 + versions/q-/qt5-winextras.json | 5 + versions/q-/qt5-x11extras.json | 5 + versions/q-/qt5-xmlpatterns.json | 5 + versions/q-/qt5.json | 5 + 91 files changed, 426 insertions(+), 321 deletions(-) delete mode 100644 ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff delete mode 100644 ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff create mode 100644 ports/qt5-networkauth/patches/CVE-2024-36048-qtnetworkauth-5.15.diff delete mode 100644 ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index e236c398f01aae..e405275d03f1a7 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-3d", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt 3D provides functionality for near-realtime simulation systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applications.", "license": null, "dependencies": [ diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json index 799e4114a3a893..9ecd0eb40db285 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-activeqt", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Active Qt is a helper framework that enables the developer to access and use ActiveX controls and COM objects provided by any ActiveX server. It also makes it possible to make the developer's own Qt applications available as COM servers on Windows.", "license": null, "supports": "windows", diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json index c4e40520cf0883..cd900f8d0e0dbe 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-androidextras", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Android Extras module provided a set of classes and functions that were specific to Android applications written with Qt. This module helped developers to integrate various Android-specific features and services into their Qt applications.", "license": null, "supports": "android", diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index de4425c221662c..9999c2f04fac8d 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,53 +1,53 @@ # Every update requires an update of these hashes and the version within the control file of each of the 32 ports. # So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 13) -set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. +set(QT_PATCH_VER 14) +set(QT_UPDATE_VERSION OFF) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-3d 30bb061b13f91a8137e961948431b0ca697135a62c8f601eb0c65dc46f0a1f3e7d850141952f0b673a80002e8493289860d9b86840406e3e72fab4eb515688ad) -set(QT_HASH_qt5-activeqt 09aaf289be9136762934358083819ff0f6ceccd2e56699184ea4787cc51d0173b2581f316c9181d21a05bc6d80992867b40677998d436e370666bcd090ce7a8b) -set(QT_HASH_qt5-androidextras f5eae2dfd9ff92096b7b636ec3f23825d54303e2ebfd3f597ee9e7c5ecea3883cd8a11e81cba6d9a3e0d6884e60ff00551a51fc2c735d0ad5ca227de56850ff6) -set(QT_HASH_qt5-base 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef) -set(QT_HASH_qt5-charts a4ebdb7577683a68c960fee649ffac543528791daa88fd412ab5fdda3765719921cd4daebc49395c4108a3da2bafdbf8e08008fcced4c18b4d1a3acedb377796) -set(QT_HASH_qt5-connectivity 631947135a362b5a417b84702b3755588e5c7fe1c9cca5b523c8d8ca340b42f929aaf58c49d8282ec46b85b58afe8f0f2600024875fb9a7bd1145566ca328966) -set(QT_HASH_qt5-datavis3d ced9c6083ade43f43db2a86b20188a75a7028b7f89613a0d94ea48ec795b234af669caa45227cbbc7c2c3187b017fb5521c2d7c16834277d9dba1671afb00076) -set(QT_HASH_qt5-declarative fd16159217f7526f6e56d1849ffb2d219e0bee48581e4a1d3bdec1602f884038f3747da68b8905a6858e6e8e03e18b9da4d598a154d4d0a11a62b818940d3113) -set(QT_HASH_qt5-doc a9acd8ee19f1fe7f2f30865449b37c8c67a1cc7029fdbcc2d267932d1c73f4b0c478a9023fe724aed8269b22b63dce824624e9cbc5fd6b5f08a719a6007ff076) -set(QT_HASH_qt5-gamepad 03f403c0f966c95b0c64286c047c54bc09e49ad7029de8476d792cc240d0d8b78a426f98e6358376cfc2abcaefb2500ff2182414bd8c2244541b065220780f63) -set(QT_HASH_qt5-graphicaleffects ee2f4e24ced70c1531ceb310c90d6c0bb5300f527a247f07599467f355fb89a426cce6bacb25b77b6ec62f4e358d2345093343ad442acd182dcaca77e031a0bf) -set(QT_HASH_qt5-imageformats 48b0dac1acfdae1b090bc5d0054610f61290135363400a629ce3650cddd4c11f7bd95edd5bd1d36d758006a5fd54ded29f540a6e8dc675ca2e85d4ae169add50) -set(QT_HASH_qt5-location 37ccec9d9ce4ab59c0e4a2827c94d2e7247786fa53dc340539160631aaa9e5de02fbff1a5fadc5d96c64b2d9a81a5912a562beb6e4d0ec09186f8508626ade36) -set(QT_HASH_qt5-macextras 62603dee7741845ad4ecdfd8dd81042031851bebe3f13281bc9fb18c56cfd546abeba200f57e1ca0364d8271bd76a8e2180e2403270fec914ee04be7dfb4248d) -set(QT_HASH_qt5-mqtt 09476ce6922a89f513f588a15c4b664f637b2d6fa17545d2a6d8d176b6f32bf41263200f52e9755f5d4d349ac2662ead4efb2a8375a19005947228a6e64c8222) -set(QT_HASH_qt5-multimedia fa70146275d03c1bb8da1930eb66a9bbbf2a6c25cb6e6204a58b8338f58e671634eab878e9bac785ae2394de7dc38d30025a4afe4d26060e2f23a44758b2e5a4) -set(QT_HASH_qt5-networkauth 939ee9759fa0584aab060f420bdd98a44c49d93291dabff74bd90536a4cbd666899d3c1e19b438c1c3333d7d3f374a7a3b0beb8728b69ef19b915d2496f3fba8) -set(QT_HASH_qt5-purchasing 0b6b81e0ba458a7dd51cd373f1c74e63a6577dbf28c0c660d47b43a00c53d4bb6e14592d2a9210d8b843abddf92f8012d188bfd374ec086776c19df82df5308d) -set(QT_HASH_qt5-quickcontrols 9d84b2a0b0c752df7dd735a29b04a2e6351e016bb693ace49d05b51754784f7da3e335e8da1070b2e31391a4dc35a55adb36286bb5ec4e29e608801fcd8d2bcc) -set(QT_HASH_qt5-quickcontrols2 0aae8d2f208a47c38f8604879a55e019b7b34a1f1202fa9b447a30753d540de9cdc3c7a8658c36a5d4c01596d2c8c65ba279d7c67e70c48a6ebdb5ad443ca8b0) -set(QT_HASH_qt5-remoteobjects 5bdcb7560f4b08e81b0646790c145598524e4e75888b96ffad2f19c51896fbbcc56d50ad24ae4072a87b63a494250dc30aca782bd093f4f49e649d670e557117) -set(QT_HASH_qt5-script 38060e3cece2819befa67e078eee6a4bcf9c0135015724af4786eb3190cb1bf6895dc5b8a919da83b6d0576d1aa109ab4050c997409c7f5eed52385ef325e2de) -set(QT_HASH_qt5-scxml ba7c40b08951521e8d56372456c6e613a49cd2bc42d8def7b477e0334100dd741fb20a6ef9d860dba9be44547998eee6bea30de0f16f43b3152e51132bcb2d90) -set(QT_HASH_qt5-sensors d6bd4fe02625272786f8c0f384ecce7497eebc3d691deaf9a42b9b221e4905715c7adb4e56fc04487b39f950b34f2239e8902e6e7880bf793461e808d6c9d245) -set(QT_HASH_qt5-serialbus 12e5580249f0d241b0536be8c4ab5a01eed722c9cbaaa4c052ecacb8e105c0d31f4e83e87fcf7f30711e48b0a6d0ee413bd837ea2bb7fbc41bddb7e6ab18ea22) -set(QT_HASH_qt5-serialport 5eab045b704f101f046880e57ff5f3c0f901867d092892939c0c20e54624f30b676802ec9535f3be39e9687497e28bfb71b560635b0cb38e241a225d377e74ee) -set(QT_HASH_qt5-speech 43b97ddc333d1c4a9715b1c306ced0506eb8faf69f1d22500b74e509d33b5a5cb9d0c166b9211a32a78eaba57925195d8ba0c39c8ae6a15551f841426294c75f) -set(QT_HASH_qt5-svg 17d13fdeec439c02e7b7e478527376da2d4efd65e019fb18822d3d7883cbf129eea2661c19e931e59280c3bda7233fa6cfd84c4d76365abc63814a80e99f2a65) -set(QT_HASH_qt5-tools a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500) -set(QT_HASH_qt5-translations 5404c98ba6303986da0ffc5f715cf7024b724183e6f30b15bc9825cac2d1715239a4479093cb46239cceaa0a7468dd05e190cd0a6911b22f3628ff57ff3d8c57) -set(QT_HASH_qt5-virtualkeyboard abe58c132c8bd23d29de1937e2f1fb6571aec829ce74f4904d322c4046d8c70b4b9b508930e4c681a8e30ff1d8a63c627cc3bec1560e83dada426c09d827ae29) -set(QT_HASH_qt5-wayland 1f5b5e911ad9026d08260e5ce15aad5c9167726ce42db85634392f1e49d545ca5bcd4e44304f1ff633ffe110712a2b5dad87de6cd89eb3b7e6c657fe260e388d) -set(QT_HASH_qt5-webchannel f0c698aded46ae1f2932a79bdf9d5601466b7e88f6af96fe48d346144fd2e5bbaa81c7c6a82ed78fe8a0314218827704648741b0b47c0efefc31eb447643ad23) -set(QT_HASH_qt5-webengine 0c9aa844148e908c2eb5af93b51d2809f183f775d5760b4654f8f34ac825fd8b9d81a9b70cb9d79d16502bdce7bd6d77484c5b04797d99726f6ff5e9e40af03f) -set(QT_HASH_qt5-webglplugin 14de04d356fb1d3475f5630ecd020b1d5c1127e1bd1032a668b6e0bb6073b04225494cf8a45c62c6b02d95f64fa81d4c0598f7e3e6a39787eeb23096da351e5a) -set(QT_HASH_qt5-websockets 578ccdb69602f978b9a10c08045f3a6fd0fe2247c07703617c1a717dc8910b383bff4c1f6a8195643f0552cb707ece5eca4c7e7f4d90356c26a409a849200489) -set(QT_HASH_qt5-webview 886c46dfb2e66ceeeb423220b48e47bdc8968faf5b9553f9e206ddb84d201341c6ad49308740835de3f27960ef04276477df5a55faf9e3c4c68180ae96acbc6a) -set(QT_HASH_qt5-winextras c0c7193f0f4c3011ff44eb98fbb66780d64037e0b8cd46554b57849e1a5e926b666263ab64bd3a1d8ff116b364425b077fae4c4d839c80d89bdf214f78fe8c65) -set(QT_HASH_qt5-x11extras 8fcaab6a1ba13798bb86c236102b2af932e46de25de3bddc11baff5175db65ab0bea123d5c8477fea36fe1075481c335dbf554165c22e43a3409706b5f330695) -set(QT_HASH_qt5-xmlpatterns 01a7e41c0fb8c97b72a503c5a8276f2a9744aac624be79c50d366a5229f91920d0827c36ee9e434c78ded4b1624c8491da08af36ccd9dedd59d0d0785a5bb776) +set(QT_HASH_qt5-3d 502d80fddbf8d3ba18dd262c85df04abf6aa2ee76ba3eb10666588872635497a2828f34963945662b54ac9552d63e0463061d2065c34fdf8a7ea78d0871ebb2e) +set(QT_HASH_qt5-activeqt ebef84c37875ab2deaf3931664527afce1e433984e8dda6036b244d29f3e561a3f1d8c948d45100658a34fca4ff098f885e53af14de68e260afc6070d1a48dc5) +set(QT_HASH_qt5-androidextras e08080a88f7dd96fec59359fe109ab3f85916f2d8c7f6b7a441fc787514dfa64ec33c346764b2d8bbe71baf883291e73642909c5480144dacf0851282e0a9bca) +set(QT_HASH_qt5-base 1280e7da926ff0c888dc3455ebeb73708bf8e44a3fe77ecf015e902608d75d7304639271dedba63635f959411452cd2b64a6f9166365a3aa3440656c00120272) +set(QT_HASH_qt5-charts 1deee169cf86bef6d92b0cc1000106e84cbbe2ccb93729e299a94e794bcc6d882e1818b1b74ddb0b2f2b7427a4dfe556218dd9988c9b31888c21907f6d1efaf3) +set(QT_HASH_qt5-connectivity a327711dcbe8d45e33732055784246ea23399aac8efecf23500709a16caabc61cc586fd21ab385573f0cc9d5a2da39de426fd882cf2c4c07bdf8c60c683d8388) +set(QT_HASH_qt5-datavis3d b1778a2a1124caa01ec931d2c018f79a6810b8931a40a1ee7889acb0f9a47fb0d6547375f0dd3435009359be73e873a2acfe16fac918bb17b9f99a55094efca3) +set(QT_HASH_qt5-declarative 06c48938c5ab96c4a9e010fdf4a8fbf2b84b7669a486298044363048de3b7da01aa5d9284d1b08b563331887e326befb25566f9972f5143ca3cde47016394bbd) +set(QT_HASH_qt5-doc ac670058501cc7732bb3d83038cb2862149ddd115d636412e95e0c8362000e38aa6eddc0ec71d4c34cea94fbf10c56ad074f790471b452e1c8ac7a6201e1223c) +set(QT_HASH_qt5-gamepad a6fffbf01fd9e022949c99e926c9f877e9802b61e9517f36a574e90b60c3cb045061907114c6aaed1da0d2d068758617931ca123facd79ead9bae3b445174e26) +set(QT_HASH_qt5-graphicaleffects 774411e6fdcec6e91fa2368d4e8d0326581c638daad0b5b9fb7bba210fad854e51fe59555ccabf9bd331f601d93e8c5e3652095daa993dbc74b205db4b46e506) +set(QT_HASH_qt5-imageformats 8b9994b7e31a941ee265958da3829240bea89662d70f0e8ded7fb0cf354d4f6a38bd16664c32a97ae73424dc9ac853b24c0b6a645e20f8c39177e26fc1d43f2e) +set(QT_HASH_qt5-location 5a6271d61bb9ede80b8483e784d8cc15170cf3f7b019472b2362c742e1e1fd52d811c2132b751574dacee6f7274b81e6049b8a3dc934ba7612c0aef6643062dd) +set(QT_HASH_qt5-macextras 70275814cbf9f9d3c4a4aa10d9d526a4082f892fdec95de10e8eeaf87b7aa0d29cc7881882039a8a0cd8b1dd09faac071be73e80923aff89c1193efe2e52291a) +set(QT_HASH_qt5-mqtt ac99b314e6223158e946a798c6c937f6f5f5541b6a574f7e35626f93cda808c8368b26fe2d8e564c1160d5d40cf87afd28d715684c8e9d35b87e4a33bebe9f0e) +set(QT_HASH_qt5-multimedia 6059bd9aec65888ed6f3a1f87506a94ea567f9e064bb4a586859bc8f76ee4dca573eb256623452ddd9daf2305f49c707673425ea08edca9cd2db7b56bf5cab9c) +set(QT_HASH_qt5-networkauth e0315df81f7ee6da7798212ac18b2e5b7936f5ec355c089f2c095bc8edd5f59cdb68c0bfec300dad30f62f4444549cfe19c5b5fe14943328064da7416cbf5f00) +set(QT_HASH_qt5-purchasing d916c404ac73a9e8a063e103c3e850bd015dc16cd860d7abf8f7cae5107dbf1e87d5f784bd7f07737a0c4224640fbaeaa4a38eaaf697810404850bb877b92fb0) +set(QT_HASH_qt5-quickcontrols 1fdfda2cd1922801dc59c0cae8dfcd3e7e342cc820e092921a7c1e40123740c527df1777209b90109ad277cac47964c40a30ad1a5d4184b9283c015c91d43ce3) +set(QT_HASH_qt5-quickcontrols2 acf6a03086fd840e13eafda20e8aef3803edfdd90ea9932e9ef8ef3c1f029375010624b1ce2b8f1386c1f0dcf08c1abc86182ceec8a00f480f1cef13e8b693cf) +set(QT_HASH_qt5-remoteobjects 78942dd10d39352850677b383eca93fb74170b5a5c037b4db1fea1a17002009ad62f0310a711accde1193535dedf5eff01c5e14b088590d91b62ba4c7dc4999e) +set(QT_HASH_qt5-script b1b5e700be35e9c063e15f2a53b97a78368642d3287dea67cc4f97a049cc6ffa1a9a39da61ac49608cfeac435215c544a6cd80d67da673fd16f341f2aa0628e1) +set(QT_HASH_qt5-scxml 1490824b0108300b1924f404431e3871ce067def15993aed9af768c871b3d0eae4cd0b8f467671d3ebcada98d5e11dfe86e250467b7dbf9708ce9f37766861d5) +set(QT_HASH_qt5-sensors 777882f3bf3ddbfe053132f123c14590538fdf483479877779cfdd3dc242021d86aedc6484a453b67282f1ba4447c73e4f7a04bf3d4b741789b37e646ab67f35) +set(QT_HASH_qt5-serialbus ac30e163fd2ef7a3d6dbb8f8f3cac06d68f915d29c87d1d49be541c38c3dd09873d89525508062b7cf6dc17d750167e0cc13bb48718f2a42b80b2e7f04e7633d) +set(QT_HASH_qt5-serialport 64980191cf8bc27a7a28bc8d373f1ee4d16bec5ab6b1e3296d4bc245498bb59d29bec49ebe609f8242bffb205f923acff7ab736f80d01d7689032896ee8f9bad) +set(QT_HASH_qt5-speech 87d021efb5d07704dd5469bb3050e9381e8da47d2ef41bd37a95ac1903410b781283af42694dd1300c84bd0f0ea219e61da0a3aaf6204937578d26044a297f79) +set(QT_HASH_qt5-svg 4f781bddaae619125fc0f73b5736eb33dc49f368cc9cab9fce436cb57b389e66d14d2625e9100c2c1d809b67c3ceb16f718f50ce4abe1c925cf8dc8bb8b285a8) +set(QT_HASH_qt5-tools c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae) +set(QT_HASH_qt5-translations bf41fea921151c10f78804e274919805ccee12c13c57fe50e8f6df863aa955e4a1aa939d23a7500cd3b5fe6aa5656b1a12628cdbed1e9c8dc1f126e2cf7d7176) +set(QT_HASH_qt5-virtualkeyboard d6ff2770282e460a8d9fff3746225918cb21c65ef0d0d89e1c6876428ca1e860ecf45b44d57c9ef6e9a85cb050a4a67ecc1b20ae5c5be0a37d8b73ca439587c3) +set(QT_HASH_qt5-wayland 9e8add52353f7a146759511c49c001cd76a56790a81af5222f6f2d3d1a2f1ee9cc62048c72efe69708eb3444c6115272d4af8d738df7b1e1da959359d7420dbb) +set(QT_HASH_qt5-webchannel 8b87f73a256dff16ec8de226b10d8a34d9a1c4f1c2d510ea58824558f3b188a3a4d66c4507764b713407f44a0861e96d061fd164a1a050129fcf4148efd3999f) +set(QT_HASH_qt5-webengine be25e76518346b0059f3331bee786fa6ba7551931794d29a59d5cc3b9f80863f9da47bf5a91f749ba7dbfae037040b4bad4f48ef40f70a188186645923550c0c) +set(QT_HASH_qt5-webglplugin 1b4d9ac16653f4e64b2c2838b4677b554b8ca1c6cbff1632a1f65f2edc4a7f925b850b2e71e2fcbd2d63f8de170887f191112ca365f0bce2e9d6c86ac8687282) +set(QT_HASH_qt5-websockets bfd3738a9bdf51dd4534c2341c20e3918a1183ca3f4307de5c2fd7224dfcc890162530e7d8c67ceed9ca56c2c9d15d4c80355e65c4e5a41bd7f7ce4d3b072b1b) +set(QT_HASH_qt5-webview 5a48688439a8d4eaa13c4a5c8453e6a399413d28a8cbdcb1d04a4723b9a0a527d64c2c48bc040cf960300335db958add05a63fb39a6a94fbe1ad19f4989864f6) +set(QT_HASH_qt5-winextras 7383843f65ba5b9a3fd20f34fbbfbb89c847fcfa05d4a948360f072b148d2eff2543c4fb1df48bf695504a01a843224a5d89c83bbb2acb6d9145e1ee11397edc) +set(QT_HASH_qt5-x11extras 32825110fb272b03cda432c25ca26eb645685d2c70beaf10045256cfc2837c64307d2475c8dabc7daeb4e19341e282d23cb4a1579fddaf17853525ad232d55f1) +set(QT_HASH_qt5-xmlpatterns a9c46ffd6c13221d981d4a5b3cb31cdcdd8250fbe11262c1778815e83892d8c299e4c78b2cf31f7c33eb573e38c8e18255d501c8b95e809d877e2c981a6e7c8a) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff b/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff deleted file mode 100644 index eec93f03362ac4..00000000000000 --- a/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/network/access/qhsts.cpp -+++ b/src/network/access/qhsts.cpp -@@ -364,8 +364,8 @@ quoted-pair = "\" CHAR - bool QHstsHeaderParser::parse(const QList> &headers) - { - for (const auto &h : headers) { -- // We use '==' since header name was already 'trimmed' for us: -- if (h.first == "Strict-Transport-Security") { -+ // We compare directly because header name was already 'trimmed' for us: -+ if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) { - header = h.second; - // RFC6797, 8.1: - // diff --git a/ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff b/ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff deleted file mode 100644 index fe344c6a310d0e..00000000000000 --- a/ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff +++ /dev/null @@ -1,68 +0,0 @@ ---- a/src/network/kernel/qdnslookup_unix.cpp -+++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -227,7 +227,6 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - // responseLength in case of error, we still can extract the - // exact error code from the response. - HEADER *header = (HEADER*)response; -- const int answerCount = ntohs(header->ancount); - switch (header->rcode) { - case NOERROR: - break; -@@ -260,18 +259,31 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - return; - } - -- // Skip the query host, type (2 bytes) and class (2 bytes). - char host[PACKETSZ], answer[PACKETSZ]; - unsigned char *p = response + sizeof(HEADER); -- int status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); -- if (status < 0) { -+ int status; -+ -+ if (ntohs(header->qdcount) == 1) { -+ // Skip the query host, type (2 bytes) and class (2 bytes). -+ status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); -+ if (status < 0) { -+ reply->error = QDnsLookup::InvalidReplyError; -+ reply->errorString = tr("Could not expand domain name"); -+ return; -+ } -+ if ((p - response) + status + 4 >= responseLength) -+ header->qdcount = 0xffff; // invalid reply below -+ else -+ p += status + 4; -+ } -+ if (ntohs(header->qdcount) > 1) { - reply->error = QDnsLookup::InvalidReplyError; -- reply->errorString = tr("Could not expand domain name"); -+ reply->errorString = tr("Invalid reply received"); - return; - } -- p += status + 4; - - // Extract results. -+ const int answerCount = ntohs(header->ancount); - int answerIndex = 0; - while ((p < response + responseLength) && (answerIndex < answerCount)) { - status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); -@@ -283,6 +295,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - const QString name = QUrl::fromAce(host); - - p += status; -+ -+ if ((p - response) + 10 > responseLength) { -+ // probably just a truncated reply, return what we have -+ return; -+ } - const quint16 type = (p[0] << 8) | p[1]; - p += 2; // RR type - p += 2; // RR class -@@ -290,6 +307,8 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - p += 4; - const quint16 size = (p[0] << 8) | p[1]; - p += 2; -+ if ((p - response) + size > responseLength) -+ return; // truncated - - if (type == QDnsLookup::A) { - if (size != 4) { diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 28553a5aa6bbdd..2efc66bfefe3f5 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -47,9 +47,7 @@ endif() qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH PATCHES # CVE fixes from https://download.qt.io/official_releases/qt/5.15/ - patches/CVE-2023-32762-qtbase-5.15.diff patches/CVE-2023-32763-qtbase-5.15.diff - patches/CVE-2023-33285-qtbase-5.15.diff patches/CVE-2023-34410-qtbase-5.15.diff patches/CVE-2023-37369-qtbase-5.15.diff patches/CVE-2023-38197-qtbase-5.15.diff diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 30eb272612a194..e929334062ad4d 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-base", - "version": "5.15.13", - "port-version": 3, + "version": "5.15.14", "description": "Qt Base provides the basic non-GUI functionality required by all Qt applications.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json index aaecfef62d143e..26ddc8411b7389 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-charts", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Charts module provides a set of easy to use chart components.", "license": null, "dependencies": [ diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json index fd655c10bb2aa7..5cdffb4694c9fe 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-connectivity", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Connectivity module provides access to Bluetooth and NFC hardware.", "license": null, "dependencies": [ diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json index 87c1a17597af2e..7be2d30c15a8dc 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-datavis3d", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Data Visualization module provides a way to visualize data in 3D as bar, scatter, and surface graphs.", "license": null, "dependencies": [ diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index d87be63859b31d..190fd6380f24d9 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-declarative", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt Declarative (Quick 2)", "license": null, "dependencies": [ diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json index 69160dfece7aec..31272bccf1736b 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-doc", - "version": "5.15.13", - "port-version": 2, + "version": "5.15.14", "description": "The Qt documentation.", "license": null, "supports": "native", diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index 2a70e7e36e100c..3d2ad368b91f8c 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-gamepad", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt Gamepad is an add-on library that enables Qt applications to support the use of gamepad hardware and in some cases remote control equipment.", "license": null, "dependencies": [ diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json index 587bf23e734e2a..a16adf1514d1df 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-graphicaleffects", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Graphical Effects module provides a set of QML types for adding visually impressive and configurable effects to user interfaces.", "license": null, "dependencies": [ diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index 825021dd7c498e..1b274e3321e20e 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-imageformats", - "version": "5.15.13", - "port-version": 2, + "version": "5.15.14", "description": "The Qt Image Formats add-on module provides optional support for other image file formats.", "license": null, "dependencies": [ diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 363d7ec016cac7..6089af0253da06 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-location", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.", "license": null, "dependencies": [ diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json index b7acb9fa7d46d5..6cd2966832b1d1 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-macextras", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt Mac Extras provide classes and functions that enable you to use miscellaneous functionality specific to the macOS and iOS operating systems.", "license": null, "supports": "osx", diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json index abafa33748af6c..229cce8b808307 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-mqtt", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt MQTT enables you to create applications and devices that can communicate over the MQ telemetry transport (MQTT) protocol.", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index 6440f167692464..0c7e038eebb00f 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-multimedia", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt Multimedia is an essential module that provides a rich set of QML types and C++ classes to handle multimedia content. It also provides necessary APIs to access the camera and radio functionality.", "license": null, "dependencies": [ diff --git a/ports/qt5-networkauth/patches/CVE-2024-36048-qtnetworkauth-5.15.diff b/ports/qt5-networkauth/patches/CVE-2024-36048-qtnetworkauth-5.15.diff new file mode 100644 index 00000000000000..63252bbe89e446 --- /dev/null +++ b/ports/qt5-networkauth/patches/CVE-2024-36048-qtnetworkauth-5.15.diff @@ -0,0 +1,53 @@ +diff --git a/src/oauth/qabstractoauth.cpp b/src/oauth/qabstractoauth.cpp +index f1ed2af..05b189a 100644 +--- a/src/oauth/qabstractoauth.cpp ++++ b/src/oauth/qabstractoauth.cpp +@@ -37,7 +37,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -46,6 +45,9 @@ + #include + #include + ++#include ++#include ++ + #include + + Q_DECLARE_METATYPE(QAbstractOAuth::Error) +@@ -290,15 +292,19 @@ void QAbstractOAuthPrivate::setStatus(QAbstractOAuth::Status newStatus) + } + } + ++static QBasicMutex prngMutex; ++Q_GLOBAL_STATIC_WITH_ARGS(std::mt19937, prng, (*QRandomGenerator::system())) ++ + QByteArray QAbstractOAuthPrivate::generateRandomString(quint8 length) + { +- const char characters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; +- static std::mt19937 randomEngine(QDateTime::currentDateTime().toMSecsSinceEpoch()); ++ constexpr char characters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + std::uniform_int_distribution distribution(0, sizeof(characters) - 2); + QByteArray data; + data.reserve(length); ++ auto lock = qt_unique_lock(prngMutex); + for (quint8 i = 0; i < length; ++i) +- data.append(characters[distribution(randomEngine)]); ++ data.append(characters[distribution(*prng)]); ++ lock.unlock(); + return data; + } + +@@ -614,6 +620,7 @@ void QAbstractOAuth::resourceOwnerAuthorization(const QUrl &url, const QVariantM + } + + /*! ++ \threadsafe + Generates a random string which could be used as state or nonce. + The parameter \a length determines the size of the generated + string. diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake index 214726759f3cf1..d70e7c401b4cab 100644 --- a/ports/qt5-networkauth/portfile.cmake +++ b/ports/qt5-networkauth/portfile.cmake @@ -1,2 +1,5 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation(PATCHES + # CVE fixes from https://download.qt.io/official_releases/qt/5.15/ + patches/CVE-2024-36048-qtnetworkauth-5.15.diff +) \ No newline at end of file diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json index 6d9e29f877c54f..90aab3f83ab0ee 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-networkauth", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt Network Authorization provides a set of APIs that enable Qt applications to obtain limited access to online accounts and HTTP services without exposing users' passwords.", "license": null, "dependencies": [ diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index be15dbd8ae0418..8340950be9f1b9 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-purchasing", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt Purchasing is an add-on library that enables Qt applications to support in-app purchases. It is a cross-platform library that currently supports purchases made to the Mac App Store on OS X, App Store on iOS, and Google Play on Android.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json index 8532b37284c658..75c45c380cf2ad 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-quickcontrols", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Quick Controls module provides a set of controls that can be used to build complete interfaces in Qt Quick.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index f39d04e3fe9434..3d40dcc80ed016 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-quickcontrols2", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt Quick Controls provides a set of controls that can be used to build complete interfaces in Qt Quick.", "license": null, "dependencies": [ diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index 4c2018073652c0..2378a926db7d37 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-remoteobjects", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt Remote Objects (QtRO) is an Inter-Process Communication (IPC) module developed for Qt. This module extends Qt's existing functionalities to enable information exchange between processes or computers, easily.", "license": null, "dependencies": [ diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json index 8742fd209cf1df..423ca87bc81c2f 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-script", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt Script provides support for application scripting with ECMAScript.", "license": null, "dependencies": [ diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index 01a7a29315ef35..8ad8d18957a7ff 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-scxml", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt SCXML module provides classes for embedding state machines created from State Chart XML (SCXML) files in Qt applications.", "license": null, "dependencies": [ diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json index 3a8f03ef82d9f1..f38536da5ae99a 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-sensors", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices.", "license": null, "dependencies": [ diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json index 01bb00065a79ca..3067b77cf49f80 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-serialbus", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, and others.", "license": null, "dependencies": [ diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index c278a134ad3bf5..0ffa03e166a940 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialport", - "version": "5.15.13", + "version": "5.15.14", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", "license": null, "dependencies": [ diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json index cde0db57271642..8eb9405e58ef23 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-speech", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users who are visually challenged or cannot access the application for whatever reason.", "license": null, "dependencies": [ diff --git a/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff b/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff deleted file mode 100644 index 8f60fba03ac517..00000000000000 --- a/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/svg/qsvgfont_p.h -+++ b/src/svg/qsvgfont_p.h -@@ -74,6 +74,7 @@ public: - class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted - { - public: -+ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000; - QSvgFont(qreal horizAdvX); - - void setFamilyName(const QString &name); -@@ -86,9 +87,7 @@ public: - void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const; - public: - QString m_familyName; -- qreal m_unitsPerEm; -- qreal m_ascent; -- qreal m_descent; -+ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM; - qreal m_horizAdvX; - QHash m_glyphs; - }; ---- a/src/svg/qsvghandler.cpp -+++ b/src/svg/qsvghandler.cpp -@@ -2668,7 +2668,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent, - - qreal unitsPerEm = toDouble(unitsPerEmStr); - if (!unitsPerEm) -- unitsPerEm = 1000; -+ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM; - - if (!name.isEmpty()) - font->setFamilyName(name); diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake index 1f8e4520e78e13..b61e8c58c2d989 100644 --- a/ports/qt5-svg/portfile.cmake +++ b/ports/qt5-svg/portfile.cmake @@ -1,6 +1,5 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation( PATCHES - "CVE-2023-32573-qtsvg-5.15.diff" # CVE fix from https://download.qt.io/official_releases/qt/5.15/ "static_svg_link_fix.patch" ) diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 9153b635571d62..238c157cc9443b 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-svg", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices.", "license": null, "dependencies": [ diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index 01608ae5b5d11c..eb7f39a7d22002 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-tools", - "version": "5.15.13", - "port-version": 2, + "version": "5.15.14", "description": "A collection of tools and utilities that come with the Qt framework to assist developers in the creation, management, and deployment of Qt applications.", "license": null, "dependencies": [ diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json index 7c33033c5cd389..dbaf6cdb4e6b00 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-translations", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt translations.", "license": null, "dependencies": [ diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index 5a6d42f20217a9..6e4fbf23094130 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-virtualkeyboard", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 5 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.", "license": null, "dependencies": [ diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index 2950075699f410..5ebde3a1f72533 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-wayland", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "QtWayland is a Qt 5 module that wraps the functionality of Wayland.", "license": null, "supports": "linux", diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index eeaf77a83021fd..1ecab30fb684a7 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-webchannel", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt WebChannel enables peer-to-peer communication between a server (QML/C++ application) and a client (HTML/JavaScript or QML application).", "license": null, "dependencies": [ diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index a068a4c333d97d..9e682c9c195db3 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-webengine", - "version": "5.15.13", - "port-version": 3, + "version": "5.15.14", "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", "license": null, "supports": "!static", diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 24e9fc9fea187b..3baf3c348fb10d 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-webglplugin", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt WebGL Plugin module enables Qt applications to be run in web browsers through WebGL streaming.", "license": null, "dependencies": [ diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index 0cf84b97ded3f3..9968529510065c 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-websockets", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt WebSockets module provides C++ and QML interfaces that enable Qt applications to act as a server that can process WebSocket requests, or a client that can consume data received from the server, or both.", "license": null, "dependencies": [ diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json index 78746bae2b1e60..d713ba348dc98d 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-webview", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", "license": null, "dependencies": [ diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json index eeb53669de6673..6eae44b4bb9bd3 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-winextras", - "version": "5.15.13", - "port-version": 2, + "version": "5.15.14", "description": "Qt Windows Extras provide classes and functions that enable you to use miscellaneous Windows-specific functions. For example, you can convert Qt objects to Windows object handles and manipulate DWM glass frames.", "license": null, "supports": "windows", diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json index 9c1e9da207c033..e1ebe6290c4fac 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-x11extras", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "Qt X11 Extras enables the Qt programmer to write applications for the Linux/X11 platform.", "license": null, "supports": "!windows", diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index 67731289c1eff1..a30992c6313429 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-xmlpatterns", - "version": "5.15.13", - "port-version": 1, + "version": "5.15.14", "description": "The Qt XML Patterns module provides support for XPath, XQuery, XSLT, and XML Schema validation.", "license": null, "dependencies": [ diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json index b87d148e7bf1cf..176273ff858ac7 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5", - "version": "5.15.13", - "port-version": 2, + "version": "5.15.14", "description": "A cross-platform application and UI framework.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 4a977cda13f899..1d72db5115d961 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7137,176 +7137,176 @@ "port-version": 0 }, "qt5": { - "baseline": "5.15.13", - "port-version": 2 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-base": { - "baseline": "5.15.13", - "port-version": 3 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-canvas3d": { "baseline": "0", "port-version": 3 }, "qt5-charts": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.13", - "port-version": 2 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.13", - "port-version": 2 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-location": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-modularscripts": { "baseline": "deprecated", "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-script": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.13", + "baseline": "5.15.14", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.13", - "port-version": 2 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.13", - "port-version": 3 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-webglplugin": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.13", - "port-version": 2 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.13", - "port-version": 1 + "baseline": "5.15.14", + "port-version": 0 }, "qt5compat": { "baseline": "6.7.0", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index c7e1d299c7f6f4..09fabbc737c85a 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f2239787354a37f67fde266bda1905c5b939f6c", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "40f41c50f42a8c28161eafd2d71221d022e2b4a0", "version": "5.15.13", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index be3866a0865eb3..07af0a73268ccd 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68954bbbd80d173831862ad6a8fe782247202a98", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "8a130d6cfe8f5c8bc2c50c9c57b40a3d5e7b28e4", "version": "5.15.13", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index 1529ab5026dfd1..59ccf70d00f309 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5701bed9e0e92a1e5be10d2c2bff6b005ac8d3f", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "375d6f1120fa00a552ebd11e93c94d95238bb39a", "version": "5.15.13", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 9ecde0c6f3fd6f..8f25ea04eb89a0 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75b18652c1bffc159027d9074d46c580458d36be", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "c0f8f147b639b6c633f50bf2e03f161dd21db633", "version": "5.15.13", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index f1056b717ef723..860f18803f2ea7 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "617e5f04a89dd5f5a16b486666c365b7995c7bf0", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "65e3230f587989f947f60f62b71864c81d6bd30a", "version": "5.15.13", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 7117881b304950..780919c56bddab 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96790dd0d12ad1a3db8f8e4aa5457eef33d4dd5a", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "19bb2b3181001464cf27869c3831dacc816e876d", "version": "5.15.13", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 26da00e068b096..21ead6551c6fcd 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9720ef8b7fe53731a6464067ec9204694670108d", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "8cfa9580cf5f5d29ccd61c28bb9953affc9456ec", "version": "5.15.13", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index 499ecb41bcfb20..4d27151bde1b75 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51104b45f8a66c7cc5eb8e9626c8d0e539a7ec72", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "4c8f405906dcc3851dc4f0e7adeefada55f409cc", "version": "5.15.13", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index 2447b289d9eee5..f4bd75aa9417de 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82b3e331022238938d3f9b1938fb99533e2cc11b", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "26dc5844ad0b435a4775256c29a6ebca226c97f4", "version": "5.15.13", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index 54392dc51b8533..b98b5b83defe9e 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0340d2963d846673c5e8d81a7fcb268e5c6abebd", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "12953a0ff2b94f56e649d6e21de059cd43d186a7", "version": "5.15.13", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 6921953552f569..eb810d2fbc43cd 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1f2f135ffff583e0cad4c6877a4f547792343d7", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "c5e7474e7d7ad22084bbeb7088ab7113c28ba274", "version": "5.15.13", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 5f280014399238..39f3d8170ff9d7 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b5ed4f41b91eb19f218b840bd00430bb44e00c7", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "0d9578ca4836355aca8058848930846f5a224694", "version": "5.15.13", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 683ec203207351..8859e039a59aa6 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf7751c0c413f0043501d81098f930f36129e91c", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "79da70b83292374a09bc6ea61323ae0cf2c32c4c", "version": "5.15.13", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index 129a0ef5c730fb..3dd317e401af5d 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efa382cb68fc399537647af6176e48ffb26cd22c", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "4c2e4efcd96bfb18b4d3cdae9a6011dbd21a7f9d", "version": "5.15.13", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index a3d3e1d6765821..5ab392e73c5aa0 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3af1b17c18c2b011e016a5802eab1a9a08646414", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "c6bc46f3ea62b6bd94d34c2f7272b0fe57d660ee", "version": "5.15.13", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index 587fe1a2786a3d..0086fd80ad5613 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84260450a36ccfc3cd60349e52f777de578d6fc3", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "b86c9499d398deb129644bc82d467850135be8ad", "version": "5.15.13", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index b6f15892f3b816..36ee8a87ca1f9c 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1becb066422d37bb022147618c963e271cf937bd", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "f2516c53ca2fd773a8995dc6f14599515336ee08", "version": "5.15.13", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index e6aa7d2e5f793c..5fd96ce1e98ac8 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3dccbaa13d1f1d20b116f3f10fc4ad990744be5", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "cddbc37874945361670fc45fbd2811d5eb2d28f5", "version": "5.15.13", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index bbea3fdfd54093..7cb8e9f99aa848 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dbfe2aab6a84f092177e276c8947096bfa1de8ce", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "b447abbe0f7bb140e91e562de4b26bd36b09aeb1", "version": "5.15.13", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index 647d1a94abde94..9a617d32d9e85d 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d62a3faad47d36883818acc3f53533371f09ab2d", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "2498ccd771f2a709abfc72099db0928d20e178ca", "version": "5.15.13", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index c97aa655ee2da5..6eb3cc1da1b0b7 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a55468e0abae43f77239363f49ca6582fd9f503", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "3ef451e0c39e315bd0e4e27a068587119e7a972a", "version": "5.15.13", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index a98aa0da8828cc..84c6387ad0051c 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fd49d3d791cd9b1788f9da0f2f974e884b15b13", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "e68a59e08e0a2da169c8b6b72fe52ce980d0d471", "version": "5.15.13", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index a1d825bc9d0235..338ec8fff66a19 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00c0e0c150442d04fde5be60ee495efeb3570c06", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "d7af091bc3daa565fdc46a0a8dbda3fdf58fba6a", "version": "5.15.13", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 616849f5968ad9..f2e6e5ce9023f6 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cc9901693afd47513d41d1c6b69d7c25dc345c5", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "58affe223cf8fa973829b45110e731c021ad0339", "version": "5.15.13", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index 31ffa2c4e7374a..490e12b4a931a2 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33600a10a871bc1423353f5e14d70bde496750c0", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "e20e90150a61429cb4c0aba17da3382cf431c025", "version": "5.15.13", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index 8e02a6106e8d57..82b9145bb74cfd 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da9203dc22c027daa7a613c469de5df34e4cba0f", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "f15598a75f95ca7a22968fc9336959c919e705f0", "version": "5.15.13", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 3d198130d6f661..384c299f2c99e3 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6ce03e938c8f321a40a1fadaeb9edfce9bc00b9", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "e8e9da74ac1e561758ff70d80a4e0b8514365f4d", "version": "5.15.13", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 29219d2fc9bef8..cbfe8fae5f1d22 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57e9f57b728b905216e887427be54c8e9972d3b2", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "546a13d568e272c2d2d953c36ddbaccdc55405dc", "version": "5.15.13", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index 1f1cc5a02839f2..969753ea7e9249 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bc30d72aa07bdececbf78dfd8d14fb110759d18", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "cb06c416339487e5b5c2b2a51fac7fca26be17f5", "version": "5.15.13", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index a7f7c0462403a4..f876e9b14a4de7 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08801f65cf92611896f37da27d9416586811329b", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "2a1274dd5db76e90f790450ddb12fdd278f24274", "version": "5.15.13", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index 0bcb7ade3fc13d..eba07c20766e41 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5263ebbe578fe2207e4dcffee326343717dd8ef", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "d686082b7f012670dcb7495b48a42313850a0feb", "version": "5.15.13", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 0f57437cfa4cc0..b470640911cae2 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "343a94ea2e1ee1ca8e70f59892dc7e3b5fc312e3", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "166158a3a6c2673b41805de95d2bc8e3a43c47e7", "version": "5.15.13", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 7853c9ff2eb823..ae6494551b6e80 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17d221761f10219246887a928d2f4cf61d9cb864", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "4910b1e32c56d7e0e334017d6be340737f694e95", "version": "5.15.13", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 71960d52839b60..0908d92c4d7a8e 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d09061cfbd0d6b0d29cb8aae7267c734ce74c883", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "58ef6b79a9cfe23e3a196d3a38970c5c48b1a15b", "version": "5.15.13", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index 3248a9a03c3462..ecfeeefc09ac21 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cded906204530ee472dbe2823a4148e5e465c885", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "467935b4645825b1aa486f5f29cb3771a109ee5f", "version": "5.15.13", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index f5ae20986eae4f..f537a7d5f5177a 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ffb36d0a2683ed1d41921492c19ee700f412de0", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "6faa38f9a8564149884c1695ff49decc57df534e", "version": "5.15.13", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index 7c5ad835c070e1..916cca1d59f7da 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7588d155e2c75b173ecfdb2560aa3b948388155f", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "8d20b00e191cfefb9d9dea3cdbe0d18afe346139", "version": "5.15.13", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 46d62d63338c47..04d6f56c1f2012 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "869da2d4e97b7b89bc39ecc236f7df90d8d9e032", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "7347f61561ca613a6d11b03e4434f76da1a3b734", "version": "5.15.13", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index 6cbe215ad29515..ed94d48caa8480 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4999fada23fd639dbafaf9e4dfb846613ea7ebdc", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "f3e8637f570dc0c2a5e5085b118e72bc1eaa1d95", "version": "5.15.13", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 266717b93c5209..e8d52b66d4f02d 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd4228b23790b204a9f10ad7d20c81e7a269c0c4", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "786fa91be5c33fbfae7705d4ad23714b384c8bb9", "version": "5.15.13", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index a33fc64f538676..44571022d28730 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00841a503c2d50d0133e412e52e3a81e8091818e", + "version": "5.15.14", + "port-version": 0 + }, { "git-tree": "5f508ce98f6759bbd61c29ea9825f2671b557998", "version": "5.15.13",