mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-03 04:49:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[qt5] Update to 5.15.16 (#42316)

Browse Source
This commit is contained in:
Osyotr 2024-11-28 03:01:15 +03:00 committed by GitHub
parent 954ec6cb91
commit 852e42db9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
94 changed files with 331 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qt5-3d/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-3d",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-activeqt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-activeqt",
"version": "5.15.15",
"version": "5.15.16",
"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",

2
ports/qt5-androidextras/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-androidextras",
"version": "5.15.15",
"version": "5.15.16",
"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",

84
ports/qt5-base/cmake/qt_port_hashes.cmake
View File

@ -1,55 +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 15)
set(QT_PATCH_VER 16)
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 66332383f242c76abe4b01c1d6d036e990d99de2abdc5d66a58506c397633507296f6d6c5e33a5cc2608c0ae2d7936ceffb832564239ffcf2ebdf60cabd12fb6)
set(QT_HASH_qt5-activeqt c99ac3ce89c72576025d2824fc0f54b46c3c8ce10f66ea3386cc3f990609d88a514ffe11aa28c3e811b1995f1f315b3a3e9cd5399098ba93ae64790ba6e15953)
set(QT_HASH_qt5-androidextras d4497a5e1659e5111c2fbaf0f0574b3f4434b4be3427f2631e73c502c733f24174b0b5920b3c92660f804577e7a5e7e4d3d26f20255c1a8926b8abd85c12741a)
set(QT_HASH_qt5-base fb49a64ba57d75f721929643c042423277c5c7259d2071fdb73d97db723ab3134e3eb6d4828027f6342ce5cb66cbd658e5db149a4633540e403a3b91fcb6681e)
set(QT_HASH_qt5-charts 873a15a6617cd809892968bd499c1d302e9ca63644205364a15711d6db8a6b3c88b4f5553b1302972d8923175fde5dac3db4af9290b9226476c3b8cd1f978fbc)
set(QT_HASH_qt5-connectivity bcfcfb5305e59a2f0b26aa7c0dba65ae1444df2c3035556147acb63801080667a6b24020961189e476060f12b0568cee883957c30e1c65a894e2780f34081cf3)
set(QT_HASH_qt5-datavis3d f172ee7a509a44e01aa595ce5bbfb4a9bc8d99c5264e4d4161a085f4971a35ceea82b9c5404cbde82caef51d1d2537a2bcfab97f2a80c8f1f54074ab35b4a643)
set(QT_HASH_qt5-declarative 9c1672037c491729805bb8a08f56b8a7ab06b8958f593c32f16c56350a13afcab38a23d35d04b1a5f67c7c5bd8724918baa6fb71f6d1c31218310c8f04544d48)
set(QT_HASH_qt5-doc d91ee2058f5ae1f395793f9467187da7a6ff353193ff339a9201b6b3051457555acac71b3623fcbd63d3dd94ab5fc8206bc25781cebf87ff89f717f107ed230e)
set(QT_HASH_qt5-doc d91ee2058f5ae1f395793f9467187da7a6ff353193ff339a9201b6b3051457555acac71b3623fcbd63d3dd94ab5fc8206bc25781cebf87ff89f717f107ed230e)
set(QT_HASH_qt5-doc d91ee2058f5ae1f395793f9467187da7a6ff353193ff339a9201b6b3051457555acac71b3623fcbd63d3dd94ab5fc8206bc25781cebf87ff89f717f107ed230e)
set(QT_HASH_qt5-gamepad 6c41351a16126d69e59775f352247cb817bb15a5b40f8ec02715245375f74e1d56aadbf476f498a36a377f98d39268b3952f13a041c193d800252f067ddb3e5d)
set(QT_HASH_qt5-graphicaleffects 0d68e8e788139fecf1dbf6fea218255d6d940314104ee445c117eba668333fa0db794d9cc9cf9b4da358508852b4052921ad93a87328e0dfef61e7ded8f3a4ae)
set(QT_HASH_qt5-imageformats ec9a60d343c240e7e85cdac68949927393b958f5e0b196fb1b3063c09b90600a46e9188c00a9dc744b526e95291dbe5c3d4fbca2b775e9824f82c36d754816cc)
set(QT_HASH_qt5-location a12d2d3979abddbcdf2750215337f10cece11b7a82125ffb3f0b75c4c8a186c6aba09a33b397cb195407292e37bf242056a33c8d7b1cf1d6f26470ec26ed2407)
set(QT_HASH_qt5-macextras 810a5cf23b6f638303e5252360717127f46a5f04e0be96acfcf99b2192f4848329a945bb07be48d1fe9e9b3f2ce762c171930482f4d46384d70e62fbb5a304b7)
set(QT_HASH_qt5-mqtt 137fe48d8c5309ef0026157abbeaec818f0865319f1374c84cf5bdd2bcd238d8a2d9612deffc76f6ae2bdaa1f00d1039f32a3e7944acae7e6639e43eb262cc97)
set(QT_HASH_qt5-multimedia a2a0649001d6fcde1fdefba4c4ccc35a7e4d776acd5a41a169f002db5fa6785a8dc1cde5ec8166e11a2c18701a650e32ea94b1ca3a967d7ecf062a18b0c18c04)
set(QT_HASH_qt5-networkauth 1645175195ecdea8576c725935c4186e709ee98fdb1e563e11481d44c8bfba20a3d3d096a968df0e6451c2bbed4a6b6fe77feb2a8d2293c88341ba272c22e8f7)
set(QT_HASH_qt5-purchasing b2746aac0e950bb969f66b3f73b7ffb0d6a2aaa810eefd775f30fb25765fb5f50d37103da90564c1312ab6f21aa7485db183dba4900feea69ab084ece80c57b7)
set(QT_HASH_qt5-quickcontrols 2477b780fd60c4b160016ad1774d74156a16aedfebc062e71bb5e62f53fbfe16a8951b046415571017bfb0289acfe469e61f1095fe7b38a5c48c10876760a8f4)
set(QT_HASH_qt5-quickcontrols2 e19fa073e42d4dddc84f2b5c258068ac7a922948e88b0002c3e77a74509532e0107dcd05ee7509b17e640593bc645b16ea1ce31621b393143a98c56e2e0fc4a9)
set(QT_HASH_qt5-remoteobjects 08f5373fd94b8db627d16dfe21efea5df062ae6a18641443b881966070b7b3e1941c182766f309dae962c81e21a0578ffe5d11530950bb4122a9ea2112f2a8ea)
set(QT_HASH_qt5-script e4898af8fe66f8b3a2fbf813eca63520686e67dc893f4636bff7591c287ddfde2680bcf900394a154f81744ca5c20ab1e379dd235915e17c8c803aefa194bd69)
set(QT_HASH_qt5-scxml 9284bdfadc94bd514c9389c44265b489b213ec8455c506d00c7f824b290ce436e1c73888695a0cddee56382b01727c57ad8ae44e908e963d16adce89fdf7570e)
set(QT_HASH_qt5-sensors 693e7764c44aebf801dc6d979b78dbf3b2af1cabc9a2c9b66b0bb21d791c3719413494c7013df4ec2f9eb467f8d29c6decbf7a59635344ae11e7208c3ebf2223)
set(QT_HASH_qt5-serialbus 6ccb01d938159954c5ff3591a3e80b221f748edd1074c5721410599135b8e22f5e992b793c9a3406343d806fe4f37bf7904c88d927f292ea2c58f50c2e78fb5e)
set(QT_HASH_qt5-serialport 8d7eaf72a29c1e33ac6ee22578fc003a1d73cfd8af432a2c1368eab846a65caa0f435f254064dbe31095d42d2bf69bf119f5a4839ebede7a38607367d6df68df)
set(QT_HASH_qt5-speech f4770a7e9578da24c02e7fe03dbddec4a75640bfa71b389657e5cf20561e56b172d8f56900eebebf2f95c5b6842a4203ea2370e4828356c9c93793fdfebcaac2)
set(QT_HASH_qt5-svg 924f88a7aaed5a8e63120cc8a669eddc122682674a3f6ac52221a49057e8c95e5c248ddc8722bd596d39583de2bc5c65f48b4472d8de3cb81bd111d8a3740160)
set(QT_HASH_qt5-tools 5ebc569fdbb781374b9ce993131a072704eea50348aea98ff12e57a2606d2accea29724d2c54953c467430b8657bcbe98509ee8cc40b4b869e11a5db8e663a88)
set(QT_HASH_qt5-translations 82846016137bea7847d15bd8aacc85e2ae826b1f6a8a15517cd99479f038cbe4ca217a2cf8eb1befd9aa901c1272bf0e6f9100f86a015eec670776a79c6015f7)
set(QT_HASH_qt5-virtualkeyboard 4db72101949ad15a3e5964293f8abea4ad5c7f449e0263920520bc57a434d7ebef3506aa67075031ba098af227c675773998d7cff52d555d1590c44cad8711cd)
set(QT_HASH_qt5-wayland ef6f210431fa04d166e814bf7269ee9ed77f355871240f629839c5637ea598a3b71c85c7e53aafbfe2e9c1c8d4f24867da37144707d9b48749be4a883e1b679c)
set(QT_HASH_qt5-webchannel 4819f656a0ca8a38d4eb92e1ab16e7911d3162e646516a944c2e693ce2da5bebe730d4552cefb40b700e9136ae01df4a372cbdb061551c83547448eeec7339a7)
set(QT_HASH_qt5-webengine 21a261f56228ca254d2fc1f952c9e7ad83b2b42cd92c11d54c2b4b7204bdeedb31168fb64dbf74254687c7e1d83090dd5f21312676d695a2ccb36c756316b052)
set(QT_HASH_qt5-webglplugin 2caa17a1a06f3d6b2e71c47a317125759194a9b50b130bbacd83770aa3d493777b2481b36abbc737f78647cb8861a23eca2c64ca292283fe76c40bdc62e503da)
set(QT_HASH_qt5-websockets 625701fd196c82634fb311020fdd6d4a4ce4adaa57dab02b0ccae3f25ed4d6bfdf1aef1285ee255c212d3cc4f4125713e90f046803064ac1da484f5c6acc2b7d)
set(QT_HASH_qt5-webview ea0f2a095c4a860ccdf324e939af0cb56385ecfe2b263bdbcdedc375d16294528fe25b81fad8af3e00d83f715713e5be91e7c07637ce9f3f03d7cd630582bf89)
set(QT_HASH_qt5-winextras 8d190e95ea5d29d734a565a102ed82fec45aeee04bd2a9d41c91b364736fe7d956ca3b4acec557c52b38d5cbb8cfea3b9448365373999ac9b05174c455086445)
set(QT_HASH_qt5-x11extras 3ff1002ff75e33237229c4639a9e66f43368752b2085609bc644609b4ee50c56c9c175ac811f6fae670907242de9fe05bd99474f03339bb2a7442c4e7a14cac7)
set(QT_HASH_qt5-xmlpatterns 1575a76dd8d2aefcaa4b0d483d98451c75908cca517f38e8bbd54f03d64b77c8c876bf2960abb213f78cf04ee81179b9e6addbc8f497514e42370cf3d651b1db)
set(QT_HASH_qt5-3d bdb13bd73a8b706eae8ad07d506ca21469a138dadb47b604a23ebe4640b593cba1353efa081a51a6d869a3d75e1b2b25c432bc7bc4621991f2fd2f5d18914fc6)
set(QT_HASH_qt5-activeqt 682044800cf359ac24abfde94e45db7ca31c3c0162ca14d952990377e03dcaba490f02ec59b015fc77e6c2bce19bd65ff9fd4a19d960d549dcc4574ccaba2561)
set(QT_HASH_qt5-androidextras 257e7eb264df7cff6076a1e57bcf0ed23291cbd00ff1da8acee2993088b336ca5cba28c60691ece1c9a1afa869421388681cf0e9606f54ff38211991c6deaa36)
set(QT_HASH_qt5-base 190581c7df9763c2550466f884784d6f38817a087ab44fe57b99c1d1ac2ea3bae94ced8a6d0873a7999e523d63831d135cd7407812c8814ac4ef957840b7058e)
set(QT_HASH_qt5-charts f57df425e767ad5e18d5bf2439c137c0b656acf4ae998d42a41e59acf8a7b3d6733ef1c4ee4b11e1d54801df1550af5ee53cb190f05db223568b31fb4fcaa96d)
set(QT_HASH_qt5-connectivity a927d74f37bfec9f55a13077786cbec56f34145fb744bb2e0f9096acdb1b4c57e24b6bc60cfb775e6c18e352e6ddd9d085268ce2e810fabe8bca54cc3edf5282)
set(QT_HASH_qt5-datavis3d ec2425d4f5d3c8b26f1682f8d3e236ad4885194946e3720c54e5afdc3c8d8cb4322cd83aa381b7c1802f6348d1cdbfc4abf7c928686ef3e4c52d223fa2a314f5)
set(QT_HASH_qt5-declarative be492d95d11ab13e13d27ca2024b5b5860d515d0b66c6d1c201bdba155841996bfdb3b813313dc75578228b6d3e661220dcc5db037624fe73d6e5e1c3ec84aa7)
set(QT_HASH_qt5-doc c9988a6c82d5fd3f61c0df1a8b16db4f087fe7f75d968aaa472f08e8a481e6ec69b56c13776000248ceab386004ba2441282db92be2be691da965d50f9a176f7)
set(QT_HASH_qt5-gamepad 4651355c59d1977c7895d4bb751a9aa66088fb6173713f90e7a188ef4e314e00971ec285f5a6779cb2b23bcb61a9555c9f44892f44c44429fc4e54c9f7ff517a)
set(QT_HASH_qt5-graphicaleffects 25f2940428bed7b85f5ae16df286f8effc30ef9f68f6db5c559b18d247e8f391ba8c7e00a927024b0c84593648391fa63d16a23f1e8ae237b198fd3a1e7aa818)
set(QT_HASH_qt5-imageformats 922c513f1d3e46b37cd87aadd06c993128c428773aad12e8fd252258840b969996e911248530b135400e43538783d8fc1c69b4fab53ab526fc5d38478d11e6a9)
set(QT_HASH_qt5-location 321a8e68f731a97c7ef0209d6db0ff4891dd14dc43e14f5c4c5ac763069c7f17298fbc6410326df9265ccd631372cdba662fc82e26a324936d371c8572e19a48)
set(QT_HASH_qt5-macextras c04cb4fc8f6f68d360bba50e2c1b061e6cc164f958725fa53951bcf54ea366128a5aa195d705510e743f890e6321e05f4ad2a4afa24194cf0d4c14ae7eb2b684)
set(QT_HASH_qt5-mqtt 1a737a5e2bb4a2ae32652ca2ccfb09b40a62a1e92f683a86ee456eefb670c06f722dd324346606da32c5839be334fcc9143aa4a279ad5631ee2e61307e71d15f)
set(QT_HASH_qt5-multimedia a848affbc38a532455a34bdf887948210ff9794dae312115be0622246993324902b81209c2cac89ca5db63e6fcc29690f47c1255b1b7c4de68bf6ad5a6ecc5e7)
set(QT_HASH_qt5-networkauth cbf112c1f9c03f6cf78de148da44639393a3a2df56116e85d51d674cb31c37ea45823c44b9839af021c1c7e7733eefd646fbaae52459088b03e3b00fd30b1d49)
set(QT_HASH_qt5-purchasing b8dd83106ded528b7fd60bd29e0d68147de782e0303affede7127ef6d48b80c0f1645dc926d6d8b45d6fdde3a519bd604850766e66d79d7fba8e4807b87578af)
set(QT_HASH_qt5-quickcontrols 530cdddab279497c9edfcecbd97f1db35054bf9fd3321a5306808447f2616062076ee98f05164f7b8a7cc3cb03fd9eec4f7fba050344db00edaeb5925677cc84)
set(QT_HASH_qt5-quickcontrols2 0b98b92eaf250a5f1d2a742c431ca95888a5985908f4fc97495ac18927338b67b23b88a3f8f87aba79dd9e96b5381313b303e2c3827939caa401671c2169eddf)
set(QT_HASH_qt5-remoteobjects 7e08a482f91e4fa6ada03ba8c24697151527df74ba7110bdff1bddc6a6a25828cfcace5fc025db60c8e61e3b1a05668871e4b5a9674c1bd090c7c6bd3a096fd6)
set(QT_HASH_qt5-script 6f209db647823084c3a9894e25e65b3161d3e14f2dc06f79c2503a319bb7449259450e8845fb76461a75be7faa1ad18fec8c4724da2754e626d7797717915e0c)
set(QT_HASH_qt5-scxml fbfb054e07767975fc44a41cc015fd12aa15cec5abda1fd3f01425eaa1fd191c529f49dd5a97b6bdf9b83e841d069e1b3190f35d396c0ea5e44d5df66337102d)
set(QT_HASH_qt5-sensors 2bd63e07a996f5377bda885e7218fc218fc981bf2a637b3d939ae5913bbffe2a797716b0aaa63e61c7e1384f07712de8683787590649a8f01a424b7f4526502b)
set(QT_HASH_qt5-serialbus 7153d0d14545394c4217d0fff62b508358335f87cfa873955f7a6618773fb796231636fd73d681f6105e3d7f6ed1b18ffd59b831c6053afc91ea625b584cec7a)
set(QT_HASH_qt5-serialport d386d528aacce7d4e015110d814e852511db83a3648bc68116e4d300168ac826e83a145d9dd38e4a40ec2d4fd48ba89ac1eb9558afb895f7b39271ad760f2b17)
set(QT_HASH_qt5-speech d0ff73b35e6d94751a31b77bcdc084623d947ace092bdddc98f29d79bf932425fd5adbef74edceb4e8dc9065bfda49efa651cef63c72fcb42171ff083b29b335)
set(QT_HASH_qt5-svg 227b6b4f0d6ad7d9405c0bceabadfab28e591b4b02d7575de0ee7679280fc7115ec04751a8e839af5e9958e1800e6d4529bf8bae2251b579abbc688fdb99b9e8)
set(QT_HASH_qt5-tools 5e81de37a5d429dd14d254a0257e6d1ca37c04a92b506d13d918fd3eb799c026978d3d673f6db0f393b598f520cf3a5d647c66de76308f9de9ac5c6951ed9f6b)
set(QT_HASH_qt5-translations 9702390b89696211b1d85a11143e3432231085c2d96b298ea584f43e8db215bf5cdb5fb5355c8c4d900d1f761dfd3dc0d5c16df2ed0cca483557f8b867e3b2ac)
set(QT_HASH_qt5-virtualkeyboard af7ca963784773b94bfed000cabf5dbfb6363211d6b2601ccb6aed26eccd2eaa1e34dc8e7a6f1bbc678432f4086284df82c66e8da1c7fc7c8f5ec37983f687b9)
set(QT_HASH_qt5-wayland 9ce2bca54aa0e17be17383fccd6caca721db5b54f8905ec86cf871ed0e2414e6bc86878b9cc5167c322153467076b2afdcd6163a8fb2feb6b19cef11c3a29247)
set(QT_HASH_qt5-webchannel 106c72c0f49e79d92b4aa2aed235f57aef358aecdc0f30eb9b5ab2c28a56ab44df709143d2755ea5f35026e5aa3994d187da14838a2a542e878d6f5b70a7fe1b)
set(QT_HASH_qt5-webengine 6bfa7aba34cd5537e6a9e69f03504da1414625315565f053c1ce1fa2875f9b327b5a73e7e9bc8f69c706732f8917ecb6c88bc958ddd4e5848c225b4129cda404)
set(QT_HASH_qt5-webglplugin caf3cc278fa0486339f8a4f75ba9c0183452b55030d4c7cac8214bc38a1e9f9318a8c832935a593b53eea9d342eeae015763a7dd47a92e91f62afed1f540147d)
set(QT_HASH_qt5-websockets 9bb15c9277f96acee0d5a49e961483706c0d6c709c587400c402b7864fe2635cf688222448bdabd5ef53568e6d8c1c32e54a9410301eede0507b975989f30b2b)
set(QT_HASH_qt5-webview 2d6761a6b01a8791dae785f829f429f336b8ba42f0675226ab09a05a7f4e170a3bc569e92e845b9416f4a0eef93f87d2e34c0a18eed025847445bb794e457982)
set(QT_HASH_qt5-winextras 9af7c7eb9f2e37052c9a866d2902ba931be16eeaa43f7430326a5e7c1c9b65fc8c11dc2ba31379d1893939f800954e0079027d08f1e79a19acaf384cd8a9c4b4)
set(QT_HASH_qt5-x11extras edfb4e43214be861c5df71675ac9209b75ba3164c0caf5ec975528d60358a49707567ba4d1862ecb91e1c37d8169ef311426977962f02f2477c5d5ad7d5f4184)
set(QT_HASH_qt5-xmlpatterns ae603468dcb399f99b3843afcbd13ca05baed2ee42e12154be5c2c64ab18c1daddc003af01cf948e57c8654b65e8890101e45b412431ad930f7d697e4b806564)
if(QT_UPDATE_VERSION)
message(STATUS "Running Qt in automatic version port update mode!")

120
ports/qt5-base/patches/CVE-2023-43114-5.15.patch
View File

@ -1,120 +0,0 @@
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index ba683cf686..217a968c64 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -1471,36 +1471,70 @@ QT_WARNING_POP
return fontEngine;
}
-static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData)
+static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData, const uchar *fileEndSentinel)
{
QList<quint32> offsets;
- const quint32 headerTag = *reinterpret_cast<const quint32 *>(fontData);
+ if (fileEndSentinel - fontData < 12) {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ return offsets;
+ }
+
+ const quint32 headerTag = qFromUnaligned<quint32>(fontData);
if (headerTag != MAKE_TAG('t', 't', 'c', 'f')) {
if (headerTag != MAKE_TAG(0, 1, 0, 0)
&& headerTag != MAKE_TAG('O', 'T', 'T', 'O')
&& headerTag != MAKE_TAG('t', 'r', 'u', 'e')
- && headerTag != MAKE_TAG('t', 'y', 'p', '1'))
+ && headerTag != MAKE_TAG('t', 'y', 'p', '1')) {
return offsets;
+ }
offsets << 0;
return offsets;
}
+
+ const quint32 maximumNumFonts = 0xffff;
const quint32 numFonts = qFromBigEndian<quint32>(fontData + 8);
- for (uint i = 0; i < numFonts; ++i) {
- offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4);
+ if (numFonts > maximumNumFonts) {
+ qCWarning(lcQpaFonts) << "Font collection of" << numFonts << "fonts is too large. Aborting.";
+ return offsets;
}
+
+ if (quintptr(fileEndSentinel - fontData) > 12 + (numFonts - 1) * 4) {
+ for (quint32 i = 0; i < numFonts; ++i)
+ offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4);
+ } else {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ }
+
return offsets;
}
-static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag, const uchar **table, quint32 *length)
+static void getFontTable(const uchar *fileBegin, const uchar *fileEndSentinel, const uchar *data, quint32 tag, const uchar **table, quint32 *length)
{
- const quint16 numTables = qFromBigEndian<quint16>(data + 4);
- for (uint i = 0; i < numTables; ++i) {
- const quint32 offset = 12 + 16 * i;
- if (*reinterpret_cast<const quint32 *>(data + offset) == tag) {
- *table = fileBegin + qFromBigEndian<quint32>(data + offset + 8);
- *length = qFromBigEndian<quint32>(data + offset + 12);
- return;
+ if (fileEndSentinel - data >= 6) {
+ const quint16 numTables = qFromBigEndian<quint16>(data + 4);
+ if (fileEndSentinel - data >= 28 + 16 * (numTables - 1)) {
+ for (quint32 i = 0; i < numTables; ++i) {
+ const quint32 offset = 12 + 16 * i;
+ if (qFromUnaligned<quint32>(data + offset) == tag) {
+ const quint32 tableOffset = qFromBigEndian<quint32>(data + offset + 8);
+ if (quintptr(fileEndSentinel - fileBegin) <= tableOffset) {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ break;
+ }
+ *table = fileBegin + tableOffset;
+ *length = qFromBigEndian<quint32>(data + offset + 12);
+ if (quintptr(fileEndSentinel - *table) < *length) {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ break;
+ }
+ return;
+ }
+ }
+ } else {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
}
+ } else {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
}
*table = 0;
*length = 0;
@@ -1513,8 +1547,9 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
QVector<QFontValues> *values)
{
const uchar *data = reinterpret_cast<const uchar *>(fontData.constData());
+ const uchar *dataEndSentinel = data + fontData.size();
- QList<quint32> offsets = getTrueTypeFontOffsets(data);
+ QList<quint32> offsets = getTrueTypeFontOffsets(data, dataEndSentinel);
if (offsets.isEmpty())
return;
@@ -1522,7 +1557,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
const uchar *font = data + offsets.at(i);
const uchar *table;
quint32 length;
- getFontTable(data, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length);
+ getFontTable(data, dataEndSentinel, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length);
if (!table)
continue;
QFontNames names = qt_getCanonicalFontNames(table, length);
@@ -1532,7 +1567,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
families->append(std::move(names));
if (values || signatures)
- getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);
+ getFontTable(data, dataEndSentinel, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);
if (values) {
QFontValues fontValues;
--
2.27.0.windows.1

18
ports/qt5-base/patches/XKB_KEY_dead_lowline.patch
View File

@ -1,18 +0,0 @@
diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
index 7bfacf4..ded358a 100644
--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
@@ -273,11 +273,13 @@ static constexpr const auto KeyTbl = qMakeArray(
Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
+#ifdef XKB_KEY_dead_lowline
Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+#endif
// Special keys from X.org - This include multimedia keys,
// wireless/bluetooth/uwb keys, special launcher keys, etc.
Xkb2Qt<XKB_KEY_XF86Back, Qt::Key_Back>,

12
ports/qt5-base/patches/cocoa.patch
View File

@ -1,12 +0,0 @@
diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
index e070ba97..07c75b04 100644
--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
@@ -40,6 +40,7 @@
#ifndef QIOSURFACEGRAPHICSBUFFER_H
#define QIOSURFACEGRAPHICSBUFFER_H
+#include <CoreGraphics/CGColorSpace.h>
#include <qpa/qplatformgraphicsbuffer.h>
#include <private/qcore_mac_p.h>

32
ports/qt5-base/patches/patch-qtbase-memory_resource.diff
View File

@ -1,35 +1,3 @@
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -1050,16 +1050,22 @@
# endif // !_HAS_CONSTEXPR
# endif // !__GLIBCXX__ && !_LIBCPP_VERSION
# endif // Q_OS_QNX
-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
+# if defined(Q_CC_CLANG) && defined(Q_OS_DARWIN)
+# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
// Apple has not updated libstdc++ since 2007, which means it does not have
// <initializer_list> or std::move. Let's disable these features
-# undef Q_COMPILER_INITIALIZER_LISTS
-# undef Q_COMPILER_RVALUE_REFS
-# undef Q_COMPILER_REF_QUALIFIERS
+# undef Q_COMPILER_INITIALIZER_LISTS
+# undef Q_COMPILER_RVALUE_REFS
+# undef Q_COMPILER_REF_QUALIFIERS
// Also disable <atomic>, since it's clearly not there
-# undef Q_COMPILER_ATOMICS
-# endif
+# undef Q_COMPILER_ATOMICS
+# endif
+# if defined(__cpp_lib_memory_resource) \
+ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \
+ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
+# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
+# endif
+# endif // defined(Q_CC_CLANG) && defined(Q_OS_DARWIN)
# if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
// ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
// (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
--- a/src/corelib/tools/qduplicatetracker_p.h
+++ b/src/corelib/tools/qduplicatetracker_p.h
@@ -52,7 +52,7 @@

28
ports/qt5-base/patches/xcode-15.patch
View File

@ -1,28 +0,0 @@
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 0040b6c..bfad10d 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -288,9 +288,12 @@
}
}
}
- isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
+ isEmpty(QMAKE_DEFAULT_INCDIRS): \
!integrity: \
- error("failed to parse default search paths from compiler output")
+ error("failed to parse default include paths from compiler output")
+ isEmpty(QMAKE_DEFAULT_LIBDIRS): \
+ !integrity:!darwin: \
+ error("failed to parse default library paths from compiler output")
QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
} else: ghs {
cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
@@ -411,7 +414,7 @@
QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
}
- unix:if(!cross_compile|host_build) {
+ unix:!darwin:if(!cross_compile|host_build) {
isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
}

5
ports/qt5-base/portfile.cmake
View File

@ -47,7 +47,6 @@ 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-43114-5.15.patch
patches/0001-CVE-2023-51714-qtbase-5.15.diff
patches/0002-CVE-2023-51714-qtbase-5.15.diff
patches/CVE-2024-25580-qtbase-5.15.diff
@ -62,8 +61,6 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH
patches/qtbug_96392.patch #Backport fix for QTBUG-96392
patches/mysql_plugin_include.patch #Fix include path of mysql plugin
patches/mysql-configure.patch #Fix mysql project
patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547
patches/xcode-15.patch #From https://codereview.qt-project.org/c/qt/qtbase/+/503172
patches/patch-qtbase-memory_resource.diff # From https://bugreports.qt.io/browse/QTBUG-114316
#patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static).
#Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the
@ -75,8 +72,6 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH
patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt
patches/fix_angle.patch # Failed to create OpenGL context for format QSurfaceFormat ...
patches/mingw9.patch # Fix compile with MinGW-W64 9.0.0: Redefinition of 'struct _FILE_ID_INFO'
patches/XKB_KEY_dead_lowline.patch # https://bugreports.qt.io/browse/QTBUG-117950
patches/qmake-arm64.patch # Fix by Oliver Wolff to support ARM64 hosts on Windows
)

3
ports/qt5-base/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "qt5-base",
"version": "5.15.15",
"port-version": 1,
"version": "5.15.16",
"description": "Qt Base provides the basic non-GUI functionality required by all Qt applications.",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qt5-charts/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-charts",
"version": "5.15.15",
"version": "5.15.16",
"description": "The Qt Charts module provides a set of easy to use chart components.",
"license": null,
"dependencies": [

2
ports/qt5-connectivity/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-connectivity",
"version": "5.15.15",
"version": "5.15.16",
"description": "The Qt Connectivity module provides access to Bluetooth and NFC hardware.",
"license": null,
"dependencies": [

2
ports/qt5-datavis3d/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-datavis3d",
"version": "5.15.15",
"version": "5.15.16",
"description": "The Qt Data Visualization module provides a way to visualize data in 3D as bar, scatter, and surface graphs.",
"license": null,
"dependencies": [

2
ports/qt5-declarative/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-declarative",
"version": "5.15.15",
"version": "5.15.16",
"description": "Qt Declarative (Quick 2)",
"license": null,
"dependencies": [

2
ports/qt5-doc/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-doc",
"version": "5.15.15",
"version": "5.15.16",
"description": "The Qt documentation.",
"license": null,
"supports": "native",

2
ports/qt5-gamepad/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-gamepad",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-graphicaleffects/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-graphicaleffects",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-imageformats/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-imageformats",
"version": "5.15.15",
"version": "5.15.16",
"description": "The Qt Image Formats add-on module provides optional support for other image file formats.",
"license": null,
"dependencies": [

2
ports/qt5-location/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-location",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-macextras/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-macextras",
"version": "5.15.15",
"version": "5.15.16",
"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",

2
ports/qt5-mqtt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-mqtt",
"version": "5.15.15",
"version": "5.15.16",
"description": "Qt MQTT enables you to create applications and devices that can communicate over the MQ telemetry transport (MQTT) protocol.",
"license": null,
"dependencies": [

4
ports/qt5-multimedia/portfile.cmake
View File

@ -1,2 +1,2 @@
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
qt_submodule_installation(PATCHES xcode15.patch)
include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake")
qt_submodule_installation()

2
ports/qt5-multimedia/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-multimedia",
"version": "5.15.15",
"version": "5.15.16",
"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": [

12
ports/qt5-multimedia/xcode15.patch
View File

@ -1,12 +0,0 @@
diff -ur a/src/plugins/avfoundation/camera/avfcamerautility.mm b/src/plugins/avfoundation/camera/avfcamerautility.mm
--- a/src/plugins/avfoundation/camera/avfcamerautility.mm 2023-04-01 11:51:14.736887185 -0400
+++ b/src/plugins/avfoundation/camera/avfcamerautility.mm 2023-04-01 11:54:19.979498301 -0400
@@ -101,7 +101,7 @@
}
};
-struct FormatHasNoFPSRange : std::unary_function<AVCaptureDeviceFormat *, bool>
+struct FormatHasNoFPSRange
{
bool operator() (AVCaptureDeviceFormat *format)
{

2
ports/qt5-networkauth/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-networkauth",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-purchasing/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-purchasing",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-quickcontrols/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-quickcontrols",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-quickcontrols2/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-quickcontrols2",
"version": "5.15.15",
"version": "5.15.16",
"description": "Qt Quick Controls provides a set of controls that can be used to build complete interfaces in Qt Quick.",
"license": null,
"dependencies": [

2
ports/qt5-remoteobjects/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-remoteobjects",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-script/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-script",
"version": "5.15.15",
"version": "5.15.16",
"description": "Qt Script provides support for application scripting with ECMAScript.",
"license": null,
"dependencies": [

2
ports/qt5-scxml/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-scxml",
"version": "5.15.15",
"version": "5.15.16",
"description": "The Qt SCXML module provides classes for embedding state machines created from State Chart XML (SCXML) files in Qt applications.",
"license": null,
"dependencies": [

2
ports/qt5-sensors/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-sensors",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-serialbus/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-serialbus",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-serialport/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-serialport",
"version": "5.15.15",
"version": "5.15.16",
"description": "Qt5 Serial Port - provides access to hardware and virtual serial ports",
"license": null,
"dependencies": [

2
ports/qt5-speech/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-speech",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-svg/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-svg",
"version": "5.15.15",
"version": "5.15.16",
"description": "Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices.",
"license": null,
"dependencies": [

2
ports/qt5-tools/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-tools",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-translations/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-translations",
"version": "5.15.15",
"version": "5.15.16",
"description": "Qt translations.",
"license": null,
"dependencies": [

2
ports/qt5-virtualkeyboard/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-virtualkeyboard",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-wayland/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-wayland",
"version": "5.15.15",
"version": "5.15.16",
"description": "QtWayland is a Qt 5 module that wraps the functionality of Wayland.",
"license": null,
"supports": "linux",

2
ports/qt5-webchannel/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-webchannel",
"version": "5.15.15",
"version": "5.15.16",
"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": [

24
ports/qt5-webengine/build_2.patch
View File

@ -1,24 +0,0 @@
diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
index 18ca770..5585a67 100644
--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
@@ -74,16 +74,16 @@ class CircularQueue {
return queue_->Get(pos_);
}
- const T* operator->() const {
+ T* operator->() const {
return const_cast<CircularQueue<T>::Iterator*>(this)->operator->();
}
T& operator*() { return *(operator->()); }
- const T& operator*() const { return *(operator->()); }
+ T& operator*() const { return *(operator->()); }
value_type& operator[](difference_type i) { return *(*this + i); }
- const value_type& operator[](difference_type i) const {
+ value_type& operator[](difference_type i) const {
return const_cast<CircularQueue<T>::Iterator&>(*this)[i];
}

1
ports/qt5-webengine/portfile.cmake
View File

@ -48,7 +48,6 @@ vcpkg_add_to_path(PREPEND "${NODEJS_DIR}")
set(PATCHES common.pri.patch
gl.patch
build_1.patch
build_2.patch
0001-Support-ICU-74-in-LazyTextBreakIterator.patch
workaround-protobuf-issue.patch
0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch

2
ports/qt5-webengine/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-webengine",
"version": "5.15.15",
"version": "5.15.16",
"description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
"license": null,
"supports": "!static",

2
ports/qt5-webglplugin/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-webglplugin",
"version": "5.15.15",
"version": "5.15.16",
"description": "The Qt WebGL Plugin module enables Qt applications to be run in web browsers through WebGL streaming.",
"license": null,
"dependencies": [

2
ports/qt5-websockets/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-websockets",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-webview/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-webview",
"version": "5.15.15",
"version": "5.15.16",
"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": [

2
ports/qt5-winextras/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-winextras",
"version": "5.15.15",
"version": "5.15.16",
"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",

2
ports/qt5-x11extras/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-x11extras",
"version": "5.15.15",
"version": "5.15.16",
"description": "Qt X11 Extras enables the Qt programmer to write applications for the Linux/X11 platform.",
"license": null,
"supports": "!windows",

2
ports/qt5-xmlpatterns/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5-xmlpatterns",
"version": "5.15.15",
"version": "5.15.16",
"description": "The Qt XML Patterns module provides support for XPath, XQuery, XSLT, and XML Schema validation.",
"license": null,
"dependencies": [

2
ports/qt5/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5",
"version": "5.15.15",
"version": "5.15.16",
"description": "A cross-platform application and UI framework.",
"homepage": "https://www.qt.io/",
"license": null,

84
versions/baseline.json
View File

@ -7369,67 +7369,67 @@
"port-version": 0
},
"qt5": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-3d": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-activeqt": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-androidextras": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-base": {
"baseline": "5.15.15",
"port-version": 1
"baseline": "5.15.16",
"port-version": 0
},
"qt5-canvas3d": {
"baseline": "0",
"port-version": 3
},
"qt5-charts": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-connectivity": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-datavis3d": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-declarative": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-doc": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-gamepad": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-graphicaleffects": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-imageformats": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-location": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-macextras": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-modularscripts": {
@ -7437,107 +7437,107 @@
"port-version": 1
},
"qt5-mqtt": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-multimedia": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-networkauth": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-purchasing": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-quickcontrols": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-quickcontrols2": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-remoteobjects": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-script": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-scxml": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-sensors": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-serialbus": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-serialport": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-speech": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-svg": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-tools": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-translations": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-virtualkeyboard": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-wayland": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-webchannel": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-webengine": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-webglplugin": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-websockets": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-webview": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-winextras": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-x11extras": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5-xmlpatterns": {
"baseline": "5.15.15",
"baseline": "5.15.16",
"port-version": 0
},
"qt5compat": {

5
versions/q-/qt5-3d.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "085d0f12be25c63d602297656677a3f5e55b2506",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "24ea39b5002568463c4999ef84b7fbcad5d215e3",
"version": "5.15.15",

5
versions/q-/qt5-activeqt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f991091bd4940f169301aa1c95eab8c6063faf54",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "ad09a82988d1e3267f36c1803de6d6ca7451cc4d",
"version": "5.15.15",

5
versions/q-/qt5-androidextras.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4080b98e7deb0dbe056edbf68e13fc1a224a5095",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "b37f59e3909e093b8e04ec07f88db3719bca70c9",
"version": "5.15.15",

5
versions/q-/qt5-base.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d207be89c93ec616752e5a19f97c2d794f117779",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "6ae808ff9831e8fc3c9f31e0ec0ac71b2e9d3a4e",
"version": "5.15.15",

5
versions/q-/qt5-charts.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "103d0efe617761c996e7dd7ac259a47c54bdd537",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "22d5d38889b54d158619cb0a072b2a0be705b495",
"version": "5.15.15",

5
versions/q-/qt5-connectivity.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e1427560b36df1131cc3a5e401ad155e29fa940f",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "67afa17d2cf24f95a1296dfd1f8ff8805be17d7e",
"version": "5.15.15",

5
versions/q-/qt5-datavis3d.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "85a014e6d432d04e4b417b48ca48b19a75303ab9",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "87229921890204be93a49bb4cd239d8ffbea157e",
"version": "5.15.15",

5
versions/q-/qt5-declarative.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b221e8a2b8b92a7321a3e497dbe9dbf7af0872c8",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "0c3955c17df5c3af891092d66097102f0a1e8a14",
"version": "5.15.15",

5
versions/q-/qt5-doc.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b5e19e4bfd58d8360153eee05cea98c8940737ca",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "64381c648cd89178e444f4ebfd9bcafaadc8b2ca",
"version": "5.15.15",

5
versions/q-/qt5-gamepad.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c0c5f9452a34705d1921b74845b136ae9350ad82",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "e951bd00bff8370f027727a031830f351afb2d25",
"version": "5.15.15",

5
versions/q-/qt5-graphicaleffects.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2f470153ac34334631257a09143562dbbb5683c4",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "837709f0c2958b0e503227dc473cacd2de21a52d",
"version": "5.15.15",

5
versions/q-/qt5-imageformats.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ec7911ed48d7606ddbb183272057ad8d268c9293",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "4c3d360158ff3a553a721f981af0ac80f82581f9",
"version": "5.15.15",

5
versions/q-/qt5-location.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bd04e516a9dd43e1089611fe978f1fdf7103e839",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "1c8e76a3559b61499f5543bad499cc7580c3502e",
"version": "5.15.15",

5
versions/q-/qt5-macextras.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6ef9c410db63859557242c57fc0ae75138e42307",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "e18c6a0c3e4a001fe2c34cd70e24a673c96f353d",
"version": "5.15.15",

5
versions/q-/qt5-mqtt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "923780f633eeb31f4f7b850a6280909bcff37952",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "8b0caaea5133e7f444a2320b39c039c380781e9d",
"version": "5.15.15",

5
versions/q-/qt5-multimedia.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "83530203612f2cb5b1fb3b2a988bef85d06ef43d",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "4ed714b52d718c1970016cac9b6f685275fae53d",
"version": "5.15.15",

5
versions/q-/qt5-networkauth.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "833e30171f4535651d788a510a4206f137b4271a",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "e87f2905d6391a45f9c6f8e85c530392a21ccd75",
"version": "5.15.15",

5
versions/q-/qt5-purchasing.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "955d76b06035970ca1533d19a5a03e95b2324e76",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "3e3a79b1d8d89350ba3091212d0d658d2d2c7624",
"version": "5.15.15",

5
versions/q-/qt5-quickcontrols.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "46cc1a78b410f6ef6c6c63bcb64233e35841de44",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "dc4aab10b2454a206d30e5bbd034f0094d913013",
"version": "5.15.15",

5
versions/q-/qt5-quickcontrols2.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "90297e8ad722045df958c28347b29a312ab27755",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "44e3863dd5521d8b95e6d1f6ba475d164ea81d02",
"version": "5.15.15",

5
versions/q-/qt5-remoteobjects.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e9a4992d99db03ee67f9b559b940186da082d941",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "3e233b54911e2da5a259199154350a3a47fe1771",
"version": "5.15.15",

5
versions/q-/qt5-script.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "58a1f546036451e132628a09ae7b44172b390bb6",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "b3c3724c57f9f19d79b15f8f7d62f79fbb5c4d1d",
"version": "5.15.15",

5
versions/q-/qt5-scxml.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "574b7a4e7470fe1176e62d39bca5c32e8c5e24fc",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "a161681b5493bb83b4eb296a3b5c8f3d750a32ad",
"version": "5.15.15",

5
versions/q-/qt5-sensors.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0fa3488f59c586350479848bc63cf04fa4ae30b1",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "66509571b96c882b2a3a3dd0996afafed796e800",
"version": "5.15.15",

5
versions/q-/qt5-serialbus.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "13b0e0d275a794621c7f7900d8dd2ec38cbbed13",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "779fc63975cd6a8584c27efc21ab30546735f573",
"version": "5.15.15",

5
versions/q-/qt5-serialport.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8d8151331fb566580b7a145b43cb5860d4592a1d",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "2332f39e0bdce11214c7974c83df14b49672d780",
"version": "5.15.15",

5
versions/q-/qt5-speech.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cc4794ae54e576001b5cd93c5c204e41e3618459",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "a0bf98b8eaa905324c531724265c39a50c905e25",
"version": "5.15.15",

5
versions/q-/qt5-svg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b463bc31d7785958fafec93f49db574b737ee61a",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "e052ae98b8fa07175f593dac7f7454308704cfc1",
"version": "5.15.15",

5
versions/q-/qt5-tools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8c46478aa6df9dde8d3d78d2b5c5739f6337fa88",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "cb208d6c3109d2bf0c29a72a81eb291c82ee5f1e",
"version": "5.15.15",

5
versions/q-/qt5-translations.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5bfe13e093858096972a7ae2fd3cf95e9dfbee05",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "d0aad797572cfe6289ebc863aa09819966ce6829",
"version": "5.15.15",

5
versions/q-/qt5-virtualkeyboard.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cbf61dcc7c0dbdb9b41f5bae9e58c174bd1f2f96",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "8ac50bea0b2c4a920838bc9cc5d7dee78b868595",
"version": "5.15.15",

5
versions/q-/qt5-wayland.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fdf5bce00a34c9062509900ce9ba89fde6982533",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "0573cbd28f1fe16d109354aa1d658d34a3981d75",
"version": "5.15.15",

5
versions/q-/qt5-webchannel.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7f98e1ba5729665bff689a7e3e115788493c3edf",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "7d514be154e444509227c208123305bd098b5aff",
"version": "5.15.15",

5
versions/q-/qt5-webengine.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b49c1e293ead06cecbbc431801688483b0473f3e",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "eeece45f507ad36455883b753c5914ef7e266c26",
"version": "5.15.15",

5
versions/q-/qt5-webglplugin.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3c20a85d4bba9b9ec194798189a7259ba0cacbab",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "5d45c7dca5dd0562a2d0042968c3f95f0b1050b1",
"version": "5.15.15",

5
versions/q-/qt5-websockets.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "74b2f0b75ad4f77ad3068bc48e4b9017ba198a80",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "06ee7adf56b994d4463c49966798f9f070821386",
"version": "5.15.15",

5
versions/q-/qt5-webview.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b5a59890aebeb8b5ef987524572d80a060a7528f",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "47bd08d247597b6c393cd87bd06575fff70608c0",
"version": "5.15.15",

5
versions/q-/qt5-winextras.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "693e3b4ebe95a20e971fd18aa892c156a105b1aa",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "4d5dc088639d7c38aca26eb84da5ff40482f8575",
"version": "5.15.15",

5
versions/q-/qt5-x11extras.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5dd90361394b224e8a91870c630ec37a7087d4f2",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "8b8c1e12c49745ca5962d3330784b8ea0535ec0d",
"version": "5.15.15",

5
versions/q-/qt5-xmlpatterns.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5590c19f8610655055402eae3a9414885b0a9dec",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "8db01c570ec7532552fe918c4205e553d96ac18a",
"version": "5.15.15",

5
versions/q-/qt5.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "80a421310ef4e6e2e5f7b54a40bd90df895d82d8",
"version": "5.15.16",
"port-version": 0
},
{
"git-tree": "e50cf12eba43b94575a5d79394938e3b08728b55",
"version": "5.15.15",