diff options
Diffstat (limited to 'dev-qt')
110 files changed, 725 insertions, 2047 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 342c849f7292..2f89b704f812 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 22170e5c86bd..64d90c611656 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -3,6 +3,6 @@ AUX qt-creator-12.0.0-musl-no-malloc-trim.patch 343 BLAKE2B 9c4b87a0de20616dc8cf DIST qt-creator-opensource-src-13.0.1.tar.xz 51891908 BLAKE2B ab4701be5328fccc91e885a6a331ba8c4f53cb7d9a723f03f30ad01d03281d16b1f49cd6027ad9873cd94ecf6555978df9eba14bfcbfa8e4c36d304b8b106d5a SHA512 8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4 DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac EBUILD qt-creator-13.0.1.ebuild 7500 BLAKE2B 4c45f30ac0f69b4dc816949df0d3433af3162e9f3fc25ee5cdbfce2be07e84c8066f0f9e70ca4cdbdb16b494a4af6d248c1d7ae997d2ad4c9c84c6a39c78518c SHA512 1fad52764ead14f568196c64ec4ce543f1327c60a7dbc3fbdf42c8b9af684c240398ab4056e9cfb8f07978c4c430ed69dbbcd76a8fdd5e2e4981783735937fa4 -EBUILD qt-creator-13.0.2.ebuild 7500 BLAKE2B 4c45f30ac0f69b4dc816949df0d3433af3162e9f3fc25ee5cdbfce2be07e84c8066f0f9e70ca4cdbdb16b494a4af6d248c1d7ae997d2ad4c9c84c6a39c78518c SHA512 1fad52764ead14f568196c64ec4ce543f1327c60a7dbc3fbdf42c8b9af684c240398ab4056e9cfb8f07978c4c430ed69dbbcd76a8fdd5e2e4981783735937fa4 -EBUILD qt-creator-9999.ebuild 8115 BLAKE2B 095c2e0dd375338727a3b60c6009426d681a2414729423ef50181a46ce6679e62e1fbb0d0f6937de79cbc78e5e11ab8c10dd20aa2b6fd700002aa7c4d418935f SHA512 033808753f2b3850f8741f9e71b8d78e9cc5688f3bc9c7b33682fae91d97f5095288fca3eb658b48cc78d6b5882c10aa4683fa0fe7f292b5555c9700f64dcd25 +EBUILD qt-creator-13.0.2.ebuild 7496 BLAKE2B 4f6b29f04047ab1fa6e6c33a5750e1f88ea4ce567b5952029feb7c5f883cebcb847c11190df2ca436b56cb7cc83d0a0dfea4b4acc53800f0d64fd2437045ad4e SHA512 f286b55f174a4ed678e1d3ef6bda09676f4aeaf0472b0796043c782777b00448a6a4eaa8b6c8e72dcdc937b15ea5bd2cbef76f41a017c72b5796644df54a0978 +EBUILD qt-creator-9999.ebuild 8111 BLAKE2B e00ee649e9b9f719c5a928bd197f8d013749c825a8f961cfe934c12844c8d8d20b743ad323595496e4d2240507bc0b40049a3f11fc787584d3cefa9d49cebb02 SHA512 a8d83d0261064188ee145da02147da179f0c6790cd75b47e881f3c571fb3428568f9feb4a558535729050bbc845d76bf546ef105fb732c8b2d6c60148c65eb92 MISC metadata.xml 1241 BLAKE2B 0d68bad4f8bdf857a44107e1b22299ce2e1ac84c2b2197f33e5f3c99562e4cd1d68982a2048961bd1d469a497f4cf4942005cdfb7876a6cdc720ed19e81e7a6d SHA512 33e3e7021d07f83f2ddd39120ac695394963978c80acdd8e2f0713e7cd485ac705ba11168276bb43f3f80b9c1122dd98a5359f342c2c075c2fd8ebddb93084b6 diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild index 25ae3358d8dc..972b24abebe5 100644 --- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild +++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild @@ -44,13 +44,11 @@ QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN # := is used where Qt's private APIs are used for safety COMMON_DEPEND=" + dev-cpp/yaml-cpp:= >=dev-qt/qt5compat-${QT_PV} >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml] >=dev-qt/qtdeclarative-${QT_PV}= - clang? ( - dev-cpp/yaml-cpp:= - $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') - ) + clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') ) designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) help? ( >=dev-qt/qttools-${QT_PV}[assistant] diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 7e70e0a5b37d..69822c51bc74 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -49,13 +49,11 @@ QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN # := is used where Qt's private APIs are used for safety COMMON_DEPEND=" + dev-cpp/yaml-cpp:= >=dev-qt/qt5compat-${QT_PV} >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml] >=dev-qt/qtdeclarative-${QT_PV}= - clang? ( - dev-cpp/yaml-cpp:= - $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') - ) + clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') ) designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) help? ( >=dev-qt/qttools-${QT_PV}[assistant] diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest index 3c8ea6d6b9fd..7e2502c4c150 100644 --- a/dev-qt/qt-docs/Manifest +++ b/dev-qt/qt-docs/Manifest @@ -53,108 +53,6 @@ DIST 5.15.2-0-202011130614qtwidgets-documentation.7z 26789215 BLAKE2B f0561ae272 DIST 5.15.2-0-202011130614qtx11extras-documentation.7z 36673 BLAKE2B b7eb8f048acecce20b911267755e1e467fb23b975911025cd43915e043ffc3f34b2b38862f32ae9959dc7e5c759d22731d33fa600c9b8d239f0f0ba1bd6343ff SHA512 ade0a62026d32342fb2b48ade9a164d24e506f5e392e68c451055238ce2a673ea4358472c1132daa779498ff7f2351440d73b6218d5a01e8162bda0907215894 DIST 5.15.2-0-202011130614qtxml-documentation.7z 448310 BLAKE2B 36de636799fbbe1b67db6e0ec19bc478d7d5003b840a7119ad8b11589a4d514b00c7aebc2ac2ff4a80004ecbb8a70b7297eae8f7624171f4ba62435996f62b32 SHA512 ac5d137311eb13491dac18746eef3a1c5dd87d37d3446047c380cfdacad8dfc9d5e54a078278d98ff4ff75b39ad6044fed9bda481e35e307b3f103b792d253cb DIST 5.15.2-0-202011130614qtxmlpatterns-documentation.7z 1199986 BLAKE2B 49caea50be44260696026fcc395df016ef69992fc2bb8e3f31005194cda4987729fbf4e837171732ac5d95184a36cf1574c1fa01f6f2520bb8c52515773564c1 SHA512 c2ad2759ef7dcd78c2039f47ee01f9d61338f6735b9ef2caf8c99b959dad94dfb32249ee5cf8d605d71ff8a3cb5549ec602df1877f3624dd9ba6ca7621a5cf0c -DIST 6.7.1-0-202404231200activeqt-documentation.tar.xz 248676 BLAKE2B 76c168aac157870c93fc2c265523be4ef24edb40d9ae3ebe653febb7665755b72ad8eed78f681caf8dc23785ea9bccbe3e0fd40ca4d757b92ee624be11730a66 SHA512 4535c34e723ba2b7603b13cd729cea39c84a7c3c2bf6bc4b5147aaa25d7a37dc91b3e9485b6837acf8ce083ea1304afc46f478589ba7fb2b769646940166d03b -DIST 6.7.1-0-202404231200qdoc-documentation.tar.xz 287028 BLAKE2B 7c5a3adedfc3cea7bb50cfad54fa1e59bd443cafe19a5d8ec768425c0f84cd504ef7d50bb4462b4454955560ca0dc22e58ccc55cf820d51fd3f5a2bb55ea5f78 SHA512 c9625df87766bd72ed3e78542d0661a4e20a2e72f156d778dfe84c915cea25e1e7c53f22cad73fecad07daab57f185e6d3b91151690d7661865245c7280175e1 -DIST 6.7.1-0-202404231200qmake-documentation.tar.xz 344240 BLAKE2B 60c4ff60822ba65f342d278be9df9204a66bbc6f2b513671521be61eb1a2cef5cc74835418ea5a8fd98ed0a9c39a728dad6d2b4080a693fdad43c8b5f1ffc79d SHA512 2427fb756b24412724d9eb90b6eb325e0d7a6fb2d88316366b5300ac62e240a0021085104906e4147e95872773b2f7bbb7bd1f69f016ed3a0bb9e7764cbad598 -DIST 6.7.1-0-202404231200qt3d-documentation.tar.xz 5601596 BLAKE2B 7e2af5e0b558e23f4df06fffc57ad18b044a852ad5fe68295a5685dc81e176ae8a862c0d936a2546fb0432d3ffc318e980c523592cc11f49cbdb2eddddcc387d SHA512 3b56eab604cd0ce9c4df62887cb923c38ae7650fbf799025d6566eda6da973e41397d1f40cf7ce5e535e91ea002ccb89777ae5cca499788d972f20e4b18ced0e -DIST 6.7.1-0-202404231200qt3d-examples-6.7.1.7z 60337578 BLAKE2B 2c28adde22a5b416aa963bd6ac421782b6f6154fe0df4b44fd7a156991de94d898c4aa8899d808a79708bcfb04744178365f9feebcb78bf75ee4831ca2966057 SHA512 2c5650d11f5ce5847c934e5917e77a60a51a0e2c49a66cce09e0428af952420cfdb9704492a09e4b561337f2f89092142b74ac1cc4d7ce2be177d0e7bf06c708 -DIST 6.7.1-0-202404231200qt5compat-examples-6.7.1.7z 27941 BLAKE2B df7aca9badeeb01a065935cf9eb8e96cfcc944333ad5cff90f10b0edd5bee4a3748f63463e6478ce4b54f0fbb73c158bf6bf4f4c64f4122da5963a633ebe7e93 SHA512 7badcee1d3bff879d234f35472de79e1873c92bd30267b28276eead0e71eff29f966500f5cc06a6afab6352c539675ef5fc530950018ffd2b09eb74c796c0ef3 -DIST 6.7.1-0-202404231200qtactiveqt-examples-6.7.1.7z 11983 BLAKE2B 535a28dc1f8bb434158097531a164ff90a26d462cecdd59ece3250e0a3d2a84af881375b12f4abeb594f57119e4031dfbb26aad52e7e795ba4b6e77d4888d90e SHA512 9abd0afd948fd3dcf7a6139ea1fb34b9f0a937dee36e17133e95eeaa75f48d03e8f1f5d2c4417436737f0c109a47ea60aa98db9f8f3e7a8d5d626da7f8e00627 -DIST 6.7.1-0-202404231200qtassistant-documentation.tar.xz 469236 BLAKE2B ba95f18f1569e65629c5cd7012fe16bc4f83d205a0ab1f380db28cfec1befe5fffb794e2d26679d4ec475fafe3f94a1525d9b176034032e3452ad858515ab49d SHA512 1542a5a55decc3ae67e251bccada18ec6f6f59057450c8e8a6dcf61706905d6e11114199696f7be3b1207b9bcbca415cb555aa1368b7489ed1b1948ca5e94f18 -DIST 6.7.1-0-202404231200qtbase-examples-6.7.1.7z 4315236 BLAKE2B 99b62ca6176e1379b4e6906144e7343d34c2e0902f9014d4d0791c988606983071e26d451f0910785a01170e07abe7455aa0a5edebdec4294161d4ad9dd01331 SHA512 ca83728f7991fd309e3ee49ea22dc873943aae69a405c23a66ff2d22dbc5e56337b97ee96495e83eb24471d15b8ecc3fbc996aaf586ed0e465d1328bd39589ee -DIST 6.7.1-0-202404231200qtbluetooth-documentation.tar.xz 1035232 BLAKE2B 7a7fafd6b7c712dbeb0872c4eddf8ffb7308dc3c7c78c223f9d2d139c843c52f59a6d43fccc2e0ee91bdc567091502e96bf37237a2b229213e067cd6bbd675ee SHA512 5480c821f7376597d71deebead5b9117328111f92f8b150dab0875fa8cebdd2d752a012ddd49816059c91226297aea9fbad9647e85fc1dd0f4c9b02bcae4bf0e -DIST 6.7.1-0-202404231200qtcharts-documentation.tar.xz 8850884 BLAKE2B b00747650c3ba2e509f2432f0c3a828ce919683c19ab9499b24de665821baa97b13d6562dcbcdd84266f8162d32c8afd3bb692a0079d36ba8ebf94b11184dab9 SHA512 58a6011641e1ee5f8fe7876dca071c8c0046c6a44f83708cda4ccae0031cdd5a8ab1c5a10228862ae9e794a8104f528dce85869d3c2f39af8e01aef652406396 -DIST 6.7.1-0-202404231200qtcharts-examples-6.7.1.7z 162784 BLAKE2B be9da71d690e9378a7117aaf913679fa1bfe23ad358a3b05018458ddc9e521e0fe15971e8f02ae3e450adee836ddabe0b63e7faa1a72a052a598339b543585f8 SHA512 92d37dcd26e2713c4dabe52e1d74bbf2f6d8399dff8a8fc3e5d91d499f24678038a03fcf92b43d9c1286fc5853623b1cf55e3763e6b2e83810622bd6df6483fd -DIST 6.7.1-0-202404231200qtcmake-documentation.tar.xz 93432 BLAKE2B 5b92f399a62b1926064c4932d8462259109915635cff61c76ca02171e8e7d060c893087d8ac9214ce9cef7751250e9f2a6e2fa161ad2d9cdedc8a09358580565 SHA512 6bb9ae59e979c31cfa0bbd4fdcecedd2d708733e8c7445367eac98c617219f1a532cf8565014e74bf68575c8b8a3486fcc25213a445d05982725ae948606c859 -DIST 6.7.1-0-202404231200qtconcurrent-documentation.tar.xz 185808 BLAKE2B f1e1f0d831da1fc7f7a7fdad8cb4f5c139b18c8e8674ac0e9b0ef325c9170773874b4ed4e6afada4c5358387e89956ae56e1924836d8e07361325fdb87cabac2 SHA512 01699da9b88ec4359e087dc11d8a124fc66c17e06494b02aedd651b124c9631292d80c38b2de8be4e8d16194352417e2532de5f123a50103ed8af38c2e4a8dc1 -DIST 6.7.1-0-202404231200qtconnectivity-examples-6.7.1.7z 403638 BLAKE2B 9a88c1e05012b990521b84537a2d33da69a893dac9868d651fc7ed127e531f5534cd5991b50ecbe52ede071c2201df9be99e8c53f4b9555ec733fb3e5e252574 SHA512 da214e6fa9664c3ae51061cb55e7e50c82e75524d57e7c9682b60745731a92e414275e0ce1f4a6e97401c9546167ea0f61b67d3b4b80ec5f1463bcba0388e6ec -DIST 6.7.1-0-202404231200qtcore-documentation.tar.xz 7123340 BLAKE2B 7b3f9bc1fa4aad3231cd5ce733e9cd550f425418b07850ef399d56e02fdb6f7675e989c53659f2e477167ed44e51044821ab8af550de847e65a0405d9f9dd5da SHA512 8855d7ca141c7204e95f26fa3f0ab7e65e803a9ce29431e3ac82c0979480dd474543904c43cc56ed1a74ffd5981a396c048fa1e803d7b1f0f1f5799721e45147 -DIST 6.7.1-0-202404231200qtcore5compat-documentation.tar.xz 319380 BLAKE2B 0fe8ee554653029e017cd7368b719362b8283e2f1ed9e367974f861fbbf8478e80f1cd0b417c9e0807da873684549c4ddec9d74458205bda1f9560a9999c5ec9 SHA512 cf977c4d1b0687a6e7ad4b9c1bb69388094e4383bb75477de568580bf6516509c04804e5e0cc4dce8a56877d8bfd2dc9dc816ef2c41193da65ffc5f07e210ef3 -DIST 6.7.1-0-202404231200qtdatavis3d-documentation.tar.xz 2708172 BLAKE2B ad3caa6092d881eb9e25ab6456343932f66d8e68f629c6e64394776b76719f3ec010062cf6d19d00f3008a7ffdd6670edef35739909cc1553b4f3bbfe7643150 SHA512 4ce33a9109faea910e0c40e15e85ef09595840d08efd2d6dfe84d709c837fa2b9186cb5b1b47137b8184e8b82c05fb3f6a6a78a9222f4f3dc57a111d5c1de9c0 -DIST 6.7.1-0-202404231200qtdatavis3d-examples-6.7.1.7z 2771303 BLAKE2B 7f6f76afa8a5587d5b8b1101c6148f24ded2c9fb047d8608d8fc95a534555cf08a27aeb81ef79175477c61b15b08f628461211a381157f59962a696131a59c3e SHA512 dec1bbfd1ea4d4f36a833ab1e05ba9a63221ca94ee2c6cfcafec7c90a76299d2f9e0d2182365b6fa5f1adada8fc98b39bbd143aa1a4f3e9a303f7ae09cac86bb -DIST 6.7.1-0-202404231200qtdbus-documentation.tar.xz 333612 BLAKE2B 27fa383fc7c919b811675b04911ac9b72bd697c06b3ff015c4087fac09c898a9bf7826b4464565f0c9dd8ebd7284f31742b0d8fd00acb200163bed0dffb72280 SHA512 be7be7a7591933be65739591f91478b6c215d65fc69ea1cd80f4dc74a185d94478afdb290518d86c7e192946969ccb0605acbaab8c9c8ddb29480eba073aa790 -DIST 6.7.1-0-202404231200qtdeclarative-examples-6.7.1.7z 11650319 BLAKE2B 795a8a4cab5f06828e1e502b1382e3e30783a7ff4ff6ed328b0ead1daf95b123366992b6de18d1796446c25109c916892a443cdbf2fb3484e93ca56411e25f66 SHA512 66cb93d934a113db090021463560aab263a51353c440c33873514611036351246d6a1b474791b21f91bf5c36d8506a360feab36adc322917a62c30928c20ae7e -DIST 6.7.1-0-202404231200qtdesigner-documentation.tar.xz 3330688 BLAKE2B 143eb42a964f26365161d41f5dcc5ac68bfe37ca6ec0ac7ea4365c73d39c6edf903b2a59cb9cbd1d982b14e5cf044158994f63c6ce01b115a792cb1543d503bf SHA512 65567fac36ebc942976c9d7dd8eeecef7c489d976290ea47ac31e4305abbf4e37fdbe3488962220213472ddf3323a86b74c1cb95966a6a3349dd93b19d1704d5 -DIST 6.7.1-0-202404231200qtdistancefieldgenerator-documentation.tar.xz 149740 BLAKE2B 45a5754522937f6f2faa216c08f878343e5c2f539aa4454a12342dcac1f34093b16fbca8681b596a570cf5a54a888f441e4d74a786402594ca71d5691ec919a3 SHA512 4c1951b0f13df14940d46966b9db49152c6291710f62b68472a374e9d2ed2a888ddf560b627bc7cea2879498e340b36635865dd600514fcb818b4c9877a45e14 -DIST 6.7.1-0-202404231200qtdoc-documentation.tar.xz 14792048 BLAKE2B 2a7b741c7eba88a0d92419d6b5ebdda702421d894e1cc00bf0455869674b12f139283150915f70ea691c610a33ba1297c10f28ab8fcc5a316e0c41932446428a SHA512 90d3a0dd97e835c0486c7ec516fe3dfde251e9c8e59c8beb609c1e14ea342be8c3299160746757e941364322edc93e58a3a884e768a435f2e27f511c3c5abe79 -DIST 6.7.1-0-202404231200qtdoc-examples-6.7.1.7z 8045713 BLAKE2B 5dcf236739f258d2763bb6b51f6e4694aeccb4005850b8b97c7f33615aa9e6c4cb7dd55f9a6de314fa2e12cb0af3b45a7070ae85fc649a15601efe6cfc13c49d SHA512 196d5a160b302212f799364e0696cbbfbd055ff0490bbf06699c0d2e0bcf727ecb4d9bc2566dee72a8fcae354ee9bfef3beba54ef334ae496719bbb336bcf306 -DIST 6.7.1-0-202404231200qtgraphicaleffects5compat-documentation.tar.xz 25786052 BLAKE2B 99deacaaa9a28ed9187e8f47a349bf4fcc5cdfd1458a16627229c72432f06c5ed1fe7fed56575de959bafc3d944646d525da211f52346114efb0793c0fb319a5 SHA512 e8b820f36448fef2ba36028df810fbf028111d0280d1832998511a6a08c50501408398a8a843aa9d9104764ff78964ee7e00ec13dd604ce783dcb6e18b3e7c79 -DIST 6.7.1-0-202404231200qtgraphs-documentation.tar.xz 2988884 BLAKE2B 55ab12f7d44b337b2ff508398d46825f60268f145db59e45b069f05f7d6a9b50e0cabf58e32087e176229662fce42dab54b570b6ea4dc774e95d2ea066c9d771 SHA512 3fac38895b311e45071795ce9b79c4fdbc0e9f4cd151b16ffa8041392b665a72d01dd47d9292ca10a79cdbf0c936c8d1542c1a2f202c050223d1652f854e0bdc -DIST 6.7.1-0-202404231200qtgraphs-examples-6.7.1.7z 2456264 BLAKE2B 6329e16beb77917ce3068eaaae0db9b7db5f894bde9d7eacf7f6cb3958bd7672ecb5ad8f15b5c7ed57b3e1280794b9b15f18486e9590448c7bc87abb0711e535 SHA512 537ff461344547eaed5ecc27a2262362c283b09a2ced7ac38bf1ce1885854414812e62e27637fc39da23db017c35b34b869745ddd8c19d0d641c5489f84c1675 -DIST 6.7.1-0-202404231200qtgrpc-documentation.tar.xz 273856 BLAKE2B 9a6d4b5987f11bde1cb5415866ec00e2c142941612218dc4ed34816b701f20de6c91afbfdb252d51371ff26dec178c11aa064d92838779b209ad5d9218bd61ca SHA512 01cb8f430c523015cc3f2fecb0ee6a454a769b07756fdde8e894e17d2bc2c8fb3248bedffaa091a7874b5223acd918ee6d5fcd191ff06d7fc29bfe91a19d90bd -DIST 6.7.1-0-202404231200qtgrpc-examples-6.7.1.7z 96505 BLAKE2B 1a0bb644d5b69ce01d02ca8893e58d66956e42d58ba08d7bb0a88c26cd35b79cf0996513544b039428d8ea2caa6b21bcb1305c075e8606d5e4f9ebc131615dde SHA512 8e12eec9cf3355c2340b44c7a933460f2cca976fb6c68a3c4e7c017257cb45acd250eb1a07eed7566d8e78f3e855463a6826af2f7baa0f4757ad626e0c0f4adb -DIST 6.7.1-0-202404231200qtgui-documentation.tar.xz 7204896 BLAKE2B be1a6f19109a1758f7debfcd0b28087011b370e6865c51cee5fd386e3dfea9d73eba6e6d35b017c810f842803384eba8ef98a425b58cf22583ebc194d47b5665 SHA512 9f9ef234347f5f931b136955bd4682f3e8e5a1de2e727868b9af1faa47fb878d450294fafb1b088f7f23a27f090da5a6cfc4e8b29a1b9fd8507e32bc0f6c559b -DIST 6.7.1-0-202404231200qthelp-documentation.tar.xz 212172 BLAKE2B ed446b2a94b8d16ee77f3970324a657619baca2cd78cf6053157b37b2af96de76288ee4010e33f93f506d9188de4f98ed5fbd335e32d858e2d3edceb9da8eaeb SHA512 ce724227d911151fe1a9b87a61fa71ead47a4886d79e94ea5d73bf180d733b8ae4456386ccd26e542594564119935f38b019da7136c28a0a709491cd07af39a3 -DIST 6.7.1-0-202404231200qthttpserver-documentation.tar.xz 292148 BLAKE2B 7fa5fe10085fb5b6a5524bbd912bf135f4f32e3fa1e5a9175dc5fbd0715d7b52f4a85404d54a703b06111fadf38f6b24952d4b93151c19f8028ffdbc63870e76 SHA512 ede9fa9eac712de876f0d9142850b28ee9e35e4046f8d8a246f4a57e4d70fafa670bc647f2acb549d2c03d798acc0d80543d69bdaf6aefe34ba86acda417e8a2 -DIST 6.7.1-0-202404231200qthttpserver-examples-6.7.1.7z 51575 BLAKE2B 2065ab74a82f13177988586eaed45f58fe636608dcfb3266417d0b23bce522fcae9671a2fa7b2f50c32126171ce7ce32e677293f7fb633d150bbfd5c85cad93d SHA512 0e2e896a9c2f7c4e944e02bd318489596ce0a626ca0098f87441684b293faa57c8875a5bf5dea898f03e80bcd5c6ee730ac3c746cb6324393dcce176932f4753 -DIST 6.7.1-0-202404231200qtimageformats-documentation.tar.xz 32224 BLAKE2B 3966ef26ebb858fedccc1b4f8fe55a61f94ad8c2df13a9e175f60b0f8c3a0841833203ae6828ffaa32f570c9ed517e1456d1c2ae160d3f7e2629afa36532ad0d SHA512 aea5dd46bbc3d983583c020d64271f9a79d1a655dad327d42662db80516f5b327e3f2649b43ce67054d04fce880a423401c401fe7350cec547f624f80bcee2ef -DIST 6.7.1-0-202404231200qtlabsplatform-documentation.tar.xz 539400 BLAKE2B f0534b772af098be7f429e728a0e36464d1f92c8fbc4341d2750dc5da8629991b140e3dd1ebcaa0e734184553c26cd9659c5a8a06414282b91e5b77cbb1a5685 SHA512 f24c43ffebadf8380da7401b419a7dff25872c32e368006c582e7a5cd9675ae7ef234133c4059c5e1003c0d5a5afadf9b9b56b2616436b4a7192d5d33ef69abc -DIST 6.7.1-0-202404231200qtlinguist-documentation.tar.xz 1133784 BLAKE2B edc879e28c326e9f2841aedbb0490d35f7d07495b3ade505c69dae2c86ad0567f7c265242b0e8bdc49b58470991bcf3df8dcc09a0fb39b0376d5841d4a4b9896 SHA512 7f6eb574ada86617bd5cb17f83d2f0a9b4851b6d8b47f048a37dacce241481b77016531ea16bbb21fea0c1de977715775594ed0273cc5818af2ef10f3d7cfdfe -DIST 6.7.1-0-202404231200qtlocation-documentation.tar.xz 2935692 BLAKE2B 011755a72fbf997559f47d6efd7e519d061aea1200dcb2b93c43cd45d175a756f015815b2853c525730bddd63b93560c35cbd13219a306877567771b7c12883f SHA512 008b1f28bf1a5390bb7e141885d3408fc4491fbc7227e4bf9ce3c52133f8603d2391db673d51a3f7cb7804a8873c25b6e77dd24fdbde10ac14105f5f65187f1d -DIST 6.7.1-0-202404231200qtlocation-examples-6.7.1.7z 1570082 BLAKE2B 68f11fb4a8001c05896f713fc26c3056400dcce8fe38cad7ca09c97532c9f7b82c0a2deee3c5778c3d24c2dab886183b0cf07a309c51d806ef97c4884e4b8c77 SHA512 ee0c423d3f0e6403e4b339f10e545e6b9d66cd0162a29009316bfedfed52b6ff23bad1ed373fa8d1c51c8920b90c614fff8828738bf9dd7239be42169aa9b0f1 -DIST 6.7.1-0-202404231200qtlottieanimation-documentation.tar.xz 40608 BLAKE2B e3cf9940c0c0afa3f555c6583e891810300a6d96203978d9d8d426a99c7ef5a7ccc7082aca2da939e781c2852f764f897de9d03caa0ea46edf2a38c8d95fda12 SHA512 c9320f98b4329065d7329634d71f6b6241df40c97979985c5734b70ad11f2369da70fd5b306e55f9b306c7ff7f79229cedd31c5b987af16d877267d495d6df11 -DIST 6.7.1-0-202404231200qtmultimedia-documentation.tar.xz 6697092 BLAKE2B 16c2b20a74dfe6e327499b74defc623b7de70ca7468f3a878209ea7cc745dfc5ffaa59945b7ed05ad21e6d0c2fdbe80dd4189444d4c4d018a6553ae46b924c4c SHA512 638a41d0eac3972d59c43a17a6de9eee7e407765f41a79bbf3be1be0dc66b504a5059ce07367c3795d02ff9d24b13ec2aa6a5aee9f3cf2f8f8b08a3c24c012df -DIST 6.7.1-0-202404231200qtmultimedia-examples-6.7.1.7z 2644628 BLAKE2B 836a1133d93bf47e745cecd1590c4d3f32791d297114cff37050eb8393aff6838135eb6c60c7c01f0a297bbaec00537e636f12c977da7db9e2adf8b781724933 SHA512 a64c48c8c6a42da1a9baca04889ca571bd6939d7a140bc8263be10c5477e06cbc0455016205f161ac6e23e90cae6a0c3f55e871c6165ae7921c35e4ffb8439b7 -DIST 6.7.1-0-202404231200qtnetwork-documentation.tar.xz 1431144 BLAKE2B f8c6eb59aa6ef7abd5f6e710be1c44429d0ff5c1c03b66d33a2b6a93a04f66429f10e47eee42a55ed1ace033770e00c93778c2f3aa595f65962aa1ddf20cbe3c SHA512 bb32ccfb98d5262b2de1fbf02fb80284df4aac44fca06a53111f471c59aed36c1fcf573a1870039e2f65e9574fc93588af1d98189f3e542e19efb94c7b0fb0fe -DIST 6.7.1-0-202404231200qtnetworkauth-documentation.tar.xz 189076 BLAKE2B 45ab3538c42b53b5d3301584a8a6a9fb5086b69c25998827c82a4302e04025e27a81b885879f66d3451f40cc1c7439073f435ae63c20a9d3214cb4e36feaac7b SHA512 44bfc92feda8191b43f0b77626b87d0652b0cde053e0e0c01a5091df7c1ef25bc1a8cf24d0aaf66d491071ef5fc76144b89ae9fcbe0056389e99ac196ff20bb1 -DIST 6.7.1-0-202404231200qtnetworkauth-examples-6.7.1.7z 41500 BLAKE2B e0a4124a86fabaf6ab2c50e1f0623e50cf9f9bda4fc16913a7c64dc4a8010584f1def45e488349cb0130ff9416a2068282aad43383dd9f08902176d0531d71fe SHA512 85a4c68cecd83180a1060386705248851d4aba0180c07ee0803d6a7a0f2b5eef383d79316e94b391e1c2df5b7a456c0227bf192905f0e52ddbfcd2158b3d7760 -DIST 6.7.1-0-202404231200qtnfc-documentation.tar.xz 234464 BLAKE2B c20ce7761c1dd7c157ed0eb7f5a2f550a2bea8cc77705dedb8326153c02201aefc864ffb1db843c1a7886d6fd27787125035f6d246f7edb51d5c0d70e3a5b618 SHA512 57fbf15dd8b0c2c0237547cfe6b64d6139dab07a4a28d1fca402c8ef1b27f2d59ffa23f740a00a31c365464391cf37883a94b2aca55e4a4da75b9530a7e2c0aa -DIST 6.7.1-0-202404231200qtopengl-documentation.tar.xz 1026448 BLAKE2B 4ce49800836ea25810059b28cda9691668edadf7d1bd464ce6db24a17f176d1a36e2e7b4bd46fa9fad7b85d972f336f3a7f13dcf2f72a5f79b328c1ee73c8518 SHA512 49c880d747adcd75b13c0e07efd723487832d5a3937fae8f88110f0838e1cefb96afb1eace8f4165cde4f14d5829285014e8f7cb63c72728cb679896ca4ad45f -DIST 6.7.1-0-202404231200qtpdf-documentation.tar.xz 1023808 BLAKE2B de1e15541b4c2f25cee44716cf7e62121259f0ea2b7795e3edea5b7de29bba551b21b078e43e0d000c90efe597dbc9a7226e7ad874458c18a18abda51dd068d9 SHA512 bfa07be5c6b0e55c1c71cd8c9d1fd39a10758ce44f54b8fb05240e811a25c0fd452a2c9b20bb6033166722adcadf09292bfed1e314826dcb009805c5486a068a -DIST 6.7.1-0-202404231200qtplatformintegration-documentation.tar.xz 42228 BLAKE2B 63176fd4fb4c8e993a803bfe029fad292f3b812d42976a439ffc1b803174847e574038c5b3df4cb37a3c071b4166a6eff38da183397de72203b382e45a6ea65a SHA512 1d4c7580017a6d53918da981efb7634dd6e11436c700ea0d7157444dca5106ee54ab1a285a8d03f2763c5bc469da3786577ab1f9307481dcd585396d11d092dd -DIST 6.7.1-0-202404231200qtpositioning-documentation.tar.xz 681764 BLAKE2B 3fb662948b06d82eb765545b39ee08d4d5e086fd8836f11034778663b9068d7eab7be5748870aea30cde91d0be6563f862c2e992e1cbf9d6529bad4eeb4d78fb SHA512 9f2e1313c89f3ada4e994132759b7c04895bb30096d45c527e96c1e803f538d2807428afd7ffc2456e9fd7a7e057ecebd6507eecd0bc9259a77910aa5433ddeb -DIST 6.7.1-0-202404231200qtpositioning-examples-6.7.1.7z 272235 BLAKE2B 597a7e39053587bee90c6743df6760af48b76e5764a92083549ce51bff631a130f2c07c1cdec805a7771c96d469eb8c2405d8eb02b757d2dd5d3fcd193fa0c3d SHA512 0bc445d142092faa0c9fcf09c3148b958832ec0da0a468d32f95372ebd7b51fd75a138ad47b98cf74123ea99206581d472f8493f7c679d0ab9a98a1aed489c9a -DIST 6.7.1-0-202404231200qtprintsupport-documentation.tar.xz 349644 BLAKE2B 3964a8e922506c34b2774e8838d3c421dc0be310451e2cc14cbeb51ac9eecfc5127749f6ca7c60c9f14ccd24847e48a4a3571c7cf35fe754a004d5917b300301 SHA512 c9ab494523ff5545440272afc299c6c76a2ad9f5f0dc3d710181d4fcdf4351e2c7de51690a3ee853c17618ce389af2fa75025385a4be676cbffb57bf0cbb5f13 -DIST 6.7.1-0-202404231200qtprotobuf-documentation.tar.xz 318096 BLAKE2B 51ce531392815a05ae68f6b48d19692efc91d2476d615cd64b4c7d50426bf676ebc1ff6ea69d1f815c0505ab441ec64c44a8e66ef9ba782b1b976d58aa36d5d0 SHA512 c53c2bc670a461e32813eacec246ff9970943565f3fa261080b4b06c6d54ba4f8c13d778b5043042d4d15b6ccef784e9a6ad5e2c8e526c689ceb0877285fac5e -DIST 6.7.1-0-202404231200qtqml-documentation.tar.xz 1501676 BLAKE2B a3ce9b9561ea81ccee0e59acfcb05eb94ad12c6817e8c837a6c8579def38264baec7cdf2cf77890e446f912a80f7cba778171ab00c51a4a7bcd792eedd0bd345 SHA512 ac386b2b0bced9b85b064ddf28a1c4facb5c924c9bd592defe783aa38339f4702a48d9dc4af199eba7142a5489ee6a630214ea571b858f7129204c9bb897ff61 -DIST 6.7.1-0-202404231200qtqmlcore-documentation.tar.xz 68880 BLAKE2B b6ef127e6b298bdbaca443f8246826fdd52a2c61511b8b96850ee85152b760efd2db68cea1b0694d1cc376973133dba27e19a610c84908d6aef040f41b59b54d SHA512 41785d2efdc867b98edda16b7c25f8fb7bce96b6a82f04c90d49c04a54c39bca479a9ede7df9aef2413748bab230f6bf9e46dc0844d85eeb677bf768de4af3f0 -DIST 6.7.1-0-202404231200qtqmlmodels-documentation.tar.xz 138984 BLAKE2B d54baf35271a5e85f90559333f1d7507a7db1f24f3ef1c04a3c469f9fe592868bf7c0d5fe4385bbb6591c248da79273dd7570ed09e794d9f1a001b64c3c76c88 SHA512 b172d0508816d4ac7c5209961ce1a0866b35cd939bcef4c9d0b48d8ac1b247f82a710e87534cb9bf41864ae6ace8d3beda954f7c1ef92efa65822d09932ca7a8 -DIST 6.7.1-0-202404231200qtqmltest-documentation.tar.xz 92160 BLAKE2B 572922f7ec42ca59f725750f919f83c326e6161941a40684e5e80671080f08b4d6f53713d31d087079fa20d2c705a2e6afb6ce5421b00a55156cf04d0611f840 SHA512 dca61b8f5bc0228728a7bc04a11566a568d594031352104b4e79c1389e4de0cd09a8b3ad6d391a7082c578bb3a4329a8d0ec97dc227c8d25ebc6c853c5e9e09a -DIST 6.7.1-0-202404231200qtqmlworkerscript-documentation.tar.xz 31264 BLAKE2B 5d9c81130d6c9269313de4b2de3f9a10d603139afa1026f8025ada5da365edbdbcee1ba26f59a78e395a4ad2a6892853e032912ec4a9bf33e5c6a9d1aaf24f8b SHA512 2ab4ba6045f8cb33606108cb8e71d9c7e6f063705414fe33b1747ef5734e6e37e1984dd1e9fd90d854ce428bfb3a784d9aa21c0cc3ff1ca14a4cac491f82b1f9 -DIST 6.7.1-0-202404231200qtqmlxmllistmodel-documentation.tar.xz 37088 BLAKE2B 7d0e2407d67c0727cc35e62c19b80a6d762f659235aeae7fd6fa4440cfd195449aff111859c9c05f5a730c46a1dd8327f25419bf351028cf1e60346ba84f0d42 SHA512 f7bb4aedd5dff4826e20539a60a8fd31317076647e27efb0adc0f96ba13522cd34fb5b34ef9fdd4761a8aa1b909278e5a63b6a06c19c6fd57f761552a50ddf45 -DIST 6.7.1-0-202404231200qtquick-documentation.tar.xz 24135708 BLAKE2B 663767a164cbe69ee6cd404095b326988b28e07478226861d0c3b8e7cbce434b4353a0487dd6831723624b643e5bc69b27e1045249b1764f0c08084dc4e5cab1 SHA512 ddb8ac92baa30728ed5156569bb8874772326ddd47e88ca729e9e119b6ec01ffd7cd146f7af33eef3ca8742f274f3cefa8a47c9f2ff77f0c01e824727dda97d1 -DIST 6.7.1-0-202404231200qtquick3d-documentation.tar.xz 62767228 BLAKE2B f624d9267a3e24b34e4b7b1fccfbf32e1568bbef18bdad42998922294520994d11ebaec02617514fdf9416e55bb7fc3a407444aadd2eb5ff2e48f83eb79f4075 SHA512 35f57f1d6c79bf87085fbeb23b860f0c6ce60650165ed75571a4216de4cc29dacde5032c2fcf28ba77260b91cbbe1b7103ae668c12ba0b4704f5d9a79f55a8f8 -DIST 6.7.1-0-202404231200qtquick3d-examples-6.7.1.7z 19426101 BLAKE2B 2854255f74e7c43e62ce3b8f6adb8fee86e31a2f80c80f9bb2129e1bcf0d0659daa67da6a2b85a5d28da46dfb156f4ed25442c0ee6685ae143884938ff16d18c SHA512 dc8dff79da799a4b186e4ce16d7dade095cc1ba332ab463a26d0e8948d33016e9aa4b932df4e69723f4e9d3622d2d410a572d1241af8353c77d97ac2774f33a4 -DIST 6.7.1-0-202404231200qtquick3dphysics-documentation.tar.xz 4592060 BLAKE2B ef9c9849f6896f676284fcf16ddb5da121683108631129028a9baceb281b9bf5576bd0cb3d1bf1c4d96c1c640f331b08db40fbcd38a1ee342ce3e01660dbe649 SHA512 98786fa1e98a1bae1b7ffc24f9ab0fa2af7fbcd00b2219355166a0f8d242cf17342b3049d5d95b32744e512f1facf0b9afd34c0aedb54ed7b1270aeba64cedcd -DIST 6.7.1-0-202404231200qtquick3dphysics-examples-6.7.1.7z 2355111 BLAKE2B fd9547024f4b8708685b29f3da75b43ebccec15dadbce81590c7b49cd97271d1bd56f2c5b769cc4e9df68175bc0f930466dee1770de80701d3859f77d9c052ce SHA512 6e6b653d78b8bc6a9fe46760040f11f0d9fd01880e761bc55dc6e0f03e970867e888b1d664810881b6b809b9ca2188491494abfea617620aa80c894a3693eaf8 -DIST 6.7.1-0-202404231200qtquickcontrols-documentation.tar.xz 7157968 BLAKE2B 1f3e2d91b304bcc3c7b9d70a196fff78e825d0186f4bf84be2d8f7b5f2d563a208edb1f50e6494b0acab0d5ade1dd8fd107045c4fc436908aaea0c0670c5b4af SHA512 931469e44f194b046e001141db72ce4fb4ec9e6b4a13c7764d0b314edda12d15b64d8bb7814cadd636a624c077955f283e243b1f224f6a3467c12fc809c2ea01 -DIST 6.7.1-0-202404231200qtquickdialogs-documentation.tar.xz 314220 BLAKE2B aa0cbc5fd6bf2c2457e941e092c8ec853ac810f20a6ebddc98870ba1e4fd20c1060c18462433a233e96511a2d30aee4b71604fd776cd01aa7816c1fe4d398a40 SHA512 08115f24f88dc312b8a7596462cbc1af139d418f0c6913ddc7d023c72e69a4bbb1fd894e44263c207fb808621ac22bd9e41c67ce26cf6a4a7f2370c6861ad92d -DIST 6.7.1-0-202404231200qtquickeffectmaker-documentation.tar.xz 804628 BLAKE2B 26a0ecfef6aa314a30d70d6598ce9650332f78bff853998a9c2bf146ce06481c9576eecd15ecb437c2c84444c4143837b4558e396325bfdb15977f0902b655ed SHA512 a999b9f384a8e48f0aca52459cc769f3fefea84bb3b0c5e94143572282559ad32ad357855382e1ee4db138519f1f6157d0d9619005a32540843cbcaee2f647bb -DIST 6.7.1-0-202404231200qtquickeffectmaker-examples-6.7.1.7z 244673 BLAKE2B 905666596343e5efd40d6f1f8bbe41cc180cc262526d8c004f53280573668a4c5e7fedc0d7fa9ae43e8f66adba1cb55d3cfa3b11772844274509407f6ccd5965 SHA512 97fdf51ad521a3f4c1e5f528110d651ed2a0ca63d52b457d5f166d4f552e8d32539bd0cfdfb58b1f54c386bf6e41460a7851e477b86b9432243f853698dbb48f -DIST 6.7.1-0-202404231200qtquicktimeline-documentation.tar.xz 166276 BLAKE2B c2aa31a9079a5fd6295f7580cfbfe5ecf7b0fe4e76ac59fb7a5d66d357503271bb1083c4d6cffd800032d1535c856fd8f9eb0cb07a51acb2390da7be1a3f0e1f SHA512 3de58e5481da7de8c56f79ae55bbce45b9652daf68be9fbff6b6d38faae1c7cf2046deec753ea6172a1e14abdb076a0a77099719014b1cfe33187aabf094f0b7 -DIST 6.7.1-0-202404231200qtremoteobjects-documentation.tar.xz 492672 BLAKE2B c3cf3ede233c13af1243d0475ce59c3e628ea05669523a011e8ef157d7e5b207f2d3a0c147eba5f162cc2a44d4a56e22bc138e02c7862e6170956e84dd1120bb SHA512 1ae23f4c322c4413d98e61dca34274b8ef1e3bb2a6ce56c2ed4279010209b675c14f5a281e2f10aa09fcabc912783c52af96e13b0ff4979bf095873537acdbd6 -DIST 6.7.1-0-202404231200qtremoteobjects-examples-6.7.1.7z 81437 BLAKE2B 3b871960952602d604bdd7095d95faac3dc3750c2b13026a1a47b9bfab4cb61d611eb07fe0a118936150e7d1cbe0f873def6ed986703f22f9bd3a2226d11d584 SHA512 1a5b02df04c98fc64a25addcd8a20cb5553d771670ac80f3d4a3b1e14448f09b6d83a9e3000e0bba29295527b0dfb5c4ca9f875c7722d25bac04c80c163ad2e9 -DIST 6.7.1-0-202404231200qtscxml-documentation.tar.xz 396020 BLAKE2B d6be901798445c077fce8b3b243604f9349d11729b92e422cb528fdf3357692df6f4fd84bcf80582f8aef0e1cf6de3b98487dfcb631d3049885ef5bdb957972f SHA512 b075a54486a5115fb8910427579381c847e686b1fae4da2423f110b671d9e241152a9c14a10c199c9ba2ea36b17b93c435829a9a8c33836aa5be40ed95366b32 -DIST 6.7.1-0-202404231200qtscxml-examples-6.7.1.7z 140216 BLAKE2B 26f5a80a97cbb868a305a990918f29bbb267d30c82d221c993f9614b1d75a60e1daa3ae4d48fc82cb2e9cb5f869e4831d52e89e95739db46b30a35d640f68a2a SHA512 329b1b76dd96275e753fdc2372d925626dec4c630ac7e9d15d9dc7c739c2bb5f59d33d8c1c68410e4b1e43ce8c64f8f7ec4e44ad5991bbed7e02046a0412d435 -DIST 6.7.1-0-202404231200qtsensors-documentation.tar.xz 2138468 BLAKE2B 21e866ab3e03066a44eaec4c2445180b96905e2118b65e822f42c2516d7e9f84ed251d61d9c8394d1c4e93af7bb7fd1abe155300d520f12af16b7520c05f4d2f SHA512 8f684c5376dc09cdf567fb60d6dedaa7088135297cefef3283bd948f88cb351acbaf20150287c6549cd8eebe07d956a3a2b16dab0c66e1cc1dd6422c170a573f -DIST 6.7.1-0-202404231200qtsensors-examples-6.7.1.7z 53365 BLAKE2B 4e1c92bc48d1d0b4fa39d23b892e71d251ca827d705fc7f76ea3ef56ab41ae1ac47768f70256110e546a86ab4303965ddf7d6f53c58a20c8494616bfa9a55dcc SHA512 d6d240f7ad1af28ecefa9463f893e44f852a160e936a0e61739cca2667926f13a3b6067da07b18d62579976220159146a7dec1d74f51a9019849f3e5089431d8 -DIST 6.7.1-0-202404231200qtserialbus-documentation.tar.xz 737484 BLAKE2B d75f794c66551415cf22b3f43060fda8eefd7a236d28de55b3ddd33a64bb26a41625a03cdc47103bb381908ccb1008c6f1dc1b9201ab15fea2e11c143d127926 SHA512 862be44793b193f129b75cc5439feb03917599ef5efa067bd17c14472e3524578da0b437901f459d00984f4b951e09d333d99b0f26a6b5f9a0aeb549ce2a9cff -DIST 6.7.1-0-202404231200qtserialbus-examples-6.7.1.7z 212026 BLAKE2B d5ea94cbc253401e42d71ca2fdd01e405f34ad110e3af4ffcf3ffd401ba5f679e64a4baee394b7421caea165fe62cf0650bd282221c8a63c41d0f514a018e227 SHA512 ac7cb38a5e80809fdba27a15e6554c25bca5e10bb57925b15cbbdcd72a7e25a849dfe6e021737a106aa3d7bb6bb7d8d1d41a1f8b1501aad533cebc71c032d019 -DIST 6.7.1-0-202404231200qtserialport-documentation.tar.xz 183928 BLAKE2B b23fc1f99c57b356ec79a921d32bda11c2a7f4b5e0eef8b3befdf4a6bbdf0f118e3664f17b106d3fe0169550d9d2957d1c5a2525b28e24472da90cf3e0dfd35a SHA512 086116e345b9cd98045b1e194dd638ad9a9a805db5922c49fe9e8c17b497409653a90efb0576c118c7a3105f21e6806ee0dff67be47c2a38e283a96679365984 -DIST 6.7.1-0-202404231200qtserialport-examples-6.7.1.7z 80987 BLAKE2B dd74d2f817e813e90132f9f2c43ee7db627731c6c0fbb269842432e3aa9507b78cb00d49162a694486fa0976f83867eccf4089ac0d864cf024e2d75071937034 SHA512 0264b53dd3ec7d999ac6895405c2d10ccf30ddce37674431a3971d8e614a083cda35fdee06ee10f0f37ac0a96f7248ca7aec85b512d2f7a6e7b782e6ceac559a -DIST 6.7.1-0-202404231200qtshadertools-documentation.tar.xz 196060 BLAKE2B 8f4bd626430878e355163015a1098a15e365c6fffc4426cdfa759dfd693d106c1fdabec68611a67fbf488e739df7eaea81cdf59d826795827fa38949d59aa4a4 SHA512 e0ac387d5cbbc29feaff7989b4ef520fb94553d4455e36c6a0eecca38bc15010803b97cffc7e6f50c53148624593879aa03fb8373f1b1d7329414e2bb901ea4f -DIST 6.7.1-0-202404231200qtspeech-examples-6.7.1.7z 157728 BLAKE2B b4541544f000cc339ddfc25611d4529b235a9ef88e44422f39abffdb013fe8893fef9d2386ab88d61c3c68d20215caec47f376d18f01e63879f132f80e1789b2 SHA512 31f7b379e1efc93ed38ee2fb270b44bce992aae843a0b53e2f0dbffbf49978670d93c4d624a5d8c303dae677bb5980ce83284b3cfe9c7afb1ba85957096ecab0 -DIST 6.7.1-0-202404231200qtsql-documentation.tar.xz 903048 BLAKE2B 0062baa280a8bd9e8e68bf1adbdfd00da5afb6512c21d735a59e7f81a02f5287d1910ae5e9919f1ed58daf429bb05a7eba3071a2d4e0fb2e0c959c42bf93f853 SHA512 a2f678238d494c6ebe0c4be69723dc81d40b4d876813993c6fa3b29d0ec04b3e4496411e9e3a4564fb151f2a27ddafaabfb745c6c457978cb113dcc1b86e7859 -DIST 6.7.1-0-202404231200qtsvg-documentation.tar.xz 104068 BLAKE2B e8a4d746b92489fe7779d4b20906ab9faa3413a1325b44f66cd6a0c490875b98ba042ff72120d254a1605cb4cfb6365712d66ea10f59f0942e90fc25cf8c7b40 SHA512 735162b0e503259a6e028b21ed8f10621bdbdda68a274aa00c1a6986c4ca0beb74a4d2fd744cbdc3090092e145997d8f2724058f36e387546c69361906f181fc -DIST 6.7.1-0-202404231200qtsvg-examples-6.7.1.7z 157 BLAKE2B ffe898b0422874e87dff0586c95ffcab6fb20f865ea8ddb6bcfca3446fff9868e95e895ef545d270ad2ee88f754a1542e7041134f5816de099e80a5c7b8093d2 SHA512 ca915da220d9ea4e1d9ddef04500ee3980227b827262adb7e04b142f2cb63fbf73e20713fcdfa41db01603b81a6c0491477ec465ca572a55f14ae76de17f1c49 -DIST 6.7.1-0-202404231200qttestlib-documentation.tar.xz 220592 BLAKE2B 0d6ae6d1e94475359665410d87d983a297aa5c6c266f8c39c79a4df0d7afdd6677c1abfad642722bdfbec5e54bf1d1faa25711baec67acb85984284124e0dfee SHA512 174666c0be740f8de37f5ede5423df510df2c3488b21e6c4ca34cac60e6d253f367dadfeb184ac1e8cb04409ccd356ccce6c7ad13d2e001dabe7a4b15a58eccf -DIST 6.7.1-0-202404231200qttexttospeech-documentation.tar.xz 401580 BLAKE2B 2c102ef6353d971df2fcaaf05baf103b3bae277fdbe87945a5dad76931c5f4552b1ba440b85e941b82ced28e1d8830352115e97ea3c5fa860374966f12bb1947 SHA512 279eaa0b97e3d6cb910933d1fa4211ff842a8177e8d4ac280b486a0db0f0cfb5a231f112885fcdfbc36f7242b13d74d87130adbc9a347b3946cbb7d576e64e9b -DIST 6.7.1-0-202404231200qttools-examples-6.7.1.7z 468622 BLAKE2B 61e3c7e79bb36a5818774be93cecc78cd8207fa4ed2824822ec20ef42f2bf136c070b06c4e6bd1e4849b3783a1799952c738ec68e59acb0d88f3c7eeefce43d9 SHA512 56bbbe4bd4840f9a6869e357f08c9383b681d64675b8d52d76a635b950f00e9922c205be5fcd344831d7a18b62a278f75f56af4313efe5559700646b5a13938e -DIST 6.7.1-0-202404231200qtuitools-documentation.tar.xz 206536 BLAKE2B 0d864908b440d1ed74dfa1be8d573633b735cdac8f076ce8168f62fc89f9fd0f8c3f85f5002a4c6df880d6cc09e249fb28003ac9a2e1f6a0b47fc7518fbebf12 SHA512 5afe91bce66f3dc8631c74ce6e1a3c8afa7952e43758dbe83cbd73edd60db581bd4ed875958e8e95546f4ae1654784e3e48c7ae9bf26fa891e92b220123a5348 -DIST 6.7.1-0-202404231200qtvirtualkeyboard-documentation.tar.xz 2073428 BLAKE2B 1cfa5221f5756619b63d951a5f392e2dd438a930c3d8da971d3001e697dc46b5b3fab186050a63db7e5c14a2333066981d1f4bcdd85ff7c4127e5471ccbb8a37 SHA512 865c4a104e4460d36559cc835e9415fdcbe2958bd2951af9b001cdcd0cef1705e551776525516da4d5df08f1875d9c52a14b5679053fa8e6316946b57e336202 -DIST 6.7.1-0-202404231200qtvirtualkeyboard-examples-6.7.1.7z 7021 BLAKE2B df7fedc788f82ea91f7c8cf1e1d97a94aeb7f32914354f75571c0c0ce34145c351dec79af2353cf8a123cc400bb7a2f74175e0947ee020a0bb6df4ddfd1e79b3 SHA512 319520d0360e6d807d23b77215f887096d5680eb25f5762fe65a3da0c5ff4a546fa8a256cabe85b29c43decbc662a7e37bd4a99e619f41c4e9a5028427cc21c9 -DIST 6.7.1-0-202404231200qtwayland-examples-6.7.1.7z 568095 BLAKE2B 9de15ad8938db477caf17ce9372d1bea74fa33ce43103ddf5638b40019c2de6d5b0406c5cefaf7f8a30852e5819bd370a23dd8be18b5d1141c0f679e2da9e443 SHA512 890647ff55873140a17ae6da69077299ee344c41e1c0c06d9bd5d1cfc8cb9ddbce976ce62c8daf2cd2ef8e3a974675c8cc8fae93228ee2af27e506b23d5d3572 -DIST 6.7.1-0-202404231200qtwaylandcompositor-documentation.tar.xz 1601384 BLAKE2B d6325420b1089631dac5b2645167c5a6099ed8547147cebb4da3698cbb18a69269ac323d65d7095caa07faab0903faf54424b4f1bb0338fec32f5ccab6178152 SHA512 a8df1261413a741e8d595a9839cd01d500942ffdedfa86d250eabbd8de08d426055bb49f282240c4e4d4e48e99a5d9d0f970c8742efab5499f82652f3c9bfe3a -DIST 6.7.1-0-202404231200qtwebchannel-documentation.tar.xz 166392 BLAKE2B c3cc800907a0e042b7fe910ebb16d010298cfad3412edadb36520b5e5f0f399b4f456389924bf2ec3dee7f0382c9183fd3f96c8a34236b8726c2fa675cb1408e SHA512 2dd8005bf4194edbdb3cdbb12009652d28f7d81620b3db841f169a8cb0809d7245a8ee6b2acebae1f2b4645724416bb0d55ef57d7ae0a87ba2cd8946fb4b9c97 -DIST 6.7.1-0-202404231200qtwebchannel-examples-6.7.1.7z 65995 BLAKE2B e9d68978a1e58b089536456b7d94430ffd200aa161b6fa3d61864c222fd5918d5c38ce5b67564a8de117e06baa094bb83345cb04cb1996be2351a95b484dae77 SHA512 535e417b8c37079a238456f6367b6f9aabcfe95cb4e39c15928ef968282ef3329c7ee8b170f6e9231a5b34511143d4a36e0236f7548a4d4e506788fdfe533f1c -DIST 6.7.1-0-202404231200qtwebengine-documentation.tar.xz 2005356 BLAKE2B a925862f52e6812e2980fabbd495d5f4592b911d3b0b81e75738e414fe63a8cc5cabd0d1330bb2b082c79b844708cfebbeda6b676ab4352bc2162c97a28be271 SHA512 3e2a24e2ce3ec4e0d9e8130b5414c676ce36bb5648f03573d1d005847841c854e1bcd5454db02f8a90c1b1436675063b6bedebf20ffe63c1c15c7e1b01a7b8e5 -DIST 6.7.1-0-202404231200qtwebengine-examples-6.7.1.7z 1115368 BLAKE2B cdd6ced99a59157227667fe499fb72ec27a3ffc3404edd9d803d1a31fe853cc852b33b10fb05bb5d90f0a374f7051cb2623599e11be7697f59e4b26eef4108be SHA512 ba191da5b7e9432703ab83346628ac735bdd3d4cea1959ea563608c6f794112efefbc3049f4197bbf259ea6573e185840bd85e8f7fc73d24a081559cf73b7a9b -DIST 6.7.1-0-202404231200qtwebsockets-documentation.tar.xz 532252 BLAKE2B 87f6efef50ada44f0f1fd3fc29570faa124e61b197a7a1db5ec96a5b62fe20a34f7289b01dbfd30f9d801bbee7a23cdee8bfd790a2291de88d6eea4bd4aba4c7 SHA512 5eb9afbeb237654c8c2d3a87ed6ea373f391ddf3cc5a97351fae382747d2128011ecf80bc809f0523d6f08958fe2b186cb4faeb6cd2078004b54ad2612df59bf -DIST 6.7.1-0-202404231200qtwebsockets-examples-6.7.1.7z 248870 BLAKE2B 34ccef7be117d0c0a3f922b51276116be793003adc3da1552c6966e7d0be59fd7eb9ce8e396bead049c1d5e8cba260b2d495b57a36e3edc6f7afa2058fa03368 SHA512 788250a70b0de6d83416262beb8e9c4ab2f675792bebb15cb672f315d5c2d32c1e23fc62520d1f87c150e7d11d941439ff74e1ebcd1a96112f0e344bf8ecc8ce -DIST 6.7.1-0-202404231200qtwebview-documentation.tar.xz 126012 BLAKE2B 45967675604c2323b1c6b10e261e7e395747702cbc3403795a398668a702fee0b7d7b7b895bd18b238a437724c8fef18b3b77d452b6f44e07cd4f0f6e5e1469d SHA512 42ed39bedfb227dffb887d3764ba26a902eaedac2f7aec46207d9a10114398b2914cfc3cdb56626f6ce7c34e24ae93f1261aaff4b6b27ced70efe0328a007f73 -DIST 6.7.1-0-202404231200qtwebview-examples-6.7.1.7z 47250 BLAKE2B 23ae897191a422802febe0cc7d6bdcf2224eee2beda19a159bb9d0964fb9043bc98bdce23651e5e2c77d00348c1acdb676a3a0f097b5d0c0dadd1ad7c702be71 SHA512 3a31b0a43059c55fdf0624feea8047470f5eeb69c3ad47b3ea34073b8a5ce8e6ce0042a2bf2004aa85919a2888288bbc53c7a517470292b9d26dbebd21de5bf8 -DIST 6.7.1-0-202404231200qtwidgets-documentation.tar.xz 18109700 BLAKE2B 3e0d0c281556252ea73e669244b078e61065d76fcba1c5ef9261a336d6975beae0a35aa5105e4012f420217410c2e28a74e918d87aaad4890fc0dcd028e602db SHA512 3be74875fab74c28edbfe3f8636bfec5ed117afba7c25e63f2c8f536d658e9c104a0acacbf0e7c43a9defa8e2ba1e1b0988b157d15c71b35ce307aa784620dfa -DIST 6.7.1-0-202404231200qtxml-documentation.tar.xz 340868 BLAKE2B 67cce4112ca776373abd0503d423bae951bd95da4580d641c7b9012b041220d367732fb84a9394f7bf1abd09a47486cad70732793179a961f35714b3b51437ba SHA512 0305ec23fe2097ca9e5e726ef6b78bad1a212697569f7fc193f601b118bd61d481e5573694f26180aba7892a7372db50870a7dec259dc3e5054a4e17dae9d9cb DIST 6.7.2-0-202406110334activeqt-documentation.tar.xz 248756 BLAKE2B 39a43239922db46f1a539ecd61ff952ba9472d7963f772fc9b13bd2e1c030e667c6e753181724918f808c0d4c0553633cc23e54da306bf6c8d94c71d9eab232d SHA512 d024c521ec69c75c0f8ab2c6372ee36d8c57a72c199dfa658344e916ba1678ef67b0a4fb9931645dd0bf29691c65b73a0721514fa290e3538bdccd676d5f6b50 DIST 6.7.2-0-202406110334qdoc-documentation.tar.xz 287468 BLAKE2B 8848b8a34cae5fb7a77ab2ab34c761ae3c2eaa5ac34892deea2819de13421f10650a93314ec910a16306a1162dc8f063ec4170a091e623379cc373b68cfd00db SHA512 489001ae82ec932dcdac8e110425ea6f240bb96c105ba21658cb5ef4430d9214eb6f79cf47fc8612fca970f21c0e59ab45251e5a10dab84cfa04c7022df9cbb4 DIST 6.7.2-0-202406110334qmake-documentation.tar.xz 344204 BLAKE2B 1e5c9c4e21eb53dcc303963f6018ecf85414b282d92ad6751ab5095edc141e587644145614e04e3b3eb02fec7310ec07f17a2b28879706013050ab2b71f48ac1 SHA512 a9ee6d7ce909d55c757ff46ac6ae9c813140087b161e41212d91291b90b3a732e7356691f332db31814e7766d070b5f8b3dd67f8fa67abcb1176ae80fb64c5bc @@ -258,6 +156,5 @@ DIST 6.7.2-0-202406110334qtwebview-examples-6.7.2.7z 47314 BLAKE2B 822c3ce800c5f DIST 6.7.2-0-202406110334qtwidgets-documentation.tar.xz 18053400 BLAKE2B 3190d89f451b8178023a5a09b3b1721563ae0d5f12b51376be1b9c9c7386a9038006d16c0181ab2784bb710b52c3018b6d92b94ce5a86caeb86c656bbe3767ac SHA512 7844e47239686a8b63e73af36d5f35b9a9e0e6bcb7f2f95f5690cd36ae46e57d2b8b1d363379620dcd4586d56e3e6402aeb1955eaf4654de6cbdb2ca9b377401 DIST 6.7.2-0-202406110334qtxml-documentation.tar.xz 341328 BLAKE2B a72b95b2f3c16400d9b7219def352719f81a338a060829a170db5da500672c14c36434669fa74944be59b071362ff8d9dd436e939afbc4b6d63f4c7038c60003 SHA512 9023ae9bec76f28785458e6cde0750aa0b15563ef7d891faa7652d215458fa1516abc891de591cb8b98cf14a2c09ea264f1aabdeb296ca1e929163a60db11b54 EBUILD qt-docs-5.15.2_p202011130614.ebuild 3233 BLAKE2B cec70539f86b4c8aa15efcf723679f735137206593183017a9e4b636cca7df8681ce6885dd2870459667492502067f9adf5cd45d93077862945456fcec6228d8 SHA512 4a7eab16f8e6008859b43d8742954209dac9e83cbc5c3fd1573e9cd73ae640ad9b11854aa5f54074b7f05ba08d0aa3f18b50ba0db5896662e38e85bdff34e642 -EBUILD qt-docs-6.7.1_p202404231200.ebuild 4816 BLAKE2B 6660883e816381419b27170b0c242ee7b07a26a219de583dff02abc00e49e993361f5c87effd8412c526f55a3b2986cc1ec2e3bd9fec91f494a67e1638f5d618 SHA512 ad53b9e1c89836934460b111a7052de09d1e0d56816f3df9888faec2d657a6d104045352da2d18328927769f2c87cf9e4b9a1125b02ababcc8b8f0992f378171 -EBUILD qt-docs-6.7.2_p202406110334.ebuild 4821 BLAKE2B ed196e723747e72eb3dcc02f5a210ae5fbabe04a74fd3765f776ce2ea98fc403b82d86045b16ce4503e8d29ee50afa6249044b28d4406551fa3743b07e2390c0 SHA512 12bfb7c63c54669a91ff06954f550182b840b903189be27c986bef093e118be5ded277d8b355ed3312008d634d555883c86e2b9597c657059a3e6dd9ac86795a +EBUILD qt-docs-6.7.2_p202406110334.ebuild 4815 BLAKE2B 00ffd6f85c3d7d7b7c9e2cb11a9fccb692ba9d5c5e7698d73960cc6334c754876977a0960d86aebdd7a6c84fa22547f8d698908bc57a564c8b810753e1dcd8ae SHA512 b6de60a91a5731cb0f3d96652bd61cd66566610e661a3f0a7ce980334310a9fdead3036f9e97497ed081ee02c8c7045bbac6a34d79878a9eacedcec884d03ebf MISC metadata.xml 5290 BLAKE2B 4bd7db247ead833a33ddca3f6d9c81773adfdcf776b02d49de7ca2e3b4a10ea8d9a0b07cd3f7068eecb954b93b0c77cf1d240df3ce33508231c2c3fb35afeb81 SHA512 7f6c6779880d1681e2dcac9273650f20690176bf47d7e3825d7d76b7f6db2cac92a2b1ecf3e2886fa724f5230e9bde703d3341a266ea05f19c2d2f3aee58c81e diff --git a/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild b/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild deleted file mode 100644 index 24d19bae0044..000000000000 --- a/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit unpacker - -DESCRIPTION="Qt6 documentation and examples for Qt Creator and other tools" -HOMEPAGE="https://doc.qt.io/" - -LICENSE="FDL-1.3" -SLOT="6" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" -IUSE="+examples +html +qch" -REQUIRED_USE="|| ( examples html qch )" - -BDEPEND=" - examples? ( $(unpacker_src_uri_depends .7z) ) -" - -qt6_docs_generate_metadata() { - local qtver=${PV%%_p*} - local prefix=${qtver}-0-${PV##*_p} - local doc_suffix=-documentation.tar.xz - local exa_suffix=-examples-${qtver}.7z - local baseuri=https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_${qtver//.}_src_doc_examples/qt.qt6.${qtver//.} - SRC_URI= - S=${WORKDIR} - - # Bumping involves diff'ing the unversioned *_src_doc_examples/*/ files - # list from old version to the new for -documentation and -examples - # files, then adding/removing entries if anything changed. - # - # Format: [+-%]<USE>[</|^><package>[!|:]][="<module> ..."] - # - [+-%]<USE>: enable(+), disable(-), or no IUSE(%) - # (should disable if associated package is not in tree) - # - /<package>: qt.qt6.*.examples.<package>/*-<package>-examples* - # - ^<package>: qt.qt6.*.examples/*-<package>-examples.7z - # - <module>: qt.qt6.*.doc.<package>/*-<module>-documentation* - # (if <module> is unspecified, defaults to <package>) - # - <package>[!:]: only has examples(!) or documentation(:) - # Note: sub-300 bytes examples archives are empty, can be skipped - local map=( - # map with (non-split) Qt6 packages rather than per-module - %base^qtbase=" - qmake qtcmake qtconcurrent qtcore qtdbus - qtgui qtnetwork qtopengl qtplatformintegration - qtprintsupport qtsql qttestlib qtwidgets qtxml - " - +3d/qt3d - -activeqt/qtactiveqt="activeqt" - +charts/qtcharts - +connectivity/qtbluetooth: - +connectivity/qtconnectivity! - +connectivity/qtnfc: - -datavis/qtdatavis3d - +declarative^qtdeclarative=" - qtlabsplatform qtqml qtqmlcore qtqmlmodels - qtqmltest qtqmlworkerscript qtqmlxmllistmodel - qtquick qtquickcontrols qtquickdialogs - " - %doc^qtdoc - -graphs/qtgraphs - -grpc/qtgrpc="qtgrpc qtprotobuf" - +httpserver/qthttpserver - +imageformats/qtimageformats: # empty examples -# +languageserver/qtlanguageserver # docs and examples are empty - +location/qtlocation - -lottie/qtlottie:="qtlottieanimation" # empty examples - +multimedia/qtmultimedia - +networkauth/qtnetworkauth - +positioning/qtpositioning - +qt5compat/qt5compat="qtcore5compat qtgraphicaleffects5compat" -# +qt5="qt5" # already installed by qtbase (conflicts) - -quick3dphysics/qtquick3dphysics - +quick3d/qtquick3d - -quickeffectmaker/qtquickeffectmaker - -remoteobjects/qtremoteobjects - +scxml/qtscxml - +sensors/qtsensors - +serialbus/qtserialbus - +serialport/qtserialport - +shadertools/qtshadertools: # empty examples - +speech/qtspeech="qttexttospeech" - +svg^qtsvg - +timeline/qtquicktimeline: - +tools^qttools=" - qdoc qtassistant qtdesigner qtdistancefieldgenerator - qthelp qtlinguist qtuitools - " - +virtualkeyboard/qtvirtualkeyboard - +wayland^qtwayland="qtwaylandcompositor" - +webchannel/qtwebchannel - +webengine/qtpdf: - +webengine/qtwebengine - +websockets/qtwebsockets - +webview/qtwebview - ) - - local entry operator use subdir package exception modules uris - local -A iuse - for entry in "${map[@]}"; do - [[ ${entry} =~ ^([%+-])([^/^!:=]+)([/^])?([^!:=]+)?([!:])?=?(.+)? ]] # || die - operator=${BASH_REMATCH[1]#-} - use=${BASH_REMATCH[2]} - subdir=${BASH_REMATCH[3]} - package=${BASH_REMATCH[4]} - exception=${BASH_REMATCH[5]} - modules=${BASH_REMATCH[6]:-${package}} - - [[ ${subdir} == / ]] && subdir=.${package} || subdir= - - [[ ${exception} == ! ]] || - printf -v uris "${baseuri}.doc${subdir}/${prefix}%s${doc_suffix} " \ - ${modules} - [[ ${exception} == : ]] || - uris+=" examples? ( ${baseuri}.examples${subdir}/${prefix}${package}${exa_suffix} )" - - if [[ ${operator} == % ]]; then - SRC_URI+=" ${uris}" - else - iuse[${operator}${use}]= # avoid duplicates - SRC_URI+=" ${use}? ( ${uris} )" - fi - done - IUSE+=" ${!iuse[*]}" -} -qt6_docs_generate_metadata - -src_install() { - insinto /usr/share/qt6-doc # QT6_DOCDIR - use qch && doins -r Docs/*/*.qch - - if use html; then - doins -r Docs/*/*/ - - # needed not to let Qt Creator believe that these examples exist - use examples || - find "${ED}" -type f -name examples-manifest.xml -delete || die - elif use examples; then - # still need docs tarballs even with USE="-html -qch" - for dir in Docs/*/*/; do - if [[ -e ${dir}/examples-manifest.xml ]]; then - insinto /usr/share/qt6-doc/"${dir#*/*/}" - doins ${dir}/examples-manifest.xml - fi - done - fi - - insinto /usr/share/qt6/examples # QT6_EXAMPLESDIR - use examples && doins -r Examples/*/*/ -} diff --git a/dev-qt/qt-docs/qt-docs-6.7.2_p202406110334.ebuild b/dev-qt/qt-docs/qt-docs-6.7.2_p202406110334.ebuild index 8c651f5ed987..3a0a0e855a36 100644 --- a/dev-qt/qt-docs/qt-docs-6.7.2_p202406110334.ebuild +++ b/dev-qt/qt-docs/qt-docs-6.7.2_p202406110334.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://doc.qt.io/" LICENSE="FDL-1.3" SLOT="6" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" IUSE="+examples +html +qch" REQUIRED_USE="|| ( examples html qch )" diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest index c05438ea9f34..30a74788fd8b 100644 --- a/dev-qt/qt3d/Manifest +++ b/dev-qt/qt3d/Manifest @@ -1,9 +1,7 @@ DIST qt3d-everywhere-opensource-src-5.15.14.tar.xz 118269268 BLAKE2B ff083f1da2d00dc9cef1e0563b2df4f8ca0ad207e273653521ce3b5c406c084544c212d95c5d4e683b8f67f1d2986e133ac76650fa1882332f7f10d94b184a53 SHA512 502d80fddbf8d3ba18dd262c85df04abf6aa2ee76ba3eb10666588872635497a2828f34963945662b54ac9552d63e0463061d2065c34fdf8a7ea78d0871ebb2e -DIST qt3d-everywhere-src-6.7.1.tar.xz 141586868 BLAKE2B da49dcc7345d422eef4dce1d849514647f96a50d7a6c6ff64e130317aa406258d64a61a04aa0dc96cdd9e6b8d09a3ea2c64c8e9a3aafe6ecc0c96746b9dac899 SHA512 0fe8f2c0e843332978651c5063d35148e7aea3f8e68b10279e731d6fb4a2b48478e8db3d5a3badf797334dcca04ee24f33935e235a97e8e9ee1f95f2d52f2443 DIST qt3d-everywhere-src-6.7.2.tar.xz 141589248 BLAKE2B cb775f7e66a3c5a42a665605715a94cffcac8c9618a02048c453d527e87465b0adeac0f683346e6edb67de8843aa803a13e1af6e778eb5ff7e25c38f488a8d3e SHA512 d2b5ccf76f75db886acf4a73b1f2bc77e79a584f08f39915b7565179943c09a3ea90904af342a6d2d668b033161c41d6d4d20022e5e990ad55fa40fcb6746480 EBUILD qt3d-5.15.14.ebuild 948 BLAKE2B 398c6ec0d38bca086daab3d2cae7a7afe107f977bd980cac0dee1c5919d28024ebce2fdf492c3d14c798e229a13d375d22188613da0d067ebbbe526799364e3a SHA512 e9503b5e06159e4a13e1ed08abb181d4cc7162f15398f1d4907c30a85d798c87793cca1e8fbb1a7c0a5759f6f246f60d7fffd3aecf23a2896a6db9090a4c189a -EBUILD qt3d-6.7.1.ebuild 819 BLAKE2B 9203d5455ee0d393559998f08a30e3db9f897f841dcfb4aaba947cb1170c1d9ed1e693bfc0dc240e59209d7181849e5ed729e005d354413f1be6cba33d5b3b60 SHA512 5e38c8c4f0ef1d2dd9b6797640fba79da4a00b16979a08a7ea302f028eab8a78eb5153db51aaf4d0e9a6a0d79605948eead999c6f6a98c535a75c02604aafdef -EBUILD qt3d-6.7.2.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417 +EBUILD qt3d-6.7.2.ebuild 819 BLAKE2B 9203d5455ee0d393559998f08a30e3db9f897f841dcfb4aaba947cb1170c1d9ed1e693bfc0dc240e59209d7181849e5ed729e005d354413f1be6cba33d5b3b60 SHA512 5e38c8c4f0ef1d2dd9b6797640fba79da4a00b16979a08a7ea302f028eab8a78eb5153db51aaf4d0e9a6a0d79605948eead999c6f6a98c535a75c02604aafdef EBUILD qt3d-6.7.9999.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417 EBUILD qt3d-6.8.9999.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417 EBUILD qt3d-6.9999.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417 diff --git a/dev-qt/qt3d/qt3d-6.7.1.ebuild b/dev-qt/qt3d/qt3d-6.7.1.ebuild deleted file mode 100644 index 1d6c2f7e0838..000000000000 --- a/dev-qt/qt3d/qt3d-6.7.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="3D rendering module for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~riscv x86" -elif [[ ${QT6_BUILD_TYPE} == live ]]; then - EGIT_SUBMODULES=() # skip qtquick3d-assimp -fi - -IUSE="gles2-only qml vulkan" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] - ~dev-qt/qtshadertools-${PV}:6 - media-libs/assimp:= - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - -DQT_FEATURE_qt3d_system_assimp=ON - -DQT_UNITY_BUILD=OFF # fails to build - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qt3d/qt3d-6.7.2.ebuild b/dev-qt/qt3d/qt3d-6.7.2.ebuild index 5e1b7809f57e..1d6c2f7e0838 100644 --- a/dev-qt/qt3d/qt3d-6.7.2.ebuild +++ b/dev-qt/qt3d/qt3d-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="3D rendering module for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~riscv x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest index 059052fc1802..4dd0d9401042 100644 --- a/dev-qt/qt5compat/Manifest +++ b/dev-qt/qt5compat/Manifest @@ -1,7 +1,5 @@ -DIST qt5compat-everywhere-src-6.7.1.tar.xz 14631152 BLAKE2B fe1927c1f38640be653048868274af4155c7b5c788071fc816b8e9bba97aae62ec7616f7d78d1c76f317fcd99c9eff2fde357eac309f229665f417b2cadb9f66 SHA512 f6a3552f6aefab374bf3e483774dff10c9aaebee7085b81b1487a0ed6fb7cff072d9f97bd199ff3e9fef6838d93aa015dec58c5b5e11f6eb4fb062a0ca015e52 DIST qt5compat-everywhere-src-6.7.2.tar.xz 14632348 BLAKE2B 81622db206b0902a14b5f14668464538989044506cfa417bfd2a5bb5163f0e6c09fdc10b641a3767595e4c80a554c6181118f75501d11eff997255a3bcfd50aa SHA512 31da40af3ab0a2283ead3363ee6c94a45018beccb777d2e4188f182d45ffb7e70d97543e22e5f6bc2c13df149676e44e259c8785626c54a4ed8757dcf414b4b0 -EBUILD qt5compat-6.7.1.ebuild 701 BLAKE2B c996c977df8cf88e60fcf1060b6c6e729a3ac1b68d57b568d7fb475ac739ae75dfafa97f3cc323f5338a4990c6087ac312950ad6fda50e6bd3600d00e8a001eb SHA512 ceb9eb9848e436ff2979c88a59877f4bea0e92d5ca3e505556fdf72ae6d853e8b20f7d8d3a116a4458a95ee52209964af6d1054dcb7ff570a232352db7c8d567 -EBUILD qt5compat-6.7.2.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf +EBUILD qt5compat-6.7.2.ebuild 700 BLAKE2B 6f317548654d9239fcee6418f5fc75d6b70f1705b279527155e71bd43615038126d765ae2cea78acf4fdbff7195a6f689641da7d54b79a64f097d11b684f2bb9 SHA512 dcf03ffd55f3ec3f394bb8b27bb878c08c403378729a31540c54582e77ed7d0ef44b601d679e766c06cf69cda74147fe793f325bb60fdf042b7c5887eeaed6cf EBUILD qt5compat-6.7.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf EBUILD qt5compat-6.8.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf EBUILD qt5compat-6.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf diff --git a/dev-qt/qt5compat/qt5compat-6.7.1.ebuild b/dev-qt/qt5compat/qt5compat-6.7.1.ebuild deleted file mode 100644 index 6a8fbc7286ea..000000000000 --- a/dev-qt/qt5compat/qt5compat-6.7.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt module containing the unsupported Qt 5 APIs" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" -fi - -IUSE="icu qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml] - icu? ( dev-libs/icu:= ) - qml? ( - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtshadertools-${PV}:6 - ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Quick) - ) - - qt6-build_src_configure -} - -src_test() { - # tst_qxmlinputsource sometimes hang without -j1 - qt6-build_src_test -j1 -} diff --git a/dev-qt/qt5compat/qt5compat-6.7.2.ebuild b/dev-qt/qt5compat/qt5compat-6.7.2.ebuild index 4462f312f154..4f479ea72d81 100644 --- a/dev-qt/qt5compat/qt5compat-6.7.2.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt module containing the unsupported Qt 5 APIs" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi IUSE="icu qml" diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 6aa2416d2991..d977d8d6a912 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -2,12 +2,10 @@ AUX qtbase-6.5.2-hppa-forkfd-grow-stack.patch 1001 BLAKE2B 21fabd37d44ad496d2e11 AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f7a9b16145259b2e23c432d4cb08465cb5d3a6685e557c9da862f3abb0d51459c7dc055155d804c3daef768bf0e9bdcc3b162 SHA512 6a82cb63812c7fa6d04e9ba9d017ce23ff1d620ec6ebcd575719678138d74e1298e3962d48e211ee72c9a533f03cb7a0fa47b428592a1402ec7ad1d1c487a4b4 AUX qtbase-6.6.1-forkfd-childstack-size.patch 1003 BLAKE2B abc1bc5633032fc55fca91ef3dcc33617b11694d7a9d97e5eac21c0b4aae900082b7158da08b8514a3424364a3c35cb49d46fa11a0739aadbb73766b7fee949a SHA512 9e1dfb3452858131db286cb30915871e46178bb0891b604a257745fad133676cdf0df5273b6f681c49b1c3d3245f2c6e0a5025ce19efe6a0ed8bf5a1b3a5a5f0 AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f7524e0df00e13912e2e28d5c204d1a3e2bc351b9cdc212b9169e4d84e2884df76d9722a73f29734c18fe50cc8e6583e41a5cc2 SHA512 1effa903d5d3c65ffc6af5fb2f9896346b4b90cd1f8a54f0a697f23f1c118dd1803b5f4fa9b4959cf4ba1c433d36ca21a6abe6cb3bfae84a811297566388e907 -AUX qtbase-6.6.3-pkgconf-deps.patch 1873 BLAKE2B a801c6aba664e676dabf421d0a8b912359b3c66cd12a67b0f16f501feec101ba0e5247d34ac43279da1b1dfc513a504d57dd56dc9f114ecf7dca501c09703622 SHA512 1bacc3ca28dd9a866570f3f792ac6613a1a291e0a0a0b2cda5d8c314e6a0ab1ae8104d7066addabd3693d5424d390eccad953bcd94c1aa296ce1394141ff0f28 -AUX qtbase-6.7.1-qeventlooplocker.patch 7083 BLAKE2B c2413fda052de5d5695050a5bfcd7dea3ff10f0ffb904e5368ef60a25f31b4599313ebfc36d546ca1d9ebff3df38a63ba0725dabf999d919b67509af26a2c815 SHA512 1fd2115fedb413459d961c6047a78713c6393e87325e8adf74d50730586438e5bb7c7ce8b26528a6721c98421275a0f842537a19399fd9818cc5b57123f44438 -DIST qtbase-everywhere-src-6.7.1.tar.xz 49324536 BLAKE2B 5e5a5801c29c1ac541812931cd56709a934a500ce4d5a38e7d3776620cb46db0d25408c22cbf33a7bcc657098c571e501fde14f523a77acba1827edd977d2bc5 SHA512 864bebfc3659907e52b8dc3f62a65d431573ef2bf406a9f71c688229083a2128c5474f75823275d11948be3d031de1d6427acf373f977df9ee9e73a27ef56efb +AUX qtbase-6.7.2-CVE-2024-39936.patch 7171 BLAKE2B d1b6e9a35e35f1e6b3e7a7c975fb6719b8594ee5f3212bc18bfe4a1990d70424a682071551c5971d62d6351a38e36b6f4c4acb9241af1ad2e64ec604ca440394 SHA512 cd6b48ebe7c1dc1224a54f0d32845e598223a3c40c6da11b4639646fb073c6b5a2e54d9625ba0413afb876a83c2d50bdf616f4876154fb33fa941d6cbf053291 DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b -EBUILD qtbase-6.7.1.ebuild 9650 BLAKE2B 0731f4a5230ad7212f8fae6d467ee34467cbda184a08bd289a9bf9533384c9f41c21276247e4f3543ff4807d6f654331f97377d285b54a4a987596296eedb775 SHA512 c330431375470cb22a25b5394730a3eebe14b4b6ef36527560b102db1c23da118db86507fe8466508fd5d22bb5d4e9b0a4c59d4d5a1d5ab48f91247fa74e03d7 -EBUILD qtbase-6.7.2.ebuild 9559 BLAKE2B 5963ad805fab54ad09255d5fa42ee6f7abdba38aa2caf211138b3df78abb4f714d54122aaf66b7455a0740e40002ee77b0bb67a5bdba307ec02ae69a92607362 SHA512 4924e009671bfc94d8c2da05ea884ce8043d77adcbd2cc403c3badbf5034e1ea511bfb4df6d343a531471d472cb865e49bcc7f7028b195647f50bab4aa6f164f +EBUILD qtbase-6.7.2-r1.ebuild 9607 BLAKE2B dc4a72c4fe827c893bb100de8c326270529c0f184a7be820e72f03c8e4d696a155484ff3d121959a1707ca7808b689a70206bb458e07271dfe1c26ebafac7a83 SHA512 a594444552146c4b8aadfb5670f336391376dc134c766d703fb531d6f89652d1e25024fea45e92697286d7fde31264ade8b40fb11eac20e7dcfdc357e1c00834 +EBUILD qtbase-6.7.2.ebuild 9553 BLAKE2B 141d9c8b0f1a288c7392fc60661e37e1c85349a2518bcdb9d042fe59eb63c59fd189fd5f1fa2b14aaab72356c7b63ce36425d5c95398a6621451c8afb5c355fa SHA512 87dfa9e3661f40feaee3d425a33f482301ae15920579c4b805872be51eee2f595179f2a83e2eab86d40daaff190da666959f9a6638cc3c827575221b031f499f EBUILD qtbase-6.7.9999.ebuild 9559 BLAKE2B 5963ad805fab54ad09255d5fa42ee6f7abdba38aa2caf211138b3df78abb4f714d54122aaf66b7455a0740e40002ee77b0bb67a5bdba307ec02ae69a92607362 SHA512 4924e009671bfc94d8c2da05ea884ce8043d77adcbd2cc403c3badbf5034e1ea511bfb4df6d343a531471d472cb865e49bcc7f7028b195647f50bab4aa6f164f EBUILD qtbase-6.8.9999.ebuild 9998 BLAKE2B 71b9fc07d2b968a92d9a421439488690a5e24a7da5b500592a7beba14aff4d6ec0eac4d78a4671c2697edb4d03d65995c708b34bc0db4b4be0f650fad3c5cb50 SHA512 c787767932b16b336f170dcfc9fa6529c941e92a7a160281aa7d40ae4e9d5eef86dc5f05a7955ba70b85eec4fff093f82bddb17ba63ac208758344e4df7cd57a EBUILD qtbase-6.9999.ebuild 9998 BLAKE2B 71b9fc07d2b968a92d9a421439488690a5e24a7da5b500592a7beba14aff4d6ec0eac4d78a4671c2697edb4d03d65995c708b34bc0db4b4be0f650fad3c5cb50 SHA512 c787767932b16b336f170dcfc9fa6529c941e92a7a160281aa7d40ae4e9d5eef86dc5f05a7955ba70b85eec4fff093f82bddb17ba63ac208758344e4df7cd57a diff --git a/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch b/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch deleted file mode 100644 index 965dade1c133..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/928299 -https://bugreports.qt.io/browse/QTBUG-124135 -https://codereview.qt-project.org/c/qt/qtbase/+/553372 -From: Alexey Edelev <alexey.edelev@qt.io> -Date: Fri, 05 Apr 2024 14:50:37 +0200 -Subject: [PATCH] Prefer the versioned targets over the namespaceless one when collecting deps - -Change the way we collect dependencies in __qt_internal_walk_libs. -Prefer the versioned Qt targets over the namespaceless. This fixes the -generating of the pkg-config configs. - -Pick-to: 6.5 6.6 6.7 -Task-number: QTBUG-124135 -Change-Id: I660376e122a99b5bc0874f2bc6ccd4d80c9ad453 ---- a/cmake/QtPublicWalkLibsHelpers.cmake -+++ b/cmake/QtPublicWalkLibsHelpers.cmake -@@ -184,13 +184,13 @@ - if(lib_target MATCHES "^::@") - continue() - elseif(TARGET ${lib_target}) -- if ("${lib_target}" MATCHES "^Qt::(.*)") -- # If both, Qt::Foo and Foo targets exist, prefer the target name without -+ if(NOT "${lib_target}" MATCHES "^(Qt|${QT_CMAKE_EXPORT_NAMESPACE})::.+") -+ # If both, Qt::Foo and Foo targets exist, prefer the target name with versioned - # namespace. Which one is preferred doesn't really matter. This code exists to - # avoid ending up with both, Qt::Foo and Foo in our dependencies. -- set(namespaceless_lib_target "${CMAKE_MATCH_1}") -- if(TARGET "${namespaceless_lib_target}") -- set(lib_target ${namespaceless_lib_target}) -+ set(versioned_qt_target "${QT_CMAKE_EXPORT_NAMESPACE}::${lib_target}") -+ if(TARGET "${versioned_qt_target}") -+ set(lib_target ${versioned_qt_target}) - endif() - endif() - get_target_property(lib_target_type ${lib_target} TYPE) diff --git a/dev-qt/qtbase/files/qtbase-6.7.1-qeventlooplocker.patch b/dev-qt/qtbase/files/qtbase-6.7.1-qeventlooplocker.patch deleted file mode 100644 index ff2bf194f07d..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.7.1-qeventlooplocker.patch +++ /dev/null @@ -1,159 +0,0 @@ -https://bugs.kde.org/show_bug.cgi?id=484405 -https://bugreports.qt.io/browse/QTBUG-124386 -https://codereview.qt-project.org/c/qt/qtbase/+/556573 -https://github.com/qt/qtbase/commit/a8ef8ea55014546e0e835cd0eacf694919702a11 -From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io> -Date: Wed, 24 Apr 2024 22:33:42 +0200 -Subject: [PATCH] Don't quit automatically via QEventLoopLocker if there are - open windows - -As part of df359bcb703db5a8adbf14e88ba4ae0d54f0cfcd the semantics and -interaction between QEventLoopLocker and QGuiApplication was changed, -based on the assumption that these two mechanisms were independent -and should not affect each other. - -This had a surprising regression where the use of QEventLoopLocker in -combination with the QCoreApplication::isQuitLockEnabled() automatic -quit would end up quitting the app, even if it had open windows, for -example when the last job of some internal job queue finished. - -It could be argued that if the app has open windows that should not -be closed, they should ignore the Close event, and that an application -with running QEventLoopLocker jobs should maintain an active window -showing the progress of those jobs, but still, this is regression -that we want to fix. - -We now bail out if !lastWindowClosed() in QGuiApplication's -canQuitAutomatically, which is triggered from QEventLoopLocker's -isQuitLockEnabled() behavior. And we do so regardless of whether -quitOnLastWindowClosed is set or not, as the latter property -determines the behavior when closing a window, not the behavior -when a QEventLoopLocker goes out of scope. - -Similarly, we now block quitting of the application when triggered -by quitOnLastWindowClosed() if a QEventLoop is active, regardless of -the isQuitLockEnabled(), as the latter property is determining -whether we should trigger a quit, not whether we should block them. - -[ChangeLog][Important behavior changes] Fixed a regression where -the last QEventLoopLocker going out of scope would quit the app, -even if there were open windows, if quitOnLastWindowClosed was -false. - -[ChangeLog][Important behavior changes] Fixed a regression where -closing the last window would quit the app, even if there were -active QEventLoopLockers, if isQuitLockEnabled was false. ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -1081,2 +1081,10 @@ - -+ When this property is \c true the release of the last remaining -+ QEventLoopLocker operating on the application will attempt to -+ quit the application. -+ -+ Note that attempting a quit may not necessarily result in the -+ application quitting, for example if there still are open windows, -+ or the QEvent::Quit event is ignored. -+ - The default is \c true. -@@ -2083,3 +2091,9 @@ - -- if (quitLockEnabled && quitLockRef.loadRelaxed()) -+ // The automatic quit functionality is triggered by -+ // both QEventLoopLocker and maybeLastWindowClosed. -+ // In either case, we don't want to quit if there -+ // are active QEventLoopLockers, even if quitLockEnabled -+ // is not enabled, as the property signals whether to -+ // trigger the automatic quit, not whether to block it. -+ if (quitLockRef.loadRelaxed()) - return false; ---- a/src/corelib/kernel/qeventloop.cpp -+++ b/src/corelib/kernel/qeventloop.cpp -@@ -339,3 +339,7 @@ - -- The application will quit when there are no more QEventLoopLockers operating on it. -+ The application will attempt to quit when there are no more QEventLoopLockers -+ operating on it, as long as QCoreApplication::isQuitLockEnabled() is \c true. -+ -+ Note that attempting a quit may not necessarily result in the application quitting, -+ if there for example are open windows, or the QEvent::Quit event is ignored. - ---- a/src/gui/kernel/qguiapplication.cpp -+++ b/src/gui/kernel/qguiapplication.cpp -@@ -3677,5 +3677,9 @@ - -- If this property is \c true, the applications quits when the last visible -- \l{Primary and Secondary Windows}{primary window} (i.e. top level window -- with no transient parent) is closed. -+ If this property is \c true, the application will attempt to -+ quit when the last visible \l{Primary and Secondary Windows}{primary window} -+ (i.e. top level window with no transient parent) is closed. -+ -+ Note that attempting a quit may not necessarily result in the -+ application quitting, for example if there still are active -+ QEventLoopLocker instances, or the QEvent::Quit event is ignored. - -@@ -3735,3 +3739,9 @@ - { -- if (quitOnLastWindowClosed && !lastWindowClosed()) -+ // The automatic quit functionality is triggered by -+ // both QEventLoopLocker and maybeLastWindowClosed. -+ // Although the former is a QCoreApplication feature -+ // we don't want to quit the application when there -+ // are open windows, regardless of whether the app -+ // also quits automatically on maybeLastWindowClosed. -+ if (!lastWindowClosed()) - return false; ---- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp -+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp -@@ -1010,4 +1010,4 @@ - { -- // Disabling QEventLoopLocker support should not affect -- // quitting when last window is closed. -+ // Disabling QEventLoopLocker automatic quit should not affect -+ // quitting when last window is closed if there are no lockers. - app.setQuitLockEnabled(false); -@@ -1025,4 +1025,36 @@ - { -- // Disabling quitOnLastWindowClosed support should not affect -- // quitting when last QEventLoopLocker goes out of scope. -+ // Disabling QEventLoopLocker automatic quit should still block -+ // quitting when last window is closed if there is a locker alive. -+ app.setQuitLockEnabled(false); -+ -+ QScopedPointer<QEventLoopLocker> locker(new QEventLoopLocker); -+ -+ QuitSpy quitSpy; -+ QWindow window; -+ window.show(); -+ QVERIFY(QTest::qWaitForWindowExposed(&window)); -+ QTimer::singleShot(0, &window, &QWindow::close); -+ QTimer::singleShot(200, &app, []{ QCoreApplication::exit(0); }); -+ app.exec(); -+ QCOMPARE(quitSpy.quits, 0); -+ } -+ -+ { -+ // Disabling quitOnLastWindowClosed automatic quit should not affect -+ // quitting when last QEventLoopLocker goes out of scope if -+ // there are no windows. -+ app.setQuitLockEnabled(true); -+ app.setQuitOnLastWindowClosed(false); -+ -+ QuitSpy quitSpy; -+ QScopedPointer<QEventLoopLocker> locker(new QEventLoopLocker); -+ QTimer::singleShot(0, [&]{ locker.reset(nullptr); }); -+ QTimer::singleShot(200, &app, []{ QCoreApplication::exit(0); }); -+ app.exec(); -+ QCOMPARE(quitSpy.quits, 1); -+ } -+ -+ { -+ // Disabling quitOnLastWindowClosed automatic quit should still block -+ // quitting via QEventLoopLocker if there's a window alive. - app.setQuitLockEnabled(true); -@@ -1038,3 +1070,3 @@ - app.exec(); -- QCOMPARE(quitSpy.quits, 1); -+ QCOMPARE(quitSpy.quits, 0); - } diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-CVE-2024-39936.patch b/dev-qt/qtbase/files/qtbase-6.7.2-CVE-2024-39936.patch new file mode 100644 index 000000000000..cc6238a55f1b --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.2-CVE-2024-39936.patch @@ -0,0 +1,200 @@ +https://bugs.gentoo.org/935869 +https://github.com/qt/qtbase/commit/2b1e36e183ce75c224305c7a94457b92f7a5cf58 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> +Date: Tue, 25 Jun 2024 17:09:35 +0200 +Subject: [PATCH] HTTP2: Delay any communication until encrypted() can be + responded to + +We have the encrypted() signal that lets users do extra checks on the +established connection. It is emitted as BlockingQueued, so the HTTP +thread stalls until it is done emitting. Users can potentially call +abort() on the QNetworkReply at that point, which is passed as a Queued +call back to the HTTP thread. That means that any currently queued +signal emission will be processed before the abort() call is processed. + +In the case of HTTP2 it is a little special since it is multiplexed and +the code is built to start requests as they are available. This means +that, while the code worked fine for HTTP1, since one connection only +has one request, it is not working for HTTP2, since we try to send more +requests in-between the encrypted() signal and the abort() call. + +This patch changes the code to delay any communication until the +encrypted() signal has been emitted and processed, for HTTP2 only. +It's done by adding a few booleans, both to know that we have to return +early and so we can keep track of what events arose and what we need to +resume once enough time has passed that any abort() call must have been +processed. + +Fixes: QTBUG-126610 +--- a/src/network/access/qhttp2protocolhandler.cpp ++++ b/src/network/access/qhttp2protocolhandler.cpp +@@ -304,10 +304,10 @@ + } + +- if (!prefaceSent && !sendClientPreface()) +- return false; +- + if (!requests.size()) + return true; + ++ if (!prefaceSent && !sendClientPreface()) ++ return false; ++ + m_channel->state = QHttpNetworkConnectionChannel::WritingState; + // Check what was promised/pushed, maybe we do not have to send a request +--- a/src/network/access/qhttpnetworkconnectionchannel.cpp ++++ b/src/network/access/qhttpnetworkconnectionchannel.cpp +@@ -210,4 +210,8 @@ + { + Q_ASSERT(protocolHandler); ++ if (waitingForPotentialAbort) { ++ needInvokeSendRequest = true; ++ return false; // this return value is unused ++ } + return protocolHandler->sendRequest(); + } +@@ -222,7 +226,6 @@ + { + QMetaObject::invokeMethod(this, [this] { +- Q_ASSERT(protocolHandler); + if (reply) +- protocolHandler->sendRequest(); ++ sendRequest(); + }, Qt::ConnectionType::QueuedConnection); + } +@@ -231,4 +234,8 @@ + { + Q_ASSERT(protocolHandler); ++ if (waitingForPotentialAbort) { ++ needInvokeReceiveReply = true; ++ return; ++ } + protocolHandler->_q_receiveReply(); + } +@@ -237,4 +244,8 @@ + { + Q_ASSERT(protocolHandler); ++ if (waitingForPotentialAbort) { ++ needInvokeReadyRead = true; ++ return; ++ } + protocolHandler->_q_readyRead(); + } +@@ -1240,5 +1251,16 @@ + // Similar to HTTP/1.1 counterpart below: + const auto &pair = std::as_const(h2RequestsToSend).first(); ++ waitingForPotentialAbort = true; + emit pair.second->encrypted(); ++ ++ // We don't send or handle any received data until any effects from ++ // emitting encrypted() have been processed. This is necessary ++ // because the user may have called abort(). We may also abort the ++ // whole connection if the request has been aborted and there is ++ // no more requests to send. ++ QMetaObject::invokeMethod(this, ++ &QHttpNetworkConnectionChannel::checkAndResumeCommunication, ++ Qt::QueuedConnection); ++ + // In case our peer has sent us its settings (window size, max concurrent streams etc.) + // let's give _q_receiveReply a chance to read them first ('invokeMethod', QueuedConnection). +@@ -1258,4 +1280,26 @@ + } + ++ ++void QHttpNetworkConnectionChannel::checkAndResumeCommunication() ++{ ++ Q_ASSERT(connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2 ++ || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct); ++ ++ // Because HTTP/2 requires that we send a SETTINGS frame as the first thing we do, and respond ++ // to a SETTINGS frame with an ACK, we need to delay any handling until we can ensure that any ++ // effects from emitting encrypted() have been processed. ++ // This function is called after encrypted() was emitted, so check for changes. ++ ++ if (!reply && h2RequestsToSend.isEmpty()) ++ abort(); ++ waitingForPotentialAbort = false; ++ if (needInvokeReadyRead) ++ _q_readyRead(); ++ if (needInvokeReceiveReply) ++ _q_receiveReply(); ++ if (needInvokeSendRequest) ++ sendRequest(); ++} ++ + void QHttpNetworkConnectionChannel::requeueHttp2Requests() + { +--- a/src/network/access/qhttpnetworkconnectionchannel_p.h ++++ b/src/network/access/qhttpnetworkconnectionchannel_p.h +@@ -75,4 +75,8 @@ + bool ssl; + bool isInitialized; ++ bool waitingForPotentialAbort = false; ++ bool needInvokeReceiveReply = false; ++ bool needInvokeReadyRead = false; ++ bool needInvokeSendRequest = false; + ChannelState state; + QHttpNetworkRequest request; // current request, only used for HTTP +@@ -147,4 +151,6 @@ + void resendCurrentRequest(); + ++ void checkAndResumeCommunication(); ++ + bool isSocketBusy() const; + bool isSocketWriting() const; +--- a/tests/auto/network/access/http2/tst_http2.cpp ++++ b/tests/auto/network/access/http2/tst_http2.cpp +@@ -107,4 +107,6 @@ + void duplicateRequestsWithAborts(); + ++ void abortOnEncrypted(); ++ + protected slots: + // Slots to listen to our in-process server: +@@ -1480,4 +1482,46 @@ + } + ++void tst_Http2::abortOnEncrypted() ++{ ++#if !QT_CONFIG(ssl) ++ QSKIP("TLS support is needed for this test"); ++#else ++ clearHTTP2State(); ++ serverPort = 0; ++ ++ ServerPtr targetServer(newServer(defaultServerSettings, H2Type::h2Direct)); ++ ++ QMetaObject::invokeMethod(targetServer.data(), "startServer", Qt::QueuedConnection); ++ runEventLoop(); ++ ++ nRequests = 1; ++ nSentRequests = 0; ++ ++ const auto url = requestUrl(H2Type::h2Direct); ++ QNetworkRequest request(url); ++ request.setAttribute(QNetworkRequest::Http2DirectAttribute, true); ++ ++ std::unique_ptr<QNetworkReply> reply{manager->get(request)}; ++ reply->ignoreSslErrors(); ++ connect(reply.get(), &QNetworkReply::encrypted, reply.get(), [reply = reply.get()](){ ++ reply->abort(); ++ }); ++ connect(reply.get(), &QNetworkReply::errorOccurred, this, &tst_Http2::replyFinishedWithError); ++ ++ runEventLoop(); ++ STOP_ON_FAILURE ++ ++ QCOMPARE(nRequests, 0); ++ QCOMPARE(reply->error(), QNetworkReply::OperationCanceledError); ++ ++ const bool res = QTest::qWaitFor( ++ [this, server = targetServer.get()]() { ++ return serverGotSettingsACK || prefaceOK || nSentRequests > 0; ++ }, ++ 500); ++ QVERIFY(!res); ++#endif // QT_CONFIG(ssl) ++} ++ + void tst_Http2::serverStarted(quint16 port) + { diff --git a/dev-qt/qtbase/qtbase-6.7.1.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild index 63fdc141c19c..499bf7372d57 100644 --- a/dev-qt/qtbase/qtbase-6.7.1.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild @@ -8,7 +8,7 @@ inherit qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi declare -A QT6_IUSE=( @@ -139,8 +139,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch - "${FILESDIR}"/${PN}-6.6.3-pkgconf-deps.patch - "${FILESDIR}"/${PN}-6.7.1-qeventlooplocker.patch + "${FILESDIR}"/${PN}-6.7.2-CVE-2024-39936.patch ) src_prepare() { diff --git a/dev-qt/qtbase/qtbase-6.7.2.ebuild b/dev-qt/qtbase/qtbase-6.7.2.ebuild index 435584eeecbe..3882a09e6d82 100644 --- a/dev-qt/qtbase/qtbase-6.7.2.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi declare -A QT6_IUSE=( diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest index 734f90803c49..8ff995ccea70 100644 --- a/dev-qt/qtcharts/Manifest +++ b/dev-qt/qtcharts/Manifest @@ -1,9 +1,7 @@ DIST qtcharts-everywhere-opensource-src-5.15.14.tar.xz 4246056 BLAKE2B 5c0f0a15f9bdb6d9f5093f9fedb2f82f6b0484cbf8c16dd24c08d4f67355c66912a619085591cb7112162c8cc376f77efe2e9161e7c3906e5bd8baa6dad9d0dd SHA512 1deee169cf86bef6d92b0cc1000106e84cbbe2ccb93729e299a94e794bcc6d882e1818b1b74ddb0b2f2b7427a4dfe556218dd9988c9b31888c21907f6d1efaf3 -DIST qtcharts-everywhere-src-6.7.1.tar.xz 4661252 BLAKE2B 7e7a6f203929548f15bc774b4f9deb9c9d25e661178d029ec8f480bd0940da79e66a55ed731e278c4ce5163edc19029ccf471db60dcded4e5ae10fb3a158331d SHA512 bb8554cff1524f618b4c1396177bfac0b7c4653d14e853d6d4cb0a10e83c97351b33ab2eeb827a729a4cac120d458218846ac14dc76efbd4f3e69f52beb429d6 DIST qtcharts-everywhere-src-6.7.2.tar.xz 4661448 BLAKE2B f35a3185bd6ca684dea07390e95e1bbe0b15e9a774e9da852425afbe22dea2c52b4592eba015b64f39e4816ae2603558067f2b453d96a0af44c755d60fcf3d62 SHA512 8e142bb3a925e802ab482890363ec1b7ed8c7b1d1bbbf6b30361afc8571ddef75d82f10b7d44bc29e6d87b752f235171f282080591f1ca252b2e47ad0b58b5ef EBUILD qtcharts-5.15.14.ebuild 571 BLAKE2B 77b3d7d6694a55144a16268d173daec87718d580224e62863905ff8e81e29253cb41143252100f84d0628634a086d6320cbda09a047886852d2ef60d210856d5 SHA512 a649aa77b03c17a2e577a3460da5e95ee2effa70c3786f7533d6f64209f790908fa2bc5b1d39cc77673010374592ebaa2423e29519bb6b81a075648a3a97fcef -EBUILD qtcharts-6.7.1.ebuild 567 BLAKE2B 794071b833b687b5d6feca19762e38e1695743a67d33c595ab4619f12efea5096a032bf9aa54396cbc60928bf5dd0f6a52a32919a9e16cb9ee863c38e381f2f9 SHA512 4b243288f399aecdcdbb1615871ce9f4742063cdb900ea07625b346a16a2899d2df5a25ecb7671d88b44ede0e504cb16ad6bcecb40ad8197cb78d648a8236083 -EBUILD qtcharts-6.7.2.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215 +EBUILD qtcharts-6.7.2.ebuild 566 BLAKE2B 55fc6766a2dde2d5d0f5a2a7439b117c1592ab4c5cc07e01eb603c8845cc591638698939d057decb6e23e5b540d54782402d1ccfc540b4fd9bee715ffe7a4ce6 SHA512 75f01666c2d25a17255360fdec2c0a4f3ee1f8624705de12138a10959341a4d62bf0cb73688b84adb3d5e6e14585830457bc8f9514c4d1826984e76fd06935c0 EBUILD qtcharts-6.7.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215 EBUILD qtcharts-6.8.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215 EBUILD qtcharts-6.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215 diff --git a/dev-qt/qtcharts/qtcharts-6.7.1.ebuild b/dev-qt/qtcharts/qtcharts-6.7.1.ebuild deleted file mode 100644 index 921ab22ff912..000000000000 --- a/dev-qt/qtcharts/qtcharts-6.7.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Chart component library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" -fi - -IUSE="gles2-only qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets] - qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtcharts/qtcharts-6.7.2.ebuild b/dev-qt/qtcharts/qtcharts-6.7.2.ebuild index 264ac86f8886..1a8eabee8904 100644 --- a/dev-qt/qtcharts/qtcharts-6.7.2.ebuild +++ b/dev-qt/qtcharts/qtcharts-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Chart component library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi IUSE="gles2-only qml" diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest index 4ab600b79bb4..bd15f64dbbc8 100644 --- a/dev-qt/qtconnectivity/Manifest +++ b/dev-qt/qtconnectivity/Manifest @@ -1,7 +1,5 @@ -DIST qtconnectivity-everywhere-src-6.7.1.tar.xz 1061900 BLAKE2B 30cb15ba6a0e08fccfd0f3ce9a9ec36a0902e3fa15bdd0791e166371c6baa31438c141c7bf5c57de0287eeee04bae87aaaf4800eeaa3062ab23d541e577cce3a SHA512 28496a2a7338f71bb51fbd8fa1b23e4e2e14e6fefc6249ce0eeae8d19b7740a70eed1c312c5d5a79344330001592acd4048c134382cdc168cf4d30e9760dbdc2 DIST qtconnectivity-everywhere-src-6.7.2.tar.xz 1061952 BLAKE2B 2b46b255f5ca5ab7b5363f6e3584dd4318a4e4d120c8595b309fba1354d9e1c763d9fa8e84b22f5c342204b2849b27d08a7f5dbd9d00533e150c2b8fb6561db3 SHA512 381098e406ac18d87d34eb9087d1655c16e604059d69b77c04df9d444cefc77630a212f52b0fc2a1573c524044aa1837379d70460e152cd353731e52c4bd0e67 -EBUILD qtconnectivity-6.7.1.ebuild 1686 BLAKE2B 81cb56aea141be4fe3b10ef606ef67b3ae8ecc576af578bd2a75e3d3800d683c01e38fe429f42eeb2d75b6869c8b4b589351aadf9ac1827d625d008cfde5a3e1 SHA512 ebba3b9f2da7c7f73853cb5dea601298b4dd7cb48b053ea8ee51c8d929da641e7d63fae2eded9200caa76a39ec57ab8cdd8b3352b8a9b1b7dcd9631ed271dac1 -EBUILD qtconnectivity-6.7.2.ebuild 1690 BLAKE2B c3f5d45d6a30e68bf4a79b6a24ce3accf595e402b2bdfbced65b360c6e1604914a8eb4bcb4d1463c2d70ee89d66f6e7bfc9bd38f2315d6e06b3ffabd15fc1478 SHA512 b8068aef0100f7922cdfe4f43b9ad666ea60267bd1881a32e17f04a9e3b74ea180cc444a37cd3b936962731ca991417abb338f66c914b8765ca8fd3e4df44b49 +EBUILD qtconnectivity-6.7.2.ebuild 1685 BLAKE2B a3fdf1c88eca294f3823151412e033fe0b7100e8eb9f800d974d47e7959a52f113eb86cc61c0e618b7a2fb04ca2dbb2a203ecae3917131fea1088de0d04fa118 SHA512 8ce8078e09b33b343c22e10ed763408498a76300d091ad0c9cd557a8771d8a5a11ffe7e0a4c236e57d7c2377faedb031b6094a6e0834b9fb1d83c19617ebf994 EBUILD qtconnectivity-6.7.9999.ebuild 1690 BLAKE2B c3f5d45d6a30e68bf4a79b6a24ce3accf595e402b2bdfbced65b360c6e1604914a8eb4bcb4d1463c2d70ee89d66f6e7bfc9bd38f2315d6e06b3ffabd15fc1478 SHA512 b8068aef0100f7922cdfe4f43b9ad666ea60267bd1881a32e17f04a9e3b74ea180cc444a37cd3b936962731ca991417abb338f66c914b8765ca8fd3e4df44b49 EBUILD qtconnectivity-6.8.9999.ebuild 1851 BLAKE2B a4202162aed20d4428e91ef19d20c42fffce688152d40aae7c330c189458e0fb995fe487ba22391558ada8384faeaa80d2a8504eca63b62cb7339ce5e4bc71e9 SHA512 efc949600e1df81120bcc0e5e5f626e99709fc20e08a55d6d34b0bce98488c8e4b13d3ea5b991d961b8798d6a635e31369952a72233437b54c4f371dad05cb95 EBUILD qtconnectivity-6.9999.ebuild 1851 BLAKE2B a4202162aed20d4428e91ef19d20c42fffce688152d40aae7c330c189458e0fb995fe487ba22391558ada8384faeaa80d2a8504eca63b62cb7339ce5e4bc71e9 SHA512 efc949600e1df81120bcc0e5e5f626e99709fc20e08a55d6d34b0bce98488c8e4b13d3ea5b991d961b8798d6a635e31369952a72233437b54c4f371dad05cb95 diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild deleted file mode 100644 index 99b67739576f..000000000000 --- a/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86" -fi - -IUSE="+bluetooth nfc smartcard" -REQUIRED_USE="|| ( bluetooth nfc )" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network] - bluetooth? ( - ~dev-qt/qtbase-${PV}:6[dbus] - net-wireless/bluez:= - ) - nfc? ( - smartcard? ( sys-apps/pcsc-lite ) - ) -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # most hardware tests are auto-skipped, but some still misbehave - # if bluez/hardware is available (generally tests here may not be - # very relevant without hardware, lists may need to be extended) - tst_qbluetoothlocaldevice - tst_qbluetoothserver - tst_qbluetoothservicediscoveryagent - tst_qbluetoothserviceinfo - tst_qlowenergycontroller -) - -src_prepare() { - qt6-build_src_prepare - - use bluetooth || - sed -i '/add_subdirectory(bluetooth)/d' src/CMakeLists.txt || die - use nfc || - sed -i '/add_subdirectory(nfc)/d' src/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - $(usev nfc $(qt_feature smartcard pcsclite)) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - # broken (unnecessary) symlink due to add_app() being used over add_tool() - use !bluetooth || rm -- "${ED}"/usr/bin/sdpscanner6 || die - - if use test; then - local delete=( # sigh - "${D}${QT6_BINDIR}"/bluetoothtestdevice - "${D}${QT6_BINDIR}"/bttestui - "${D}${QT6_BINDIR}"/qlecontroller-server - ) - # using -f given not tracking which tests may be skipped or not - rm -f -- "${delete[@]}" || die - fi -} diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild index 718408e17903..b9c695138870 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" fi IUSE="+bluetooth nfc smartcard" diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 5a82ab81e90c..fc3d84ab8e68 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,11 +1,9 @@ AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3 DIST qtdeclarative-5.15.14-gentoo-kde-1.tar.xz 26628 BLAKE2B 2b8302b96e5a8cae374da43dfaa5c5c7bf66ddfaa4fed055850fe7b39b995b1416268b94fb98fbc7074b6a0da47e8f9232751dba34b6021e095d7f9339fbfdd9 SHA512 3d4f3cc023e9da32105520bbe74847bb438ec3af85cf6203321400d451902071115ed3cc0c42e8cf995d0304f86cda11096223ad99b09a7dd95b3d83291a7b4a DIST qtdeclarative-everywhere-opensource-src-5.15.14.tar.xz 21595408 BLAKE2B c88388bd04636bc55cad17d97a9f3ee2d3bda6b585cad59d70106bd4e14bf37570bba5edc21627bc08852034adcb483b4c23d7f21ba523dc9e7b6c1f0386a994 SHA512 06c48938c5ab96c4a9e010fdf4a8fbf2b84b7669a486298044363048de3b7da01aa5d9284d1b08b563331887e326befb25566f9972f5143ca3cde47016394bbd -DIST qtdeclarative-everywhere-src-6.7.1.tar.xz 35624448 BLAKE2B e3518c5882f8789d19aabe259f1d7b9cd76674ceb95e645703f97dcc827cf1ed6af26705bd9c538350cdcab5e41c3dbbc46289158a465484251b0abe5319efcb SHA512 77cdd31f2efa6e677755477b14c7770afa51b81cc7626ef21ebccf52ce69173a73b03851b0b491766f816e0cc946e6f238f8c7c70ad121d56428fe513e50a4d0 DIST qtdeclarative-everywhere-src-6.7.2.tar.xz 35629324 BLAKE2B a2c5a17e2f88dd91dd7ae21950d8bb7bc0856f1f05a093405c68e1b3b584a75fee474a9a7116a1797c464e2ca92778ebec774d4afa5ac6eebb1022daabad8868 SHA512 ca172e79af317f481d6f5e6388dc074fc6f99966b896135ab9991fa1a9502e46b0ac21b7f2bc38278448939e77882c5fd17252e3e6460c1665f8156fa99bceaf EBUILD qtdeclarative-5.15.14.ebuild 1537 BLAKE2B c2f7b010977ed65abbe16d8b2df6ed8c29407685e014778f4f3da5b2853b6dfa6d5ce2a0d5037852d8d11894c1a33323090bd18659f7c85d8cdf56f8bf41ae79 SHA512 fd6e5bb4709174b8746d520a6fd0109e2d6b2de19d6a679fdbdcf4cf074dc778854afc2b364f7d692e6c60e0d3e3580c19e98b36368258f6e76b3a5ef2cff0c4 -EBUILD qtdeclarative-6.7.1.ebuild 1176 BLAKE2B ecf6fd3eae85dae7a8dcf89feb9c0783899f16c4255b61162222b85abe8ff48252d130efedf42dc43324e64e3b7fd545430ac70edd950d12eabf65914b5508dd SHA512 d6d1286b630bac2c34fcff2e4c6b57ce2846c0e8675e229b54c41a504786ad78f4be4b85cc917a4587ee7e79e5f76e5ae48bde76d0924fb0ec9ae5d3845267b9 -EBUILD qtdeclarative-6.7.2.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90 +EBUILD qtdeclarative-6.7.2.ebuild 1175 BLAKE2B 4f4d132a22d7987afcb7164ce83e35358b664cc70013f269af95e72b353cfc0103d3953fa308532dfbd00ce0f703c33e341e8a829c1a6bb62a09c07ec8cb7910 SHA512 48af79fdeff33c7d2da696364e1dc1a6694d9a6428a8aae11c5bd2ad2046f7a82bb780824da9a1aef1741322680534cd0d261a50acf235ae3b4fb0f8346d7dc7 EBUILD qtdeclarative-6.7.9999.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90 EBUILD qtdeclarative-6.8.9999.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90 EBUILD qtdeclarative-6.9999.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90 diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild deleted file mode 100644 index 59627e482a84..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -# behaves very badly when qtdeclarative is not already installed, also -# other more minor issues (installs junk, sandbox/offscreen issues) -QT6_RESTRICT_TESTS=1 - -inherit python-any-r1 qt6-build - -DESCRIPTION="Qt Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] - qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) - svg? ( ~dev-qt/qtsvg-${PV}:6 ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND=" - ${PYTHON_DEPS} - ~dev-qt/qtshadertools-${PV}:6 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) - $(cmake_use_find_package sql Qt6Sql) - $(cmake_use_find_package svg Qt6Svg) - $(qt_feature jit qml_jit) - $(qt_feature network qml_network) - $(qt_feature ssl qml_ssl) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild index 347c469cee90..c2f0ed6a0516 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild @@ -14,7 +14,7 @@ inherit python-any-r1 qt6-build DESCRIPTION="Qt Declarative (Quick 2)" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets" diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest index 4e9b28f917f9..9cada4e06211 100644 --- a/dev-qt/qthttpserver/Manifest +++ b/dev-qt/qthttpserver/Manifest @@ -1,7 +1,5 @@ -DIST qthttpserver-everywhere-src-6.7.1.tar.xz 163700 BLAKE2B 681f9423a884fe366a4060443d70f6eb958068d9cca93033591b7bf0913b79674afa69e37af961d7dadbabe55646eed039fd84a78af7f2e64de95d20f4327a72 SHA512 08db67d93575d18650b3c210ba42a866362f1aa390fde9423af18b786bd47f83d39adbe84820db8deece4bcc4515f9f576411eba6813128a6667df55031f15c0 DIST qthttpserver-everywhere-src-6.7.2.tar.xz 163640 BLAKE2B e8ab499db3e91c95685a41645ed1992b669f5049d39f6ae232dcaf527ab1c9fa5fe69be145bf0a67310be8e4ee192449be3734ef2230ea590b9c76552f93b331 SHA512 0830fb4c5968ec5e23576f58e117dcca9f012cf742043c8b4786fb7bdcd68cd86f49d15d1ba66ee64e80d5a50d3c797dbffdf6f977ad7c101bb5be1bc02c1323 -EBUILD qthttpserver-6.7.1.ebuild 574 BLAKE2B 6cf58709afc0e04b157dab96c0c48f00e613eb751e50a741752b97cf6a934f99556f3c580645eb40431915d9376eaba9f3d47be99c962b7f11051ac84ff331cb SHA512 e06111695c353ee1b2991d4f0c492b1e504a29802b7177d3046690825e3b7f0a6c8e632b7eba3e100c47a6a5178826cc202ea3c0cd382c59dadbb4d530d5c4be -EBUILD qthttpserver-6.7.2.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf +EBUILD qthttpserver-6.7.2.ebuild 574 BLAKE2B 6cf58709afc0e04b157dab96c0c48f00e613eb751e50a741752b97cf6a934f99556f3c580645eb40431915d9376eaba9f3d47be99c962b7f11051ac84ff331cb SHA512 e06111695c353ee1b2991d4f0c492b1e504a29802b7177d3046690825e3b7f0a6c8e632b7eba3e100c47a6a5178826cc202ea3c0cd382c59dadbb4d530d5c4be EBUILD qthttpserver-6.7.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da EBUILD qthttpserver-6.8.9999.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf EBUILD qthttpserver-6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da diff --git a/dev-qt/qthttpserver/qthttpserver-6.7.1.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.1.ebuild deleted file mode 100644 index a4b020165245..000000000000 --- a/dev-qt/qthttpserver/qthttpserver-6.7.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="HTTP server functionality for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64" -fi - -IUSE="+ssl websockets" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network,ssl=] - websockets? ( ~dev-qt/qtwebsockets-${PV}:6 ) -" -DEPEND=" - ${RDEPEND} - test? ( ~dev-qt/qtbase-${PV}:6[concurrent] ) -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package websockets Qt6WebSockets) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qthttpserver/qthttpserver-6.7.2.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.2.ebuild index 7583ea864f5f..a4b020165245 100644 --- a/dev-qt/qthttpserver/qthttpserver-6.7.2.ebuild +++ b/dev-qt/qthttpserver/qthttpserver-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="HTTP server functionality for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="amd64" fi IUSE="+ssl websockets" diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index ee5a61a6cf9d..953ea423698d 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -1,10 +1,8 @@ DIST qtimageformats-5.15.14-gentoo-kde-1.tar.xz 62216 BLAKE2B 26982404bc2ed7946adb41b702cb144f84366da88757ca626f80a1cc7a3ee3719708bbd8db3253e9724ec9e394b7aea2e690bea70f2adf39d7af2176ad44fcf3 SHA512 750b6511d1e79cac4984dc5a239f804a65be3548b8f45dfee5475029109b8cb9a3df660002e5879b58ba1117bebb21f4662609fd05c502e94aaddfb319dd683e DIST qtimageformats-everywhere-opensource-src-5.15.14.tar.xz 1879816 BLAKE2B 5c3ce90b97a59e65a6c5c0bc518d8b6d41c15e92b5751570b53823ed62f5530a798f7c2645748d039c62eb29ae1074a43dcf2e96efe976e7302f7f645a03aa92 SHA512 8b9994b7e31a941ee265958da3829240bea89662d70f0e8ded7fb0cf354d4f6a38bd16664c32a97ae73424dc9ac853b24c0b6a645e20f8c39177e26fc1d43f2e -DIST qtimageformats-everywhere-src-6.7.1.tar.xz 1971500 BLAKE2B 478bfcd220d6fa9c8e0bb465fae08e397130b00a3b30f494b5dfee1d807cda757a75b9ecbe0d9cf8c811e3be0afd772a8d27ed302d9d22642833f1a4e0c7663a SHA512 992e54d4b7dd2244163989836a534c20719185a8fcccad45bf837708cb35ece75075a02a73e14a2e6ce4d72d405012f45a4ed1f12b66fc5fcfc0cce6f81c049c DIST qtimageformats-everywhere-src-6.7.2.tar.xz 1974768 BLAKE2B d57ba2cc12b3af02b0b15bb9836328ff0586c53cdb0acec7ba72ec4c089092f54677ee7faae18bd6e352c9105bb441e9173d33c8bf73c92205e01490728163fb SHA512 78871edcdf1ea0dec172e5d17fb7fee75c0512d18a7830ddcdcabb04719f57fc41faa7d1a82bcf4639213dbe98f495f817f5680745eb43a80b2e321f141d562a EBUILD qtimageformats-5.15.14.ebuild 704 BLAKE2B 1605a4ca9b659cf90d68e28ec61141794a01e996c42d56178fa040ed01daec10ed3f1a4742285f7815aeb0714773148e7e871a4a20f068e1951e3a3f808bf7ce SHA512 28017ce3fb5a5a3bba55ede588db6333a577656771bae3dfa5df9ea80819535e2db2aba31220fea89f8e6433b8cc07fc226702283e120fa9ad34d20d5a28bf41 -EBUILD qtimageformats-6.7.1.ebuild 846 BLAKE2B 73d140d34187d0bb89bfd7ab4d74a99d5243727820b4ee1426578c1f2b1df6690e7d608f2512971b762b385b791879f832e01e9ffdfeea03ee9b9ad46be2f4e9 SHA512 82c35a7c4939cf3318ca3324941099f30cc747aa034764fdcc01014e025e6cea48e44eca2f33c20d189e2b30ad98830ce7b56538d76552b2c27b590304591e7a -EBUILD qtimageformats-6.7.2.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e +EBUILD qtimageformats-6.7.2.ebuild 846 BLAKE2B 73d140d34187d0bb89bfd7ab4d74a99d5243727820b4ee1426578c1f2b1df6690e7d608f2512971b762b385b791879f832e01e9ffdfeea03ee9b9ad46be2f4e9 SHA512 82c35a7c4939cf3318ca3324941099f30cc747aa034764fdcc01014e025e6cea48e44eca2f33c20d189e2b30ad98830ce7b56538d76552b2c27b590304591e7a EBUILD qtimageformats-6.7.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e EBUILD qtimageformats-6.8.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e EBUILD qtimageformats-6.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e diff --git a/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild deleted file mode 100644 index ac6f299f55a0..000000000000 --- a/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Additional format plugins for the Qt image I/O system" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86" -fi - -IUSE="mng" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] - media-libs/libwebp:= - media-libs/tiff:= - mng? ( media-libs/libmng:= ) -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # heif plugin is only for Mac, test is normally auto-skipped but may - # misbehave with kde-frameworks/kimageformats:6[heif] (bug #927971) - tst_qheif -) - -src_configure() { - local mycmakeargs=( - -DQT_FEATURE_jasper=OFF - $(qt_feature mng) - -DQT_FEATURE_tiff=ON - -DQT_FEATURE_webp=ON - -DQT_FEATURE_system_tiff=ON - -DQT_FEATURE_system_webp=ON - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtimageformats/qtimageformats-6.7.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.2.ebuild index 9d1a9a6f9685..ac6f299f55a0 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.7.2.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Additional format plugins for the Qt image I/O system" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86" fi IUSE="mng" diff --git a/dev-qt/qtlanguageserver/Manifest b/dev-qt/qtlanguageserver/Manifest index 9aa866fb1d27..11afa63d2cd4 100644 --- a/dev-qt/qtlanguageserver/Manifest +++ b/dev-qt/qtlanguageserver/Manifest @@ -1,7 +1,5 @@ -DIST qtlanguageserver-everywhere-src-6.7.1.tar.xz 145728 BLAKE2B de0de15a57338364bde6304b6247d33e6f35efed294861b60e1d8d564da42b6b39607f438ce3b7a0544b356b2d4f035b5cb73041313ecdbdff9c771ba791da6f SHA512 492922623cdb5ba1545e9fce86cbd06bd1a1ef4532a76a54561652ee855f7367967056ba9d091812f8eb1b7cd598474bd587785f0cfb2eeec3a2cb3fd6968732 DIST qtlanguageserver-everywhere-src-6.7.2.tar.xz 145660 BLAKE2B adef11c166335fca41eceb4f48321cb1df84937663351f35e007476232d857221cd25ea1bbbc211e450858cebce95a6ca0b54f2a09d5d423defaeea7e722fa90 SHA512 15ece6a24b43502a66b992404230d4561fe3e3ac561bfbf75b1e56ca4b6f5e0110a95155207b844692b72e43fbaa44ab7c9ea39bfb21c30b2c3fd30f92ec3303 -EBUILD qtlanguageserver-6.7.1.ebuild 315 BLAKE2B 20841e633743aaeaf6f61a5ccf0ef80d88e4eaeef957b03fa4cdbb4acfba6349dd6208003ddde02092b00b818e17d25d3410b33f34e8e5fe40c544b2594a1bd7 SHA512 4eac32e1244a4a4d68061860ad0d7b6454d7485b825ce57deac8c715417a8ebffaec7ad23e3ddce840348ba96d73d3a5093f178038e4a3ae7f6f751792a26ff7 -EBUILD qtlanguageserver-6.7.2.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17 +EBUILD qtlanguageserver-6.7.2.ebuild 315 BLAKE2B 20841e633743aaeaf6f61a5ccf0ef80d88e4eaeef957b03fa4cdbb4acfba6349dd6208003ddde02092b00b818e17d25d3410b33f34e8e5fe40c544b2594a1bd7 SHA512 4eac32e1244a4a4d68061860ad0d7b6454d7485b825ce57deac8c715417a8ebffaec7ad23e3ddce840348ba96d73d3a5093f178038e4a3ae7f6f751792a26ff7 EBUILD qtlanguageserver-6.7.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17 EBUILD qtlanguageserver-6.8.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17 EBUILD qtlanguageserver-6.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17 diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.1.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.1.ebuild deleted file mode 100644 index 3dbf250ac2cc..000000000000 --- a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Implementation of the Language Server Protocol for Qt" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64" -fi - -RDEPEND="~dev-qt/qtbase-${PV}:6" -DEPEND="${RDEPEND}" diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild index b02596ef5aab..3dbf250ac2cc 100644 --- a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild +++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Implementation of the Language Server Protocol for Qt" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="amd64" fi RDEPEND="~dev-qt/qtbase-${PV}:6" diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index 9f786b531721..e71e9386778a 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -1,13 +1,11 @@ DIST qtlocation-5.15.11-patchset.tar.xz 4796 BLAKE2B dcfa75bd3fb2e9069e1a530c27e2b4e9ac921fcf0ccb712f0894375b575ba25103948c6e5b85b56a8f9c9f2d7edf7df8e38501e93356e69f060b577a04c2d221 SHA512 14bd2864abc6f446dc4fbac03548cb42305685b46db757d856360780144095a021130bc0ebf1d07a516dc7991dc0cfbf733bd0ef6be58237bc15822c21af1d0b DIST qtlocation-everywhere-opensource-src-5.15.14.tar.xz 6549056 BLAKE2B 831c7091a7b9d1355121f7e1e89f62c8aaa8819bef98c80f90b1521eea9c11a35452557c97d1dd49d13e0e810bd70f5038f8682f6ac42b68622cd269664eadd3 SHA512 5a6271d61bb9ede80b8483e784d8cc15170cf3f7b019472b2362c742e1e1fd52d811c2132b751574dacee6f7274b81e6049b8a3dc934ba7612c0aef6643062dd -DIST qtlocation-everywhere-src-6.7.1.tar.xz 3166636 BLAKE2B 9e42fc72473f9e11aac9de4c79acf69ce406903f2bd2611cad38b803c67bee30a8812a0700bbd4193a6aafd4b4e04ab0dacf4d79eda0bce739a0eb141c742a81 SHA512 6d7c332ff6a974102f874801c90a64d606e3f9db53787029091cfe043c087f7825d983d6245dfa749f46339c1886ecb74dcf0f9638e9d9bde7c9d6047c47d467 DIST qtlocation-everywhere-src-6.7.2.tar.xz 3166188 BLAKE2B ca22bc51308b5f5b28f96bedd4190ad747bd335790ec0975e1dc381d8fdacf720907a9842ec01cdd1add3d56549d4c096021731ea3268423d3288e1b24c993a6 SHA512 d7b8d4b9c99247362747d2d8fcf9207e710bed70c320d5c38e6868760cfe5ae2a158d1c0496af939a3e0d74369a86673cddfb25096ff8dda8dc209fd0df94e21 DIST qtlocation-mapboxgl-5.15.14-35d56672.tar.gz 3726302 BLAKE2B f51c0589a06fab35ba85b3bf4ca8a1904cda5aec47b17fdf747da527d02be623a76b1af5883b33267fab825a4b5d0863ea0220f2907e98e286b40d4a0bbc82e5 SHA512 5c2ff6ab7e4382d87546a802c5603bdcec3deb7fbb836fc981292c67660514caaa6118e164d2e099d0304710035572706562ec84e4aba5ce36b01cade8b0993e DIST qtlocation-mapboxgl-5.15.14-4c88f2c0.tar.gz 3726387 BLAKE2B e9b818505ace86516262d1407450c14be82122bb91363a57708795844089371ac7d511a857f713c7cb4e6f8b54867aab0bc5dcdb9c49aa28aa3f8363271378e0 SHA512 e4d9133db892fd8b7b1bcf584bf7dae30c0f0353f3b0a696a6cabc9485067f262d42554b583640521734498572e5480b5e8d0143d5be47bb92077f3192fefa4d EBUILD qtlocation-5.15.14-r1.ebuild 1629 BLAKE2B 93af70522115073f42fcc8b073cd515c547f4be99a98bd8352fee740690fbbd0c5cba351f54ec0038dfc0c21bacd78f7bcba0a8d9cb02145a2748d4a5f371de6 SHA512 b21a9278eac1accf942ae82bb066991d5aacf59e43412a47e68b88a6b9bb0abf59347c310ca8988e248242b701a496862108e489da00ad7b537b6e6459aa61d3 EBUILD qtlocation-5.15.14.ebuild 1629 BLAKE2B e5552627571a6b161e8fa025d5d8b21d96d8aba6b407efcaef5ccd6a17d656975904e2f927ef1218662a74dc28aa19811f2614298e3c1e653388e830d80db177 SHA512 dfe5123c519a24ae26cecb5d92b7a6a7c73722b78ed73cf66e6ebe45e09260ab119512fa6d2a48371a0830bf60e129321a2ea3b36fb13a67df04391bbe3ab7ea -EBUILD qtlocation-6.7.1.ebuild 1368 BLAKE2B 9d82b14e41e5cce2522c9de85e72e621a73545e85ecbd3970d41b116161011edb7899ec05670208b9b4e66eac3f5844f12ca2c676f2591b6cc9b5ae023a08a8b SHA512 186a02a1832e65d995645cbcf8f08db7a633b1b02ec3323336d099fc405700b6b1262697fc5efb8f80b836cda96229b85a312d2d5438d7be8f0b422291853a8d -EBUILD qtlocation-6.7.2.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26 +EBUILD qtlocation-6.7.2.ebuild 1367 BLAKE2B 7b74bb6c4539fa58b6d2b6153909d37eb9dcfa0a0ba9fd9145329519b5fae4196b53ff8a12d004f98717b7d43762a90742740e0755f89bc090bf0ded151d7fff SHA512 e8ce507d2ec96be88e69a7161e9e3e4bc3e142ab4bdb10572d4b73d31c8803be9d773a06481d5f0da1261c03e5dc6fe5e6ef36e6a038dea4b7cd4a6ce2545951 EBUILD qtlocation-6.7.9999.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26 EBUILD qtlocation-6.8.9999.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26 EBUILD qtlocation-6.9999.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26 diff --git a/dev-qt/qtlocation/qtlocation-6.7.1.ebuild b/dev-qt/qtlocation/qtlocation-6.7.1.ebuild deleted file mode 100644 index fdafb2309b3a..000000000000 --- a/dev-qt/qtlocation/qtlocation-6.7.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network] - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtpositioning-${PV}:6[qml] -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # ignores QML_IMPORT_PATH (unlike other tests) and looks in - # the missing builddir/qml, skip rather than work around - tst_declarative_ui -) - -src_install() { - qt6-build_src_install - - if use test; then - local delete=( # sigh - "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake - "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake - "${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so - "${D}${QT6_QMLDIR}"/QtLocation/Test - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -} diff --git a/dev-qt/qtlocation/qtlocation-6.7.2.ebuild b/dev-qt/qtlocation/qtlocation-6.7.2.ebuild index d407e2f12e54..2eb3c22bc232 100644 --- a/dev-qt/qtlocation/qtlocation-6.7.2.ebuild +++ b/dev-qt/qtlocation/qtlocation-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" fi RDEPEND=" diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index f7a5e1ea70b1..fb3af2cec603 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,11 +1,9 @@ AUX qtmultimedia-6.7.2-gstreamer-no-v4l.patch 567 BLAKE2B e7adab12e4823370677e0c466058cf4966b8384937edb7759ecb84062fcd43f205944835bbf9885a99bf117d310a7e6d23b05a167cab3be2ef994c21a7ebc07e SHA512 dc41e9e82ef2a740bba967cc6430f0e72c88810b978bb61e78b6f19fc980de9744cf9f05f7d787bc2c5807c54fb630b83b58c805d693d7c2306588773c1db481 DIST qtmultimedia-5.15.14-gentoo-kde-1.tar.xz 1492 BLAKE2B e2474990d9efc327f35a979c1f317cb213c6121b4e1285294c132a1266eaeb559e7239c7cd58da072e50dc85dd9aa0c1b6aa493f95fe31268171780cd3346883 SHA512 5427c7a5e06f8296b091b2bb3fc67e678ac01bd1179de5a11c38cfe9f87ba8e3ac87a1395c2c3044ad31fc5c040230e35a1e71e173e12109c24cd97da70d9e9d DIST qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz 3842164 BLAKE2B 0065c95b4f14e566c667e16c4eb264e466174a9548c6a4bd39dbab9cf14ddad444cc3318ecdf18ca9e3999a3f95a669fd121937287d466a6b9a9c14af74ff686 SHA512 6059bd9aec65888ed6f3a1f87506a94ea567f9e064bb4a586859bc8f76ee4dca573eb256623452ddd9daf2305f49c707673425ea08edca9cd2db7b56bf5cab9c -DIST qtmultimedia-everywhere-src-6.7.1.tar.xz 8362120 BLAKE2B 2dc442d9ee1290507ebe437e0087756b98ba63baa65fb64174e876d84758dd1062044934610134a782ec1d2a32c6281657e060554be3a2fe9591ad925e7c0129 SHA512 18e7b2036baac68a421cb8741713b43d739f558cad8b9d2b8192e390b2c37cfda17f6bb290c9313ae9e3b7ea2ee4fda52b86a58195201e99179d6f4a4e386783 DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70 EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91 -EBUILD qtmultimedia-6.7.1-r1.ebuild 3188 BLAKE2B dcb9e39eec40a1b84a17c07a60523d65a8eb51aa9b1cf5e02dd98b29a895968250a145069bec014122832367b5af62dea50497360757bcd2a119ca2982df2db2 SHA512 b89cea044c03896b03d438e71e511e377ab89a7b6874c99b6511467293afa684302b49b7b42b6dbc20db8fe741ea11ff90d3247bc65bb53d10cb71e1503dedc1 -EBUILD qtmultimedia-6.7.2-r1.ebuild 3249 BLAKE2B a0747832a4cf9206a7b4b46d657c886e7939a1d737c819d266b4f3d05f577756145693d366e33a637a8d4646b97ad064447e2714e86bb9e579fbce59bf8cfaf4 SHA512 05fc3e1770c320737318054fbcebfd3cfb1b4ef8878f7135884dbeebbd2e3b0abf19133a8ecc74338edbc2f4804098bb864e4f84d16f148ce37c82924a41be11 +EBUILD qtmultimedia-6.7.2-r1.ebuild 3243 BLAKE2B 33b3027b45a188cdf255de400a73f2eae5b1baa707f499b5f4809ef392cc6d708818445bb1d14e535f71092380693323a0807babb3afc591eeade74f922ee044 SHA512 b1d23276920b596cf3dda2b3f2bdd7d1ab9beb6e73b5ec2784c2e1a1235a6e263a104d0768e69dce8ef7ccd8b7344b80cf7fb7a76ea6c230cad084a6d57b4326 EBUILD qtmultimedia-6.7.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667 EBUILD qtmultimedia-6.8.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667 EBUILD qtmultimedia-6.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.1-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.1-r1.ebuild deleted file mode 100644 index ddf6bb150a26..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.1-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic qt6-build - -DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" -fi - -IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" -# tst_qmediaplayerbackend hard requires qml, review in case becomes optional -REQUIRED_USE=" - || ( ffmpeg gstreamer ) - eglfs? ( ffmpeg opengl ) - vaapi? ( ffmpeg opengl ) - test? ( qml ) -" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] - alsa? ( - !pulseaudio? ( media-libs/alsa-lib ) - ) - ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=] - media-video/ffmpeg:=[vaapi?] - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - ) - ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0[X=,opengl?] - media-libs/gstreamer:1.0 - ) - opengl? ( media-libs/libglvnd ) - pulseaudio? ( media-libs/libpulse ) - qml? ( - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtquick3d-${PV}:6 - ) -" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) - v4l? ( sys-kernel/linux-headers ) - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND="~dev-qt/qtshadertools-${PV}:6" - -CMAKE_SKIP_TESTS=( - # unimportant and expects all backends to be available (bug #928420) - tst_backends - # tries to use real alsa or pulseaudio and fails in sandbox - tst_qaudiosink - tst_qaudiosource - tst_qmediacapturesession - tst_qmediaplayerbackend - tst_qsoundeffect - # may try to use v4l2 or hardware acceleration depending on availability - tst_qscreencapture_integration - tst_qscreencapturebackend - tst_qvideoframebackend - # fails with offscreen rendering - tst_qvideoframecolormanagement - tst_qwindowcapturebackend -) - -src_configure() { - # normally passed by the build system, but needed for 32-on-64 chroots - use x86 && append-cppflags -DPFFFT_SIMD_DISABLE - - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - $(qt_feature ffmpeg) - $(qt_feature gstreamer) - $(usev gstreamer $(qt_feature opengl gstreamer_gl)) - $(qt_feature pulseaudio) - $(qt_feature v4l linux_v4l) - $(qt_feature vaapi) - ) - - # ALSA backend is experimental off-by-default and can take priority - # causing problems (bug #935146), disable if USE=pulseaudio is set - # (also do not want unnecessary usage of ALSA plugins -> pulse) - if use alsa && use pulseaudio; then - # einfo should be enough given pure-ALSA users tend to disable pulse - einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set" - mycmakeargs+=( -DQT_FEATURE_alsa=OFF ) - else - mycmakeargs+=( $(qt_feature alsa) ) - fi - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - if use test; then - local delete=( # sigh - "${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake - "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri - "${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.* - "${D}${QT6_PLUGINDIR}"/multimedia/objects-* - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild index 3325d8cc1142..f86755c55902 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild @@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 451d38c5e60d..4c2b89c21cce 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,5 +1,7 @@ +AUX qtnetwork-5.15.14-CVE-2024-39936.patch 7381 BLAKE2B c946387ec8015fe4be214eb231e3cfd14bd64e660d0d246266fbe9e1fa8fff7db55ea0c0f13c7c45d777138e4921a5f6eedc45df8c043ea375b0a2251caf1580 SHA512 2a5efc9b17dd9c688c57caaa183ace4e6de34d0c14dc327ab5c74004adef4d7879d7bdf00c43fc847c395ec911dfa82678c360b0cdd99427e2e032007c237e32 DIST qtbase-5.15-gentoo-patchset-6.tar.xz 8288 BLAKE2B ad9695a528345dd3b8e9ce72b7bdfe8f744f16685a567bbc7862ba6c28e5a426260cb0b73e2573cb3a6f16f1785786898ffb44c90f5d75354b97e5756c7573db SHA512 97bc4d5375e1750a5578439ff320ee2e5e929df1dafe56b4e86f2de8ad26c91dc4002e45ad75d9f936347d49b9f54c0c42f8fc2cb7dfd4f54bf08a210b3bc720 DIST qtbase-5.15.14-gentoo-kde-1.tar.xz 329640 BLAKE2B 5bd2d84f48874267a3328bf04e764f327bc8b3d574f8715fe02c4691e1ea8b2c0218ab66d55031e805d151be99956c5dfce304cac72b1edd371e2c447292e1e8 SHA512 37a7479c0fd0160fedd087f6da221484d47585f082f33f59118a75f9fa7a2e0969b9e9ed1b1234821dc6ffe55c07d22d20dc2ea4d2ee1dbd061f57bb4bf7f518 DIST qtbase-everywhere-opensource-src-5.15.14.tar.xz 50887988 BLAKE2B 292814ff8b9030766ce9941f4f13af56425f385543ff41cecd5d86b0a562fd220c8d9126fc36cfa0eab96440a64ec6a497306e00a59d388d13d34c8ea10a9633 SHA512 1280e7da926ff0c888dc3455ebeb73708bf8e44a3fe77ecf015e902608d75d7304639271dedba63635f959411452cd2b64a6f9166365a3aa3440656c00120272 +EBUILD qtnetwork-5.15.14-r1.ebuild 1256 BLAKE2B b483b543f29001be9579ea6204ef4bdd95272317aaf32c544a9e7f84319770eecb474149b1a88c688aed8db519be061ee9e5bde5fdb893a43561228b7318e3c8 SHA512 fe02fc5ad7119bc0b645e3c4574540e52ec074959041b1b5c2c5d18966b4ccf8b84277695d9b58948c6e530d962a97936fbb7f246d6eeff120e5561a7b476eb4 EBUILD qtnetwork-5.15.14.ebuild 1184 BLAKE2B 6c7972f073bdbd38117943fa710fbbbc5274c5cab32f9af022541d4ed600254fe163804d8429eaf5cd4288b91588bb0c072aafd9fcd3c0159f3720d1b5a9efd6 SHA512 21aac350a0a251b61870392c53fad5e274a85e74f19436f50d82ed75ba10011ad07380e1c28548083cc2522b6b1916e9c6b0659f3a1e95ea407da6be0ba9f5bc MISC metadata.xml 690 BLAKE2B 3e1cccd88cb778d868aa5aa650d9114a79eaf7b5961dc6222b2da3e5c7536a43c7481b6d56bb9176b36ed2560ccb0712635146872f370fdc1e319286133a1651 SHA512 e402ad3b586e305a6f7ee99f24edd505b1e76f7a957108fc252a4a1af8978ac113b9b1c56e4fb0bfb696bcf29a1295f52af6614924f0e3ae2d7f71810a3be707 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.14-CVE-2024-39936.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.14-CVE-2024-39936.patch new file mode 100644 index 000000000000..c4445b2a72e8 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.14-CVE-2024-39936.patch @@ -0,0 +1,178 @@ +From 9f9a56d750caff8b4459e7e9bf82f1f4d725f72f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> +Date: Tue, 25 Jun 2024 17:09:35 +0200 +Subject: [PATCH] HTTP2: Delay any communication until encrypted() can be + responded to + +We have the encrypted() signal that lets users do extra checks on the +established connection. It is emitted as BlockingQueued, so the HTTP +thread stalls until it is done emitting. Users can potentially call +abort() on the QNetworkReply at that point, which is passed as a Queued +call back to the HTTP thread. That means that any currently queued +signal emission will be processed before the abort() call is processed. + +In the case of HTTP2 it is a little special since it is multiplexed and +the code is built to start requests as they are available. This means +that, while the code worked fine for HTTP1, since one connection only +has one request, it is not working for HTTP2, since we try to send more +requests in-between the encrypted() signal and the abort() call. + +This patch changes the code to delay any communication until the +encrypted() signal has been emitted and processed, for HTTP2 only. +It's done by adding a few booleans, both to know that we have to return +early and so we can keep track of what events arose and what we need to +resume once enough time has passed that any abort() call must have been +processed. + +Fixes: QTBUG-126610 +Pick-to: 6.8 6.7 6.5 6.2 5.15 5.12 +Change-Id: Ic25a600c278203256e35f541026f34a8783235ae +Reviewed-by: Marc Mutz <marc.mutz@qt.io> +Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> +(cherry picked from commit b1e75376cc3adfc7da5502a277dfe9711f3e0536) +(but really taken from upstream CVE-2024-39936-qtbase-5.15.patch) +--- + src/network/access/qhttp2protocolhandler.cpp | 6 +-- + .../access/qhttpnetworkconnectionchannel.cpp | 46 ++++++++++++++++++- + .../access/qhttpnetworkconnectionchannel_p.h | 6 +++ + 3 files changed, 53 insertions(+), 5 deletions(-) + +diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp +index ead88d781ae..926f3134a0e 100644 +--- a/src/network/access/qhttp2protocolhandler.cpp ++++ b/src/network/access/qhttp2protocolhandler.cpp +@@ -375,12 +375,12 @@ bool QHttp2ProtocolHandler::sendRequest() + } + } + +- if (!prefaceSent && !sendClientPreface()) +- return false; +- + if (!requests.size()) + return true; + ++ if (!prefaceSent && !sendClientPreface()) ++ return false; ++ + m_channel->state = QHttpNetworkConnectionChannel::WritingState; + // Check what was promised/pushed, maybe we do not have to send a request + // and have a response already? +diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp +index 7620ca16470..13f9630c658 100644 +--- a/src/network/access/qhttpnetworkconnectionchannel.cpp ++++ b/src/network/access/qhttpnetworkconnectionchannel.cpp +@@ -255,6 +255,10 @@ void QHttpNetworkConnectionChannel::abort() + bool QHttpNetworkConnectionChannel::sendRequest() + { + Q_ASSERT(!protocolHandler.isNull()); ++ if (waitingForPotentialAbort) { ++ needInvokeSendRequest = true; ++ return false; // this return value is unused ++ } + return protocolHandler->sendRequest(); + } + +@@ -267,21 +271,28 @@ bool QHttpNetworkConnectionChannel::sendRequest() + void QHttpNetworkConnectionChannel::sendRequestDelayed() + { + QMetaObject::invokeMethod(this, [this] { +- Q_ASSERT(!protocolHandler.isNull()); + if (reply) +- protocolHandler->sendRequest(); ++ sendRequest(); + }, Qt::ConnectionType::QueuedConnection); + } + + void QHttpNetworkConnectionChannel::_q_receiveReply() + { + Q_ASSERT(!protocolHandler.isNull()); ++ if (waitingForPotentialAbort) { ++ needInvokeReceiveReply = true; ++ return; ++ } + protocolHandler->_q_receiveReply(); + } + + void QHttpNetworkConnectionChannel::_q_readyRead() + { + Q_ASSERT(!protocolHandler.isNull()); ++ if (waitingForPotentialAbort) { ++ needInvokeReadyRead = true; ++ return; ++ } + protocolHandler->_q_readyRead(); + } + +@@ -1289,7 +1300,18 @@ void QHttpNetworkConnectionChannel::_q_encrypted() + // Similar to HTTP/1.1 counterpart below: + const auto &pairs = spdyRequestsToSend.values(); // (request, reply) + const auto &pair = pairs.first(); ++ waitingForPotentialAbort = true; + emit pair.second->encrypted(); ++ ++ // We don't send or handle any received data until any effects from ++ // emitting encrypted() have been processed. This is necessary ++ // because the user may have called abort(). We may also abort the ++ // whole connection if the request has been aborted and there is ++ // no more requests to send. ++ QMetaObject::invokeMethod(this, ++ &QHttpNetworkConnectionChannel::checkAndResumeCommunication, ++ Qt::QueuedConnection); ++ + // In case our peer has sent us its settings (window size, max concurrent streams etc.) + // let's give _q_receiveReply a chance to read them first ('invokeMethod', QueuedConnection). + QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection); +@@ -1307,6 +1329,26 @@ void QHttpNetworkConnectionChannel::_q_encrypted() + } + } + ++void QHttpNetworkConnectionChannel::checkAndResumeCommunication() ++{ ++ Q_ASSERT(connection->connectionType() > QHttpNetworkConnection::ConnectionTypeHTTP); ++ ++ // Because HTTP/2 requires that we send a SETTINGS frame as the first thing we do, and respond ++ // to a SETTINGS frame with an ACK, we need to delay any handling until we can ensure that any ++ // effects from emitting encrypted() have been processed. ++ // This function is called after encrypted() was emitted, so check for changes. ++ ++ if (!reply && spdyRequestsToSend.isEmpty()) ++ abort(); ++ waitingForPotentialAbort = false; ++ if (needInvokeReadyRead) ++ _q_readyRead(); ++ if (needInvokeReceiveReply) ++ _q_receiveReply(); ++ if (needInvokeSendRequest) ++ sendRequest(); ++} ++ + void QHttpNetworkConnectionChannel::requeueSpdyRequests() + { + QList<HttpMessagePair> spdyPairs = spdyRequestsToSend.values(); +diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h +index d8ac3979d19..eac44464926 100644 +--- a/src/network/access/qhttpnetworkconnectionchannel_p.h ++++ b/src/network/access/qhttpnetworkconnectionchannel_p.h +@@ -107,6 +107,10 @@ public: + QAbstractSocket *socket; + bool ssl; + bool isInitialized; ++ bool waitingForPotentialAbort = false; ++ bool needInvokeReceiveReply = false; ++ bool needInvokeReadyRead = false; ++ bool needInvokeSendRequest = false; + ChannelState state; + QHttpNetworkRequest request; // current request, only used for HTTP + QHttpNetworkReply *reply; // current reply for this request, only used for HTTP +@@ -187,6 +191,8 @@ public: + void closeAndResendCurrentRequest(); + void resendCurrentRequest(); + ++ void checkAndResumeCommunication(); ++ + bool isSocketBusy() const; + bool isSocketWriting() const; + bool isSocketWaiting() const; +-- +2.45.2 + diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild new file mode 100644 index 000000000000..b28dc1384dcf --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="gssapi libproxy sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-CVE-2024-39936.patch" ) # bug 935869 + +QT5_TARGET_SUBDIRS=( + src/network + src/plugins/bearer/generic +) + +QT5_GENTOO_CONFIG=( + libproxy:libproxy: + ssl::SSL + ssl::OPENSSL + ssl:openssl-linked:LINKED_OPENSSL +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :network +) + +src_configure() { + local myconf=( + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(qt_use sctp) + $(usev ssl -openssl-linked) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +} diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest index 765666639c29..862a412e65ee 100644 --- a/dev-qt/qtnetworkauth/Manifest +++ b/dev-qt/qtnetworkauth/Manifest @@ -1,10 +1,8 @@ DIST qtnetworkauth-5.15.14-gentoo-kde-1.tar.xz 2296 BLAKE2B c42be1f7ec16edd3765b6d737a7af0666aee2013a60f79b520e7e8d6b0f52ae2c11f3c2415797033af4cf4298450d93dd4e129147aa79f5a1d42c09aa7b3024b SHA512 3d8c3936333df0488002d64dae278da0fe96b180b6eb3bf2c491bcba2a4878fcbca9f22179e680d8d94f9b60fcb74afb9daf8eef9702ce861ca7db021c205357 DIST qtnetworkauth-everywhere-opensource-src-5.15.14.tar.xz 135840 BLAKE2B 7a52debbbd1d9f72c3d5992666d309af64da50563f417cbdbc59904ab71d03d297eab504f1f3431f7aa01785f23166fe463add83690c8abe04953bc1ee057d16 SHA512 e0315df81f7ee6da7798212ac18b2e5b7936f5ec355c089f2c095bc8edd5f59cdb68c0bfec300dad30f62f4444549cfe19c5b5fe14943328064da7416cbf5f00 -DIST qtnetworkauth-everywhere-src-6.7.1.tar.xz 144184 BLAKE2B 8a08b5046a55b5444f53ce6d878f6b89a1fbd27a655e4b9aa2eaf2cb1577d0c6d3b9f35444a34396ddf00d4843f85092d8481390924b0e88ccc8e852b7364e16 SHA512 7bbfefe9b266030dddcf0a61d16cee5d4c3717e4f0ecbf607d5b4b75e8ca36ad96a8f9c761f2429e912880151925213b63d6038848ed3755a12afd0987af8032 DIST qtnetworkauth-everywhere-src-6.7.2.tar.xz 146892 BLAKE2B d2d788edbf0bc8c6a33cd7303cd593d8415ee7f006ee00bc19b4659052ad02032dddbcad4eaeedcba56f782fd2b5607304720a9b131781eeb12ca7daea6b301b SHA512 8357b2b833da9f652c88e706c7bf15b19b2c5b8f054914bfc16d33ea69dce86999b03fb7dd5b79e2a58d8d4e16af0fd2ff6dcf8e621ed251e63171fc8151f75b EBUILD qtnetworkauth-5.15.14.ebuild 601 BLAKE2B c431059ebe441ffcc6b1b7f63d1835a8312532befbd64510de5fea00b5d2b8d3db9431d022ce60feacc16434a06400002a89951254b6e6ee6ff1c76a509df915 SHA512 8d12c5f7c18cafe553bf338f454c19b496f1eb2ceba8665668653aed7fffb75f276014728ffb9c0ad391ea445bbda279f7958c1aa6e43529c0de26bb7dc393ff -EBUILD qtnetworkauth-6.7.1.ebuild 351 BLAKE2B 3a89d156e081ed05d82c94aa6a43729242f033fc30ecd608e63d1e51f7766dc1c1b92fd3a81aa4051be12847942a74da3e565358a25f95a07ccddb7c2a6a1aad SHA512 753138b26bca428cb4cc7a14809c17ffc0a3e1ab093b579f5db79b821224797006932bd0eb0bcfba3c6b448ad7153845effdeb9a6386f41a5cee1cfeea5da3c2 -EBUILD qtnetworkauth-6.7.2.ebuild 354 BLAKE2B 147c4a1b609cd478ef1cf34fcbba9fe2ee476e7bc987b39b64b383b083f3a050591ec0ea4134051e1a01b55199a227503a248e050e0b4ec39945b437637b4188 SHA512 94dbfa735d67addc18d5b8fcfba8f6721da1e7784227ac8218f297b276cc72b987284e8704b7a91fb267f96fe5a28ee01b4f01efb947b37280d9ab3f2cb1999c +EBUILD qtnetworkauth-6.7.2.ebuild 350 BLAKE2B 207a1fe348d0c5b0b94537aa9c77c789d53b622b7c865318c73615c099ffa050806d4554953b64c218b0cfaa027fa84c11137f700098cad513d9736c659d1327 SHA512 c0acf003d69ffc679fc7475d6eaae4f2ccbea8098612f870ebf654ddbd4db93c091534920fd6a8ea7944d8f1fc92326c3743de434fc4b804ef1451e62a2a819d EBUILD qtnetworkauth-6.7.9999.ebuild 354 BLAKE2B 147c4a1b609cd478ef1cf34fcbba9fe2ee476e7bc987b39b64b383b083f3a050591ec0ea4134051e1a01b55199a227503a248e050e0b4ec39945b437637b4188 SHA512 94dbfa735d67addc18d5b8fcfba8f6721da1e7784227ac8218f297b276cc72b987284e8704b7a91fb267f96fe5a28ee01b4f01efb947b37280d9ab3f2cb1999c EBUILD qtnetworkauth-6.8.9999.ebuild 358 BLAKE2B 3c7c84223bb8da524851b41b82eaec6ed51dc12f1658127a36fd9728903bb2c204b10d7a6e6866cfe975bb9b1e2692fc62299d8943735bcc8602dff04c0927bd SHA512 508dd20e4ae66ee07dc85c5bac4e14f7d3ee6b63edb534becd25bba15d1942a0de4ad70863e41ea60f1c58a970bb5fac7c744aaad80f744adf5d93362391d145 EBUILD qtnetworkauth-6.9999.ebuild 358 BLAKE2B 3c7c84223bb8da524851b41b82eaec6ed51dc12f1658127a36fd9728903bb2c204b10d7a6e6866cfe975bb9b1e2692fc62299d8943735bcc8602dff04c0927bd SHA512 508dd20e4ae66ee07dc85c5bac4e14f7d3ee6b63edb534becd25bba15d1942a0de4ad70863e41ea60f1c58a970bb5fac7c744aaad80f744adf5d93362391d145 diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild deleted file mode 100644 index c738dab963d1..000000000000 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Network authorization library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -fi - -RDEPEND="~dev-qt/qtbase-${PV}:6[network]" -DEPEND="${RDEPEND}" diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.2.ebuild index 606ca90b42f8..a9c901a07baf 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.2.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Network authorization library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ppc64 ~riscv x86" fi RDEPEND="~dev-qt/qtbase-${PV}:6[network]" diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest index 85eac7798bd4..c125ed430158 100644 --- a/dev-qt/qtpositioning/Manifest +++ b/dev-qt/qtpositioning/Manifest @@ -1,9 +1,7 @@ DIST qtlocation-everywhere-opensource-src-5.15.14.tar.xz 6549056 BLAKE2B 831c7091a7b9d1355121f7e1e89f62c8aaa8819bef98c80f90b1521eea9c11a35452557c97d1dd49d13e0e810bd70f5038f8682f6ac42b68622cd269664eadd3 SHA512 5a6271d61bb9ede80b8483e784d8cc15170cf3f7b019472b2362c742e1e1fd52d811c2132b751574dacee6f7274b81e6049b8a3dc934ba7612c0aef6643062dd -DIST qtpositioning-everywhere-src-6.7.1.tar.xz 658028 BLAKE2B 9e42900658975726b8d26565ac26e1e884ecfa251c2d948d1dbf91897c1ff31e6d53a600ce83e3a98dea457ce3be9bc7563ce4464e2b3a11127378edea3f6884 SHA512 3d5a51d1ad509f6834390955da0d53b92b28b285265a3d0972069606df4076275499e283f08961016949e90925fab49cd650041c28cf5aa879753dd4631b784a DIST qtpositioning-everywhere-src-6.7.2.tar.xz 658112 BLAKE2B ef32068ae5d718df1ad10fddf735d65f9f90edb559211978f7112d6228a69ef37e92dcd7c124d3fff3887f1032e970c8735f92397751bdcd482451251afb4cc6 SHA512 2983fde05cbccf86288cd989279551b5babeddcf9be2848870e59dbbfc2d91749465bf43c17e291d6df37ee746b5490c0bb1e6b3fd4298b4f0a22cc6d67db04e EBUILD qtpositioning-5.15.14.ebuild 877 BLAKE2B faaba7ce4da8906b08b10a326f4f9a211f9eae86a12135dc0f58396342b82c91a1bb2aa1e8bac4b5fb2cf6e55733d12d77cbab56b6b26ba955036f5f072ce32d SHA512 f342bfdbb38c7f13c37087b544e07cccb6c7655774e9547caff9bbf3517e02d9b1e82fd3ba47b319a17fcac1e2476134f0d71368f5af792e8579c90a5a25dc67 -EBUILD qtpositioning-6.7.1.ebuild 1571 BLAKE2B 3692949cb0c40644f6ece51c678db7b0e2bca3ca5f97b5a681f1dff91d1076cd10654dc3570f95eb72e978bee00102ad55d0e4c43af99034563e50d83dbfe0e7 SHA512 b2b7090183ccb373aec63bd75ea0bb41c9434694d319eb24d96d145bb4738a4003fbf4baf0b1f6d4467734cffed15a1bf6ed51b7c78c53dc73c86f4e61a64341 -EBUILD qtpositioning-6.7.2.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56 +EBUILD qtpositioning-6.7.2.ebuild 1570 BLAKE2B d6667399f47cd0fc13627c2141a587f3f31fdf8e45a474f8c82ec477ed9075ac902d6eed05c9cd84959de42f3db85e609ff62d31a1d2b1cc5cb17c6f93349f82 SHA512 b33849cdf0ae471c35b53e48b6c6d8ae1e9b5e45750e699688795775cf11bfb8faddb7a919c221113b3c428064ac4e1b9eabf092baefc75ef0f53ed5ac02d3a3 EBUILD qtpositioning-6.7.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56 EBUILD qtpositioning-6.8.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56 EBUILD qtpositioning-6.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56 diff --git a/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild deleted file mode 100644 index 1f349010160e..000000000000 --- a/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Physical position determination library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" -fi - -IUSE="geoclue nmea +qml" - -DEPEND=" - ~dev-qt/qtbase-${PV}:6 - geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) - nmea? ( - ~dev-qt/qtbase-${PV}:6[network] - ~dev-qt/qtserialport-${PV}:6 - ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -RDEPEND=" - ${DEPEND} - geoclue? ( app-misc/geoclue:2.0 ) -" - -CMAKE_SKIP_TESTS=( - # threads test (rarely) fails randomly - tst_qgeoareamonitor -) - -src_prepare() { - qt6-build_src_prepare - - # unfortunately cmake_use_find_package would break things with qtbase - use geoclue || - sed -e 's/TARGET Qt::DBus/FALSE/' \ - -i src/plugins/position/CMakeLists.txt || die - use nmea || - sed -e 's/TARGET Qt::Network/FALSE/' \ - -i src/plugins/position/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - if use test; then - local delete=( # sigh - "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake - "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake - "${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so - "${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so - ) - # using -f given not tracking which tests may be skipped or not - rm -f -- "${delete[@]}" || die - fi -} diff --git a/dev-qt/qtpositioning/qtpositioning-6.7.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.2.ebuild index c872768c9bd8..ccc9e5fd0f6c 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.7.2.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Physical position determination library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi IUSE="geoclue nmea +qml" diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest index 5151396285f5..5f785bff35e0 100644 --- a/dev-qt/qtquick3d/Manifest +++ b/dev-qt/qtquick3d/Manifest @@ -1,9 +1,7 @@ AUX qtquick3d-6.6.2-gcc14.patch 953 BLAKE2B 0119092790be34134af0989a7e4b78d565a741e3a72f0ae76c48106f68fb6867b3395706951e93e86343d3214c5d02b3b21eea175c1460e8c38d44c8f36ec605 SHA512 13352dc71f986888e5017f2e4a6267e1bc10c81c419d607de673212cb7d16132566e11a040c6ebfa5bde9834043eb1b38d6723f890c707af76f6490c1a8b3ffa AUX qtquick3d-6.6.2-x32abi.patch 439 BLAKE2B 293bbae94e4ffcf6cbeda420a2f2af0e7fd6112c4e69ddb7dc9bb87bd82374c6435e038e114da08508312d742924f701aec5f647f60519e55728efb7feeb18e5 SHA512 4d8fdd20a6d3e06772bbf3c025651daa4d33ced61dfd8191f946b19318826c41f8f3c0eea1aae3aaeb01766715287d237eacbae1741a807bf64a242aaddb323c -DIST qtquick3d-everywhere-src-6.7.1.tar.xz 66184636 BLAKE2B c0ae24f0a1b635c0b71e1223e5cfd2d74184b68239d4a89ebf60c9563e1577d856cc3003bf365ee6d2e4a0550eb71a851c6f96c9d0dbd555bf114d0ba524a644 SHA512 a26da739a949011c33c989456658c6f91dbc991a2570d7ac2abc78189c3daa78d5e7ea25e0f3f5828e6f9dececbd5c18b2cc67cf9d16badd36c98781fd882a44 DIST qtquick3d-everywhere-src-6.7.2.tar.xz 66202160 BLAKE2B 1f3741bb11d21804ec56aa5bfa00b590d94258cb119b4284aa2757fa00785a69aba243e06bf68ca625355a8e8a392249be2ac9679226c8d250320aeb6c4ccf0f SHA512 d5a4557a6f0ea73b43de9238b8cd42fc037c417e72443a8cae96e8be779f82d5fd9efe1a09258a4d5dd55c4791b84192cb72e31bb1d744b618951080fe6fa1e2 -EBUILD qtquick3d-6.7.1.ebuild 1042 BLAKE2B e6d457d178c43419d0725b80434d240bce4f91472d83dfd9ab367aa672b2c2c765477da601a5abfe0154c2dee99a9752731ad0e8b283dd84f1951a498fb638f6 SHA512 6a4469d5df6064b2cc0205ca2d53b25ac43f8bb5f2b01b0a3b209d92f8fa65bc39a7e42e46f776214c711334dad8c3eeff96652d11f5d38cf5c643ade01c3fce -EBUILD qtquick3d-6.7.2.ebuild 1047 BLAKE2B 160eaff9170302827436e7f0e655a165ef0944b06431cefa01f1f3868a73ea8dd605828adcbad4f26c42207648c3b749914154c669e3edd9f0ef136aa9868f64 SHA512 14f1d194977ed84ddcdeed65e94be09b2b294ce9172a437eaa12117870e87accc946cd6754bff0fecc3fe5f216efa354ffeda31b61eed3129d769e5054471486 +EBUILD qtquick3d-6.7.2.ebuild 1042 BLAKE2B e6d457d178c43419d0725b80434d240bce4f91472d83dfd9ab367aa672b2c2c765477da601a5abfe0154c2dee99a9752731ad0e8b283dd84f1951a498fb638f6 SHA512 6a4469d5df6064b2cc0205ca2d53b25ac43f8bb5f2b01b0a3b209d92f8fa65bc39a7e42e46f776214c711334dad8c3eeff96652d11f5d38cf5c643ade01c3fce EBUILD qtquick3d-6.7.9999.ebuild 1047 BLAKE2B 160eaff9170302827436e7f0e655a165ef0944b06431cefa01f1f3868a73ea8dd605828adcbad4f26c42207648c3b749914154c669e3edd9f0ef136aa9868f64 SHA512 14f1d194977ed84ddcdeed65e94be09b2b294ce9172a437eaa12117870e87accc946cd6754bff0fecc3fe5f216efa354ffeda31b61eed3129d769e5054471486 EBUILD qtquick3d-6.8.9999.ebuild 1238 BLAKE2B bd4ca7741647c874a96257a6530ad83ae3d4c6580e4c20e6cc9c79ed9472c1011db63f3dcc0894ce72642cd77c8d086aebd244a5a904e42e225efaf938cb1345 SHA512 e5932651031fb1b9a6f34585fd4fede6d1e268c8051405d0f868e87f2580115ecf5344074b568e9d63416849eb0ef05de5edb54f7db5c3139ac2d15bf3920677 EBUILD qtquick3d-6.9999.ebuild 1238 BLAKE2B bd4ca7741647c874a96257a6530ad83ae3d4c6580e4c20e6cc9c79ed9472c1011db63f3dcc0894ce72642cd77c8d086aebd244a5a904e42e225efaf938cb1345 SHA512 e5932651031fb1b9a6f34585fd4fede6d1e268c8051405d0f868e87f2580115ecf5344074b568e9d63416849eb0ef05de5edb54f7db5c3139ac2d15bf3920677 diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild deleted file mode 100644 index 09ff3f5ce309..000000000000 --- a/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" -elif [[ ${QT6_BUILD_TYPE} == live ]]; then - EGIT_SUBMODULES=() # skip qtquick3d-assimp -fi - -IUSE="opengl vulkan" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets] - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtquicktimeline-${PV}:6 - ~dev-qt/qtshadertools-${PV}:6 - media-libs/assimp:= - sys-libs/zlib:= -" -DEPEND=" - ${RDEPEND} - test? ( ~dev-qt/qtbase-${PV}:6[network] ) - vulkan? ( dev-util/vulkan-headers ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.6.2-gcc14.patch - "${FILESDIR}"/${PN}-6.6.2-x32abi.patch -) - -CMAKE_SKIP_TESTS=( - # collada support is disabled in system media-libs/assimp (bug #891787) - tst_qquick3dassetimport -) - -src_configure() { - local mycmakeargs=( - -DQT_FEATURE_system_assimp=ON - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild index 44521151cdbd..09ff3f5ce309 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest index 61ab4a177353..2a05e1961473 100644 --- a/dev-qt/qtquicktimeline/Manifest +++ b/dev-qt/qtquicktimeline/Manifest @@ -1,9 +1,7 @@ DIST qtquicktimeline-everywhere-opensource-src-5.15.14.tar.xz 96560 BLAKE2B fba190b4d3a2adbd93823628936edb9ba409fe20f1e6652afaa704c0480c1841ae57ff8170975306d83f7f5702198d75f65f829853be3ed52fe6ab881dc034d9 SHA512 29457540834a0452f20069615f2d2c7e22c36ff6f42ecb0e8e9519eaca22bf8af09cd24559e4087b3641204644806d956552ea2ec8ca6261854d890713d3249c -DIST qtquicktimeline-everywhere-src-6.7.1.tar.xz 110116 BLAKE2B b9af1e99c98257fa81b4430054657972f87df6ed5ee67c7db9d36950a9679fbf6fa5fbf56afad3dbd5f317d99a6dc1ca51b74993396e853966e79eaabf651758 SHA512 52a55c09ac64870b522c1f357876c612afdccc76cec8b8ca06a4470be754b04908fffb9ef8f7df031f8a6e4a6f46cf64657ca6011c297bf73b59b4f7135bd58b DIST qtquicktimeline-everywhere-src-6.7.2.tar.xz 110200 BLAKE2B ab181ced9e06bbf4ac9d9c3e558749a14d038a2bc741a67461f901f013b0e5da328485747499934829b60d3ee125a674033caad69dec3b2255fb36ed206a55c1 SHA512 cb460db34b726216f539bcd305e257375b01250a4f2df546a9a27c53bf78287e2c9d1ecc81edc336e5d55b87006a271ddc435e5fb57a898947bcf93cf5ea1b90 EBUILD qtquicktimeline-5.15.14.ebuild 367 BLAKE2B 177d100c4cd775817bc42b853190722920cf6453a773c12de253907fcf730af3e1b146b40e519619850162c1fd6a841b32ea99926276bf05f05d0f546b4edd13 SHA512 80c731f2b961d1191f8a3573748fafd23ed73bc93b5645e107d9c4138f07d8139b47484b15d1289b0c9546de46a5e4876e33cdd4e3a899d31d1de2ce65d7bb93 -EBUILD qtquicktimeline-6.7.1.ebuild 390 BLAKE2B 3c681942e4da9869ecd39a039f136859918b1524b0f31bf2bad541ad0af935c4cc88c1c3b0af3ffbf2394d6b82a6201468de4f517e275c808fe9b44afc214827 SHA512 f66102e1ecb6a658399d2041822c4b9541a1bad07ae46fd00a8e3deae3e045538e5c2f81616d45834cb37dd82ce66e0a7f22650901d6fff174e09bad573b5469 -EBUILD qtquicktimeline-6.7.2.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040 +EBUILD qtquicktimeline-6.7.2.ebuild 389 BLAKE2B ff876ea9bce98b1093d8bf580150581d77ed7fbecc1c8db13c7869014e6ea5a0c85acab1527c0d323557a1eb9c546ac169bbea962fb30129e2e14c8165285de9 SHA512 c543dd8a5b220b5d264ef04b986e4e91147b54e169d8f747d962b2ada540e261ad3932489dab3d3f519e3f6ebdce6e711ad7773188363ccfde2b3ff2ec8d8452 EBUILD qtquicktimeline-6.7.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040 EBUILD qtquicktimeline-6.8.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040 EBUILD qtquicktimeline-6.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040 diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild deleted file mode 100644 index 5baaa72f2711..000000000000 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt module for keyframe-based timeline construction" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6 - ~dev-qt/qtdeclarative-${PV}:6 -" -DEPEND="${RDEPEND}" diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.2.ebuild index 393a5c2037bc..53b50c299892 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.2.ebuild +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt module for keyframe-based timeline construction" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi RDEPEND=" diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest index 0a6eed3cd04c..663669454466 100644 --- a/dev-qt/qtscxml/Manifest +++ b/dev-qt/qtscxml/Manifest @@ -1,10 +1,8 @@ DIST qtscxml-everywhere-opensource-src-5.15.14.tar.xz 429224 BLAKE2B 67936258bfb67bddf5b711bc97bebb123f56d8f7dca9b46424a33d1205b0a3a6dfc89ae7bc429ffedb928d4f1b88c62abdabee301c09a0e3b0bf65128f174d67 SHA512 1490824b0108300b1924f404431e3871ce067def15993aed9af768c871b3d0eae4cd0b8f467671d3ebcada98d5e11dfe86e250467b7dbf9708ce9f37766861d5 -DIST qtscxml-everywhere-src-6.7.1.tar.xz 1168276 BLAKE2B e97d521ce1c239c4c6dc40c44fed2f158e27df596df552fc8c296ce2824bca904a031303907ee2d8ec8d1cbc96c7b0d0ea384044e6a8cd1a31965ffab4e6bf3b SHA512 64a3fe0fb4311b4531c6fa9576399a181456990882c9aa7a5ddd5567cef579a22978e87d1641aa61532ef7c482b188967a401d7fd3b1cdf0f3ff657927594c61 DIST qtscxml-everywhere-src-6.7.2.tar.xz 1168452 BLAKE2B 7cb06fd09758aaea28ccada62aa51b427c265416afa3f152601cadd1c9586050e87d36f8cf9679ca3ef83777bfec1119d861bd9491a176460d58beb5376e4ce4 SHA512 4eba366c2c10593cfc0fdeeff92aa9951b838837cacf113bf849b5da68da4d41d550490bc4be28620f766ab412ca4066c71ee7a1ff18651dd08267b01df6c2fe EBUILD qtscxml-5.15.14.ebuild 397 BLAKE2B 51caa0740ef74f457378f5f276ff3d4fd29bdeb7881f906cb17c11d3fb625e869bcfb62d45c3ed940363b67d192ff36c94893e93a99b817477578bb74f4b1c46 SHA512 3bb9882d106168b0e30d0d96a9005a1d8a91f42da90c13b6020643cff878dc0a45ea92e7675733faf42901e2627b9a88acc3f8b37a53bd9a9ed7779f39eff512 -EBUILD qtscxml-6.7.1.ebuild 697 BLAKE2B 1c1efe6f56f36711d93b52956030e0c55059e8b5d5cbbaba1db44c3054e62dc82260af3507b8d48dde79368009b458bbd03f5260d39e58aea794549fe648595e SHA512 bc0c8f521b7927d5190c3a2b33a0479a1ef25482a38ab1ab99a93b298455fc692334dcb60a312e70074d6b5aeb7dc5eb47710ce27454449086a703227e9dd524 -EBUILD qtscxml-6.7.2.ebuild 708 BLAKE2B 2cbd0470924188e65a411a76106f7a9770613cd8ac38a30b0ca14d68000ae64b442018bcf368f305fffd0910e9ee095e20084f6851825589e24e8314b574c6aa SHA512 faa7db3aabd68b8f61bbf614f6a787870cd3a07736225a8e2b89660d65050cb538456d37da593d7538d89afc94ffb7cc5ce1fedbad31a3e12d3ee024cc899746 -EBUILD qtscxml-6.7.9999.ebuild 701 BLAKE2B 3f3dc63d520a01a012cb68170e09eafa3f4b5c76c89f9e5aaee38e881065609fb699cb6e83f364a54b27fed845f86d8eb08ef1c133be7254bf639450b8766d01 SHA512 5fa304b9927a5986908eeb9b6b0d364e1d6d6a9454aed38f8774092fcfeee1d97ddb55aeebe3b0d592b5b8f934d1981ab25ac4e5f0bb050614968d0a5defd96b -EBUILD qtscxml-6.8.9999.ebuild 701 BLAKE2B 3f3dc63d520a01a012cb68170e09eafa3f4b5c76c89f9e5aaee38e881065609fb699cb6e83f364a54b27fed845f86d8eb08ef1c133be7254bf639450b8766d01 SHA512 5fa304b9927a5986908eeb9b6b0d364e1d6d6a9454aed38f8774092fcfeee1d97ddb55aeebe3b0d592b5b8f934d1981ab25ac4e5f0bb050614968d0a5defd96b -EBUILD qtscxml-6.9999.ebuild 701 BLAKE2B 3f3dc63d520a01a012cb68170e09eafa3f4b5c76c89f9e5aaee38e881065609fb699cb6e83f364a54b27fed845f86d8eb08ef1c133be7254bf639450b8766d01 SHA512 5fa304b9927a5986908eeb9b6b0d364e1d6d6a9454aed38f8774092fcfeee1d97ddb55aeebe3b0d592b5b8f934d1981ab25ac4e5f0bb050614968d0a5defd96b +EBUILD qtscxml-6.7.2.ebuild 710 BLAKE2B bbd105c679bff1928af4d14c4af530c28ce44b26f88e6d78d9f95240bd06cb85c47e9589b52a263392666ef94bac37f68f30d4f0e9bdfc9522b11639d1c62c6f SHA512 ff4e669ae0319b95c83aafa3bd831fcf2c4c1c21e37842fe1eed4954b2bcfe072ca1c6ebb89f5858f22733bd57131de03a25d0e7baa1618919266dbc4836bb4b +EBUILD qtscxml-6.7.9999.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6 +EBUILD qtscxml-6.8.9999.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6 +EBUILD qtscxml-6.9999.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6 MISC metadata.xml 612 BLAKE2B 74120f98e194bd3776134a96e12add6f8b485464004a9b0bad910cd81ca00bb29d740dfbe8484067eaec788ea6d228a4148f2d9d0757ced2cba1ba0cc4cce0bd SHA512 42b0ed27db93385ca6734f2bf81a9d01b97b6658326c61f821d517a26451b27919e4c429641f7e4a27bcf26407b5c1e134e90651948064308075abd77f4fb942 diff --git a/dev-qt/qtscxml/qtscxml-6.7.1.ebuild b/dev-qt/qtscxml/qtscxml-6.7.1.ebuild deleted file mode 100644 index 67054f2b3468..000000000000 --- a/dev-qt/qtscxml/qtscxml-6.7.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~riscv x86" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # may fail with pid-sandbox, or at least musl/hardened+gcc (exact - # conditions unknown but passes without pid, considering this flaky) - tst_qstatemachine -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtscxml/qtscxml-6.7.2.ebuild b/dev-qt/qtscxml/qtscxml-6.7.2.ebuild index ab05251ac1d9..c856510d3f29 100644 --- a/dev-qt/qtscxml/qtscxml-6.7.2.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" fi IUSE="qml" diff --git a/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild index 70bce441eda7..0f087eb496fc 100644 --- a/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi IUSE="qml" diff --git a/dev-qt/qtscxml/qtscxml-6.8.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.8.9999.ebuild index 70bce441eda7..0f087eb496fc 100644 --- a/dev-qt/qtscxml/qtscxml-6.8.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.8.9999.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi IUSE="qml" diff --git a/dev-qt/qtscxml/qtscxml-6.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.9999.ebuild index 70bce441eda7..0f087eb496fc 100644 --- a/dev-qt/qtscxml/qtscxml-6.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.9999.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi IUSE="qml" diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest index 53163ba2d294..26d9891f7b1e 100644 --- a/dev-qt/qtsensors/Manifest +++ b/dev-qt/qtsensors/Manifest @@ -1,9 +1,7 @@ DIST qtsensors-everywhere-opensource-src-5.15.14.tar.xz 2051164 BLAKE2B 100f6e6c11b4ab9f25753b2f40c25920993e2b3b14173d36da1ec6fab0ee47e4bf29c44d45d6bfda431d95d62514aaa4bf7db0d2504982f11a469beda65341c7 SHA512 777882f3bf3ddbfe053132f123c14590538fdf483479877779cfdd3dc242021d86aedc6484a453b67282f1ba4447c73e4f7a04bf3d4b741789b37e646ab67f35 -DIST qtsensors-everywhere-src-6.7.1.tar.xz 1494588 BLAKE2B 1876030016b0c98a03218c585eaea9b670a7142ac2614d0c50d89009084f9e7c6a2d4cb7944328ea07cc74e99041df15fa770ab1630dfaca61af2d08729c6048 SHA512 3b7d44140c1de65d2ad7dc55d3891a0961be0604891aecd79c2f2f52bd1e2085747dcdb42735e3dcceb25dfe6204af79d8331f80bc7209e6ae302f02de7194f2 DIST qtsensors-everywhere-src-6.7.2.tar.xz 1497432 BLAKE2B 6bec19a047e8331cc3b7a6f8f3965f4dce0435a57374fb28bb38651dbb6e758727e5e2116d38f2ee6ebb3ca82f935ca9103b1a928514bdb714a0e770751e2c65 SHA512 fcc437407191ea8d56f54bdbef07d0c25f15e1eefa74f5bb2c3a49af4418fb75cd8f7a16a9afc9efcba7e14ed842ca6bddeff6225949e1d193bb6e8ff55fe565 EBUILD qtsensors-5.15.14.ebuild 566 BLAKE2B 1448b9978f85ba18bcccb00f356458bcd30d0610d48c172002c0fea61252a9966f8e6c7a9323499a6110e8d5bbe41e74744f37bd56d8601ec2c2f57b72362e14 SHA512 14e7dfe121cde2f5603c7d19d8c4d30abec0d9aa303938a57d0e3919c45e4500ca16f7e369cac8cb0b33f239c3325674815d1ac50a04d38145b16c1a7335f9b1 -EBUILD qtsensors-6.7.1.ebuild 536 BLAKE2B bd32243316951c1838dcb79360221029aa7142a1baa6ff14c25131fd40933d63ec8c2d0b5e8a2658f5248ac23c35ab728db7e0c7e2f16f2b0126ab3317a718c1 SHA512 9db0458e87dcc4e5c8f67e3343f4eeaf13510fadf385fd1bb06d24737750501f356b7d93fa6a7c3ef3209e02816f72e8dcecfe7ff1cc53cab81efb853fa99b3c -EBUILD qtsensors-6.7.2.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb +EBUILD qtsensors-6.7.2.ebuild 534 BLAKE2B e3d26f2197c4776078c309a1bc8241fb3a7de843a6896b6557a4f7da2bd3dd2577b5944f1f29c8a1181dacb5a3949d750c1b968330dfc2d66aec5de4c83bff3a SHA512 2664df744724a0748afacddc005daba4ef037b7a58f961aa5daebf98272fc8fd7acfc80e1f8d09ddc1e8c1f2590bc0790629d40d078fd75ee756e59f89399568 EBUILD qtsensors-6.7.9999.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb EBUILD qtsensors-6.8.9999.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb EBUILD qtsensors-6.9999.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb diff --git a/dev-qt/qtsensors/qtsensors-6.7.1.ebuild b/dev-qt/qtsensors/qtsensors-6.7.1.ebuild deleted file mode 100644 index b6709a364bd1..000000000000 --- a/dev-qt/qtsensors/qtsensors-6.7.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Hardware sensor access library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[dbus] - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtsensors/qtsensors-6.7.2.ebuild b/dev-qt/qtsensors/qtsensors-6.7.2.ebuild index 5a576fcfd7cc..d1c5cf9d6455 100644 --- a/dev-qt/qtsensors/qtsensors-6.7.2.ebuild +++ b/dev-qt/qtsensors/qtsensors-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Hardware sensor access library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi IUSE="qml" diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest index 6260d9f40a96..edf907468c15 100644 --- a/dev-qt/qtserialbus/Manifest +++ b/dev-qt/qtserialbus/Manifest @@ -1,9 +1,7 @@ DIST qtserialbus-everywhere-opensource-src-5.15.14.tar.xz 350748 BLAKE2B 88571e730c6a81d8db8be02550b0abc1f72bf8c40a5f0616cf879f17043b775f992d19d1b2429acfa0cf86634f9430d7b16f812e9b436f7f1403059298274057 SHA512 ac30e163fd2ef7a3d6dbb8f8f3cac06d68f915d29c87d1d49be541c38c3dd09873d89525508062b7cf6dc17d750167e0cc13bb48718f2a42b80b2e7f04e7633d -DIST qtserialbus-everywhere-src-6.7.1.tar.xz 547732 BLAKE2B 7728063e3cca62ffde710b3e45dabcabe1e09f9a9f82f15c34ad794102598bf0b6f8e20dce22a18a49477d47e12dfcb304d41b6cbee03d41e7fa33191e4ba7ca SHA512 d90a8209cf966f716a946880b595fc9fd22fc3069712c46ce22aeb85af5ed2c0fdb1c571bc569e95311453246c9697b92bb05648c7f4be3d18a262b500d59bae DIST qtserialbus-everywhere-src-6.7.2.tar.xz 547596 BLAKE2B de990e57a8139e540d906ba11a4a396db8bf5c6f719e366585251e513364cbd531bf8a31638b29aec0bc8fb5c2208745395de07569a5358c918b0c95c40f1656 SHA512 ba4d8c698e68508080f851d96428908b83f3d2f5d36dbcb00586567beb3001a8ca3f1d79fd9895aefb32c7d1a8400024e43cee2cdd4f427e80d47949593a3055 EBUILD qtserialbus-5.15.14.ebuild 430 BLAKE2B 11ca9b29a206685addc9929eb1bdd1f0f2be4235ca4f8d1a374f96b8984cc9009836c158909d6fabf3d710a06f00d2becffb6bfee6ecc52fa8b793db8f61e40d SHA512 526c137d6e04dbbf06ca280b9a35403b2d05499ff1eb9cfc79cf805bc025a7e20a495f3d16858a25ebbe075c1e6d48d4020edd20457cb4ea9e4b3331a2cef9b3 -EBUILD qtserialbus-6.7.1.ebuild 900 BLAKE2B a8212f5f347a83f277a94b61f552b34ada5574fde237693e1415c7cf8be8d1895386ffec3c88e8b8add5ce05f02ec799966ed0b7978d4caa4c6d5d34a4fd6183 SHA512 2283d8ad2911a159b34f8af5b0b3dac1788072a21502b5afeecef815345384170feb42d46bea5b685c9093fbbb96073533e9ed9dd02cbfb722cf69ad9ef18aff -EBUILD qtserialbus-6.7.2.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050 +EBUILD qtserialbus-6.7.2.ebuild 900 BLAKE2B a8212f5f347a83f277a94b61f552b34ada5574fde237693e1415c7cf8be8d1895386ffec3c88e8b8add5ce05f02ec799966ed0b7978d4caa4c6d5d34a4fd6183 SHA512 2283d8ad2911a159b34f8af5b0b3dac1788072a21502b5afeecef815345384170feb42d46bea5b685c9093fbbb96073533e9ed9dd02cbfb722cf69ad9ef18aff EBUILD qtserialbus-6.7.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050 EBUILD qtserialbus-6.8.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050 EBUILD qtserialbus-6.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050 diff --git a/dev-qt/qtserialbus/qtserialbus-6.7.1.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.1.ebuild deleted file mode 100644 index f545d9e396f3..000000000000 --- a/dev-qt/qtserialbus/qtserialbus-6.7.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network] - ~dev-qt/qtserialport-${PV}:6 -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # rarely fails randomly (perhaps related to -j) - tst_qcandbcfileparser -) - -src_install() { - qt6-build_src_install - - if use test; then - local delete=( # sigh - "${D}${QT6_LIBDIR}"/cmake/Qt6SerialBus/*TestCanBusPlugin*.cmake - "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_qttestcanbus.pri - "${D}${QT6_PLUGINDIR}"/canbus/libqttestcanbus.* - "${D}${QT6_PLUGINDIR}"/canbus/objects-*/ - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -} diff --git a/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild index 7f316fa23bbc..f545d9e396f3 100644 --- a/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild +++ b/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi RDEPEND=" diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest index 95afa8e5f132..c5d633fb89d9 100644 --- a/dev-qt/qtserialport/Manifest +++ b/dev-qt/qtserialport/Manifest @@ -1,9 +1,7 @@ DIST qtserialport-everywhere-opensource-src-5.15.14.tar.xz 315004 BLAKE2B 51f7353d373d258e2e9ed7fb5d6831cea66e9c29b2a632a67aa66936ec9b43a71792094e2fc5be6621edae6e0bc117282a3c278aad0446d391720859c15fa213 SHA512 64980191cf8bc27a7a28bc8d373f1ee4d16bec5ab6b1e3296d4bc245498bb59d29bec49ebe609f8242bffb205f923acff7ab736f80d01d7689032896ee8f9bad -DIST qtserialport-everywhere-src-6.7.1.tar.xz 271220 BLAKE2B f6d882a2ef2378877e4b677104f58a0d0fe53a609b35d3714e3c36213258ee5e86ab638a2b8eeae8bdae89ec59b249ec9278a57f9f7805430cb709b80a0348b3 SHA512 027d9f481760bbdbb3e131bc169dd515d736cb29e06a19afe7606e97f9c49871d210bbadbba78db1349717e88f37177294331e0669e002b1c24bf6a8e8ad3705 DIST qtserialport-everywhere-src-6.7.2.tar.xz 271320 BLAKE2B 14283d2a7452a828e5b238003ed1762d0c502b9abab9d42af4f56b5aad29d5f26a263fc8f9d68988b2d4b038c1169b0a8999cc5aacb2af67a43a643103f40700 SHA512 faedff39212a98e6b3d96e0fb530c6b63c5fec519f5226b015771b8c5122528c8b087b6ccf74aed42ee87f61ffe324ac5c87152dad282395013a84e3f5cb2d3f EBUILD qtserialport-5.15.14.ebuild 565 BLAKE2B 683036990929b3ceed4ead89d9a5d77b84494675bc8f7acdfd24f899781009785c91fd0c515f621d8d1cc489c363aaeed228d946d58758de28a54e012c042543 SHA512 484bfec55cb2329151f7e62e4530239b461177d760275b5af5424084664abc37974e6286f2f0621570d60ded7149e2e62a306649441b1552030110def0df602f -EBUILD qtserialport-6.7.1.ebuild 387 BLAKE2B d81600998ad987db736d6dcb757641564606f634b7f4c9c1c42c2c0102a4ecf219c9577f17e03c3ad695115134b0d070b7bc3522929544ed126abd712f7c753a SHA512 ad04575b8ac6adab70a7cdde411a939694795de1c2a1c243007e570833c0f58f174cdc97aece7626c8041233a6130e9a6becbb3c59960f84d95334dd1b7d572f -EBUILD qtserialport-6.7.2.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58 +EBUILD qtserialport-6.7.2.ebuild 386 BLAKE2B edf782f739e2ab208f66d9312943af46ea791526fcab53f393500eb5c1f5370ae2046714e32469e9e8eebf0b1352f88bcedaeb5e341e8b35ecb3983c892e69a1 SHA512 47a166753a785778c77b21579824c917e8eee0c63c16f0247b8634ebbf1706cd6f16db52d7912ec4547da4f59a03f75304ab47f85473a35b58d2dd09ac41d950 EBUILD qtserialport-6.7.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58 EBUILD qtserialport-6.8.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58 EBUILD qtserialport-6.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58 diff --git a/dev-qt/qtserialport/qtserialport-6.7.1.ebuild b/dev-qt/qtserialport/qtserialport-6.7.1.ebuild deleted file mode 100644 index 67ab8b8451f2..000000000000 --- a/dev-qt/qtserialport/qtserialport-6.7.1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Serial port abstraction library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6 - virtual/libudev:= -" -DEPEND="${RDEPEND}" diff --git a/dev-qt/qtserialport/qtserialport-6.7.2.ebuild b/dev-qt/qtserialport/qtserialport-6.7.2.ebuild index 95b360fac6cf..050871411f2f 100644 --- a/dev-qt/qtserialport/qtserialport-6.7.2.ebuild +++ b/dev-qt/qtserialport/qtserialport-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Serial port abstraction library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi RDEPEND=" diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest index 43f413b0540b..5b3c6bc4299a 100644 --- a/dev-qt/qtshadertools/Manifest +++ b/dev-qt/qtshadertools/Manifest @@ -1,7 +1,5 @@ -DIST qtshadertools-everywhere-src-6.7.1.tar.xz 1111284 BLAKE2B 337bb5ffe15ce5355081bbeab5004118e369cd7983d37fd770c303b8b326998c466a718002de18d854f4a5e24f6f74d9db8aa59432641b5165715764109d0d05 SHA512 8de9659e11c8b0048fd0af7616aec9a3395a3844f5e24740a88ffd7c3acffba041150338e2a3b7986006edd77a557bb944992b082191d2d959aae511fbc35dc6 DIST qtshadertools-everywhere-src-6.7.2.tar.xz 1111256 BLAKE2B a0bdf6f27882a903819c580c37a3dc7f361101345b66542dda162e99adf9a62983bfa7321881d6dac7e662178a125674606b08973bd55b77743fee19cbad8737 SHA512 b33e55f81d6878518dfe05db8ea3b319614dda10e215784496a61daaf8415fdeed1a3d802efc3cddc4fbca6c9894faf13475b35b3bb7d9a215b91238f9b38233 -EBUILD qtshadertools-6.7.1.ebuild 367 BLAKE2B f9ea7557570da1a2f1d3309770f7b9c8aa75a0dc5f168611ead563ab867557ca556210b6dbd004c0239fe96d0fd7c653443e50c41cbecc6201351d4623c72d7d SHA512 9ef147da0c026712a3d4d5409741859ffd3b7b46e5d0310dcee1c14ca3725cbb1a2d8311f822361ba58b26bb43f09942e0ecb7182db027a63f0c7a05d017ebf9 -EBUILD qtshadertools-6.7.2.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084 +EBUILD qtshadertools-6.7.2.ebuild 366 BLAKE2B 3bd5c942084732411b0c2249cd2bb83a81f8b46e27461cc3ef347abf63d1e2027baff3e0ace38bc48982bb1f8ae9e75a46f1ef95b699645b10e3b951d6d12e3a SHA512 1352e69d418bb3b926a84883f1831c94190d8563944a45c63361d8ea40ed6d22dcef8550ed62411e559c36204befee5f1d13aa67b5f6332de53a3225a1285098 EBUILD qtshadertools-6.7.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084 EBUILD qtshadertools-6.8.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084 EBUILD qtshadertools-6.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084 diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild deleted file mode 100644 index e8a5a86f2b64..000000000000 --- a/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt APIs and Tools for Graphics Pipelines" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] -" -DEPEND="${RDEPEND}" diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild index 68dae044e31f..e3cbab00e5f0 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt APIs and Tools for Graphics Pipelines" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi RDEPEND=" diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest index 4d5fedade33a..5761decb9682 100644 --- a/dev-qt/qtspeech/Manifest +++ b/dev-qt/qtspeech/Manifest @@ -1,10 +1,8 @@ DIST qtspeech-5.15.14-gentoo-kde-1.tar.xz 1044 BLAKE2B 9f5feb7168f17fa76e89efa2c6b08a339dcf024c2a248c3a23d210570a99e9232a06b0559593adf6eb62cffea4fa62e942c6e0f4efecfd3f073276e49e5a9210 SHA512 9a468eb627902932cd39d6b59216f3aff3183f047dec61361857ccc47502406731429abc39940e21b0f62c2ad2bc3bbe3f1d0a78e57f13fb891821ef2307bf90 DIST qtspeech-everywhere-opensource-src-5.15.14.tar.xz 95916 BLAKE2B 15673759f71d4096e29854caa398a5b72257d77891a568e8e4561403b6d88f584a709ab1281c69ff99b250030c40b85848436254b5b6b2277b95728994b81f14 SHA512 87d021efb5d07704dd5469bb3050e9381e8da47d2ef41bd37a95ac1903410b781283af42694dd1300c84bd0f0ea219e61da0a3aaf6204937578d26044a297f79 -DIST qtspeech-everywhere-src-6.7.1.tar.xz 261772 BLAKE2B a776930705b7ad7a127997d35046c0101a8c40111b5cec50779944b2db9aaff8ddce3d0d7a25152d4a13360a5c30c2b9993fe17ff931180ecb32845de90be7b3 SHA512 b97fc36601c77e9c594077e15be658f6307a2d89cc1c23594143827eb92b72182a671e418e3f83d3e072465068546d626a4cfc09ee03738f8c5a244984587b67 DIST qtspeech-everywhere-src-6.7.2.tar.xz 262360 BLAKE2B 0faceb7e8425ccb03574fa6db5a9f8dab967197341fce497fc2600a6200d417dba8b83a6a7616fed7cbce3d2c34b48b77e37814518996f917aeadc7ca628ebff SHA512 f6e598834ab455c9feb5836b0add05802261210be088f7860b746a214a5be7d332a43d7c09bd03eef48d362165f2739b858e966249c061c9ef537346453bd588 EBUILD qtspeech-5.15.14.ebuild 730 BLAKE2B c3941cd7399ec7d5cdffd2ad65611bc094c64d0aafdf08f40dc36e2da2feacd037bb01e32bcc8cc1d470a70b19dc3c71a7356c8b4a3921de65f1db6d800000e4 SHA512 e019cb16105b96d9e5d28ea5aa6e0cdb30572e6fcb5313a9efcf5da5b0c35cb696a2173ecf3f969e738db4b84311659c7b8666fe187e2f538db7366923d79374 -EBUILD qtspeech-6.7.1.ebuild 1186 BLAKE2B b9e21b364e3324458acf6e1a94e2972bab09269947b5d2e3e04a62c53a4cee6c3c62e81ab010214721eb3bc1c03adc4012dfc9a135ef7743cde43a8c2174255b SHA512 d97330a81fa2f3853d969057dc8426157dee620a73d565bc59f0a7dc358a76b9b6617a2fade9d8b470d7bfe11a1d3660d5c4f69b6a1ac4b2fe6ce2c6c916df21 -EBUILD qtspeech-6.7.2.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04 +EBUILD qtspeech-6.7.2.ebuild 1185 BLAKE2B 4dc3fb855f441253cf74cdfc6e75c7437d2e38b8be1f1045677b675f8f9da51827a9c9333adb0a05dbc2d4802573be4945815a13a3699b130080823f5c6f88a4 SHA512 e3f1519b15d9d46aeca3a907d71fb811e5bba2e47dc2490f82a3032a1341a3a1f7a6c10fcd5789dec1746b2116c5cc44fe74d4d00f37af804a813fec70c1d05f EBUILD qtspeech-6.7.9999.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04 EBUILD qtspeech-6.8.9999.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04 EBUILD qtspeech-6.9999.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04 diff --git a/dev-qt/qtspeech/qtspeech-6.7.1.ebuild b/dev-qt/qtspeech/qtspeech-6.7.1.ebuild deleted file mode 100644 index 483d7fddd3de..000000000000 --- a/dev-qt/qtspeech/qtspeech-6.7.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# tests are kind of flaky, sometimes hang, and also fail with clang -# (not that it's unusable with clang) -- may be worth revisiting -# eventually given qtspeech is still somewhat new (added in 6.4.0) -QT6_RESTRICT_TESTS=1 - -inherit qt6-build - -DESCRIPTION="Text-to-speech library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86" -fi - -IUSE="flite qml +speechd" -# can build with neither, but then it is just mock tts and may be confusing -REQUIRED_USE="|| ( flite speechd )" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6 - ~dev-qt/qtmultimedia-${PV}:6 - flite? ( app-accessibility/flite ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) - speechd? ( app-accessibility/speech-dispatcher ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - $(qt_feature flite) - $(qt_feature speechd) - - # flite_alsa was likely to work around old issues in flite, it does - # nothing but add -lasound (no code change, and is unneeded) - -DQT_FEATURE_flite_alsa=OFF - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtspeech/qtspeech-6.7.2.ebuild b/dev-qt/qtspeech/qtspeech-6.7.2.ebuild index b668e25bbabd..cbeae1e0894f 100644 --- a/dev-qt/qtspeech/qtspeech-6.7.2.ebuild +++ b/dev-qt/qtspeech/qtspeech-6.7.2.ebuild @@ -13,7 +13,7 @@ inherit qt6-build DESCRIPTION="Text-to-speech library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" fi IUSE="flite qml +speechd" diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index a2a346a530f6..b1311967b3b2 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,10 +1,8 @@ DIST qtsvg-5.15.14-gentoo-kde-1.tar.xz 2868 BLAKE2B 57e8e5112bf2efd41ee7ca305003884b6f28fd37ea9d7c895e93d4b952e0d7a40a6af0498e25e0017bb3d3828fb5df36b143ea7f31e760aee0fa075c4c74bd10 SHA512 2ab453dfff56c690c058a2751b03cf7faa7c5453a558b9bf64367d5e53f6139b63544a2bfc6fcf312ba852137574675b9d6cfa56f13421084f22e9477e7c92a7 DIST qtsvg-everywhere-opensource-src-5.15.14.tar.xz 1881248 BLAKE2B dc0f0754d480448436eb11e962877ca4d396859f7282dc7e66ac726ddea4135e0d8360bdfc5ea9896c228e496a4dda2c72d82c0cf688255aaa0a0518bed36a05 SHA512 4f781bddaae619125fc0f73b5736eb33dc49f368cc9cab9fce436cb57b389e66d14d2625e9100c2c1d809b67c3ceb16f718f50ce4abe1c925cf8dc8bb8b285a8 -DIST qtsvg-everywhere-src-6.7.1.tar.xz 1790712 BLAKE2B 4df926dbac0372d41fbaf0ac3ea5cce5c80439ef29154837c9a67b054ba901a48b14d5935afe77ba748b909910bd719fc3a7cec5a3b4afa2712dd671b0ecccfc SHA512 8c5b54886e8a9580c022229b8b6176eaf9f113890333e5d9ca558fe57e6f2acad2a2e01fb5154ddb67a48ac95727d744339512876fb8334077ca5af27506e106 DIST qtsvg-everywhere-src-6.7.2.tar.xz 1791468 BLAKE2B e72cf5b153141942c7aa92f7433b19317549deacc5d9bf981dd41f80ce25b0bc60c81185eb9134146aa93a6ce830aa3afcaced9e92902b9aa8c4a321718a5f86 SHA512 5a4209134afd3265d4b4b02a388a3078f2f915613c83e8a4aafd292e6b49d77019597f820468c8a9fe6c046c64e6890ac94ebc52e6b321a9b57a5ef3b51552e4 EBUILD qtsvg-5.15.14.ebuild 496 BLAKE2B 973507084399af01f2f442cbfd3a6c9dfe91c8185ddb483c9b7b8cc1f7cf135e80e4c7c1286f22bc59a5209a87144310780d0c380681b963d42204c46a228e07 SHA512 d8500010ff86d3d03f18210b771fe0961b99d16efebbba0c428ffcc49dda115814538f6d8b20801671ee5a0de7b1e643eed6101c7f37dbf42795d1a5c6dfd978 -EBUILD qtsvg-6.7.1.ebuild 655 BLAKE2B 4609e7e89355efc516d215b53fe91d69d477fa83985b0a1251ece83c0e12857c365f7087add8888c034cf9a938b128718ac4d49c70919f6ea00c73da39df6f68 SHA512 a3ce460ab6bd044ec810b978394a3bea266c9587202caa413e40011f690b103d03f4ea88331e8db7b0e7ca5f1413667a1b1908ec461bc2734924befa663402e8 -EBUILD qtsvg-6.7.2.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef +EBUILD qtsvg-6.7.2.ebuild 654 BLAKE2B 868b671ad183a7fe54943560e5a3498212d973c57ec5ff5b8b50e443f6666d59c723d1848378a75205b0d43b7979fd6c2b2e93720a3048566fd7c4bab879debd SHA512 f680b4b711d32a94de2f400499ae4d25c9a2b53938591684e49b75e96047d69ac1691c0acef8279009fe603a17c299fcdbe97edc3677626b16716db1fe674751 EBUILD qtsvg-6.7.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef EBUILD qtsvg-6.8.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef EBUILD qtsvg-6.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef diff --git a/dev-qt/qtsvg/qtsvg-6.7.1.ebuild b/dev-qt/qtsvg/qtsvg-6.7.1.ebuild deleted file mode 100644 index dfcbf6a8848b..000000000000 --- a/dev-qt/qtsvg/qtsvg-6.7.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build toolchain-funcs - -DESCRIPTION="SVG rendering library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,widgets] - sys-libs/zlib:= -" -DEPEND="${RDEPEND}" - -src_test() { - # tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact) - # is known failing on BE, could use more looking into (bug #935356) - [[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer ) - - qt6-build_src_test -} diff --git a/dev-qt/qtsvg/qtsvg-6.7.2.ebuild b/dev-qt/qtsvg/qtsvg-6.7.2.ebuild index e7ea7c613b25..a715121ada1c 100644 --- a/dev-qt/qtsvg/qtsvg-6.7.2.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build toolchain-funcs DESCRIPTION="SVG rendering library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi RDEPEND=" diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index 99818b5f9d8c..59d876214e71 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1,7 +1,5 @@ -DIST qttools-everywhere-src-6.7.1.tar.xz 9016376 BLAKE2B 081a8a6fc838ee1dcee1b82cb46996ed246639a230f23d324fdcf2153c46ddbdd619505df0380ea20c7e9c668159dc49a061ecf57f27026b0a6fc7e6017d9b1c SHA512 5b21fc8a5f208615a3493a2ae24356705477c50f675cd7f29fc2eb7f7af5c2af7859068d26404ff8075d163adf0b0c4f267d14fa3f618de76ace8cd353a58a15 DIST qttools-everywhere-src-6.7.2.tar.xz 9019636 BLAKE2B c4324275adddefc2399ce4ff1305d285c9e4bc7fb6cebf6bd310573773ada5cf91f14561b855df685bdcce0a39897c3b9e0b62544083af2794d7eaaf35660146 SHA512 311467d0e6970711b4d984fe792d2b75609f38c04121073d5c3c34c682fcee89787f6982c886e62206a76b1f647de60e56510439b0288f8bd1ae21a2683a37cd -EBUILD qttools-6.7.1.ebuild 4647 BLAKE2B df21c86f66baa7e799184c8e914191fb8ae2552d2f81608c90e149849eba154b9dbe80877e3de241bbd16f9f09b7b0df32a366907292a38dfa5fe8ed378acfb1 SHA512 cb09bae6d6728597c4f727165777ca1517413182341526f5d5b02898ed00c295bd118f13f376a6be0104a7b80df6503fb8d54373551820f48ea9f870fd45fe06 -EBUILD qttools-6.7.2.ebuild 4652 BLAKE2B eebd7864fe6b6c135e0a8a3ca82facb8596cd468c6cb7b9064ea2eb88d0340c9756c5c53cb29c8aff02553dc60665391d337bf470d0483e7d7e7dc6b789512d0 SHA512 0f106b67908d04dc45ef0954251dc699c2e4de63a223b03680fe295d2687830dfd2814bf7c0a5996fa847c4e48fa7e3d41fbe076f278e17cdab571fb91dc2f8a +EBUILD qttools-6.7.2.ebuild 4646 BLAKE2B 4a77d671a5311fcd7e6170bc29764560993be958cc8ea58d6c31d8132372a5f65197a69acd3eee45d211cbbf95ee653849faa7d98a302db07f60e3b79b3e4912 SHA512 69930be9d05a6fbb10c616b8ec8b664d40428abbf516777ac5fcf85adc4a2ed39a82bcbfbb988aef8568ac0a3adcb4939fb89e531e90bbda97c751c6ff0e3e49 EBUILD qttools-6.7.9999.ebuild 4652 BLAKE2B eebd7864fe6b6c135e0a8a3ca82facb8596cd468c6cb7b9064ea2eb88d0340c9756c5c53cb29c8aff02553dc60665391d337bf470d0483e7d7e7dc6b789512d0 SHA512 0f106b67908d04dc45ef0954251dc699c2e4de63a223b03680fe295d2687830dfd2814bf7c0a5996fa847c4e48fa7e3d41fbe076f278e17cdab571fb91dc2f8a EBUILD qttools-6.8.9999.ebuild 4975 BLAKE2B 35918fb023a017c7c2b958e5ec7990cf80cf45fed3d633b65e26314d62e597e7f19dc72d96b781f498e646f11a0c200c4510b2761c75df892b8a084d8707c823 SHA512 d2f528eabad3c58e41ec133a56715efa394d659cfac183477c8e41ae7c2afeca48cf81dbadf6f52ebff3da9f5f9a42aba761f57cbb436b02446d1d26fcb3cbca EBUILD qttools-6.9999.ebuild 4975 BLAKE2B 35918fb023a017c7c2b958e5ec7990cf80cf45fed3d633b65e26314d62e597e7f19dc72d96b781f498e646f11a0c200c4510b2761c75df892b8a084d8707c823 SHA512 d2f528eabad3c58e41ec133a56715efa394d659cfac183477c8e41ae7c2afeca48cf81dbadf6f52ebff3da9f5f9a42aba761f57cbb436b02446d1d26fcb3cbca diff --git a/dev-qt/qttools/qttools-6.7.1.ebuild b/dev-qt/qttools/qttools-6.7.1.ebuild deleted file mode 100644 index b00cc875577e..000000000000 --- a/dev-qt/qttools/qttools-6.7.1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum -LLVM_OPTIONAL=1 - -# behaves very badly when qttools is not already installed, also -# other issues to handle (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -QT6_RESTRICT_TESTS=1 - -inherit desktop llvm-r1 optfeature qt6-build - -DESCRIPTION="Qt Tools Collection" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE=" - +assistant clang designer distancefieldgenerator gles2-only - +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner - qtdiag qtplugininfo vulkan +widgets zstd -" -# note that some tools do not *require* widgets but will skip a sub-tool -# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) -REQUIRED_USE=" - assistant? ( widgets ) - clang? ( ${LLVM_REQUIRED_USE} ) - designer? ( qml widgets ) - distancefieldgenerator? ( qml widgets ) - pixeltool? ( widgets ) - qdoc? ( clang qml ) -" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network,widgets?] - assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) - clang? ( - $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT}= - sys-devel/llvm:${LLVM_SLOT}= - ') - ) - designer? ( - ~dev-qt/qtbase-${PV}:6[xml,zstd=] - zstd? ( app-arch/zstd:= ) - ) - qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) - qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) - widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) -" -DEPEND=" - ${RDEPEND} - qtdiag? ( - vulkan? ( dev-util/vulkan-headers ) - ) -" - -pkg_setup() { - use clang && llvm-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - # prevent the clang test as it can abort due to bug #916098 - $(cmake_use_find_package clang WrapLibClang) - $(cmake_use_find_package qml Qt6Qml) - $(cmake_use_find_package widgets Qt6Widgets) - $(qt_feature assistant) - $(qt_feature clang) - $(qt_feature designer) - $(qt_feature distancefieldgenerator) - $(qt_feature linguist) - $(qt_feature pixeltool) - $(qt_feature qdbus) - $(qt_feature qdoc) - $(qt_feature qtattributionsscanner) - $(qt_feature qtdiag) - $(qt_feature qtplugininfo) - - # TODO?: package litehtml, but support for latest releases seem - # to lag behind and bundled may work out better for now - # https://github.com/litehtml/litehtml/issues/266 - $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON) - - $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - if use widgets; then #914766 - use designer || use distancefieldgenerator || use pixeltool && - newicon src/designer/src/designer/images/designer.png designer6.png - - if use assistant; then - make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ - 'Qt;Development;Documentation' \ - 'Comment=Tool for viewing online documentation in Qt help file format' - newicon src/assistant/assistant/images/assistant-128.png assistant6.png - fi - - if use designer; then - make_desktop_entry designer6 'Qt 6 Designer' designer6 \ - 'Qt;Development;GUIDesigner' \ - 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' - fi - - if use distancefieldgenerator; then - # no icon, sharing with designer which fits letter-wise - make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ - 'Qt;Development' \ - 'Comment=Tool for pregenerating the font cache of Qt applications' - fi - - if use linguist; then - make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ - 'Qt;Development;Translation' \ - 'Comment=Tool for translating Qt applications' - newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png - fi - - if use pixeltool; then - # no icon, not fitting but share with designer for now - make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ - 'Qt;Development' \ - 'Comment=Tool for zooming in the desktop area pointed by the cursor' - fi - - if use qdbus; then - make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ - 'Qt;Development' \ - 'Comment=Tool that lets introspect D-Bus objects and messages' - newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png - fi - - # hack: make_destop_entry does not support overriding DESCRIPTION - find "${ED}" -type f -name "*.desktop" \ - -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die - fi -} - -pkg_postinst() { - use assistant && - optfeature "Qt documentation viewable in assistant" \ - 'dev-qt/qt-docs:6[qch]' #602296 -} diff --git a/dev-qt/qttools/qttools-6.7.2.ebuild b/dev-qt/qttools/qttools-6.7.2.ebuild index fd8e80ea6380..ac30a31faddf 100644 --- a/dev-qt/qttools/qttools-6.7.2.ebuild +++ b/dev-qt/qttools/qttools-6.7.2.ebuild @@ -16,7 +16,7 @@ inherit desktop llvm-r1 optfeature qt6-build DESCRIPTION="Qt Tools Collection" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi IUSE=" diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest index 3a3777fc52ce..221643b07912 100644 --- a/dev-qt/qttranslations/Manifest +++ b/dev-qt/qttranslations/Manifest @@ -1,9 +1,7 @@ DIST qttranslations-everywhere-opensource-src-5.15.14.tar.xz 1626976 BLAKE2B 61263b9b28fb0d8feb715ebd7cfd85a7fb3e4a6a1e13841d5c4a38dfbf0a57cafa2484e8f4352e0ed16bf820153df0b4c192cf7e906fe29cb56c5de040368523 SHA512 bf41fea921151c10f78804e274919805ccee12c13c57fe50e8f6df863aa955e4a1aa939d23a7500cd3b5fe6aa5656b1a12628cdbed1e9c8dc1f126e2cf7d7176 -DIST qttranslations-everywhere-src-6.7.1.tar.xz 1547716 BLAKE2B 5b5ff4c81cdf56e9e3b6dfaa6eeaa88e5589c742a1a129b663e49d7666824d7e52b775b367951830407807a97f7adfa67ee0c02e997fa72374859096cde0cc63 SHA512 380b1f4738720955ec8f8790325952eb2eb7c3257f6fb24a283d86d8f4063109c55b7b2b077c0ae5119523cc42e39db203c88f2af66104be9e09edc1370c6ff6 DIST qttranslations-everywhere-src-6.7.2.tar.xz 1547608 BLAKE2B 93d6dcd62a0dd4210be5d0f00957dd89d32d6362d8e3a1459eb819d32eeb05f354185df4ae8cc2fe705b0b964f73dbf01ed5b8d8fd89c679f99cb2953a065505 SHA512 a1937f117af71a6896ebaf89f05bcb9c61c34711105609ac80a0f85d96cd427786e902ae4e2dccc38060c4fd9161f42a0cfdd7e39e618e3996fbe1c7f05c84d9 EBUILD qttranslations-5.15.14.ebuild 379 BLAKE2B 4e8592ec1a5ee9571ebf1eb9fc40b2b593a8448d6a600f7ec61813a8416fbf6492759ee1b93e36137d994166f30d0ddc1a95b2971c0f4fa61779b37c37b2514b SHA512 483a60952a599acea2c0a6b4916fb7566120e552812469f7a0291ba8b7a063be4afd1a7ce2f8e56271a24f34fb8750eff99c03814b0c92f38cdec1a005c0d6e3 -EBUILD qttranslations-6.7.1.ebuild 413 BLAKE2B c8f21d4f1e7090c80673c17672e354a406196b47fb9909df401840d32823c5052979b5bea19e2ba196a54f440de19eb2e01ed17b11da982dd40216f000650541 SHA512 366f05b04bb9c37f2f4856a8f49634c04085a88f4c0f7d061124ad3e849831e4da7ed93fb0ac6f99cfac41e4fc0498aa595e747c50153e6c60431f21f6b2c58f -EBUILD qttranslations-6.7.2.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf +EBUILD qttranslations-6.7.2.ebuild 412 BLAKE2B d08fc60c197e7a0349b64fefb0351ca74a71120efa4bd339d5e0350e44436d9ee1aee9b993a76eca13624f3327ff86ab1c6036be785169f40a297301bb99647f SHA512 4e00238cd3a999111c233a96021b1a98783c9edb0a3345313c750713f99aacc78b8b35a6092de4ab5a6490b569f52a6d19cb947850689269303874541ed7cc90 EBUILD qttranslations-6.7.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf EBUILD qttranslations-6.8.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf EBUILD qttranslations-6.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf diff --git a/dev-qt/qttranslations/qttranslations-6.7.1.ebuild b/dev-qt/qttranslations/qttranslations-6.7.1.ebuild deleted file mode 100644 index f4c597c04812..000000000000 --- a/dev-qt/qttranslations/qttranslations-6.7.1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QT6_RESTRICT_TESTS=1 # no tests -inherit qt6-build - -DESCRIPTION="Translation files for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" -fi - -DEPEND="~dev-qt/qtbase-${PV}:6" -BDEPEND="~dev-qt/qttools-${PV}:6[linguist]" diff --git a/dev-qt/qttranslations/qttranslations-6.7.2.ebuild b/dev-qt/qttranslations/qttranslations-6.7.2.ebuild index 4957b280c2a2..d15dc95a0d36 100644 --- a/dev-qt/qttranslations/qttranslations-6.7.2.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.7.2.ebuild @@ -9,7 +9,7 @@ inherit qt6-build DESCRIPTION="Translation files for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi DEPEND="~dev-qt/qtbase-${PV}:6" diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest index 416d46104517..f4912f30a5b2 100644 --- a/dev-qt/qtvirtualkeyboard/Manifest +++ b/dev-qt/qtvirtualkeyboard/Manifest @@ -1,9 +1,7 @@ DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.14.tar.xz 10952936 BLAKE2B 258584cfe09100fa35b8b6293a6fb29f7d7631a7ca8e3b27d121bfa8a86e96c5a346dae1aed3aca6d80501210f5cc594f1c133adc41f12dcdfde6d12d2f91a0c SHA512 d6ff2770282e460a8d9fff3746225918cb21c65ef0d0d89e1c6876428ca1e860ecf45b44d57c9ef6e9a85cb050a4a67ecc1b20ae5c5be0a37d8b73ca439587c3 -DIST qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz 3729484 BLAKE2B d5079f63f8c8dac1d5f364c7fc92477eb50f05c991ce9fbd2f5c7cde424348f9284b18b39bb0a22962aac5bdefdd890650356d65653ab20c68ab98b779e2a1cc SHA512 7d3baf735cac2906de5bc982fc3d1efa45c77d1d527ca3392cade59975cc8307ea85b0f7f018607cfc531742e8da6bfbc04f9ba4b523b2ebf1ebcde8f64befcd DIST qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz 3722296 BLAKE2B 316ee5e2204ebabd97c0d6ceb8bd9775bc456eb404f6ffee43a163823c43d86a94e900a06d8a1124506385aa8b17d67efd70caec64cded9dcd747d667186c9fd SHA512 016400a65e14a5ec960f20ecf6b2b7c32fa0c67d530c5046b423633b02efce200e0967642a072ff825c54c334dfe45be3e569c16d641a735f181d233fa414782 EBUILD qtvirtualkeyboard-5.15.14.ebuild 1214 BLAKE2B a2d1b8ccf58d8236afd410c626b28d6ef7cbbbd678620335d0f9f1f0f623d36c5185e5d7cb469d5e48a0759135a045c83afe88c409a764d87c97de88d5513ad3 SHA512 a5ee55fa5a05d94e62e6c5ee5d5abb10f3243985f9d04d9b57df175864ef2c73fb82ba0ece7bf2710e4ad4ad47c8da190a7f085f291e6f5f5786df681c76b08d -EBUILD qtvirtualkeyboard-6.7.1.ebuild 1129 BLAKE2B 1674a0d4b3a37095f07942dd8fee94a9b7ba08715bb20f13e1d5aaf5d1cba76ee512bad49bc3a08fec40bdf025f746ac11f13fa09d635ea5012c2fd940d49cfa SHA512 a75546b4bcd2e4cf8dabef6cc188d584559268c2f0d10214e0b6c9ad0aafef005864870ec7b878740a40f1a5a13f1cd6f00af95ffd28a2bd6be1fdb194f2e579 -EBUILD qtvirtualkeyboard-6.7.2.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b +EBUILD qtvirtualkeyboard-6.7.2.ebuild 1128 BLAKE2B 5e2e9cc78e01cbd695a92b5bcfa28158106ca8a20318b7afaaa9e2bd368246b9d3d3e5901874c08aa6460010f3789c5d16fb1c0340793713f439d58cf7ff5b77 SHA512 634a516fe913cc5ada1862aefb7c0023bc749fa040ea29a1ecdcc3609af7d3fbedc1769332fc5abc2beeba5cf3d15fbf3d6dc7c415fb98f1ac31567cd046a506 EBUILD qtvirtualkeyboard-6.7.9999.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b EBUILD qtvirtualkeyboard-6.8.9999.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b EBUILD qtvirtualkeyboard-6.9999.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild deleted file mode 100644 index 7297597168fb..000000000000 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Customizable input framework and virtual keyboard for Qt" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86" -fi - -IUSE="+spell" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtsvg-${PV}:6 - spell? ( app-text/hunspell:= ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(qt_feature spell hunspell) - -DINPUT_vkb_handwriting=no # neither cerence nor myscript are packaged - ) - - qt6-build_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - # rarely randomly(?) fails even with -j1 - tst_layoutfilesystem - ) - - if use spell && has_version app-dicts/myspell-en; then - # 99% pass but minor sub-tests fail with myspell-en, needs looking into - ewarn "Warning: notable tests were skipped due to ${_} being installed" - CMAKE_SKIP_TESTS+=( - tst_inputpanel - tst_inputpanelcontrols2 - ) - else - einfo "tst_inputpanel can take >5mins, not known to actually hang" - fi - - qt6-build_src_test -} diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.2.ebuild index 4639b2cf069d..8c917e41434e 100644 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.2.ebuild +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Customizable input framework and virtual keyboard for Qt" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" fi IUSE="+spell" diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index e45e77606e75..8ad1aac20df4 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,10 +1,13 @@ +AUX qtwayland-6.7.2-drag-drop.patch 2349 BLAKE2B e22347050b017831c8039700dc3658c468e2e4577df2e9afabd73574b311c3f8c2ed5ca40138cd9b4bdf1e2bb9e4c5333ab2856a1a46e879ca84308f7cf585d4 SHA512 ea6780aed6ec30dae53e73d7be9329b1daa59db704c6d32aff776a72b12411fa1a0d4376d1bf295a57df9761e2f81d3644d626d37f7a7490324ee79dbd23ce5d +AUX qtwayland-6.7.2-null-screen.patch 1208 BLAKE2B 7ccc921245d3dccb1c3ea440becc85959bf94fa0b7836097c862f966396d68850af660531edcdd4637ac2a752a8bf50bdca6260ceb753b921eee85783d4ab714 SHA512 b3336eb707abafc8928893ac3e61c708a7cb43873b2fdb1576ac6dc6c74b52d9ca45d80c30f3d5fb8d374fb72fbb19cb7b0b799528f820bcda87704375841516 +AUX qtwayland-6.7.2-plasma-popup.patch 1032 BLAKE2B 81a0c2dceac3bde808f463d0d2ad6159fd362528b2b37ed018283a05e4d317f6d31fcf87815e2b041aece5f49ae60bd4dfd7a2861aa2ea71f914343e6ff422ad SHA512 c5a63dfd9ff7a3a36bc7fce76b7c6b7ceb12b03dd9f758690cbfca715afc8989c747b4a535749ee44f6827e3af576d614050e0672263a32b420dd37aee008fb0 +AUX qtwayland-6.7.2-thread-safety.patch 2420 BLAKE2B 4e5d871bd93a24cc2bb5c879a9eb336aacbfe20c3a6df15777ccdfb41a4d2b84484097a7d0680a5c02631cb84864259cdc9e68d04b0ab654275bd73ec92700b8 SHA512 18978aac57472575ee2dbcd44d1dbb7d21e6a116589cd78d9530272e0c67c8e730d2bf8272cc92cbd78d460ba710cb408595e11c59dca2649d8565cf4e7b135f DIST qtwayland-5.15.14-gentoo-kde-1.tar.xz 47472 BLAKE2B 3812e5f18bcb857cf3c76cf8a53525a84b14bc4cf8430f4339c1ef9a5d6208dcdfba3f052bcc80c6ad8815db2415207e2eb5ed07bbf9e7076be675f2a4cee3c0 SHA512 912bc902e4f9d945dac396c75a2af9896e3002535a51e6b5b07166c38b9d6ea073da3d93db07742a0db295dd5f8167fdef351230adcb2145704c36b576c0f5e3 DIST qtwayland-everywhere-opensource-src-5.15.14.tar.xz 560916 BLAKE2B a5edb21446348f20e6f65736b402c3075a4bde0d7fa02c24cbfc5de65739ca8d7ac2186bd17a995bfb3de23106e696e2b1321dc3ae401984bdafaa3479c9aa1e SHA512 9e8add52353f7a146759511c49c001cd76a56790a81af5222f6f2d3d1a2f1ee9cc62048c72efe69708eb3444c6115272d4af8d738df7b1e1da959359d7420dbb -DIST qtwayland-everywhere-src-6.7.1.tar.xz 1122036 BLAKE2B 93acec00864f7f112b442ed60dbd1c297d08695ebccd6755bdc46b40af0e5f69288c9b404fc1d43fc0217bdeb1e770c4ec3950a33c67b577da4f0c308e6867b1 SHA512 9128ecd32319fd2ca154cb3d52726c80f96e2c906f9cf80cd67a3f91a4db49a853948489ec712061c6ef2c5abe70cd850c37f947659199678ac1482c77485a76 DIST qtwayland-everywhere-src-6.7.2.tar.xz 1123220 BLAKE2B 70c2d8942afc4e1629d2ef34b6c062ecb5800185bb37e150c1d66a5216606028d2f59668991bddb5036572c962e92c3658d336167a7f9ffbf3d2f4d609a771f9 SHA512 2cd4f45f05ae60bc7f82b94f2e9c217ee4b8322f60381e1b079b90e0687e51cfbeb10b5dd724e1cca7e422b1b101d2b91c0ee47b1a732411cef330fb052c97c2 EBUILD qtwayland-5.15.14.ebuild 1214 BLAKE2B 4d974a96e807dfbad6bf480bb6faf022828c9cab0fd5bc82b6c6455344fafd7a349f1f232fa62a00e32cc073cda39aead004657e7b4072f49890442baeda3252 SHA512 75966f4a890e77a29937d63ed50a8095d579fab4871f2d091bb410443a0101fabc592a6cfbe033b12d6f0663c196930a32c85a062a10de4f8dc13eee4103b86b -EBUILD qtwayland-6.7.1.ebuild 1476 BLAKE2B 562d8812d8d5aaabe8942dda7789cffdf55d9544eec04fb9bee2503f6abb74fa7914c5224c8dd0db794ec309dfe700ebced6f7c709af1d5614fdcde475221324 SHA512 9418a1600472831aa16a061f0a92cd32a2b712b08018238f2f71d21c1c505e94cff8a58982e5f9fdbb34c4863cad689a5f54ec470d0338c79aae21f515adb261 -EBUILD qtwayland-6.7.2.ebuild 1481 BLAKE2B d0762b5c9c61dbe06bcef6410d60ea27fc33b9debb8d8d80e8fa3b03de7cf8f60b5c240094d8b21518da97167ddb5acde78e11f21b2589d10a3bd8dd70044abc SHA512 e8eccc7fb2b9d6c67bdc717428b8579c8d92c1ee239de07d6bff6715aea430fbfc756fa286640b6f8d35b0a774bd4e15b404d017e1f6043e9e8d79385fea4eba +EBUILD qtwayland-6.7.2-r1.ebuild 1527 BLAKE2B efe529b2925dc1ec8ce987a3eed243afcece1963d84345aeb1b758d5fbbe59d29c06229eaa4ee88f9fd2f776ed9f34136f9c0750b9be3bbc1fcad93fc076ec14 SHA512 001a07a9ee53545f18ca970c9dc7caece8055a1eb559d6e52fc0a1c5e6c7f9b14ff03098c203d6f1f823283b6b1143edba980258073f0eb884b82e9d570d6026 +EBUILD qtwayland-6.7.2-r3.ebuild 1643 BLAKE2B 2a6e6a274173f93a4da9c8d95bb39240d57969d6b96819f85aa488ac6707729003d402d756348852c37001672fb3cf07258af84411a5610497513bd81c76fc86 SHA512 c1f133bfb32c03922b8c26cfdd9fc0120bce0f4ad02fc653615d69f3a48f62b313b8c67b2df65b8445f95574e3fdb438f00d8beb3fad5b73d46e07497b8171ed EBUILD qtwayland-6.7.9999.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289 EBUILD qtwayland-6.8.9999.ebuild 1604 BLAKE2B 955233e9dce7287eab5e8ccb13b548e44bc31dc71a195f665c1422a33045a309a131cf4443714a31799a2c1a387fc0ffc1d4f653c6b7bd25de77cae8f92c2e68 SHA512 374607e7b5f0e65e89ce1dc9e2cb714212a876c556826ca92cfb347a6a7bea8dd2f94e3455dd3e2fd66cf16a5e23350e2ca4fb316139626eb0c7bc46f66fb800 EBUILD qtwayland-6.9999.ebuild 1604 BLAKE2B 955233e9dce7287eab5e8ccb13b548e44bc31dc71a195f665c1422a33045a309a131cf4443714a31799a2c1a387fc0ffc1d4f653c6b7bd25de77cae8f92c2e68 SHA512 374607e7b5f0e65e89ce1dc9e2cb714212a876c556826ca92cfb347a6a7bea8dd2f94e3455dd3e2fd66cf16a5e23350e2ca4fb316139626eb0c7bc46f66fb800 diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-drag-drop.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-drag-drop.patch new file mode 100644 index 000000000000..6141d95cb834 --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-6.7.2-drag-drop.patch @@ -0,0 +1,67 @@ +Backport from upcoming 6.7.3[1][2] for [3][4]. + +[1] https://github.com/qt/qtwayland/commit/85ec3ae70b905ddf9e16d86c468446d74867743f +[2] https://codereview.qt-project.org/c/qt/qtwayland/+/565408 +[3] https://bugs.kde.org/show_bug.cgi?id=482770 +[4] https://bugs.kde.org/show_bug.cgi?id=490059 + +From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@venerandi.com> +Date: Mon, 3 Jun 2024 12:19:59 +0200 +Subject: [PATCH] Emit a LeaveEvent on drag and drop start + +All focused windows will now receive a LeaveEvent when a drag and drop starts. +This makes sure that the dragged element does not preserve any hover decoration +during the drag and drop, and that other elements that happen to take place +of the dragged elements don't become hovered too. +--- a/src/client/qwaylanddnd.cpp ++++ b/src/client/qwaylanddnd.cpp +@@ -29,4 +29,9 @@ + void QWaylandDrag::startDrag() + { ++ // Some compositors do not send a pointer leave before starting a drag, some do. ++ // This is discussed upstream at: https://gitlab.freedesktop.org/wayland/wayland/-/issues/444 ++ // For consistency between compositors we emit the leave event here, upon drag start. ++ m_display->currentInputDevice()->handleStartDrag(); ++ + QBasicDrag::startDrag(); + QWaylandWindow *icon = static_cast<QWaylandWindow *>(shapedPixmapWindow()->handle()); +--- a/src/client/qwaylandinputdevice.cpp ++++ b/src/client/qwaylandinputdevice.cpp +@@ -524,4 +524,10 @@ + } + ++void QWaylandInputDevice::handleStartDrag() ++{ ++ if (mPointer) ++ mPointer->leavePointers(); ++} ++ + #if QT_CONFIG(wayland_datadevice) + void QWaylandInputDevice::setDataDevice(QWaylandDataDevice *device) +@@ -880,4 +886,12 @@ + window->handleMouse(mParent, e); + } ++} ++ ++void QWaylandInputDevice::Pointer::leavePointers() ++{ ++ if (auto *window = focusWindow()) { ++ LeaveEvent e(focusWindow(), mSurfacePos, mGlobalPos); ++ window->handleMouse(mParent, e); ++ } + } + +--- a/src/client/qwaylandinputdevice_p.h ++++ b/src/client/qwaylandinputdevice_p.h +@@ -93,4 +93,5 @@ + void setCursor(const QCursor *cursor, const QSharedPointer<QWaylandBuffer> &cachedBuffer = {}, int fallbackOutputScale = 1); + #endif ++ void handleStartDrag(); + void handleEndDrag(); + +@@ -321,4 +322,5 @@ + public: + void releaseButtons(); ++ void leavePointers(); + + QWaylandInputDevice *mParent = nullptr; diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch new file mode 100644 index 000000000000..6a7e85a8f4b6 --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch @@ -0,0 +1,29 @@ +Backport of [1] for [2], will be fixed in qtwayland-6.7.3. + +[1] https://codereview.qt-project.org/c/qt/qtwayland/+/576718 +[2] https://bugs.kde.org/show_bug.cgi?id=489072 + +From: David Edmundson <davidedmundson@kde.org> +Date: Wed, 10 Jul 2024 09:00:33 +0100 +Subject: [PATCH] client: Guard against windows being on a null screen + +calculateScreenFromSurfaceEvents uses the screen information from our +surface enter events. If this is not set yet, or refers to outputs not +yet complete we fall back to the QWindow::screen. This was introduced in +e03613524fc9f6be5c4cd7e9bdb00bc09c7f1e0b. + +It was assumed that this would always be a valid value as QtBase keeps +it updated, but there are apparently paths for it to still be null. + +It will be evaluated again when the surface receives a wl_enter event or +the output that we have entered is finally initialised and we will then +be marked as on the correct screen. +--- a/src/client/qwaylandwindow.cpp ++++ b/src/client/qwaylandwindow.cpp +@@ -1406,5 +1406,5 @@ + QPlatformScreen *newScreen = calculateScreenFromSurfaceEvents(); + +- if (newScreen->screen() == window()->screen()) ++ if (!newScreen || newScreen->screen() == window()->screen()) + return; + diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch new file mode 100644 index 000000000000..25c7918a5a8b --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch @@ -0,0 +1,25 @@ +Fixed in qtwayland-6.7.3 + +https://mail.kde.org/pipermail/distributions/2024-July/001512.html +https://invent.kde.org/qt/qt/qtwayland/-/commit/92bcb8f6b7a852c7a5d662fc34de561692a7a454 +From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> +Date: Thu, 20 Jun 2024 11:25:06 +0300 +Subject: [PATCH] Client: Ensure that guessed popup parent has a shell surface + +The last input window may not have a shell surface if it is a subsurface +or that window has been just made invisible. +--- a/src/client/qwaylandwindow.cpp ++++ b/src/client/qwaylandwindow.cpp +@@ -1157,8 +1157,10 @@ QWaylandWindow *QWaylandWindow::guessTransientParent() const + return mTopPopup; + } + +- if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) +- return display()->lastInputWindow(); ++ if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) { ++ if (auto lastInputWindow = display()->lastInputWindow()) ++ return closestShellSurfaceWindow(lastInputWindow->window()); ++ } + + return nullptr; + } diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-thread-safety.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-thread-safety.patch new file mode 100644 index 000000000000..92be3b81d5b0 --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-6.7.2-thread-safety.patch @@ -0,0 +1,65 @@ +Backport from 6.8 branch which should later land in 6.7.3 in [1] for [2]. + +[1] https://codereview.qt-project.org/c/qt/qtwayland/+/574983 +[2] https://bugs.kde.org/show_bug.cgi?id=489180 + +From: David Edmundson <davidedmundson@kde.org> +Date: Fri, 05 Jul 2024 16:13:40 +0100 +Subject: [PATCH] Client: Improve thread safety determining window size on the render thread + +updateSurface is called from both the render and GUI thread. We +therefore need every property referenced to be thread safe. + +Rather than guarding each property we cache the buffer size whenever the +window geometry or scale changes and put a mutex round this one +variable. +--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp ++++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp +@@ -51,4 +51,13 @@ + void QWaylandEglWindow::ensureSize() + { ++ // this is always called on the main thread ++ QMargins margins = mWindowDecoration ? frameMargins() : QMargins{}; ++ QRect rect = geometry(); ++ QSize sizeWithMargins = (rect.size() + QSize(margins.left() + margins.right(), margins.top() + margins.bottom())) * scale(); ++ { ++ QWriteLocker lock(&m_bufferSizeLock); ++ m_bufferSize = sizeWithMargins; ++ } ++ + updateSurface(false); + } +@@ -61,12 +70,15 @@ + // Just resize the wl_egl_window, the EGLSurface will be created + // the next time makeCurrent is called. +- updateSurface(false); ++ ensureSize(); + } + + void QWaylandEglWindow::updateSurface(bool create) + { +- QMargins margins = mWindowDecoration ? frameMargins() : QMargins{}; +- QRect rect = geometry(); +- QSize sizeWithMargins = (rect.size() + QSize(margins.left() + margins.right(), margins.top() + margins.bottom())) * scale(); ++ ++ QSize sizeWithMargins; ++ { ++ QReadLocker lock(&m_bufferSizeLock); ++ sizeWithMargins = m_bufferSize; ++ } + + // wl_egl_windows must have both width and height > 0 +--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h ++++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h +@@ -61,5 +61,11 @@ + + QSurfaceFormat m_format; ++ // Size used in the last call to wl_egl_window_resize + QSize m_requestedSize; ++ ++ // Size of the buffer used by QWaylandWindow ++ // This is always written to from the main thread, potentially read from the rendering thread ++ QReadWriteLock m_bufferSizeLock; ++ QSize m_bufferSize; + }; + diff --git a/dev-qt/qtwayland/qtwayland-6.7.1.ebuild b/dev-qt/qtwayland/qtwayland-6.7.2-r1.ebuild index 930d08222fb3..359827ec4690 100644 --- a/dev-qt/qtwayland/qtwayland-6.7.1.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.7.2-r1.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Wayland platform plugin for Qt" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" fi IUSE="accessibility compositor qml vulkan" @@ -28,6 +28,10 @@ DEPEND=" " BDEPEND="dev-util/wayland-scanner" +PATCHES=( + "${FILESDIR}"/${P}-plasma-popup.patch +) + CMAKE_SKIP_TESTS=( # segfaults for not-looked-into reasons, but not considered # an issue given >=seatv5 exists since wayland-1.10 (2016) diff --git a/dev-qt/qtwayland/qtwayland-6.7.2.ebuild b/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild index 11f94d7bd709..b597f8cb8897 100644 --- a/dev-qt/qtwayland/qtwayland-6.7.2.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Wayland platform plugin for Qt" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" fi IUSE="accessibility compositor qml vulkan" @@ -28,6 +28,13 @@ DEPEND=" " BDEPEND="dev-util/wayland-scanner" +PATCHES=( + "${FILESDIR}"/${P}-plasma-popup.patch + "${FILESDIR}"/${P}-drag-drop.patch + "${FILESDIR}"/${P}-thread-safety.patch + "${FILESDIR}"/${P}-null-screen.patch +) + CMAKE_SKIP_TESTS=( # segfaults for not-looked-into reasons, but not considered # an issue given >=seatv5 exists since wayland-1.10 (2016) diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest index b023c2630481..aabaae2a8117 100644 --- a/dev-qt/qtwebchannel/Manifest +++ b/dev-qt/qtwebchannel/Manifest @@ -1,10 +1,8 @@ DIST qtwebchannel-5.15.14-gentoo-kde-1.tar.xz 5812 BLAKE2B ac20fd8622e8a201520e1b3540c7f832ac755b7054e9968e5254873ddc21ba06ca17582f02628e5327d9cc6720becd952fef7c9f4e22f5b0a96664d15fe45435 SHA512 de64b3b5d90c4401cd42d05129923db10a29fd65282be98c54c07b9fd3e677a541bc2abe149ffeae956ee9f2f5c2bf279d82bde67c8dfde26f3ea6890b7593d6 DIST qtwebchannel-everywhere-opensource-src-5.15.14.tar.xz 203184 BLAKE2B 5d6965b3fcd9e449be1fe2b81935b665c23028d22fd68305faf6b5541642071cb4c991dfea7b079e7e66635756f095284b6fae88e2b328878df7dc3fb10df24e SHA512 8b87f73a256dff16ec8de226b10d8a34d9a1c4f1c2d510ea58824558f3b188a3a4d66c4507764b713407f44a0861e96d061fd164a1a050129fcf4148efd3999f -DIST qtwebchannel-everywhere-src-6.7.1.tar.xz 206564 BLAKE2B 0d9187d5e37f92e1b297f5b5e73bc0fdd7dfa979d79c47532af5cacdbfe1d6ff3d8b810e060f4a97f62f50addb581b23784b8769f12ba3c34d661f3e5bd88b82 SHA512 a70af0f0f778a7a9455859fe1c03eb4f3263e9333f24389763c340787ef4a76caad5c6639692aa070d76ba87b3c8b45c5fef8dec4e9abc9bcbc377b093696751 DIST qtwebchannel-everywhere-src-6.7.2.tar.xz 206584 BLAKE2B fb990da23a2228a49a5e4eb99d1c8085265b25e7371c3cafb565c3977772ac0a47bdc6cad7e4ea4493c4c25897e8ac4993e3718cb893fcc299f8e1c5b56c6fdf SHA512 6d9dae2925acfe560c2c1b4382d6e7ce7762f840e76b513f03f5e9e892fb4ad3fb0059ffef725210d88ee4210a8a09678af9b7d3dfbc6d7ff55f3e65396153dc EBUILD qtwebchannel-5.15.14.ebuild 599 BLAKE2B 73cf6f6f51eadeaada9e9a50fd4ca14f1b7cb0b9822f793c016e4059fc1fa8a32332e2e5318370c8806d03affc9de63b38dc0511e8c01cc631b01df21dc75cfe SHA512 f0a6f32a6791c4c66bdf6cee33b1349b80f60560575cd72684d600a831f98c44e0d406eb074aaf0a50b7df7de44f06db9489659ca041013bac3d1714d540a6e8 -EBUILD qtwebchannel-6.7.1.ebuild 561 BLAKE2B 3f4b65820b76ee966eb797660a5f91de8607ebd890d9cbd47ad61d9000d002de9c3ac2494695206aa11f2c54de6f0f92bf6e88ddf3e4d2de9639f3e95e85bf4f SHA512 fbbea0b89cea2baf8ebf751f1a53aaf6cde3f1c988199295e9119bfe112680331ab2540c334889fb0b21be4f20eb8ad6ad77e48b4fd42ed32247ca2a4c0cb627 -EBUILD qtwebchannel-6.7.2.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553 +EBUILD qtwebchannel-6.7.2.ebuild 559 BLAKE2B 592c74b3e20fd7b6733987bc830aa0e96c1c5acc2b88add79938aeddbb801d057a561ea6f996b88a3256e38b5b0c28da24816d0e32016b9bdce0c3c5a2e4ebef SHA512 ec033de27d6e77b83f141cd73ea56b85df144b2ce53f09cd11672fc65f09459f6cb8ac3188251bee6dba2b278434a50b0373c985590aa4380d9cb52373f44aa0 EBUILD qtwebchannel-6.7.9999.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553 EBUILD qtwebchannel-6.8.9999.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553 EBUILD qtwebchannel-6.9999.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553 diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild deleted file mode 100644 index 3c0f01392f22..000000000000 --- a/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt WebChannel" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[concurrent] - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND="${RDEPEND}" - -src_configure() { - has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692 - local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.2.ebuild index e0cac52a6b5d..3d70b781aaa8 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.7.2.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt WebChannel" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi IUSE="qml" diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index b261ec235ee5..75035f2e5085 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -3,14 +3,11 @@ AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf AUX qtwebengine-6.7.2-QTBUG-113574.patch 1696 BLAKE2B 10d4bca0527636a3934ccfdf6e52fca4ca369d07624c3b63377dc899a2f0313a936347d73dccf2f35d259f43c9c76bb7519b85339468b93b49862d3d5057f23b SHA512 bb2489a41da7b7a00fe58fee963b89e6ba8ece2c1a8f29e75169db7400a475473866c71bc78825875d007cac1e98175251b1f5fb4bdfbdd4318d32fc6f7871a2 DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474 -DIST qtwebengine-6.7-patchset-8.tar.xz 8320 BLAKE2B 88f31506865aeef02d6ad0c46dacd478f4c77330815648bf5377762b9f053f5a51b6426c1fbeef81fff5c3a9f4e853f8d51013d5df27fcd0ab0449ce369e18e5 SHA512 1d8e1f8e15a13c6f1675208ba1a329dfa335031e06577de39dc89464b40bd5cf7df7bce4f09f6e67a84c1c2f7aa1fbf6d2d94ea8c142ec5ea67bac8cef1b03b1 DIST qtwebengine-6.7-patchset-9.tar.xz 7440 BLAKE2B 061f39250450af3c8d4458649c80c18d0bf8448061e0bb91f8a0d7c630ff1cd2ee19a9528998c5a4a3ebab1e96ea0ba579cc0db5d879fe56a1239901942ba933 SHA512 4dabb56d6c74600f8d5a4ebb4356ffaaff1814eefe1cb268e33749fee034e9488e34043d0ce0893138ee01b023c09298c737bca3875a30be1bf862a145e244c7 DIST qtwebengine-6.8-patchset-1.tar.xz 7512 BLAKE2B 04eee1a1008f8a193dbb719e08c61e26a78cb68f3a0b9f7cc43b442bd2d851301682009ad7cd96df13da1c0aa7e9459b1b7024193379509abd4784e2547276e7 SHA512 591e5340435a8a40b6805d3db07b440bf185c694461382051c668e41f2ea5d04d5d7ab72602f557ee91a687d6187e919d662751e32dadaea8dc19de568e2c54e -DIST qtwebengine-everywhere-src-6.7.1.tar.xz 550975920 BLAKE2B b0bbe1d62132bc75f830df7e40d885e976629e759de442702043c71b50a11e874d06c9450378c522894d5e29cc07e05111554758b5bb6aaeca59de1720d6550f SHA512 dc70048bf65ef610dd9cec7e233f1e5a387bde620e84ee5a8e517fc9c326220d58c80939454d55481ceff5ac5b82baaa9823255ea43eb4bb43e86beae68c7b8c DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7659 BLAKE2B d930e49649e91657fbe65668a0dfe41ebd4732d4901c36f59f562094d9cb9d339157bf0f5c4e8b530270a13c8a40449ac4800ce9a17a29069be1c7177c288452 SHA512 6c621d916a502e778fb9662dba61161eb55b6ab37bd1045d5a96924bc943428b3ef28512d7838b31b4bfaa0ac43e23b10a66d67fdce2505139325cc837dd756f -EBUILD qtwebengine-6.7.1.ebuild 10335 BLAKE2B 07a6b771a160576cd1812da7fb42bc020c603288bb2220af2d80dd5a8a1e21b324b6d040936fab0986dfa8eb19e5567b56e4b872c8315ce9321534327c31b158 SHA512 fae01a93192be9ad56c3970b523cf0c606e794944b468b95646aee20a234cb785216eae6c652a64e49b24b26c4c210daae60df1b85275973f418b9630bcfee29 -EBUILD qtwebengine-6.7.2.ebuild 10383 BLAKE2B a48d23b446dd01073e0250213733c41ffe0d856c2a7db95aa3d160c49e8f1ea07b93c2e8fa016ebc8477e98b781af0374b6c090b0bd45f19d873c63fe3711147 SHA512 bccd4d397ce5ed9ebe91c7c422e91f6def0af290d572261331e574bcd1f6954c7656c7272ccd5d6869766f08e457b0a96eabdb4b9e321a5f90bf8cbeda3aa03f +EBUILD qtwebengine-6.7.2.ebuild 10381 BLAKE2B 38654e43a9c524829c8a31f9e0e6b06428a7626ff237c6022dcf9ffe2552f4239153702dbaf633bab51bb1ecb239fe3af6997ad779d8e944a0661d215719e204 SHA512 c2fb4ea75b501d5d60ca890f244115db8319949fb4af3d864c777e62154635c430d9307b0aff44d568b4d95cb6de68c0c9143ef14b0275237d3d4db7b3158bd9 EBUILD qtwebengine-6.7.9999.ebuild 10383 BLAKE2B a48d23b446dd01073e0250213733c41ffe0d856c2a7db95aa3d160c49e8f1ea07b93c2e8fa016ebc8477e98b781af0374b6c090b0bd45f19d873c63fe3711147 SHA512 bccd4d397ce5ed9ebe91c7c422e91f6def0af290d572261331e574bcd1f6954c7656c7272ccd5d6869766f08e457b0a96eabdb4b9e321a5f90bf8cbeda3aa03f EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild deleted file mode 100644 index 5a2f200aba85..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild +++ /dev/null @@ -1,335 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -PYTHON_REQ_USE="xml(+)" -inherit check-reqs flag-o-matic multiprocessing optfeature -inherit prefix python-any-r1 qt6-build toolchain-funcs - -DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" -SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-8.tar.xz -" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64" -fi - -IUSE=" - accessibility +alsa bindist custom-cflags designer geolocation - +jumbo-build kerberos opengl pdfium pulseaudio qml screencast - +system-icu vaapi vulkan webdriver +widgets -" -REQUIRED_USE=" - designer? ( qml widgets ) -" - -# dlopen: krb5, libva, pciutils, udev -# gcc: for -latomic -RDEPEND=" - app-arch/snappy:= - dev-libs/expat - dev-libs/libevent:= - dev-libs/libxml2[icu] - dev-libs/libxslt - dev-libs/nspr - dev-libs/nss - ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?] - ~dev-qt/qtdeclarative-${PV}:6[widgets?] - ~dev-qt/qtwebchannel-${PV}:6[qml?] - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libwebp:= - media-libs/mesa[gbm(+)] - media-libs/openjpeg:2= - media-libs/opus - media-libs/tiff:= - sys-apps/dbus - sys-apps/pciutils - sys-devel/gcc:* - sys-libs/zlib:=[minizip] - virtual/libudev - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - x11-libs/libdrm - x11-libs/libxcb:= - x11-libs/libxkbcommon - x11-libs/libxkbfile - alsa? ( media-libs/alsa-lib ) - designer? ( ~dev-qt/qttools-${PV}:6[designer] ) - geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) - kerberos? ( virtual/krb5 ) - pulseaudio? ( media-libs/libpulse[glib] ) - screencast? ( - dev-libs/glib:2 - media-video/pipewire:= - ) - system-icu? ( dev-libs/icu:= ) - vaapi? ( media-libs/libva:=[X] ) - !vaapi? ( media-libs/libvpx:= ) -" -DEPEND=" - ${RDEPEND} - media-libs/libglvnd - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libxshmfence - opengl? ( media-libs/libglvnd[X] ) - screencast? ( media-libs/libepoxy[egl(+)] ) - pdfium? ( net-print/cups ) - test? ( - widgets? ( app-text/poppler[cxx(+)] ) - ) - vaapi? ( - vulkan? ( dev-util/vulkan-headers ) - ) -" -BDEPEND=" - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') - dev-util/gperf - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex -" - -PATCHES=( "${WORKDIR}"/patches/${PN} ) -[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999 - PATCHES+=( "${WORKDIR}"/patches/chromium ) - -PATCHES+=( - # add extras as needed here, may merge in set if carries across versions -) - -python_check_deps() { - python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" -} - -qtwebengine_check-reqs() { - [[ ${MERGE_TYPE} == binary ]] && return - - if is-flagq '-g?(gdb)?([1-9])'; then #307861 - ewarn - ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which" - ewarn "is non-trivial with ${PN}. May experience extended compilation" - ewarn "times, increased disk/memory usage, and potentially link failure." - ewarn - ewarn "If run into issues, please try disabling before reporting a bug." - fi - - local CHECKREQS_DISK_BUILD=8G - local CHECKREQS_DISK_USR=360M - - if ! has distcc ${FEATURES}; then #830661 - # assume ~2GB per job or 1.5GB if clang, possible with less - # depending on free memory and *FLAGS, but prefer being safe as - # users having OOM issues with qtwebengine been rather common - tc-is-clang && : 15 || : 20 - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G - fi - - check-reqs_${EBUILD_PHASE_FUNC} #570534 -} - -pkg_pretend() { - qtwebengine_check-reqs -} - -pkg_setup() { - qtwebengine_check-reqs - python-any-r1_pkg_setup -} - -src_prepare() { - qt6-build_src_prepare - - # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix - hprefixify -w /Gentoo/ src/core/content_client_qt.cpp - - # store chromium versions, only used in postinst for a warning - local chromium - mapfile -t chromium < CHROMIUM_VERSION || die - [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] && - QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die - [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] && - QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die -} - -src_configure() { - local mycmakeargs=( - $(qt_feature pdfium qtpdf_build) - $(qt_feature qml qtpdf_quick_build) - $(qt_feature webdriver webenginedriver) - $(qt_feature widgets qtpdf_widgets_build) - $(usev pdfium -DQT_FEATURE_pdf_v8=ON) - - -DQT_FEATURE_qtwebengine_build=ON - $(qt_feature qml qtwebengine_quick_build) - $(qt_feature widgets qtwebengine_widgets_build) - - $(cmake_use_find_package designer Qt6Designer) - - $(qt_feature alsa webengine_system_alsa) - $(qt_feature !bindist webengine_proprietary_codecs) - $(qt_feature geolocation webengine_geolocation) - $(qt_feature jumbo-build webengine_jumbo_build) - $(qt_feature kerberos webengine_kerberos) - $(qt_feature pulseaudio webengine_system_pulseaudio) - $(qt_feature screencast webengine_webrtc_pipewire) - $(qt_feature system-icu webengine_system_icu) - $(qt_feature vaapi webengine_vaapi) - $(qt_feature vulkan webengine_vulkan) - -DQT_FEATURE_webengine_embedded_build=OFF - -DQT_FEATURE_webengine_extensions=ON - -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet - -DQT_FEATURE_webengine_pepper_plugins=ON - -DQT_FEATURE_webengine_printing_and_pdf=ON - -DQT_FEATURE_webengine_spellchecker=ON - -DQT_FEATURE_webengine_webchannel=ON - -DQT_FEATURE_webengine_webrtc=ON - - # needs a modified ffmpeg to be usable, and even then it may not - # cooperate with new major ffmpeg versions (bug #831487) - -DQT_FEATURE_webengine_system_ffmpeg=OFF - - # use bundled re2 to avoid complications, may revisit - # (see discussions in https://github.com/gentoo/gentoo/pull/32281) - -DQT_FEATURE_webengine_system_re2=OFF - - # bundled is currently required when using vaapi (forced regardless) - $(qt_feature !vaapi webengine_system_libvpx) - - # not necessary to pass these (default), but in case detection fails - $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ - freetype gbm glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libtiff libwebp libxml \ - minizip opus poppler snappy zlib) - - # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON - -DINSTALL_GN=OFF - ) - - local mygnargs=( - # prefer no dlopen where possible - $(usev pulseaudio link_pulseaudio=true) - $(usev screencast rtc_link_pipewire=true) - # reduce default disk space usage - symbol_level=0 - ) - - if use !custom-cflags; then - strip-flags # fragile - - if is-flagq '-g?(gdb)?([2-9])'; then #914475 - replace-flags '-g?(gdb)?([2-9])' -g1 - ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)" - fi - - # Built helpers segfault when using (at least) -march=armv8-a+pauth - # (bug #920555, #920568 -- suspected gcc bug). For now, filter all - # for simplicity. Override with USE=custom-cflags if wanted, please - # report if above -march works again so can cleanup. - use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*' - fi - - # Workaround for build failure with clang-18 and -march=native without - # avx512. Does not affect e.g. -march=skylake, only native (bug #931623). - # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time - use amd64 && tc-is-clang && is-flagq -march=native && - [[ $(clang-major-version) -ge 18 ]] && - has_version '<sys-devel/llvm-18.1.5-r1' && - tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} && - append-flags -mevex512 - - export NINJA NINJAFLAGS=$(get_NINJAOPTS) - [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v" - - local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}" - einfo "Extra Gn args: ${EXTRA_GN}" - - qt6-build_src_configure -} - -src_compile() { - # tentatively work around a possible (rare) race condition (bug #921680) - cmake_build WebEngineCore_sync_all_public_headers - - cmake_src_compile -} - -src_test() { - if [[ ${EUID} == 0 ]]; then - # almost every tests fail, so skip entirely - ewarn "Skipping tests due to running as root (chromium refuses this configuration)." - return - fi - - local CMAKE_SKIP_TESTS=( - # fails with network sandbox - tst_loadsignals - tst_qquickwebengineview - tst_qwebengineglobalsettings - tst_qwebengineview - # fails with offscreen rendering, may be worth retrying if the issue - # persist given these are rather major tests (or consider virtx) - tst_qmltests - tst_qwebenginepage - # certs verfication seems flaky and gives expiration warnings - tst_qwebengineclientcertificatestore - # test is misperformed when qtbase is built USE=-test? - tst_touchinput - # currently requires webenginedriver to be already installed - tst_webenginedriver - ) - - # prevent using the system's qtwebengine - # (use glob to avoid unnecessary complications with arch dir) - local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* ) - [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}" - local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess - local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales - local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]} - - # random failures in several tests without -j1 - qt6-build_src_test -j1 -} - -src_install() { - qt6-build_src_install - - [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472 - die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" - - if use test && use webdriver; then - rm -- "${D}${QT6_BINDIR}"/testbrowser || die - fi -} - -pkg_postinst() { - # plugin may also be found in $HOME if provided by chrome or firefox - use amd64 && - optfeature "Widevine DRM support (protected media playback)" \ - www-plugins/chrome-binary-plugins - - elog - elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with" - elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. Extensive as it is, the" - elog "list of backports is impossible to evaluate, but always bound to be behind" - elog "Chromium's release schedule." - elog - elog "In addition, various online services may deny service based on an outdated" - elog "user agent version (and/or other checks). Google is already known to do so." - elog - elog "tl;dr your web browsing experience will be compromised." -} diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild index 1ad6561ecc65..bd95d3e001b0 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" " if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64" + KEYWORDS="amd64 arm64" fi IUSE=" diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest index 698b15066738..51caea8538be 100644 --- a/dev-qt/qtwebsockets/Manifest +++ b/dev-qt/qtwebsockets/Manifest @@ -1,10 +1,8 @@ DIST qtwebsockets-5.15.14-gentoo-kde-1.tar.xz 1516 BLAKE2B 9e4f7d81c06ff4556294e75d84b66d9f42e4bd5232460c05513a7ee6f96410b707101877bfda875765db1f419273d3888684275d6221b21070cacbb09c9525b1 SHA512 f0831286d7cad8b954c20274be86c75bb6e2f60d0b5acdd5567921a539949e88a7f0d25297786d1b4f203045e9ab95d4a2234bedb5e05bc930ac7e2d35527a9a DIST qtwebsockets-everywhere-opensource-src-5.15.14.tar.xz 253024 BLAKE2B d1e2306f566ed3b0bff07920ab3ac83d268829ead4afe042ebdbdda92110a6d8af5f2483ba667c52b3bab812ca4fbfb2b38fd498271271562493c9815e952f5f SHA512 bfd3738a9bdf51dd4534c2341c20e3918a1183ca3f4307de5c2fd7224dfcc890162530e7d8c67ceed9ca56c2c9d15d4c80355e65c4e5a41bd7f7ce4d3b072b1b -DIST qtwebsockets-everywhere-src-6.7.1.tar.xz 459720 BLAKE2B e9564a82b4548d1b6df5f703e9affbeee7b8e525512b43c93835ee67872ebd7f58220e60f40af2aa0479c36f246bf7b3ffe3cc904aa31a509162761920bae542 SHA512 32fc9c07fd9e5a36ca9f8787abc59dec309beaf060a0b7f86a9f8d9d3a678a0ec95883455b036a81456af063c1aec01898b5914c27b9845224add0df5cbf5b28 DIST qtwebsockets-everywhere-src-6.7.2.tar.xz 459636 BLAKE2B c639132f9a4b029d52172bf50aa3b4534f7dc39dad12a1ea85d6bb6a9f72a61d9043688734713fd553952cf63be034102a9c22daa9306fd112d75bd3bd756930 SHA512 ccd2bde6f68aa0993f099b4755f6e79f64d8ff85be8891b2682194984851e0ec0f71dfa69aec53df6c7f49df7f123eff30920c9b1f5c79da5285ab5605d22dee EBUILD qtwebsockets-5.15.14.ebuild 578 BLAKE2B a2f9c91925d8c60877cb1913fe32b4789b3ba2245c8c2e7dbe21bcbf79929ff3b8b2ebc35ce6041d9a6484eada12a56a3a66749626f8f78257f562e96155b7b6 SHA512 f5ed35b96c058ca3a60515a29a4d46821cc706db7901959ab1e46e461cb471eb554656b94d8d54cb16c985354a04f45db46b266b40e9ba1e466a018df2570b47 -EBUILD qtwebsockets-6.7.1.ebuild 561 BLAKE2B b966b8ede4480f0039d3df08fd4acc00879a3ae6937e5f2a7757375a289bb6f21610cd5e2ed67bd8f22c90a4614127ecb6ed76eec5b25b0f5cd2ad6f2796df72 SHA512 9d766be2b9bb8f7a4913f3a200b86d7b4d1f695fc53b7905a10fc919b6f6cfdfaaddbd8a9d23776b19d14ccf22fd6ddcb9fe020adb7ae0f8846e2f0de922e005 -EBUILD qtwebsockets-6.7.2.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226 +EBUILD qtwebsockets-6.7.2.ebuild 559 BLAKE2B 9b2e30c6559234b0a5489a79a2dd6c3e62702de945703a2490cba704b3e5e73338b1e7d5aee3057399a3f6cb38d719296ac86d8ed0f729db4a1ac5cf9c2d3596 SHA512 b8170c0b84848bc6a4bee20d545a21a4320befdb6ce8d188abc709e0908915dc9b06cecef7a371cede19ca0a6f783c9353292e85d7d1a0b7293048deae7ae0b2 EBUILD qtwebsockets-6.7.9999.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226 EBUILD qtwebsockets-6.8.9999.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226 EBUILD qtwebsockets-6.9999.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226 diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild deleted file mode 100644 index 349761620a96..000000000000 --- a/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86" -fi - -IUSE="qml +ssl" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network,ssl=] - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Quick) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.2.ebuild index d7e808f49cf7..af33451a2582 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.7.2.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi IUSE="qml +ssl" diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest index 7b381ac80791..735cebe720c1 100644 --- a/dev-qt/qtwebview/Manifest +++ b/dev-qt/qtwebview/Manifest @@ -1,9 +1,7 @@ DIST qtwebview-everywhere-opensource-src-5.15.14.tar.xz 128212 BLAKE2B 89f3d770b6a23eb9dd4750e65d9b40e55379374a87c66d319f534d68e4a70ab1656497fe7ccf4df9b62553acb9231dfc3c79b69cd76c284b7d745b01f09a46ff SHA512 5a48688439a8d4eaa13c4a5c8453e6a399413d28a8cbdcb1d04a4723b9a0a527d64c2c48bc040cf960300335db958add05a63fb39a6a94fbe1ad19f4989864f6 -DIST qtwebview-everywhere-src-6.7.1.tar.xz 138776 BLAKE2B 0823353cb22211b46a90dd09b80eef4bd353d1d3d058ec6238b05e5c6a9cfaec0b3afe5da2a78f41104761b356d8228a8b44928ec0a8ade1bf3811f76afd04f7 SHA512 fb37f33db26eb7cbd4f2295df50518fde5f3bb74f95f7f73e6c5edbe07f9db86091f47ab5a962c39ec342a87aac95a5c3a358b169f3664ec5ca1bfac5bd64af7 DIST qtwebview-everywhere-src-6.7.2.tar.xz 138764 BLAKE2B 3c7d51dfa8f82a30c92eed804e9f51986947e3f8042b6a3a8d777b02bd7369b98c53686e5032b855bee2200958df00b0e779720bfbe91aae9df154133ca765be SHA512 9cae6f415941049c975a86f99afbb62f3177285a15d182655b9fbab5b3d9ff19d7fb0b646c243db75f382fd971f5b89bf29659c150294e9c4e7ced2921b77c2d EBUILD qtwebview-5.15.14.ebuild 464 BLAKE2B 6ab5da91708d6d3d65e303eb3c700bd2c528b5b802bd5cc6b18df39730bd76a82b61ecc0193b664865010f261275e3bb7c68331dabfb6e5246b4adf77efd1039 SHA512 0cbb7b9974dda9431cda7d5a634633a1e9e485e2f6ed3993a4965b0fb5f36ae2e290a31d142d4da828c9e6007d4f88e41dcef59229d092602076bb3766d2d3bc -EBUILD qtwebview-6.7.1.ebuild 424 BLAKE2B 86e3c7fd77a21cf01d75f05ca479c626ff1c7ef0676e97ab501acab0d5643d027bc9c34cddf294986c18e7cfd44158bf52407ec38c73fb2cc6eef5f954a2155a SHA512 78ae1e47c4d63c01b4defda29cde53d3fc0ad74cab32abf5e43e6ed022d7d8030ddfae059cc7e066205dda60014b0eefa5bafc8a07f7560c9359ba678984b957 -EBUILD qtwebview-6.7.2.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2 +EBUILD qtwebview-6.7.2.ebuild 424 BLAKE2B 86e3c7fd77a21cf01d75f05ca479c626ff1c7ef0676e97ab501acab0d5643d027bc9c34cddf294986c18e7cfd44158bf52407ec38c73fb2cc6eef5f954a2155a SHA512 78ae1e47c4d63c01b4defda29cde53d3fc0ad74cab32abf5e43e6ed022d7d8030ddfae059cc7e066205dda60014b0eefa5bafc8a07f7560c9359ba678984b957 EBUILD qtwebview-6.7.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2 EBUILD qtwebview-6.8.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2 EBUILD qtwebview-6.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2 diff --git a/dev-qt/qtwebview/qtwebview-6.7.1.ebuild b/dev-qt/qtwebview/qtwebview-6.7.1.ebuild deleted file mode 100644 index 39a6aa99e416..000000000000 --- a/dev-qt/qtwebview/qtwebview-6.7.1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtwebengine-${PV}:6[qml] -" -DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebview/qtwebview-6.7.2.ebuild b/dev-qt/qtwebview/qtwebview-6.7.2.ebuild index 76539b793b79..39a6aa99e416 100644 --- a/dev-qt/qtwebview/qtwebview-6.7.2.ebuild +++ b/dev-qt/qtwebview/qtwebview-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64" + KEYWORDS="amd64 arm64" fi RDEPEND=" |