diff options
Diffstat (limited to 'dev-qt')
262 files changed, 2699 insertions, 1325 deletions
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/assistant/Manifest +++ b/dev-qt/assistant/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/assistant/assistant-5.15.12.ebuild b/dev-qt/assistant/assistant-5.15.14.ebuild index 7244f21e1477..7244f21e1477 100644 --- a/dev-qt/assistant/assistant-5.15.12.ebuild +++ b/dev-qt/assistant/assistant-5.15.14.ebuild diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/designer/Manifest +++ b/dev-qt/designer/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/designer/designer-5.15.12.ebuild b/dev-qt/designer/designer-5.15.14.ebuild index df9e9ddcee8b..df9e9ddcee8b 100644 --- a/dev-qt/designer/designer-5.15.12.ebuild +++ b/dev-qt/designer/designer-5.15.14.ebuild diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/linguist-tools/Manifest +++ b/dev-qt/linguist-tools/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.12.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.14.ebuild index 49d8f26a1f3b..49d8f26a1f3b 100644 --- a/dev-qt/linguist-tools/linguist-tools-5.15.12.ebuild +++ b/dev-qt/linguist-tools/linguist-tools-5.15.14.ebuild diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/linguist/Manifest +++ b/dev-qt/linguist/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/linguist/linguist-5.15.12.ebuild b/dev-qt/linguist/linguist-5.15.14.ebuild index 1d10ebf75c06..1d10ebf75c06 100644 --- a/dev-qt/linguist/linguist-5.15.12.ebuild +++ b/dev-qt/linguist/linguist-5.15.14.ebuild diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/pixeltool/Manifest +++ b/dev-qt/pixeltool/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/pixeltool/pixeltool-5.15.12.ebuild b/dev-qt/pixeltool/pixeltool-5.15.14.ebuild index 85357825dd5c..85357825dd5c 100644 --- a/dev-qt/pixeltool/pixeltool-5.15.12.ebuild +++ b/dev-qt/pixeltool/pixeltool-5.15.14.ebuild diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/qdbus/Manifest +++ b/dev-qt/qdbus/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/qdbus/qdbus-5.15.12.ebuild b/dev-qt/qdbus/qdbus-5.15.14.ebuild index ebac49f9b11c..ebac49f9b11c 100644 --- a/dev-qt/qdbus/qdbus-5.15.12.ebuild +++ b/dev-qt/qdbus/qdbus-5.15.14.ebuild diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/qdbusviewer/Manifest +++ b/dev-qt/qdbusviewer/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.12.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.14.ebuild index b7beb738cb31..b7beb738cb31 100644 --- a/dev-qt/qdbusviewer/qdbusviewer-5.15.12.ebuild +++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.14.ebuild diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/qdoc/Manifest +++ b/dev-qt/qdoc/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/qdoc/qdoc-5.15.12.ebuild b/dev-qt/qdoc/qdoc-5.15.14.ebuild index 0690dba01d03..0690dba01d03 100644 --- a/dev-qt/qdoc/qdoc-5.15.12.ebuild +++ b/dev-qt/qdoc/qdoc-5.15.14.ebuild diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index dd4e4099f113..bd4b1c18ddcb 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,2 +1,2 @@ -DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd SHA512 03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7 -DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459 SHA512 cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1 +DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac +DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db SHA512 75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index fcd44daa8386..581b84c86cb1 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pesa@gentoo.org</email> - <name>Davide Pesavento</name> - </maintainer> <maintainer type="project"> <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> @@ -13,8 +9,9 @@ <flag name="clang">Build clang-based plugins for C/C++ development (code model, formatting, static analysis)</flag> <flag name="designer">Enable designer for QtWidgets-based UIs</flag> <flag name="help">Enable the integrated <pkg>dev-qt/qt-docs</pkg> viewer (also needed for examples)</flag> - <flag name="serialterminal">Build the serial terminal plugin</flag> + <flag name="plugin-dev">Install the 'Devel' component needed to build external Qt Creator plugins</flag> <flag name="qmldesigner">Build QmlDesigner and related plugins (Insight, StudioWelcome)</flag> + <flag name="serialterminal">Build the serial terminal plugin</flag> <flag name="tracing">Build plugins requiring tracing capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)</flag> <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> with the help USE rather than bundled litehtml</flag> </use> diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild index f295798776cf..ee0fcd198e6e 100644 --- a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild +++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 LLVM_COMPAT=( {15..18} ) LLVM_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg if [[ ${PV} == 9999 ]]; then @@ -25,7 +25,7 @@ else [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" S=${WORKDIR}/${QTC_P} - KEYWORDS="~amd64" + KEYWORDS="amd64" fi DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" @@ -34,8 +34,8 @@ HOMEPAGE="https://www.qt.io/product/development-tools" LICENSE="GPL-3" SLOT="0" IUSE=" - +clang +designer doc +help qmldesigner serialterminal - +svg test +tracing webengine + +clang designer doc +help keyring plugin-dev qmldesigner + serialterminal +svg test +tracing webengine " REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -44,18 +44,20 @@ 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,gui,network,widgets,xml] + >=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] webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) ) + keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) qmldesigner? ( >=dev-qt/qtquick3d-${QT_PV}= >=dev-qt/qtsvg-${QT_PV} @@ -78,7 +80,7 @@ DEPEND="${COMMON_DEPEND}" BDEPEND=" ${PYTHON_DEPS} >=dev-qt/qttools-${QT_PV}[linguist] - doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] ) + doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] ) " PATCHES=( @@ -97,6 +99,14 @@ src_prepare() { # needed for finding docs at runtime in PF sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ -i cmake/QtCreatorAPIInternal.cmake || die + + if use plugin-dev; then #928423 + # cmake --install --component integrates poorly with the cmake + # eclass and the install targets are otherwise missing, so strip + # out EXCLUDE_FROM_ALL until figure out a better solution + find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \ + 's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die + fi } src_configure() { @@ -113,7 +123,7 @@ src_configure() { -DBUILD_DEVELOPER_DOCS=$(usex doc) -DWITH_TESTS=$(usex test) - # TODO?: try to unbundle with =no when syntax-highlighting:6 exists + # TODO: try unbundling now that slot 6 exists+unmasked (bug #934462) -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes # Much can be optional, but do not want to flood users (or maintainers) @@ -145,11 +155,17 @@ src_configure() { -DWITH_QMLDESIGNER=$(usex qmldesigner) - -Djournald=no # not really useful unless match qtbase (needs systemd) + # meant to be in sync with qtbase[journald], but think(?) not worth + # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays + -Djournald=no # not packaged, but allow using if found #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes + + # for bundled qtkeychain (no switch to unbundle right now) + # reminder: if ever unbundled/optional, qtbase[dbus] can be removed + -DLIBSECRET_SUPPORT=$(usex keyring) ) cmake_src_configure diff --git a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild index 362b77f6691a..a04b85dcdd48 100644 --- a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild @@ -3,8 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -23,7 +25,7 @@ else [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" S=${WORKDIR}/${QTC_P} - KEYWORDS="amd64" + KEYWORDS="~amd64" fi DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" @@ -32,28 +34,35 @@ HOMEPAGE="https://www.qt.io/product/development-tools" LICENSE="GPL-3" SLOT="0" IUSE=" - +clang +designer doc +help qmldesigner serialterminal - +svg test +tracing webengine + +clang designer doc +help keyring plugin-dev qmldesigner + serialterminal +svg test +tracing webengine " +REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" -LLVM_MAX_SLOT=17 -QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN +QT_PV=6.5.4:6 # := 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,gui,network,widgets,xml] + >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml] >=dev-qt/qtdeclarative-${QT_PV}= clang? ( - dev-cpp/yaml-cpp:= - <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') ) designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) help? ( >=dev-qt/qttools-${QT_PV}[assistant] webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) ) + keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) qmldesigner? ( >=dev-qt/qtquick3d-${QT_PV}= >=dev-qt/qtsvg-${QT_PV} @@ -76,7 +85,7 @@ DEPEND="${COMMON_DEPEND}" BDEPEND=" ${PYTHON_DEPS} >=dev-qt/qttools-${QT_PV}[linguist] - doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] ) + doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] ) " PATCHES=( @@ -84,13 +93,9 @@ PATCHES=( "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch ) -llvm_check_deps() { - has_version -d "sys-devel/clang:${LLVM_SLOT}" -} - pkg_setup() { python-any-r1_pkg_setup - use clang && llvm_pkg_setup + use clang && llvm-r1_pkg_setup } src_prepare() { @@ -99,6 +104,14 @@ src_prepare() { # needed for finding docs at runtime in PF sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ -i cmake/QtCreatorAPIInternal.cmake || die + + if use plugin-dev; then #928423 + # cmake --install --component integrates poorly with the cmake + # eclass and the install targets are otherwise missing, so strip + # out EXCLUDE_FROM_ALL until figure out a better solution + find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \ + 's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die + fi } src_configure() { @@ -110,12 +123,13 @@ src_configure() { use elibc_musl && append-lfs-flags local mycmakeargs=( + -DBUILD_DEVELOPER_DOCS=$(usex doc) + -DBUILD_DOCS_BY_DEFAULT=$(usex doc) -DBUILD_WITH_PCH=no -DWITH_DOCS=$(usex doc) - -DBUILD_DEVELOPER_DOCS=$(usex doc) -DWITH_TESTS=$(usex test) - # TODO?: try to unbundle with =no when syntax-highlighting:6 exists + # sticking to bundled for now until it switches to KF6's -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes # Much can be optional, but do not want to flood users (or maintainers) @@ -147,11 +161,17 @@ src_configure() { -DWITH_QMLDESIGNER=$(usex qmldesigner) - -Djournald=no # not really useful unless match qtbase (needs systemd) + # meant to be in sync with qtbase[journald], but think(?) not worth + # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays + -Djournald=no # not packaged, but allow using if found #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes + + # for bundled qtkeychain (no switch to unbundle right now) + # reminder: if ever unbundled/optional, qtbase[dbus] can be removed + -DLIBSECRET_SUPPORT=$(usex keyring) ) cmake_src_configure @@ -169,12 +189,6 @@ src_test() { cmake_src_test --label-exclude exclude_from_precheck } -src_compile() { - cmake_src_compile - - use doc && cmake_build {qch,html}_docs -} - src_install() { cmake_src_install diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index f295798776cf..23836162a90d 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -5,8 +5,9 @@ EAPI=8 LLVM_COMPAT=( {15..18} ) LLVM_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing +inherit python-any-r1 readme.gentoo-r1 xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -23,7 +24,10 @@ else QTC_PV=${PV/_/-} QTC_P=${PN}-opensource-src-${QTC_PV} [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development - SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" + SRC_URI=" + https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz + " S=${WORKDIR}/${QTC_P} KEYWORDS="~amd64" fi @@ -32,30 +36,38 @@ DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="https://www.qt.io/product/development-tools" LICENSE="GPL-3" +LICENSE+=" BSD MIT" # go SLOT="0" IUSE=" - +clang +designer doc +help qmldesigner serialterminal - +svg test +tracing webengine + +clang designer doc +help keyring plugin-dev qmldesigner + serialterminal +svg test +tracing webengine " REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" -QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN +QT_PV=6.5.4:6 # := 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,gui,network,widgets,xml] + >=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}=') + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') ) designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) help? ( >=dev-qt/qttools-${QT_PV}[assistant] webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) ) + keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) qmldesigner? ( >=dev-qt/qtquick3d-${QT_PV}= >=dev-qt/qtsvg-${QT_PV} @@ -75,10 +87,13 @@ RDEPEND=" qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) " DEPEND="${COMMON_DEPEND}" +# intentionally skipping := on go (unlike go-module.eclass) given not +# worth a massive rebuild every time for the minor go usage BDEPEND=" ${PYTHON_DEPS} + >=dev-lang/go-1.21.7 >=dev-qt/qttools-${QT_PV}[linguist] - doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] ) + doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] ) " PATCHES=( @@ -86,20 +101,43 @@ PATCHES=( "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch ) +QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go + pkg_setup() { python-any-r1_pkg_setup use clang && llvm-r1_pkg_setup } +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + cd "${S}/src/libs/gocmdbridge/server" || die + edo go mod vendor + else + default + fi +} + src_prepare() { cmake_src_prepare # needed for finding docs at runtime in PF sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ -i cmake/QtCreatorAPIInternal.cmake || die + + if use plugin-dev; then #928423 + # cmake --install --component integrates poorly with the cmake + # eclass and the install targets are otherwise missing, so strip + # out EXCLUDE_FROM_ALL until figure out a better solution + find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \ + 's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die + fi } src_configure() { + go-env_set_compile_environment + local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie" + # -Werror=lto-type-mismatch issues, needs looking into filter-lto @@ -108,12 +146,13 @@ src_configure() { use elibc_musl && append-lfs-flags local mycmakeargs=( + -DBUILD_DEVELOPER_DOCS=$(usex doc) + -DBUILD_DOCS_BY_DEFAULT=$(usex doc) -DBUILD_WITH_PCH=no -DWITH_DOCS=$(usex doc) - -DBUILD_DEVELOPER_DOCS=$(usex doc) -DWITH_TESTS=$(usex test) - # TODO?: try to unbundle with =no when syntax-highlighting:6 exists + # sticking to bundled for now until it switches to KF6's -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes # Much can be optional, but do not want to flood users (or maintainers) @@ -145,11 +184,17 @@ src_configure() { -DWITH_QMLDESIGNER=$(usex qmldesigner) - -Djournald=no # not really useful unless match qtbase (needs systemd) + # meant to be in sync with qtbase[journald], but think(?) not worth + # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays + -Djournald=no # not packaged, but allow using if found #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes + + # for bundled qtkeychain (no switch to unbundle right now) + # reminder: if ever unbundled/optional, qtbase[dbus] can be removed + -DLIBSECRET_SUPPORT=$(usex keyring) ) cmake_src_configure @@ -167,12 +212,6 @@ src_test() { cmake_src_test --label-exclude exclude_from_precheck } -src_compile() { - cmake_src_compile - - use doc && cmake_build {qch,html}_docs -} - src_install() { cmake_src_install diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest index 977582bb4617..b3aaf146a087 100644 --- a/dev-qt/qt-docs/Manifest +++ b/dev-qt/qt-docs/Manifest @@ -53,105 +53,105 @@ 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.6.2-0-202402121133activeqt-documentation.tar.xz 249028 BLAKE2B 07eab503d83013135f5c757c296779681e607b64c68a57a88d39374f82b857f1556c5b9df257325df3c813fe6cf1d1331dd76c6205e8f32545fb3745574aa837 SHA512 c0a509d9791ca4c341f3e662e45c1f9ed810eea46b573f0d4908a997d5486262e962deb8bd1dc4d968bb90f013be5ed8a0e1267f1fa30b5def4840ea4872ed48 -DIST 6.6.2-0-202402121133qdoc-documentation.tar.xz 285360 BLAKE2B 153423cd28e6535a22c9ea907bc7f261ef8229cc6ba8ed9b4abc686f0a54eb1d52f3f4af4401e8d9d56830f1c7094d12d7c29ee0c96a36d08bd75806344569cb SHA512 70347eff0ef249f52d57563fa47a511f5f7f4b5bb7a53c0a3f9bd7adbdc5299ecb08c7e5a0800d4b6da33858e1658bc5d5c2e8632391f3f1f0b5f301eae81568 -DIST 6.6.2-0-202402121133qmake-documentation.tar.xz 344380 BLAKE2B 8366dfb9c1ba3f7df990f24eecf62a7bb1191409a54308bd072963ed0f75bad89e656d97b1da59b4084f0bf10366ad3c0b71094b0c5f0653504af7d806a66111 SHA512 1cf4e7d6a30baaccc34fbb335c6e3c8d29d407061a5c8c1050c23a4d3f4f7a954cadece6e07021a1b9e3feac893ce0dc4a85bae6b7e1f9b3e4bc98caaa99804c -DIST 6.6.2-0-202402121133qt3d-documentation.tar.xz 5588096 BLAKE2B 1c70645a8d3da31b53cbf9e3072cbe17851c372dddab6d4e298e260ed4f90f91514383201f6b4fe46ec79e2aa0ddd47af3732cfe2b1dcca3c224da94107fa588 SHA512 ef22a4f6e901d0ca3fced61b27b58e81b7e49dd4ceb46070d5b457ba415d3e022fafba7b70b74b48c40a670a728bbefc8ad88b11d99c16f66c0346cbfdb97a5c -DIST 6.6.2-0-202402121133qt3d-examples-6.6.2.7z 60339397 BLAKE2B 97c79f463703bbc88668dd7647982b5ca61d1ad628097653a7407f98936a5d69964a6b0b235c1d5e26e636be8e1842292f9643367800f5fd6bb66c213eafb42f SHA512 f3895b46665f27213704290bd1dd80931983e6de5441fd2a70263c2abca765623fbe36147b1070bb558051a42b509c7d25075fda1737928da7929c8058f175ad -DIST 6.6.2-0-202402121133qt5compat-examples-6.6.2.7z 27951 BLAKE2B 901c497e8974b1df9ea9d8eb90bbd4e3113a4439e6586e6be41ba963c5593b84e5c4df0d86a12ca25389c8653005b0ca75b68fd18d5149e9e41ffb8eaf2b4f82 SHA512 ecd355679c17614dc22db18f26e2fa1547695038b8c529f49cad5a88d3df1269ccf8f06570ba825d52551be7e44536a300dfbf5a3db4c475e25e8b15980890b5 -DIST 6.6.2-0-202402121133qtactiveqt-examples-6.6.2.7z 13126 BLAKE2B 517124857a216863f9cfaaf2a8c0dd48872b85462a192b028d754af0674ff6ce3dcce8b7c30bfd568618275b04748632e25292c7e086ec4dba23a1edf190e4e8 SHA512 f9119bcca8f0b4129c8372782bfda370184c3720cfc9aadc11e6ea59bf26a074ba647122b340bda946f611a34a445e833376684b908232be843ba8dd0def99df -DIST 6.6.2-0-202402121133qtassistant-documentation.tar.xz 461792 BLAKE2B 46a32906e6d6b3efc03e39464b72b11946b2aec030f5b8e269720ab891b58f0bef1843c2577ef9cdee3da50f862643aaf74d13969f915ee02af202c989b0ee73 SHA512 13f0e7e6435ba352cf3ff4f30e26ffd70cf320071f4f8060569f3363441ccb1e342d3529979c483fdf82f540a7ad73bd02ca5700efcb753e40add868e6c0648f -DIST 6.6.2-0-202402121133qtbase-examples-6.6.2.7z 4286085 BLAKE2B bf9364ea3b0d26c61bcacb6771dc16fc08dfdade36f213c5e32c81b2f70ac675fe5279e474d8dd8cd88392992d4898f3b5792bf931e1713bde13feaf0657f65a SHA512 f6ecde63822cfa84797f119c06506fe005c22d60250db6578b716f5b7871576679dc03f3bb42eb0a06682cc5998604df29c11bd5b578167adcb81b2fa6ad8910 -DIST 6.6.2-0-202402121133qtbluetooth-documentation.tar.xz 1023332 BLAKE2B 4fab1a4d8c012cf3b23696125dfdfd6426c7f4ca4972b34421a747316b8642e1815f721cdc108477eb6f53cddf0d6ca9787e63b17ca63de75eea0c6bd9a607ef SHA512 3a3ec32d124c00230282f74731d88ba0d2ffbddc325ec1fb20d50a6444e9900777aad989c533df04c131ee044eb403ce7f29362dbf0910eacb930e78a03040c3 -DIST 6.6.2-0-202402121133qtcharts-documentation.tar.xz 8852304 BLAKE2B 34af480facab67af8af142e05aa5c326af917183333c99bc038bfdcc222b1e0a355fdeb07f28fc4129e1616d36643bafa883a21b4a15091f432242c1145e4e08 SHA512 eb2c25753e4ff056b3c93ac3c8a798d7e4a76f3b1e2a83ada8d868a5542efbf0d095e773c7e79a239c8782f00fd5556a8d93bef76465732e0ad74e3b57258454 -DIST 6.6.2-0-202402121133qtcharts-examples-6.6.2.7z 162695 BLAKE2B 1b0282559cc803967a03c409be5cd862f7bd70366e23bbe618400941247a28681196d96e847dec776db6d89cde3e02df789940a0faa60fbf6b3d8fa3f60cfe2d SHA512 5824faf46e7c77173cc67556923af1f34e79ec15e6d82bb5e8719529a0ac4ca0c0db10756afaca010f724b891813f90295780e256b9f639717d524c96c8de56c -DIST 6.6.2-0-202402121133qtcmake-documentation.tar.xz 94424 BLAKE2B bea60c699d23f04a667af61b57450aba2b3777dfb05b21af1928292d26812bac87b361893db7a509ad0715ecbe307c75b47baf531f8452cdfb4e21f664392f06 SHA512 79554daeed91f7eaa488dca956bac9e9c7d7563cbeced7028f8f8614947a1b7bce3c2a1420d605e60ad960c66ff90df693c61f69c42e4ad188e8c4d53c1915e0 -DIST 6.6.2-0-202402121133qtconcurrent-documentation.tar.xz 186100 BLAKE2B 3469da955c96d3ac56b77cad7e09db78d11a5ab8f247d9b79652cff2f9852d807294e7489b55a573fb538bc84d17a626248b2926ecdb90f709ddc2af1b4190d4 SHA512 ce6c6a85e358c5585488cb0a0f65f4c9f2a21592290482f2788b72c4f98c6210a1bfc01a0eda265298472e615831193c01bc9412bd7a95e4a81b1ff4204f0141 -DIST 6.6.2-0-202402121133qtconnectivity-examples-6.6.2.7z 403984 BLAKE2B 1fcddb27bad161f7c1321730d4db785cb84ab9a69438156629ef058d2e804654ee52bade79aee271569291063d568a3ec04b6b611190ade8d3314b6012ff7501 SHA512 ded9dda213114adf52172cbf4bbc7440be61012ed6cd7e59e9334913944fc59b1dd62ff7bb42c8fc5e9f62e219cf8bf678c11ed1f04485972ee06c7ac8623acc -DIST 6.6.2-0-202402121133qtcore-documentation.tar.xz 6994040 BLAKE2B 39448509670682426627e1f0a4fa30c12121310cdc2a67fc3c58ea521208d538e3c2f1a1bbfd9bd58c7a4014d58626d2246ad5a8320b8b5d29c1f59f7693cc56 SHA512 9c28674a02bb1cd2d8112ad5ad3d68d2bb147624b6e4712ee1717be1488f8cddc2c7b4c4f36bf07a8798614e48fa2f25116829b8b9798d0da9c503a41b20583f -DIST 6.6.2-0-202402121133qtcore5compat-documentation.tar.xz 320684 BLAKE2B 335d3d4ffd953bac331471d4aaea38254da86fc01ae915a7265de2ba7d754b8ef5fc3560352cab9f3dd5578dd65174488d9aa6db1be68e4a89f7e71891809f3a SHA512 8b44e2452f8e838357605170b6835accfab90ac67ca32121865c281771b454ecee56130c94558f0eac8f0e643ddeb2e6d9d59d41930a5f8bbd7c9440e06f0ed1 -DIST 6.6.2-0-202402121133qtdatavis3d-documentation.tar.xz 2709208 BLAKE2B 4cc6c7ced71b4330071fa39d6da5e0691cdf34835642d1d06cb029a2cea2d679d4da63ad8c34bc39c3bcca188ee430be55a2412816ed48cf614a5ab4463f4922 SHA512 e89efbec00c46c425a96a3c125d1a42f5b1882ce64bd51a235b0f2c9124d4a17b2a5e5cf45c26b68edc5a91fa346b0809c14c69385e68e379bdc097f4a6558f6 -DIST 6.6.2-0-202402121133qtdatavis3d-examples-6.6.2.7z 2771142 BLAKE2B 6306587a62ffba42528e88ad053d3594448dd870d0f345657d646661b3843013480381edc65b63e4fec1e808771470a13ecf2586c43c11687df95dc58221ee60 SHA512 7a97de46690c6377c2bbbd0949118329840e37ac618f085329c9f25cfd834235b71f75b49a0992225bf78a1b685ac47740e9dc25b167f1b081ed997c3d736de1 -DIST 6.6.2-0-202402121133qtdbus-documentation.tar.xz 331204 BLAKE2B 75d95b54a5f11077c993998a9947134d594b24739b72ab896f21b0da85c670c317c9434a995cbb66ebd587cbaf841305c1d111c3ca88ca2466d224a99cda9578 SHA512 1ad36644bdd2ca217659d6c5f0488882899a3372e6f3593e342e4f3734ed71f36dd08e0881455f6a75a922e2eb571789e9b9014444f7a29681c67967d9269527 -DIST 6.6.2-0-202402121133qtdeclarative-examples-6.6.2.7z 10942253 BLAKE2B 5964bad57e80bb17c09386cdefe160d8ba3d150b7e3cefafb1100cc39815e89ff1a4c3b02cb386ff368c01f79a837c6541b31335199c5bc3604a429b2bd3b75f SHA512 b384c83a6ea4f7beeff4e0b255ecb7742b0973239add1f928f7b35da0864b3c6cc32ba3d0fdfb58113bfc540ff0ba0b934e27b2644a660c7cda7e65cab148109 -DIST 6.6.2-0-202402121133qtdesigner-documentation.tar.xz 3331472 BLAKE2B 4701377eb2393b55931afd2ce90d5c9af381b4421a18bd8c3b90a2cc93fe577f8040a2d941a2e7a5a4db35c0f0dad1290f294b1de9d00ca3583a89dffb16ba8a SHA512 77382597504499744315fe42b00af6c0b6b04a707dcd1a436916060d8bf92179515a7ac3382dd3ea5e90fa53f99fcf07e020693b45a73cd77c18aacaf6750c08 -DIST 6.6.2-0-202402121133qtdistancefieldgenerator-documentation.tar.xz 149792 BLAKE2B 9647c7afae90155341e7a70b30b663ff0e663add3c175bd21fd3e0e1c5d2ad32294b6dc974aa6a385dbfd56a23cc7dbd69b8ec1a877e00e71e683dcec7702216 SHA512 49bee73d37fdc5a69dc551f3b7f8f0e4ba434215116aa548fb88dba6ab2fb90ca03e3471ea98a4cff6aac1dac1bd6cea17f6878218389195bf2a817f66731983 -DIST 6.6.2-0-202402121133qtdoc-documentation.tar.xz 13438272 BLAKE2B 009f18954d9bed1a1dbf9157477a323724122f97bf3aa303442891a8cc00062ce60516d7419be066939d223781c91de2b53f4556eefc2b80e92bd65e3e0c7d44 SHA512 2b3b259d2a22e36f31babe8f06f7c0f9e0a4c73c4f7b0c09897efc2d10f06ef55912358b3f12043033f3c60c951fdb36197c732426a5a83493befb58fdaf570d -DIST 6.6.2-0-202402121133qtdoc-examples-6.6.2.7z 7290958 BLAKE2B f528a71bec3d09be700964bc24bcb61db49015026d8334c52db5a8456c6de1113bb4835d770ac3e3cbe0b4ffff302212bb6993e78e645a25c3eef97d0f90cd48 SHA512 97940b1c7a45688b1c2ba240f94887322e684f097b1f5a3dece420e9164bbd052cb54d4d04cad04c8c16c6fee58de1a627d30b63c4ff724fc056bc9dcb30d5a2 -DIST 6.6.2-0-202402121133qtgraphicaleffects5compat-documentation.tar.xz 25785632 BLAKE2B 4452125d6ceb103af706340d62d6d1af063ae4b677d382c4fda31dd85954b788758c625ce8d444067b89ec3c568a36d18e133fa8bd0ac1989da454b0bcbca9a2 SHA512 cb83eaa4b799027115de030ed72344e9c8579c2a395a44113a76926bf059c56eadaa51d10a723a3e62c0c6930eb83689e98d62f613c7dc499996d51d2d7694b4 -DIST 6.6.2-0-202402121133qtgraphs-documentation.tar.xz 5982456 BLAKE2B bd38e6ad571e0c829171814add7718fef2ce53489cd8b0002f8cf23f8b404039e78004d09d80382d7d5190ef415de01bf63e26c9fbc1af51bb4102be7d6841d6 SHA512 31768b9582a5c3988a19d07513e79600a57e26e921ff1b31eb9165ddd69c55112baaa46f31764d78a421d6b1f3c7bd4da3560367011a9e4d6e6595362b997434 -DIST 6.6.2-0-202402121133qtgraphs-examples-6.6.2.7z 2562825 BLAKE2B fe9cc7d05b2834080a8c7587edf6b2b76d43a211840c001bc8133057b6ce9761a90f45ce415cff3d6cf9af6f259b8b8894661e19ff1b4ce1685b3563e5b8bb02 SHA512 fa1442a6cb6eba93e269e203c16ab89260163052adb50c4870e63af90c33545ccb4bd0099a28e433c40cf6810c4fac36e5cb8d053cc696fcb0a9906854c25a79 -DIST 6.6.2-0-202402121133qtgrpc-documentation.tar.xz 201824 BLAKE2B e011c0e67d16ad0649387d474f137bbc470edd6aeb7789211544e6217d1cd3496e6e73d892f1035d5cd7bfdeb676f2ba20d5b4e1a798c924306e868bc6ad7e32 SHA512 8d7678830167bfbeed63819d6400abb1e32eae250dacb379878e565e91ea9aa43b4a6d6af88e894e734bbece40722424d176261584a54f91d68ecc3f63776827 -DIST 6.6.2-0-202402121133qtgrpc-examples-6.6.2.7z 96671 BLAKE2B 15201607788cc8dae4bbe5d499f0411dac841ba7e4f3dc88bbf0ac8dd10568a9477f42812c3061ca6b8431a4ad8073d1b5361b6bad9051f6b30a1dc7387626be SHA512 de6903674f85f3a2008c565d3580c8c9f4196d8cbe14c598fa0deaabf632c6587df8c558c8b5b688c937dda66af79379485c74a2f47313d5d7e436b0db8cec56 -DIST 6.6.2-0-202402121133qtgui-documentation.tar.xz 7160180 BLAKE2B 79d538ecc51667dee4c120f98881436ee501d871d5ca0df1715836b054fa7f521fbf119fe9f5b759757515edf5ecfde30a9abe0d6fd335000a5121098bb18a73 SHA512 cb106b9e05038bf15761ca4930f57996fe95282b1d470e5316b19f90461c61116ad58f83b522aa1240d22b7e89b0d2f3e9415a29e8ae5b75228817bdc32ca779 -DIST 6.6.2-0-202402121133qthelp-documentation.tar.xz 212004 BLAKE2B 1715a7932d78f75f4ab3d67dc350174fc8be2253df6a8a167ab76e40e0d0296775a420f96abbc74d19e9bd3164b27c860362f94d5a19d8ab6cd68558ba62e050 SHA512 a868de443ae5becb4fcbe15ea3d6b1d2cc6d7176ff6ae4fc91e2bfeb3833a2ded151bb911f9103fc02ff9fca5bf9c7469c7791d93f80319729dac01bf2f0bcde -DIST 6.6.2-0-202402121133qthttpserver-documentation.tar.xz 293108 BLAKE2B c463c397a43d766f8b6a0e4ccfdb0dce91b2c70ac7d96c909ad9a1bb704db137839e3058a96403f2e83b4509e4624239eff0389b9b7dff17db04b4536e83ed4b SHA512 d498eb62f84334b9c35020516105a439fda99a1fb9d09ac9d114d8b5c2b323544fe865e648bcf4d1fb713bca425337f25a4461d04e0a916bfc7991e1d3eec7bd -DIST 6.6.2-0-202402121133qthttpserver-examples-6.6.2.7z 51577 BLAKE2B 8287721e8f6c86bc6eefaab2b3c0172c7925028d2210115138e0836bd2e83e824ce2691a1834fd6b3039b464e4d7d17c5cc4591da2d94b352982f5fbd316cb4a SHA512 485fb5222bd7eabcd44463eeb40d8fd813203523889120ef0f52357b5b6eb4723fbf53624c34ac52f397313337e69560f302833605bd8916e27f69ee25631f8a -DIST 6.6.2-0-202402121133qtimageformats-documentation.tar.xz 32300 BLAKE2B 4284a7d92ba45aeb351dc5e3814af0646d1ea28f7727987a3c60da30f3ab5bcc6d4b3ec5badc7ee0db937c7739e13765e754dbaee0efa19392271abf5923bdd1 SHA512 7bb8502a31d1d59e2e0e6add0e2b6572f3d746e576346b1b1e0a26e05d5c37acbe6cfe2a34c462df1eacf73819f5b8b42f92666a96e54bfe25ac4f04558dc1c6 -DIST 6.6.2-0-202402121133qtlabsplatform-documentation.tar.xz 538756 BLAKE2B 839c467ed98272fbf5fb947dae90bc4b390dba650a92ab6631344c23d4b5f1628def7845d8b668e93f57d1c080b1c32d7ec4f528b4e3451300c8e9b8d62a2db2 SHA512 291e0e74a0f758d46f74917293f016d63dbc51438e60991346bf18f0aefb92d2eac1ca30c9eb757c04da4e3af44242be66e4900beb90f5294e4727579a34283e -DIST 6.6.2-0-202402121133qtlinguist-documentation.tar.xz 1114060 BLAKE2B 0ca43332afd7a9d20299b792d4db28630f404df2064a9a65a543e87ccf951d10d75f6ea8340e22d62a1590bc4697f3d21d4c1781896c2164a201160473a191aa SHA512 0aa31183606e3ee851625d3645a786f6a52f9df83e2387dc6d731f4c005557cdd0353b17cc699f9cfb1b60ca2b6e9edf32bb5f9e376d122d388ece2ab046ffcd -DIST 6.6.2-0-202402121133qtlocation-documentation.tar.xz 2761100 BLAKE2B bc35054591d631a54917b7d1baad506fcc6410815973f18387a4a5366efdd2108410bf474352fcd26e06f7885db460956085c3f9e100faadd947a991aca26599 SHA512 33edb5ae4e785702613eab817f5edba7d90adadf397e28233de7684050b6c58b68a9332b59c6f6bf27698ab0d9b267434ea79dd39e0a299b3930fcf38f340209 -DIST 6.6.2-0-202402121133qtlocation-examples-6.6.2.7z 1433938 BLAKE2B 0b6b91ad30e021132b9807fbde223ccbe4d59883bfaba97933aa5911b87bbf23056fb45648352167a9da667d64f0182c5c049ab4c7979ddc552bc3456c93bb00 SHA512 d32d11d8f421bef07f4b3c490c0fa73db342020c2256655e11a50e0e2c2ba7ab8c5d53a75f05c38d43b59b61fe816bf02a37b0c70c2e39d09708108664527372 -DIST 6.6.2-0-202402121133qtlottieanimation-documentation.tar.xz 40528 BLAKE2B 21fcd192497ef7e91f241d69f019c2552ea64fa278a4d365faa65e951532985d73da1391ee2a62ff16aa7f69e1de1ae60b363e6d74afcf704581486f9c1955c2 SHA512 2ab6080b5701df6f0de4e66af6bb4f86cf142fd831df10d7774144ab6f55a58d0953b47936b172284b1d3e1575ad19d715089130c1020ccf52b237d3f6b73a59 -DIST 6.6.2-0-202402121133qtmultimedia-documentation.tar.xz 6566788 BLAKE2B d5664940ad7c34cf281a9cc35566d34715daf471aeeffc82eedd08d840522d780e496a621a67abbbaeb77278c66fcd4c4bce97ac684220f44bed968205394be3 SHA512 fb5aab8a9f1565b5474b149c3236207608c6d596957da1cc3810b7393e04f7f841059b75e91a86540817b30a40e3edab6d31e3fc8a5d426e87988b18b04f8c5f -DIST 6.6.2-0-202402121133qtmultimedia-examples-6.6.2.7z 2643321 BLAKE2B 34a13e763dfc026b35b894960366d9238866223dfc3aba61627ea06965aa19cb949003c0fb24f4eb05d533a26747c5aeaad8e70d5d63c349d31c78bd42fdcbff SHA512 aeb626f34cbf4c04cdfdccd590ab90f31607b36561239e234200d14b2d815aae1f13212ca76aec194fe6d6e965a23c3a771f1ac555ee2c9a596f732592af5141 -DIST 6.6.2-0-202402121133qtnetwork-documentation.tar.xz 1239752 BLAKE2B 458d1c9b3d79666cff03fcb90f58a64e19c9f8f0495bf0f63f240244d63e38ded25e2dc27d46c79e80057e66f46d31dff2c3acb0ff097e8a897e45ca07a5add6 SHA512 db9857edf5602dcf67f1cf518e7c93a41f465351900e86b974775898e2868d582d714703fc56faf5fae5d624848d460b5ad32f7e6d5f1f67b510c9e2ee0e4678 -DIST 6.6.2-0-202402121133qtnetworkauth-documentation.tar.xz 189248 BLAKE2B dae93d78fbf1e8e9c153db2f99d857f8a1898ad0cb8964eeb0f2f06435f3ab69b058d206c7fd95d96d820f3990fec044fb93b8263d2c2c29bc9bcbe3b0c45e37 SHA512 2e2f29a67697e0ecab34ff7266567379c18d8f9a5d3d6c2af68cb57790bafab01e62136e0c7e07a2254eb3b2cb48f8b11a139cf116d97efe5383ae7b88a28bae -DIST 6.6.2-0-202402121133qtnetworkauth-examples-6.6.2.7z 41496 BLAKE2B 254b4e3377b2042bd6acc6510cbda6f903ac3bc924a9e268bc5c99b3faa0e8ad08609750283712f259996c1cea0a937f070da051d756a755b98aaa693cb63e3a SHA512 c2a258a6845362234b4b941c885afdaee45467a5763b22f653581ca7c1b0b65285a3a431b52f086de77a91c68df47c9c4245a67b748ceec94c489ddb64223630 -DIST 6.6.2-0-202402121133qtnfc-documentation.tar.xz 227668 BLAKE2B 10fe5e308788e2f0b2d65282d8aa3745476008eaf1fc2a624c347a927cb6c5939ba41ffeceec7aa0f7dadc22c53306cca4392f7e3b713050fe6318514d16353e SHA512 aa1180663c6fa491e856e9261c47a61f645a66eb89015b860aa162334d8cd6fe344f6140a657d7d044090c04d83b706484b0dcb24ffec9c1fab7e804184ec13d -DIST 6.6.2-0-202402121133qtopengl-documentation.tar.xz 1027408 BLAKE2B 30b59d9c43176198eb0e1eedfcf857aa73aa5e21071e4c932b86e881edb5d4e6b6e830c18149bc757b906a5715b722e42a40b57d386dad1bb4c2036e79a8b59c SHA512 0406111abc8f7c546d6fdf9f005ae241f7862338adac78033f9c9573468e8e3d197b97d39db779aaa082d12f2603a974b93ad0b9f8af6e1d89becc27127af7d6 -DIST 6.6.2-0-202402121133qtpdf-documentation.tar.xz 943792 BLAKE2B d6d26ebf1f413dbec39ef922335cbd64769915da00413789d2278b27dec3438963481d7fbcb248c245409bbd3212dbfd9b0a846061ada24abaaf78135e52781e SHA512 a0c570638767c9e22ca6c4f74216620c3d6c7f5b794b74077e070bb2202fcf6dcb59017bc8cdf4c5c8e532e36268a04cf0f71fb6727809e578422cfe2ee7b42e -DIST 6.6.2-0-202402121133qtplatformintegration-documentation.tar.xz 42108 BLAKE2B 7ca4c85bf633ee996f2e4ac40d320c3c4170ed5afeee37ae82a78b529e12daa995d506105ae4489b78e40492dddc22cf90cfaacd98564c426c598d1dc09681fd SHA512 5a9ff4a6f1c26d29fb09627a099afea4e82f451bc37af74d6ca969be3926b98cc80f123cba6d682052353490d8a357e21412f78f4d2e14e4f9df7eacce02f39c -DIST 6.6.2-0-202402121133qtpositioning-documentation.tar.xz 639004 BLAKE2B e7118b1ca25c359181d41ba14be81a7b8b4257fd7526e544649d3e4c7c85eed64d585cab69d9266dd43c57d6c007c4eb4edbed5a3c32d94c7b34065ed71a4350 SHA512 c767b66954508aa8dafadf55924f84ed0166984b97f03cfdbd0d359739905d4b5c59de5e25c02bd238451ee73ac65aa3a083ae07fbae1030988e3eb7ff8ab4f0 -DIST 6.6.2-0-202402121133qtpositioning-examples-6.6.2.7z 1118783 BLAKE2B ea94a458023d91846d76cba3cf9f6dd6607e8647321f887bb9c1fa7c27ad76f89b3e91db1db85756aa5274bce2e4333b75c1d177ddb83aecca6a41b288c636a9 SHA512 cb01896cbe79c39e83462b3d72ea951862adbdda26a24fb0cb355c00052b0c62e9052bdb42296629c3ff782e615e0126a901ac02984e5a921b5c63b8a97c7e51 -DIST 6.6.2-0-202402121133qtprintsupport-documentation.tar.xz 350740 BLAKE2B 9913c6bf0442f6f000822519bf3f44048241697bfa86b858a2167de6c5688f2173213729793318e758ee1a131fcb1637a022798c933d75ca0a7e7282c03eea20 SHA512 f6f8c637ffa4b8e8e5100d40bd96ad88275fe9fe6d22d92142e18f37356a6c399885c1406b87f83f6d26116d4667e2e92e03fb5192789790c8dcc8a5a0a739b3 -DIST 6.6.2-0-202402121133qtprotobuf-documentation.tar.xz 302440 BLAKE2B 1251e8775c1c12b54c9274ff39491039989f8a309e39b057c91699f1b6057290523f92eec55124f7b95272486446a00a6337b729c1237a9c21de9344b2550a02 SHA512 047fc457ecb1717a2dc2b62f4ba65a0aeee3b44b8ec34518ecbb28a0f9bd56eb39b5cbb0f2a98acd2645ee2777bf7fafb1eaabdf6f5cd16de5a542515f7b4a0d -DIST 6.6.2-0-202402121133qtqml-documentation.tar.xz 1449068 BLAKE2B 3aea68a065e31aa715e48eed9c8096b2f6362bff4d3a95d12bb7c552ee8c3c08a0ed323b2a7518809f08c60c21e6a310c49c96c469ec01e3bd3d4491c71fc6d8 SHA512 af1186d0a17abff0d5fbc251a1f2cabf3534daa49e9b67cabf8344afcacc9b24caf829f841d43558176388332b6c5da8682c9233dd3825bacca7f427d8e89fb9 -DIST 6.6.2-0-202402121133qtqmlcore-documentation.tar.xz 69156 BLAKE2B 8f3877aab350c68734213188ff7f7f8e61337a4742feb2cf0fb4f9cd0621be9545a5e3d3b2c74940efc29a0b75b88e78a8fb328dd4c0ae1e32e3a84fec0ca77e SHA512 0cdcc5255f44e9b38f93ecd0885c1ae28e7711bb7b71dd0975f01393991390e5eb86dd73e8cf9c70f0622c1a38d469afb84fec34d3f797361b248997d94cf063 -DIST 6.6.2-0-202402121133qtqmlmodels-documentation.tar.xz 138876 BLAKE2B cab85b16d89d62973a760648797af466cc108b367c6f48f5cf2872285e39e6fa30aeb0894b4df919b0fdb94917a2366cf4b8af2374bd5e0e8b1764f69caa838b SHA512 76300f845fd163c7081fac4a2c338cb5d78b7b07e2497a1caf428159319a07f66c95cff8e19867ce301cd87f75ce7ffa4813c809e7bdd709895604ca9be25359 -DIST 6.6.2-0-202402121133qtqmltest-documentation.tar.xz 90268 BLAKE2B 3f62c6eab30c2742d20ab158c1dbde1a6b4f11c897033f08e89757042b2f6bb7b6f394fdfb14d38a19368f6ed413083cd860b65baff630ac2a62b0aea4d85795 SHA512 3e5d470cb9aef17dc1b64c85f07b28e51de9cfc62cdbb2bf90b32ba0218f34cba5e36fb5679a50f51c245340451acc72d3ae9a0630fadabcd720a1b31fed8c3f -DIST 6.6.2-0-202402121133qtqmlworkerscript-documentation.tar.xz 31304 BLAKE2B efcc0a8b02c4d998b8ff59d670621c8b2d5f0facb716714e02e9731188f9e0d87a99ad3a5292522e8751a2c777074c6828ee111cc8a20d8c133e8ce29029bfec SHA512 ea558b83982a45322ebc51b6cc6610f7f6796be267d0daf0fa1c62a5dbe24dc2d545456bae7cdfc592f0cc5729e5253ede9d56e9bd58be427476bfcdff6e95f4 -DIST 6.6.2-0-202402121133qtqmlxmllistmodel-documentation.tar.xz 37128 BLAKE2B 432c89e32c5eb30a6e0cd5adc90a5683d727d3ddc412466a2f63ec192a37353303669390dfd43e100d421a68cb67f57598bd671ef99c054474c80b02dba26eb3 SHA512 d51d7f19a3ffab83ad494a429e4014c1e723e0de5253603c1db8e0bff1a0fc91f00b2f2541cbc07377fa928a93be9e09ee8f9749d43e0f56fc284477f03492fb -DIST 6.6.2-0-202402121133qtquick-documentation.tar.xz 22260060 BLAKE2B 120462cf3544cb42669ad496f88f93f9bd23dc75815a1092f5129c5b3df074e77fca89195b9b4b5ea69dd65ed71e78c2c2aff4bc546f608d54dc9eecce79ca1d SHA512 e7335d90268be82ecc8b25646b5c9a59b5868227213f236e60e7ce8a8721b5e7a5c5076a2d0dea822e545a908b617aeca6fa90501dd55f2aec927cfa8eeb5c94 -DIST 6.6.2-0-202402121133qtquick3d-documentation.tar.xz 62586380 BLAKE2B ac998a1013769f983e1d5ada4012f5dbe4c50ef4a911d77ade4aa266bd46cc94007619dcf69fe5dbf3d865f19176acee3f692dcb4142bccb18bc924964e78eba SHA512 358ce6f61a6e17bb55cf103569f24ac7c27addf5bfed9f65ba566d584e47a22d378a2be31467169605ef324056de9bdb5f377f48969248e9b16dbee5809ea359 -DIST 6.6.2-0-202402121133qtquick3d-examples-6.6.2.7z 19258580 BLAKE2B 661bcf29a584bcf7a596051de8a2d31e036ff105c161c9feee85becf03986f90802dbc5dce1c23c3109f3f51300d2f7e8ea742cf50a00118487f44f31f45be45 SHA512 66f211d7f7e955834c4b5e0489b2cfbb9f987396b3c61e891ead097145a277c0c8923017a5616dc75e5fc89e784bd82da93ee21dc5f9c69d616ede390a161d05 -DIST 6.6.2-0-202402121133qtquick3dphysics-documentation.tar.xz 4587808 BLAKE2B 828033a708ff1329efac1e52575104da75c8a58300afc8bc1f75e91a8d6244eef5f06451de31e5d4a895d5c4d2cda8d8cf7685d1a9b1047b51d817d9cda45bc6 SHA512 d4563fa3de47a10f0440861ba53798ead5b27ad0a1b6ab36f3ed7890304dc21f1b9750e13200dcc916f1a0c67b2054fe2d88673c5d63cef8ce4b7fcaa71f139b -DIST 6.6.2-0-202402121133qtquick3dphysics-examples-6.6.2.7z 2355447 BLAKE2B 144f255df48817c7df551af98761818cf181b3846352feac2f01065c4421c4f5d110f5133e14b3c7d370adf50ba3e096e2562d3b37a7fdeff2e4ccea92a53799 SHA512 f3f5b1f4609341839d3ab0e58aa12ffcdc78af331d37232627fad661aa739f4e724bef35213ca638d4e927db548a0110a412991278ad2b399f7b012f72c9956c -DIST 6.6.2-0-202402121133qtquickcontrols-documentation.tar.xz 7305164 BLAKE2B cffe06903bb712052b7362e79f3aa8fcb840de261c4771cdbfb117e90d411dd88c7a10f76045a3c3753e2c962808f40e48afae348011cbcbefffdd8f08037b9e SHA512 e0c7933d1e369f645ca3e1570462be1cb421dbcbf5f1e0c25541b83fc9c2c6ec6b76674ba6f2bd65e3107dc6ec778e67a1ac4d045080c0d155baab71f4dc4ea1 -DIST 6.6.2-0-202402121133qtquickdialogs-documentation.tar.xz 313752 BLAKE2B 8881b38c91ae18fad8f0cbf7282709932a61bdb9a2cfd199e879fc1c0dfafe154ac87fe241e43da7312c0b6b45349f70c01328c9b4890c87d7716dc6257e42d4 SHA512 ebf5b5fe4ffa8e33f4fff8e1c0ab93993a3b21dd58157a00ff0575791b9faebf613d19e0184528ed9057f1c6efb80e0378366b4b87df2cf1fd9a13bd9da78172 -DIST 6.6.2-0-202402121133qtquickeffectmaker-documentation.tar.xz 804828 BLAKE2B aa1ce2a1f594674c7dcd84b9dd600e85abfaf6b5dda692b80f7f367507d26d31b602e062c9f76355d2ae101bf6a71df52055f61861ef3b223f518278e4f7dc21 SHA512 85cd2694e6b72bebe49a6ce07e8614ea3f53bb3973dd3fc5e5f0a23706bcde213aa72893c858b431d75739774508f1f1561c736d118703cf3bbc4df03a11b1cb -DIST 6.6.2-0-202402121133qtquickeffectmaker-examples-6.6.2.7z 244672 BLAKE2B 0c1079240e8e3e53076b665e0800331e8979505fa1abdba972629f67d744d06d93c0d540beaad8914c4a2cc8583a7536fc7473d93dbb0f810b6736b43ea33cce SHA512 ef6c7acf74914699a7ffd58f0e657ce8845e1bbdf837a8e8ee42de76af4acca940f9f2c967d60e439ed27b5a8a2da57d5603834b5e74a890e59a4abb768f4fab -DIST 6.6.2-0-202402121133qtquicktimeline-documentation.tar.xz 153156 BLAKE2B 30626ed15373e2a5aa8deee14c1bc932f163a884da4018c56621b736babf77e64ba776af64e0e964449e4ffc2de4fe20c9e286e2d72752e2259e596b6336b76d SHA512 b1a995a935adf6050532aa808c89fabcd91fc5644ed0c0d62bc1a819a2b995d71f32f6ba3206589881ea25194fb7ccbb9693d14e2fd30279a019e7bf579d625a -DIST 6.6.2-0-202402121133qtremoteobjects-documentation.tar.xz 490556 BLAKE2B 27d43a6eab41698fd106ce5bcda2bfce2af3e53dbb928a637403088a42d92bd26c4fdcb58004be228f6d59a5b2ae4ed167db563055fd1f022eb4fce8ee136c25 SHA512 4b8d96b52edb0212e7c81ff51daa3624aa121f29358b260b0a1c65efd48fd9cb1dc7c7dae6f6be5716adf869a4511d9be528fa87a52f70bde8be00fefd927051 -DIST 6.6.2-0-202402121133qtremoteobjects-examples-6.6.2.7z 81356 BLAKE2B 487931534f1a0709813be2a6bc0f116851e9f1b35f797caafd22f124775fd6644a253c7165cca5c985090c06ff0d4e859988f825b8544e3a9b74a53f98dec45c SHA512 f6c7fc1b9698d2ceab7f9e22e4476c3fb39b43b2ebbf59048e3946af932546ad8ceb1d0c9b9cb5b5af9e516209b96d677ec3552e002a2961d13394dd22031ece -DIST 6.6.2-0-202402121133qtscxml-documentation.tar.xz 396424 BLAKE2B 85f30aded40aa23ab0b8eb1bec19de9603726f62a416c887be3c8a9f2449ccb6067cfb499049d2ce8b83e6c387cda88f6a8d3e5e59c5316420148e07ed99a883 SHA512 9a71732d32d83f1dbaa26e7201dbf038d2b48059b2918e335bd35e1bf3c9d649d08797b6f6e231b9d922cb526ea197911ccea3d9d093a8af13310a62e53513f2 -DIST 6.6.2-0-202402121133qtscxml-examples-6.6.2.7z 140180 BLAKE2B b99fa21107ce282fd01dbad97929e98b137624215eb7380970e99b505a09e891984439b033b2c39ca73f8407bebba332c8d3478a5d91a37efdcc796627c7e63d SHA512 09e15bf6d744105fc62538c2417f5d4a155c135bfa18370ed278b533781cf93a6883d562f4c23194c24d916fbdd267d6248562ca7b1c8d72c26dcbcd56389dbc -DIST 6.6.2-0-202402121133qtsensors-documentation.tar.xz 2134588 BLAKE2B d95f7cbbfafc7ef42416b841389c5f02d666ae519258f6b3d1b78ef15eb300dc2b5f8c2e0fe57c48f6a6a0d40db02fea020ed09aa7cfe99b8b163fa7fddd581f SHA512 99c41ae7dbbb340a7b48150cd203f906b4f618d4abee4f92054b0a480ac0a6bd23f6e2d76105a1e4a22162f9aec1aa5e1129d1282bc1f7028c1f255ce6e585c6 -DIST 6.6.2-0-202402121133qtsensors-examples-6.6.2.7z 53371 BLAKE2B 2f375a9d3e7a277a39af8a71b2fe24cee35466af93397492db0382d97439e943c69c5834c427f3c76ed1f039e366b1df62f692f1b484363db62258d8dee2291c SHA512 519747e06e27aa1cb64a53a3cfb90914e579e4d4df11bbf7eff14b9966bbf151303c2692c8bd036394f531c2b995d674d84cd70a9abc76846458014348e139f0 -DIST 6.6.2-0-202402121133qtserialbus-documentation.tar.xz 737276 BLAKE2B c931720947a32070e7ee31782bbfd547a58d6f0303e0f41d058c2f2134ca860bd6efd9a34feadbb989b6491a30c64ad68a84592dfcc8fe078bcb0c5e00110eae SHA512 72dc5bd7dd66467c535bcb18b479558cd71fa58c4b1c6bf7037d48f8e6b0919a6c608a36a58192a7cc42ae326d35fb51d727402f1b309eb94f2dd7ae9c1e7e3e -DIST 6.6.2-0-202402121133qtserialbus-examples-6.6.2.7z 212000 BLAKE2B 79c1c79766c57f9b3dc5bf6ba9b43d98ace85757a934ae01d11ee4385ae31d0e19a94e18d47e961bd0b4e93bad7275510399e30fd7becc9f001d3ec354fde5cb SHA512 c1c1891695a0c636f910b3586925b508b0275df64756e6c61fb840b13c4233b88db7ff4b1c4cf4b5d7c85e81968b853aa92a6f764a3207d60361fa352ec0743b -DIST 6.6.2-0-202402121133qtserialport-documentation.tar.xz 184136 BLAKE2B 86670d4e38696cfa10f04b9e0632a3b152d08ae518b3ef87df38c2a6009c0cef55b8184efb26c0e9ec2425b3763165bc0d63cadf6424b6ef377c32579c7c3a33 SHA512 1e5931ab886d7e2a7a1cb2ad2b73b54b86da594b84248327529b6e41cd40ada9f8f702393eb213702f2ad3891c4956dbfae3eb4f1ec85c5a4e09e2e11dd88f7e -DIST 6.6.2-0-202402121133qtserialport-examples-6.6.2.7z 80941 BLAKE2B 238bf407b2dcb6158e60859cb45792010d5abb57dda68d291744f2cb9da72fbc81c636ff5eaa69facdfe2597ec3a0e774092cec46d616276e82d42c65a1ffae0 SHA512 66dc4f38965b826c5b7de266c1cfe603f614177facac293a4e1fabb86c215a1397b39f0d1f621e945fb45af0af224086c276f29d4ec6064c6cf9cd1de46ee1fa -DIST 6.6.2-0-202402121133qtshadertools-documentation.tar.xz 192052 BLAKE2B 3059637581b105e64701090e6aafb756e08296d0c6c6c0805d9a59e500b9e399fb8e2436cd775379c9c108410b291da53865ea76987bfef59bd27c6d8087798d SHA512 bbdf4b764677abe935c5691d2142188cb53d187a9e222255682a4faf8df4d0dcf0215e768735f1cc765a06785d15ed9c656863f2db8191e247d344b152359932 -DIST 6.6.2-0-202402121133qtspeech-examples-6.6.2.7z 157716 BLAKE2B 66d23e6c0ce5a68aecd6ce8ada424a031b32c718200b62761946100107bd98dd886cbddd27705c42824f4a24426484f06039bb77c1f0d8fdb82fea325cc2b144 SHA512 6b6d1903327520e7ad9880095ad1dbf65ff4f83331ad600c38f7562c630c6c759f6d9a168045efe5aa631500cbeca9e58a59a1e4ef579aeeb87ef1e65ab76a24 -DIST 6.6.2-0-202402121133qtsql-documentation.tar.xz 883696 BLAKE2B 4e14d3ab39b9bd777755415c98c708f3164cf29ae3936ec228a76f418b00109df79d50028af521234a9fa485024d465b810bf08939187dcb3e3d8f147450e5c8 SHA512 43eacb160fc0a7b2a967cb932730989893cfc73f81365f222f8ecd83e34a94eba2f3f3c4eb0e0816dd0c4aeae0fdc4485dae7d152d9e8cab1ebd39851320be5a -DIST 6.6.2-0-202402121133qtsvg-documentation.tar.xz 94956 BLAKE2B 58f94792e91a7bfb555f2b147a5bd2861e3e2c90da0540032545dc46514df31b41b46a58fb9485e220c6a3d621a799e0e504cd846f270e076c6ae6f6efb99595 SHA512 feecefaa00a98658200e899ff7d41ec5bd0e1094c555bb705927c2ac18a680e5ed789ca3fddb48035ac3636e1963c6c6335c321e87c68ce0819d4cb84d7a27d8 -DIST 6.6.2-0-202402121133qtsvg-examples-6.6.2.7z 486 BLAKE2B c334895ae44c04a57ade57deeed3376a5b5a28cff6a84f1de4922e481ebe9645622957d844b9d2df9b389e65d3428639c60b5665fece8e2f672bb8d2e91150b8 SHA512 38af13df44419905f61f5c887a94e17e4da39b6d46d67b2c38874fa7a757bf95080997239bfef31eb068566797dc7746502cc78de350dfa1e9f4afe85e74fab8 -DIST 6.6.2-0-202402121133qttestlib-documentation.tar.xz 218980 BLAKE2B 7d145a5f26febcb290374e49b972ddb615ed761f3ccfa2421721893d47c10a2e9ec8cd4e213b292225ae376639e69e0ad9830fe719daa331dcfe212d50bf8ecf SHA512 914979b16ed81d3284d915dfddbe7f1798772c5a9d38a3ca8a0a8101e37095820bde2936b5ba03d90d3ccd395df35168050350790888a869b40ef451575f9d58 -DIST 6.6.2-0-202402121133qttexttospeech-documentation.tar.xz 401460 BLAKE2B e8bdbe7af92dc2fad2625911cf49cfe1fba7790e6aa1777a147a22574728d5edede75df9532c10fd2dbe6c23a12cc55c6b214ec93064f9dfd54508562924507d SHA512 30c5be8e2715079a166188c558913d4dbc7695c8b2a058d09e2941427304d38c768b518c95f68f41243eeccf8d34e5e0d757d2c65d777f48725a916e434586bc -DIST 6.6.2-0-202402121133qttools-examples-6.6.2.7z 468538 BLAKE2B 5bd89d6c7f25c723eb4ad0e9575371de57723a35d0a554bc77ebad323c0e778e911efe26e8191857c0c68f54351bc4e8c02d95891f8fbf7144c393ae815439bb SHA512 dfe6ceeb41cdb74b22c25838c72fb0aea7e7d9b8d96081b1cd55379f34929406dfc06ab9541975825a1e0f44bfeca351eed0a20a8d5f22707cb8f5151f0b89a2 -DIST 6.6.2-0-202402121133qtuitools-documentation.tar.xz 206576 BLAKE2B 5a41e24d5c4f7222af45b32ab6ee7ec00536ca4e46631c69b4484402ba6a3df5520bd842852fec6013df7ad4aad99107855e853af7664a7673db66c9e1c4fd88 SHA512 b78203b0d285e7e05497b0281b72931312d783038d093ff050964d11a97cc144a46372dcfec296f931afd4b8dc6cea68d1b1281b9065642d50c5780f4b87696f -DIST 6.6.2-0-202402121133qtvirtualkeyboard-documentation.tar.xz 2067072 BLAKE2B 45cce6fc1d8c8787a3cba437f524087e1e2c39de7b0814e53b0d34bb2d5288c630f342455e037a71240d49be139ceb28018592372f6e2391f682084f9655b635 SHA512 d3871e2b25f1770d6429f3395e9718a2c1b0c4a2a3579d5c295242613c58d55e12f210f3da34cd0485ca26d04a2372b8b87871b64874a77455543fd32f8f3694 -DIST 6.6.2-0-202402121133qtvirtualkeyboard-examples-6.6.2.7z 6954 BLAKE2B e13f5e0f338996e37dd132f2f8f427e4cb39f032dbf6dcdb437ea9db9c01047fbf4cd027be4c8b16ba19f6789dde9e0e9aa90c1b1aa6265435cc4d8fdfd68bf4 SHA512 0917dca8c16fa5b29f674707bc03147786710cc1bd4e19e66a45042544b25435366b41a362ce3a22e592b12499c4ca8de027971de53061051dc8ed9cead1d11f -DIST 6.6.2-0-202402121133qtwayland-examples-6.6.2.7z 568013 BLAKE2B 1c943b21f910309ac69325b9ffc93d6d214769f2f043c5e82206524da6c1f0f5618232f8f096810c045d759e6ed606384f015af39da01abe869b7153fc9794ec SHA512 781586b23581c8837cfd78af0fdb5729a690b0b0926e0481b893889a6ce50fbad57082090b255dc64ce695d93c428972e68e9baae87aa791b873ff9e78ec4243 -DIST 6.6.2-0-202402121133qtwaylandcompositor-documentation.tar.xz 1596272 BLAKE2B 3a83f2beb451f746b65d403b168b42e03c42ab69cdb1c96ddad03347c31ee1ad90ef3e51e9bb3cd61469477f6c9dd81dacbb7a873f0cd1260766c1b256d2550c SHA512 139d20c917c2f7e52c374c2bdc88aa65d1df78ce914504d243d888f9964c5cb8b0f73cd9c5337faf57f064008486b2f3505c1e44f17548ef77b511c6482c2359 -DIST 6.6.2-0-202402121133qtwebchannel-documentation.tar.xz 166436 BLAKE2B 690175f899a7d36ce82813eed82268e078d664fb74c83c8e6b0932b9d012bbc420c4afa14313e890f400ed599d0932e391d22b45b15b5c80a3d7c8d75d7ceae8 SHA512 cb976635752aed8151c87186eb17299de58def33e9950a566ea90e999a2afc27a4a441258088035f313be1e22a041bd5289794fcb80603413af1413d5cae6bf5 -DIST 6.6.2-0-202402121133qtwebchannel-examples-6.6.2.7z 65950 BLAKE2B 934400e7d382fdb2b544a2dc7e450dd8b4cf561e71c5f7480c36683b61220d4e8a0d2e33d4b5205d996a8416010932d41edaef2f0696f145ae541e72fb769a4a SHA512 598a541b3f6a09e8a0a5f88d2edf874e2f2441e72a8eebae5213539a4d3a246e19faeaa4f4890d7a66cfd72a42ac178af33b7ea4660bfee6506a75c53ff946fa -DIST 6.6.2-0-202402121133qtwebengine-documentation.tar.xz 1965288 BLAKE2B 5393dfa9edabe057355ad7dc79b098165768e3ab231ea8789f7d65f23efbfac859bcfb81182de8b6cd08b0d61ebe285da5605b1c2c6253e6f96b40fe2a063e8d SHA512 c502b2543f130206e64dae3070d986952e34a3c26c1c4d93ee0ac67015bb973483fc54334b26d870d674e578a1d21eba973e3aa0720bbf47cd07b5dc369affe9 -DIST 6.6.2-0-202402121133qtwebengine-examples-6.6.2.7z 1110546 BLAKE2B 96623490ba20299c7290db28ea942d1d13fbc0b2c40f38f0c94414a1ec37a0b700e4f16c97e32eef50429f38b5547c3e980fb14022ba7882a0c4cb82a821198b SHA512 bba9e24249dcfd455004b9b68c02ae13893012b04cb982d6ec1986e00ef7935bb6ff94b2474cea24a0eb69c46bbf76cd8985f7865647f3f5f4110d6ed8a13b5d -DIST 6.6.2-0-202402121133qtwebsockets-documentation.tar.xz 532504 BLAKE2B 7963951cf63f8fd622d6107940a02879853750c55e64071b5d8dc7869fd633a0be703b29e553264d4063cf5539e82fe849bcd061afc7a9851e391712a512792c SHA512 9baa5c496d3402a1b7cebc680fb3e1d87845633cbbc090eff9c66dea664a619bc6195736154246752139756cc79c40021f2008de05efe236a661d78db4e0cb4f -DIST 6.6.2-0-202402121133qtwebsockets-examples-6.6.2.7z 246697 BLAKE2B fd3cd5e6c34b8a10eaa80ac9238498a0fd603b9d54064717f077b8d60a9b92a174b05fae62f5728caa253501e57a7bd7cdbf911d8966ccdc2b1219264ddf4a0f SHA512 9e843f67472861e8af5d43606d142e6923ac311cef38e840b487b29c6ecc9d66b4655bf5f0b03c7ae34bf8aa15341fe8a6c30910c3be798f703c95d489939865 -DIST 6.6.2-0-202402121133qtwebview-documentation.tar.xz 125952 BLAKE2B 47bdfe25c3533fcaae9067212ad79b92981f02503371ea62b03b0e6afed7df46c534ddf00c80612ce4dcbf849aedd1cbc3e3b39d5d83983a904c96e398cca6c3 SHA512 362c46ab1d106e30e41c6d5681edea7f5a76c4caf92c7616f6bd9cecca4f6d9ba8bc98ff247d2eac38fb0c6f6cdcd1e137f60c13d70fb0aad5b873fb70840584 -DIST 6.6.2-0-202402121133qtwebview-examples-6.6.2.7z 47248 BLAKE2B 782eba36eb72099f9379cedf3e6ebdfe0c52a7184705f16a2a279ca900224dc426e4132177b84499948468f1cfe053dd8c14d0a7a87a9711a6a391b0b8a02692 SHA512 b0d9d4d118df4021e11c4f923913257db55fbbafe3ab2a4bbff13731b609b4e25c6d0d47408120791fecad4d284872791fa66847ac9e3f2b21ebd2936a367961 -DIST 6.6.2-0-202402121133qtwidgets-documentation.tar.xz 17600500 BLAKE2B e67e2484efd2ade83895e28f5faebeeaeb0505ff367b9264977b9adbf4ca02b92c66d9b78e159b7b9acea9bf3bc909b04776ac220b5aec103ba215fe918adc77 SHA512 5043738e4d985ad1fb62dc3ceb8259b51de4c123292bf45910e9b38715b27da7f617743601348515540b7f0820522bbfb320696981fdc8568fd5d58b7cb6ea82 -DIST 6.6.2-0-202402121133qtxml-documentation.tar.xz 341488 BLAKE2B f32528d0cfd7524d82aee84f5ce823c64d2a71bd04975c3a888845b4db342451680570b1499843ec348f5344e00983239b44074b1311aafcc1e467b6112f2766 SHA512 8e53738a218623511b3ab2f3ab092654607d71b8c192f6a911ace2d946e3b1209161a56f52d7e5ae5d6392d495d4dffdffa1cc11a7fe0b5cacc7bb1778b08c26 +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 +DIST 6.7.2-0-202406110334qt3d-documentation.tar.xz 5596452 BLAKE2B 91f3033ecc3592011a9634fd3089ecb5c835b49672fdbe5d895eb31aa16caf9610b67a4a9760127390bb9376f22a097b142d7b90643388fa6723593f493c0c5d SHA512 61444822db33e6e4d59c9699eb401cf7375a484a213ba89412899c8e9921b7452d21d1fa01d63babfa17bdbee166f708983a05804c1b6dfbaea245bdeb86d391 +DIST 6.7.2-0-202406110334qt3d-examples-6.7.2.7z 60337866 BLAKE2B 494e4e6e1b50c1468557090aea6b8c335fc0998dd9d9ed0c18535139e1043a36c782f934883af744c9b5686f875abe55a56ce32dcd82b3b192e400669449898b SHA512 0c50921e239199f29b21f4189e313dabde584842552bbdabcc1aef55b059083e895c4bd3d65e91fc876ef82cd3fbce45452d16f8a5a234fd6ca552dd93a6fc73 +DIST 6.7.2-0-202406110334qt5compat-examples-6.7.2.7z 28013 BLAKE2B be3aa45f92eb06ddae1739fce35d975cf28e540aa6604750f5fb369ebfa533d817fa57aeb4d84817e4a901ec5333a4620dd9be2dc83fa73667db403f84dc9555 SHA512 fb823c73b02d60bbcfb51f1c4d010090b98552790ec2bf26f33d77866ed46efb731895d205f2de203dde1fe83b7eadfba3a47e1b04fdb01782ecb803b5a63b26 +DIST 6.7.2-0-202406110334qtactiveqt-examples-6.7.2.7z 12056 BLAKE2B d3e46398a1522cf32670f46c16325f244f57059c1a47a7671f736d09bd2908cdc3b97d5a2aa07311f4f1dec1d4c786a3378b20fdf75ba2f42f3871df3a5014de SHA512 d72314b38859547c9f2956476fa43a25c7475b77ce843b63177d48a839767eafde67caff7ab7c9d3644a7e20088393fa72839474d7a7f36a3d07140526484757 +DIST 6.7.2-0-202406110334qtassistant-documentation.tar.xz 469236 BLAKE2B c8afdf54e4eef9cf3c1f591ede408c6e95882a7e0abab554a246de7dcb869ba343d2930aa67591da39792c9faf662031d55d8d070f6ac6ae7663fe32c0e47d5a SHA512 2fab86d18927fa765ee0980541c58885b4afa40f1e749ab5be1956cd6990f22224c18e53a01089f1f30c441c4640c2d551f3e2244ee52cab38a16a4bf87aedcd +DIST 6.7.2-0-202406110334qtbase-examples-6.7.2.7z 4314957 BLAKE2B 9061ea75a4363e56aa0338433f3552b4177b3dd6eac23f234e531058cf1a0ad00a496366d768a380c352a731fae4dcf4918a70a4f83d5ed21463fe41fcef47bc SHA512 a38ffc5b48bd0e13983df1020c9b9ce6bc5598f140db58bf265306ab007188a437f031e84f8b8e715158441620a9c03b5063d051572fd6256f6c6c320d8b7dfe +DIST 6.7.2-0-202406110334qtbluetooth-documentation.tar.xz 1035068 BLAKE2B 5f8c0e5860b85d34730e0a3203148ac88f7dff0e9ded2f4fd213e67a2380f7183ae854d81d6f8b47d359e27406f9a547a4ed22772d93ae80540b51ec9336a741 SHA512 5c259aded83cebac905961c5b8e9a18d80e6cad8cdbac468bf78efd2893c7529477c3a6b298214c2a9b82304f26c8a5c7ea7374d8784909fc3327b15a8db69cc +DIST 6.7.2-0-202406110334qtcharts-documentation.tar.xz 8853312 BLAKE2B 46e3e55b5622351650a298227dfe9a493f0010c593ec175e30bc8bd3762a24ab32121e703bec165a00cbbc9bb74463e14bf8efda55f493d0ebd895f9ebc75b4e SHA512 3ce033e38b518eacb6ee1e6085a4b63b4244cb7e362cc40f8b0ff1a2d73e09358103217a48ab9145c865e57c5b70add5b5581b607423d2697bc9161d21a4526b +DIST 6.7.2-0-202406110334qtcharts-examples-6.7.2.7z 163213 BLAKE2B d4da66167bbcc09d7c131f1cb5b68f1690f786444cf3c446a6941c033ef62f5800e2953ca50e2708bbf4136add4b46d3fdadad9f280f5f9dce120d7e918c3e7e SHA512 cb825edf6d61f2849965c1132c0f834ee325bc0f9c0d34bf687891f0c27fbd018a961f586023e7f789a555b2ad063215390a5ab92dd56c90dc0ea7f12a4e5eef +DIST 6.7.2-0-202406110334qtcmake-documentation.tar.xz 93580 BLAKE2B 08c8289e2f2accd46868873fefa1a98363a839da3bd28a7962975e7633cf142cfc9e53cc7af6022118ec06bbaaea5599c413a58232294125daf8b3cc2fb0d33a SHA512 eae1d5c7d2c74c55aeaf3eda507c5886a25140e5715339c3fc6e549e15d8167f3dc4b2e23eca16965e09f744ddaad516034b2466a60966e6329ba6da8a778276 +DIST 6.7.2-0-202406110334qtconcurrent-documentation.tar.xz 185812 BLAKE2B 5713c3d8633cc6efbd049ba0001c280ba4306f68b5f4809e66145b45c4b72474a7fb17c95208b49fbb4a9ddfac1e1d132028545f6658ad3fb67aac558b6a3513 SHA512 332fcc314f2e0c1a77313147575bbcd60871c117ae2240eaa88a6fbb2a2020fef1220acf6ee8e70a45b1e9ed4f4ac026ef68ba461171a2c91c91d53d0db2baa1 +DIST 6.7.2-0-202406110334qtconnectivity-examples-6.7.2.7z 403863 BLAKE2B 914adc150d8a62b5fda7083e2407917eabfb1b28a90451a3a815c4384a9139bbcc3a7b7b5b0b878d28fca6c1efa846c5a63710e5ab49bf665581bcc5f208728c SHA512 7a538bb8b4e5f9c33846f56e82ddc6f1e16b57a4b8657f60645eefeddedf4e54fa39c82de403accdf93afb4b9e0d34e322072608f130bebfcf9f14a8b556457b +DIST 6.7.2-0-202406110334qtcore-documentation.tar.xz 7126464 BLAKE2B 3d5418808ab38994e695dfb6625374bf009cc27bb45993e6a4ff5a29634c736760f373d749d4b4f78a376400117390a98f9e7b6ede82462a5b5cbde92aa114ff SHA512 6105b49fdd5023674dff91381b0bc79ca45b8a1b748be7d1872cba9b78f5c2d2e8e57bd0c4462ad3735a772b8c788b47fa449797556208028d411c86e8b41e5a +DIST 6.7.2-0-202406110334qtcore5compat-documentation.tar.xz 319612 BLAKE2B 1c29e5510853c8ae434143d39dfd846900b9b74721b50d89d7120784566a15e54e94be651ad91697c45c10111fc4d61b55f2f1d0da6b51f4691c7d67ef767abc SHA512 75cc6f0381a65c1c286f2d698442c4250fa096e9bc2f4640ffd005adfc3bc114a554b33a214ad436740750db9985af8657bba7cef8d987331ffd0a9a06db235a +DIST 6.7.2-0-202406110334qtdatavis3d-documentation.tar.xz 2709180 BLAKE2B 36b8799ec2ca35ea02f8234c3c7027bd92130f1e65dcd98884fbdffc02cde78e21256e53710b5e4aa390630d1aa8cec4884fdf8e581c42b0635e8338782ff2a2 SHA512 6c56fdc8c0412f37ba4dae705a0caa829cd204c66c0ea5e69a74b3bdf3e94ee192b159cc53bcc0caa3a68390a326d39cd8439c8a6790e01226e71a94a275f607 +DIST 6.7.2-0-202406110334qtdatavis3d-examples-6.7.2.7z 2771387 BLAKE2B 5f04db8cda0d5c81bc1f7530d3fce1e1f537600ef512cf7497966a03dc81c05f0e65fea95203ee8a6b88626cdcd5826bee5e93a1918e9b61fab6e61462ab61e5 SHA512 54a0efca7282e00cd6b5db165a33134c3ba2b70a9bbae34509d5dff1f456cab9da060c1327550be5846a722ba38852157c084066a159ac21c10cd0ec8442553a +DIST 6.7.2-0-202406110334qtdbus-documentation.tar.xz 333800 BLAKE2B 25d93de929a7938699a8f3514802fe4581ebb890155ac649b6585640273cc0f50e57606ababb78affbb775bed2862aebc45aa74528f415011b900b7b97e8939f SHA512 478544db47bc96ee337ed0aedda2b58ed40e3731dcfedbc630760563ee377da03db206f878a3252d5637353bbe66e53c58537c4f0fc030cd01c7f7c9df1e887b +DIST 6.7.2-0-202406110334qtdeclarative-examples-6.7.2.7z 11655278 BLAKE2B d9a33bf8c0e156e1e892e42518a380e8ca19daec3b74d82532d90428b7871ab5475d9cec66876e223653a9af68cedd5f3d0306d0408edc3ded71bb3f8182f2da SHA512 bc9d26fc022fb90e7b52c060775c296f534dfba014a25869967dbed401528c2cb8b5553cfd8e214669fab3ab60055c79729150f109dee2b5264333d088672128 +DIST 6.7.2-0-202406110334qtdesigner-documentation.tar.xz 3330880 BLAKE2B 71dce44e612bd9069f66579b09fb5308c7e47438e8d10ad300ce5d21e9c87df57217372c35d3550880573869a7ac3c138ec65bb19567823e107db99456b72427 SHA512 20eede5887aea1ede90aba2e46190ced5e3e37e14f236e98401d6bf35bbe66e214b796c90014af2df1eff25d7de1195271099e6cb08d91289b34a6feb4d64f46 +DIST 6.7.2-0-202406110334qtdistancefieldgenerator-documentation.tar.xz 149740 BLAKE2B 1a16b07c97d1efc72e584f7ec8e441346a404dea5fc65755b19277908e1b1974f6fc4cd738f8f0368f3679dd2ad1fb3f6b76e3676f416568d4609e7d04b09118 SHA512 828ebc0065589aa9a5bc0d8ba651c313cb1b3f1a2d5b8922c7007c36e6fb292ad39ac660c8f8177f949e6e008b0c54cedce58327469ee5d8af77ccbefd894703 +DIST 6.7.2-0-202406110334qtdoc-documentation.tar.xz 14801980 BLAKE2B fb2385d28d379d58ff293cb707627beecacd0e5183a5d0302c440b526fc88dfcced97c85ea31a48e18cc31571170f4bb072928f231ee1ac2571fbf9b8b91d7d2 SHA512 2389d3e1c1ceb5f1afe256f141cef0c080e7c0d19c97950fa70edb313190006c5b42ee39ee11be82ff85174e3946a1eaaa818d8dbcd9f3e33ef82c8ea1381ed8 +DIST 6.7.2-0-202406110334qtdoc-examples-6.7.2.7z 8045618 BLAKE2B 114661c51fff3ce96277fb8bd4ef14972496fa475a25526d2d83486309caf55ac70888eb98877ad0465a08f4274bcb64231f078d40067480db4f356a5e9860c2 SHA512 a28903d8d41b33a265a1e7c8f3f7116199d945023d7f9e33988f018ca0ba0fc0a70844aeff5eb80ba51ef535c2b2c279cacfb621935d31d253994d1eb4d36da6 +DIST 6.7.2-0-202406110334qtgraphicaleffects5compat-documentation.tar.xz 25785044 BLAKE2B 02dabda8cb4a8c4b55e1082549be2953f13beec622769bd2645a360159aeb43f1f317d4d0d792b7f190b1f2c4ab2478ce02a97c19d951829190ac2c7cdcbc9e6 SHA512 5b4ad1ca5720c8c4c2df9ef8c55dd503b103824a267d7dd95446c4b1a70d2ee1038b7cb54d999cde9217b3c91a77331c3e8021874bb2edd8c39fbda139ccbc04 +DIST 6.7.2-0-202406110334qtgraphs-documentation.tar.xz 2989464 BLAKE2B b9681a7ed7a97b8a6d8d61d0078f306ad8e787975ed4b7d78f77fe8feea09cf94e0ada1ae543236e1ca09605f15a5d76ebed26535e061bb62fe9877c39af0a0d SHA512 c06fac09c7a9789ebf04706d6a4c29c66b849bee68bbf31830a3001af81fa5a70b050aa352107da3370f750c9e219612480f926012d8f526e01ae0c044480477 +DIST 6.7.2-0-202406110334qtgraphs-examples-6.7.2.7z 2456415 BLAKE2B 774f4a1f0b6a5286372ad2532fbd1e99ecd6d547b22383bdfba7e20444d27727bc5860b6733a25ba9618f9e25bfc8df627b7d394ba7a5097250f3e48bdf73bff SHA512 1109be1000a232b15b42c7dd17f425418c168d19bad25a3c08abee1d67ab784281a9d25403c9e600271e912377a1204f7239e8fdbff3b98612c8ced9f96f4b91 +DIST 6.7.2-0-202406110334qtgrpc-documentation.tar.xz 274072 BLAKE2B d7b048e2c233cec7e2b73d68f5a41aac0675d1c2f3a74cbed318fd78b0d5331f6522f0b06fd2b87b0a37d62084570e91b3eb7d96572f3cc69947f5d6444a8687 SHA512 c7438fab2b5ab5651e9c75a8f5270d18586dbb68ec8536d556d7931a3f9bfbaab3b65131e8d8a6c372ef2269e1095eee52acbf48eb7fa482681d783cb32a8efb +DIST 6.7.2-0-202406110334qtgrpc-examples-6.7.2.7z 96580 BLAKE2B d9d52451dbd76b97137223ba9ff3964e81b9edb87b0119bb245e24b9c82af2a611ff78e377df310b5872df66447a9a7ed953b5f9b0787b170d500dddeba21586 SHA512 43482367d7f8916ab45ab8857389836f2a12cc4caa76c2bc01b2f7a693eaa08562e9b618f45a3b2f67c262e0091313fd99f3ab32f5dfb1454f2e74dbe2cbaaca +DIST 6.7.2-0-202406110334qtgui-documentation.tar.xz 7205960 BLAKE2B 21170b5e49b87768338e3356fa13d48954b0fe3af906c8d264db9f586ab2cb1b16315334b162a1ea1a01f10e3e1e47e1ab1e3206d489a67bca6c2af346a5503d SHA512 02044b7a95cae891dce7c7fe63d20ffbe553fd856ecc4f341a7988e96fefa40b388ddabc58084b993898dd9115da22a54a037ea8751af44ae104fe2d365f56ab +DIST 6.7.2-0-202406110334qthelp-documentation.tar.xz 212392 BLAKE2B 166dd59a2f28d9189a0843ef29f54f8a475899f66597df9bd9beb48b88d60c86d6e66af16455217c4f06b4ab9b5479a56cfe0c7a552d48b64754ad836c6fcd2b SHA512 aa8cd18f97f5723fa87dc071ac7ca2d90f30c890bc3044d5e914d96b5ad683f1d8bc25b1014c2ece71427ae8e2a7b2c9d2c8ab235ac9b84c7e39fbccc0fe10cf +DIST 6.7.2-0-202406110334qthttpserver-documentation.tar.xz 292108 BLAKE2B 8012c32de12fb741fa600fa9ebfebf2458747fdcd000050a72240998efa05f4c91892cbde9e1b5eff15960182969c4aa4bb4cc2020ec8b2ecf9e05a099d5fc4e SHA512 220249d0e3275f185bb2c7c1cdd354cc76bdf17caf5865ca5039670a78143559b732cba738727a8df7a91335a10a418710c0435b4fb4b965ef0c0d7975b38e2d +DIST 6.7.2-0-202406110334qthttpserver-examples-6.7.2.7z 51619 BLAKE2B ea16eaca2c34099e555c83166045c5aad97a73362d11d9d6f3e8c574817202e2d4d52229a9ec522b3c520c313043aa3958f57c6888c1d42a8a6c1d5cad26b59e SHA512 54e8e1104f15337f0d50d1945b59812e2a1b83f1a15e7b439d2dcded5814beb91cd2e3b41cb5d127d112205a3a682f5aaf5ab5c6a2a119d7bbe7eeb79f6dbb46 +DIST 6.7.2-0-202406110334qtimageformats-documentation.tar.xz 32220 BLAKE2B e7208e65f05bade8ca2ef9ac694263ea796557293b34450573c270fbad1d831c7f921dfeb8f11d754d3f5ef0f6a4b629d48499573be4c0f7bb8da7df12d8f5b5 SHA512 ae9289d92c296b6685e362a1180182955d508efa93761f30915f5597959731bf34c2293d604a9532d1f85e99a36e4c848afaebf4b8826342e7d45f8078d875f6 +DIST 6.7.2-0-202406110334qtlabsplatform-documentation.tar.xz 539392 BLAKE2B a75e8392a780e5265dc816210e0dfcec6b7da7c8ebbe466b3d55e3340ffe44de07f6ce1fd7aab20fd832f1c9d2ccfa3222136420a2172530d1c6da69b8c86ba2 SHA512 fa5d02ffecb279b1ce94ae475004e79420f98e950b76e5871598980f7cc38b9fdbb2d17e371c14023cf54cdc543855cda38c8be9928abe742a024b662ce4ce1e +DIST 6.7.2-0-202406110334qtlinguist-documentation.tar.xz 1133804 BLAKE2B ce21532d436823d430ff50cc2fe75b0a73d74b14a96349a9d58f249e071e2456e8af8b926a7a486885e48f2000fe8fb216f486ab07a81bec5b2ec1005772db0c SHA512 ca82eba79057e564f24fcd9293f2dccb3ce78211d62ef88327526064c0a104734d00da12ee4f789eab1558062f66824978862bf7b6c6c4d9938a7d53f050434f +DIST 6.7.2-0-202406110334qtlocation-documentation.tar.xz 2935176 BLAKE2B 91d86d30d181c6aef6eeeedb57cb0fd553e7bb6b441829cbc8aecf9f691ef3065d54e2e9a237d58df137a9fc4d5d2d4ecc66c4f3faa368bcb7cb94520a11a318 SHA512 c2fd774ee7bbc32d2512764806ceedd621d0c3d8005a447f1b4ca4aaaac6c02856a1ea878361c5dc4daa0a1a6d6c2bbe1945ea2ff76ea488be534c04f811e19f +DIST 6.7.2-0-202406110334qtlocation-examples-6.7.2.7z 1570415 BLAKE2B aa93f7e9aadec35396ea18297fea54c0f52020e46549de73f8dc41702e3c3952738134bb50578d8c14901374065e0734a6de1e6c5f5658203651e98372b09063 SHA512 ddf31aced7175dcd2c54b96842a76974bb47c8d853c33200ca190cb5ff857d09b814289d973fdc95928ea07dd78ff70719918df04fc50d640dd1cee45fa7b803 +DIST 6.7.2-0-202406110334qtlottieanimation-documentation.tar.xz 40604 BLAKE2B 76a742cfb6260be5bd47356700c680588c770e0f4e7c8d9fac486f37c3a235a1879023bbe78a479dad0abcc26717aaddb75a296fab75e203e8567e7d8f4efe3b SHA512 d9878f8409de6711b042b95f7ece3f65384411c49e26722233fa1bb50fd29c76afede28be8a55df88517a15779efd8e20f91d9d7d8f33adb9c454f6451251872 +DIST 6.7.2-0-202406110334qtmultimedia-documentation.tar.xz 4650432 BLAKE2B 05f741824f83f4a7f91ef5d16add4286a26ccba11239448fbb3bbcc28434fe74f49b3f2e1d420f8660c76723b4f097832ede2f1a8226b4b748748ebb58677a13 SHA512 8f4216c0b802d8d7d7cefdb6862220a3299f52a7eeca28b06b67edd7b807fe885a05b4b451571bd81ecc0039026abe6d425fec656b4e9a54955703cd2108e908 +DIST 6.7.2-0-202406110334qtmultimedia-examples-6.7.2.7z 1648928 BLAKE2B f17437c523f1078cb9d7cd12438e6515a5740dd3ccdb619a5db5758f87982cdfc4778270a1ad9d569ec74f43cba0fbaac2490bbfa05f619ca30b85340333fba7 SHA512 5866d5a0881353e1846861757ba6172c2e7b7540be7f5ede27001fad7ecbce21e558338c40025dab260ef11dd73bb97fcf3049b6a04783d47cc3faf9ecdc85e6 +DIST 6.7.2-0-202406110334qtnetwork-documentation.tar.xz 1431832 BLAKE2B 713310893e7115a13582bd9c7f61dc49e6ef0c53690fcd7100178a9f6494a3991607890a207fa5c39e03ad8457f8313d1dee5684bfc48116776e876894af9ff0 SHA512 39d9c5a5fc90ecfa9356361f552277f2b0a54165d3f21d9f9f2e5a5ec2d4c3c90318d35894cf83e6bee314c76c24e40c9d884ad0a31d6879b7c2029e7c452221 +DIST 6.7.2-0-202406110334qtnetworkauth-documentation.tar.xz 199604 BLAKE2B de90694d2f915dd4ab6adee19c284787979fe04bc37001484338a353e504f868eb221e48470aa9a2375308dad369a05e144737f15cfc1dc5499ca35e7c78058a SHA512 2ede152b577325a68afe5f496ff76fee7e361b70e5b0b86a777b681d4c3ea3e5b891de291c0f11254af41754ad05d64b4675a20469d6e6403c6546afca169a18 +DIST 6.7.2-0-202406110334qtnetworkauth-examples-6.7.2.7z 41557 BLAKE2B c452bcc102b710b5851369e8a6236320f6136e98de1751272b54bab9f2c7fb1f692a30616058e7b41278be83688cd0da4ba5ae91786c43d9c1a20b6b157f4c24 SHA512 9138744f1f78accf7fa7e6f4e7575bd026fc070c414ef6d1bafa043a903a3005e839176b568ea21b8f826eb5f7c872f72c05329c5a16c2b8e54ee4818f124d12 +DIST 6.7.2-0-202406110334qtnfc-documentation.tar.xz 234520 BLAKE2B 698dc75ee43059061b7fb92a3f290c7d566f561c0017efb8c6729924de95320d1409b25583da12b535ea81f919614195f29135b38a5c87ee27eb9f25abbaf1a3 SHA512 5ef536f4c45f86ce9c82a800d33337abf044fe04d6a91e129c7fe70ece5029a9424fd100007c96dc1712aa9b07ea3d2d7212c515a5495e8aedb433e209e12a0a +DIST 6.7.2-0-202406110334qtopengl-documentation.tar.xz 1026132 BLAKE2B b9a2fe45542101fa624e0c736138840c46a8d1ee065c8d6db5086bd1923a04b22a5e8caad34c4da9e42373dc936c800b6b266e83ce6243f5b6075dd706c2ce92 SHA512 6a672fc414b7f20531a2a62e4f7c0059f56ef5aa1177eb823e19790ca7d62f9b7b79c317aff83dd19337fec2e412c66687e77739426124d45006fc4d0a1b93ba +DIST 6.7.2-0-202406110334qtpdf-documentation.tar.xz 1023764 BLAKE2B 46333ccc8f68d2689ff78e54df08ed283d698aeea3984ddfd663d893042b3aa63ffcb9df0b06dc99c82c31d6e1011d0c16f0843e2416b4126b8c1411429ac3b5 SHA512 937e9f1d8bb9cfb4b349bbbb728b3c2ad5aa3e7c64d1dbb16c8e18b7f5aba001330793662f0036971e5de6c3d22ebaa4522deb1394aec196e8a0726d053b0e7f +DIST 6.7.2-0-202406110334qtplatformintegration-documentation.tar.xz 42212 BLAKE2B 49f3488b043d6bda7eb31070c964a7f3149dae59d24913fa61ac0f13797afa98db9b5b7534f6dde2a781da09c5b2243fac27f08d38137a67974df24d45b04373 SHA512 f429d4a114594f25d3b95469c5e210ef79e94b1f0c4915c61e382b2688d43389a4ed18ca32c1a1a00b448078662b4e0a9ccd47809fd746d06adcc3b47f076fe4 +DIST 6.7.2-0-202406110334qtpositioning-documentation.tar.xz 681780 BLAKE2B 95a31613b5dbbf6a50f68b7bcb7f82005df8d5f0f4db64b31acf3efed983187ffb9be4e799164b297c4627767d4550f013098507650aa2f421aa8d912fbbbe11 SHA512 9bc27f7610b6491d00857c418f6e411d56b0beca0977debd095bc5b92b95a8480d05c9dca2899fe1519a00fd7388da0ebd672fec0de1ea88902f1792faa24ded +DIST 6.7.2-0-202406110334qtpositioning-examples-6.7.2.7z 272482 BLAKE2B 22eeaafe29871448ba81412141c5fd2522a805e24431ebefc1a3b0ce8ed8a1ae66962d1b2e3da86fe14aee0b2e6dbfce70e2fd57cd659ee34512bb21960a9ffc SHA512 62a225b63d24e1cd3952bf060a1d387d2b54d988a3e1c8c8fbf8cbeec3120338346d8f219626f04fd9363b49b0815af5623cf913db2fd4520e5465201cad7a71 +DIST 6.7.2-0-202406110334qtprintsupport-documentation.tar.xz 349784 BLAKE2B 76d46b323a8386723a4a0586ff712fa8584ffe8eb254fee2816955ee56bf24718edaf4bd8e6ba810d7c6970e01434ff025663f27e7c844ad8befd8268b164b6b SHA512 230b813c397d47a121b1b5c93e20f2c1a89c18239d3d57705be2f56e441b91d28a2d908d61e3042d688e4dff633ceb99a2b5bf14cbef6cf543f36444cdab6b4f +DIST 6.7.2-0-202406110334qtprotobuf-documentation.tar.xz 318092 BLAKE2B 1de9f5056e236f8bd6f264ab57a9097fd188666df3579283a54c9ad60286969a45b0e389487c3f87811acd44875cbc78f97a16454abe6b6b293090eb1d159f94 SHA512 62bb13e629ba430ae10ed1da99bd642dbad9d2493fb34a5711bbbc56d7a93b1d5bfb30e0816ce25b958c47504fe355f98c65e6205740076bea45f1975cf211d0 +DIST 6.7.2-0-202406110334qtqml-documentation.tar.xz 1502496 BLAKE2B c5387024a57048400114a30035ff428dc58c52de4f5f1aa1567bf59217dfe4754b3836801d5b7951ffd3dc745977eb7193f6974743948a97c3609aa255b77a9b SHA512 f5b7fa31be294d45a3dad3fb413f279564af471af7d4b38f6d8ecdb3b9d937aec9476601c4364eaee9200153600f3c05046a66d574144b32db57b8437b6c0144 +DIST 6.7.2-0-202406110334qtqmlcore-documentation.tar.xz 69676 BLAKE2B f456ed4d619d994b719d180e655381f6a18d00d8a60c44972a3758d0ac1ff3f6b6f51613906c98312fb1f0f8ddad4be5a12f164a6052aece82702731a3aa2cdd SHA512 ef8ce824ffed51b61302782ba26e4995368e0a57847f2a7f5402ba296983dd86a3109af05d90304cdf4b1be27ce063c97ba3e8a1ff737ec161e20e8f52424297 +DIST 6.7.2-0-202406110334qtqmlmodels-documentation.tar.xz 139448 BLAKE2B cb4ec40f1940c419aaeb039acec374f1dae578787c155447c816440e15dcc82af9d9c2c838f4191d7b73a308ee5763ae541d489f125179ae521826c5e277e839 SHA512 e8f91c1626a93778a1e182513598f36e7edbcacd539d3722c80cc0ed30a81fe29d7d399496b73cc7e96d1ce864170f2d83e72f3045cf4c126f81208de6b49dfb +DIST 6.7.2-0-202406110334qtqmltest-documentation.tar.xz 92176 BLAKE2B 8996ddca3e72c8d495df30e72995b219008478fb7925a1082d668f702c05f44a7bf032c652344c305d6043ceaed0c256e74bfff9060d43fc6ab97cf68ac5c453 SHA512 3cf082e888bff06204e9fb430d44345552af4344708e27c3f8f8c55ef05b2771c43b33fb7a235a4cca37e0bd696ec877298d9c646b53a74db4cfea599622071e +DIST 6.7.2-0-202406110334qtqmlworkerscript-documentation.tar.xz 31272 BLAKE2B 828a5e2580481b50dcd543fb9b8f8314380edeec77c2605e86fda2b3fdb11d2d728009e75c4e2bd4ca3eecc34c3bd7a4f551124ba6abedaaae73b4bca4f471d0 SHA512 8b24ad46e64640dee0ffb0cb464835f94a97401e51927e11469d41d116922106aa6b4ce0dfb4ff5aa84decd9f2eefc69bdfa25f79b4329898286476dce082cc3 +DIST 6.7.2-0-202406110334qtqmlxmllistmodel-documentation.tar.xz 37088 BLAKE2B c960e59852dab4bef13d13f0cdb21ec7ae78a1a1c770c09254da48fbbb1e8593f12e1ac05ca251aa517518efd1769e1b0d58b28165f7f8897746413f2558e5e5 SHA512 2bb2619f5af332b5a52250654697bcdb768477b1083f2e611bb2c7803bafc1019f89c30b26e787f1a5775983eff1e0fcc218082be926145bb928ad6e1efead51 +DIST 6.7.2-0-202406110334qtquick-documentation.tar.xz 24140184 BLAKE2B 2f43c01419dafebc2259c4494014c0cf755b9bc7b44706893e23ea7f1ead40341f202d1db40233ea9a99922344cebc552511d54b28bc2ce6b66679bf8afe2f8e SHA512 ebae5ffcc93e62c8aff95477406d1233f75974086f3e7a15ada6fd3dce07afacfdca2e25ed39cc77537504badf1762519cc098ebb81e225d4ae2b3e19330850b +DIST 6.7.2-0-202406110334qtquick3d-documentation.tar.xz 62792892 BLAKE2B 3d727767f030f66694399f7d257279a528828fc18a3a4fa468547003a315aa00130f8a0afa1ddaeb5c6e55fa3f8b2f261efa57f8ae48b31d5b59e329c3b426ee SHA512 11fed151af4aa51e6ab14f9e8600a6f80c5244e96c9ea90dd76046462854c0a2858850edc8888e0a7882c733dc74e91322da8394b3e3749dde8a0092649e7a55 +DIST 6.7.2-0-202406110334qtquick3d-examples-6.7.2.7z 19437981 BLAKE2B 331f89b06bdc6d1418e0afab3243148320c41bef07a43265b926eeaeec125f04d646107594e280e16c3399ea903fed940714e9b14e9e303352984d34ee29215a SHA512 dfc92196f37a8e0030eb5231def17c54be21a08d44a6eff3eedf50e666b3e152947d11b2822690f37878b7a09fe75171ee9de46e5d3a5a3742dcda20d64a7535 +DIST 6.7.2-0-202406110334qtquick3dphysics-documentation.tar.xz 4591824 BLAKE2B e2c1dced63ea10f77b010d48afbf41a7e94bf56e226af7a34a430c70545fdd493b0fc193b3084195ca28a612e37a443dad49c6cb0c1d8ec1d26dcfb37d38f726 SHA512 1f03a5414146b0ce64be3feaabde1af9ee958c5ffe173b7df95c86e8e1404dfaf13563cbc1842f70b423e2c9e1a9a3299578a247dfb2de18c1adae67670d7439 +DIST 6.7.2-0-202406110334qtquick3dphysics-examples-6.7.2.7z 2355396 BLAKE2B 41e23b2b8865e7cec48d1f5e1f8b7a8d00b562196c82ea76b3f151e55c715cb5b4d6a95c2cec93aefd07e3cbc747e49e555d9a5e91b8bd4576bcb0738358a196 SHA512 01ba69553e7877b8668a7a847f86327d6291fe3d3b3078d6142e86795dcd16a1c664df862098e100ed52b51cdd8e30ac0bf77cf808c1270d7ba9343bcdbfb0a0 +DIST 6.7.2-0-202406110334qtquickcontrols-documentation.tar.xz 7159884 BLAKE2B 559577315beba463d7b3e9a60bea048f48da1e285beaf8d38f8a977d49429e6474388d869eecf5e1229e856fbc4474adddd31f43661b2f01c12e94b8293eb0f9 SHA512 2c45208561bb529345f1800d21351b1535d77cb6e0fcd9700b6626467655820a4faf89d00bf4abd09a483253e9d78625a25ca26776877277c7a535f31ed9756c +DIST 6.7.2-0-202406110334qtquickdialogs-documentation.tar.xz 314076 BLAKE2B 430405e1c7200994ca76c9c1eeb6461223db3cd87c343cd03e08e9f4748ba4072f9c1ff41f2a1e38eb6d1a446010640ed5c17a621cdc18dac7231ef70f8e4ed2 SHA512 a5286f6d7b2a5fca05b9ee59f902a6358769db3552a7a3497b7c6969a7b3037ae52ae7f907c1dd8b36cdad4ffe433fbcb0190317dc5fa34537eb8db381a94749 +DIST 6.7.2-0-202406110334qtquickeffectmaker-documentation.tar.xz 804648 BLAKE2B 3d6c48dadaadfb983093878f6ec99833ede76f0236f9bf56f01ecdaa4dd8aadcdadd25a84f2d0d0ce2be0347924040998f0d6f99b642785f5ff45507e534d6ad SHA512 9f811a417137ab6fd4f60f1b3e19985ac8f4a82d391ddb7c494042fa2fdb8402a337dcaa1caee11f784814689fad672fc8e6a746edcfeac1cb95940af4b9e62b +DIST 6.7.2-0-202406110334qtquickeffectmaker-examples-6.7.2.7z 244740 BLAKE2B 5cf7f634050ce84119c6c9d1b9a097fc55083bada213a7b142853ff82281168d39690560c4a05d9700429255104d9f1f681458be9adf8a665cd5468ccd6c36f1 SHA512 f2c8042e0e0972bc7dd65aad2b60b561b46ec2120fed5208eb686d452166c0ad5e7e44b761feab5868043693bf45df79e9cd8f6c8563c1da21f1abe91e74844f +DIST 6.7.2-0-202406110334qtquicktimeline-documentation.tar.xz 166184 BLAKE2B 405d91d252437c180c197dd61d9e72d191ae3340199a0d40f7c91f37675812a66f1526c5d2ab85770cd8f382243459117f17671bcfff8d611abda82bf028aaef SHA512 778428a44f39a391cb898e9522f4c9e880de497d0856af2ea2867b71ca404209097b0760bcbc220d049d81cf27975636bcdc97f4d964b6482d67927399bcd5ee +DIST 6.7.2-0-202406110334qtremoteobjects-documentation.tar.xz 492756 BLAKE2B 77103530cf7fc3bee9160b46e7d2dd0e45a85271c0e87890fe6a84f126723d37ad3a2868c9cccc4d159e6953657284c1b4a397c89b15ccf06a50179ac9215c46 SHA512 ca72d44a48e62ff531546b194d76b0811534191ede837f56f26afd1819be8905f5fee2a8297191eb9d90f703b6e0019b8a69136c6f8c2f3b41ce4a34e32ea39f +DIST 6.7.2-0-202406110334qtremoteobjects-examples-6.7.2.7z 81608 BLAKE2B 69bf707084ac808348eb3f145927934fa514c84915b686e10e1545b7132193e1d30b603fc818b3cd00ec4afe861e49a2ef491d964451186bf49659d3a78b906a SHA512 050b2955bfa8820c3cec1e335f631ff9f2b2ee35ea3378fb2113b5d20d60b9e72aa2f18752b7729781e676cfe66b33f5f71e71520fad902e5716c498ca6294c2 +DIST 6.7.2-0-202406110334qtscxml-documentation.tar.xz 396068 BLAKE2B 73cbb3ffce89f8d0ae6c7f88a691c1b30e69df737e6b0019fce8f29cca2a92e9a2ca188a6983cd62113c37c20ce2ab2a4acaa78a53076de4543bb309fbe0a11e SHA512 f734d47277ec3b9dae31c0d42b5be32ca439eca9bac6a9855880c08c404d1633386c376613961a148284d1c8abac1e9161658ae5417a703b662ce813e6510fe0 +DIST 6.7.2-0-202406110334qtscxml-examples-6.7.2.7z 140543 BLAKE2B 31c3081b8902934ec30dc63f0ecd2806d03f5668d3aa09b4769b4b7a8dde40d1f85eb0e8261aefe91168a347d5622cb556563ee6c045fb505345b365b7a2fc5c SHA512 f3341a015c8ff9bb938a784ed1f3ad8978e50565dbc4324233d0f31880e44ad35864928e96c0671ccc92e5a0800e4aafa98e49a0eaaaa17fbb6e80e6a9991e45 +DIST 6.7.2-0-202406110334qtsensors-documentation.tar.xz 2146504 BLAKE2B b6aa99a5e27d7803ae26d5db242ac6ed36bfbaf24f4fbbdfc1b1f673e239d8e835fac814a52222855636b6abfd090f282d7ea8e1b3248ddb5b99e419484f3971 SHA512 7a2c7d5c4cf3730234ebdc4aedffa92e047c7e65e113f47d5ddf14f4b6e8449064ee727bb61fd32de669c33bb39f24244f501d2a81b85d767c7bc2798511267d +DIST 6.7.2-0-202406110334qtsensors-examples-6.7.2.7z 53417 BLAKE2B 651ee12cd0c87ce2684740e701b09a754acecfec8839fe6aba0e9673305e7c4266269860e2aea7d1c2ea1ea05e2bc43752fb57399111decae340314016d76359 SHA512 173bb07bbbf27ce0af739f104d56ffc1f3d94626531e1be99da984844b55677f1577e872c8320153bb57794b81f5fc626d662fd1e741e471a04bcc3ac5a6aa70 +DIST 6.7.2-0-202406110334qtserialbus-documentation.tar.xz 737340 BLAKE2B 190e453e5ee7c593c34387fdaf62298e0f9bb9d0457bd52d03a78d1a00e0b389b75ab3bf38a75e8c723d137235df752ef741f54a19deec1832a6b09cb21134d8 SHA512 8498afab2c0d47828768321ad411533bfd598290a2173ab8c86e7f16ee09bde5212361c77bdc22e4b18e56059edd5fca4ed0baf85871270b6ec78ebb0ec2f20c +DIST 6.7.2-0-202406110334qtserialbus-examples-6.7.2.7z 212228 BLAKE2B 0cebbbdfd30f504f96a1fe8c3459cb19e123181ec669073aa0c94092578ab5ca41de4179c95af24a9eb9b87adcb59029b5117d0cfa270032324cc66e79a5650e SHA512 8e6bf466d26b15ff569379ab43b5f672be46c8893955f3e00a207dae8e48a0e72298e318f2543fb14fb214dd792b9d10f8a919012da29fd67f24cbfa4edca9b8 +DIST 6.7.2-0-202406110334qtserialport-documentation.tar.xz 183948 BLAKE2B b3c50f09d653632992ea04e2f99c6526e2daa343f70ea18fe9d48dd36f2cca9f73c5543fb6d93710aed911acbed4c8af2e0ae24a223bdf1e6cdf577a098d9360 SHA512 bfedd01eef60196dcb486b0038039d9cfa3428ca37bfc5148587bd9f248cb8f18c7b05da92e53ee35e35107210fce219216f90c6fa6c34ab110779578bd7bbbd +DIST 6.7.2-0-202406110334qtserialport-examples-6.7.2.7z 81071 BLAKE2B cdc59c20e95bc3cbe74e6478a805ced55e59af097a8cf1e594bb5ee14b91de67040d605568de31806248144f9ad9e5eb6067dbced73e3aa3e13eea9d1ad8f473 SHA512 22a320b856c06cd40be848d94571d68c7d3b8271fe532c9e6803b8b6a2491a996c3961853ff896991b79c7d6ae474542ed148c0bba24f0ede5c1604c995d22a1 +DIST 6.7.2-0-202406110334qtshadertools-documentation.tar.xz 196076 BLAKE2B c2efe1bdee6a95db972b2cb866ba7656a7fa8342215b960e4082469747ce501a196ae4f90d682ae644de5b9660c6bb8c62237cc55cf20ea63842e27979977e71 SHA512 1d2b7a9b74286a4ce5d497fba4489979a82e8597bcde5a3b96806985610d546b264e6e36cb1d42cc944f53856ee6e1dfbbb6ea86bd6b92d512f542a5453522f3 +DIST 6.7.2-0-202406110334qtspeech-examples-6.7.2.7z 157785 BLAKE2B 39d929437b792f0601ab4bcd2f335132070d57caf3efa03efc38c7958d1af458f30a2a235612587bc654b718fbae28ae62ca9f5a27c4caeedb63f8e741b337cc SHA512 32e953677a958dbdbf5030e70907908cf3ff2694a4a5533b82cc4def6dc83c45ab42318394cc2dd48c0311575340f22e70f160f83f1082b2f977a63fa7d6a76e +DIST 6.7.2-0-202406110334qtsql-documentation.tar.xz 898056 BLAKE2B a1ae5a475470088ef4f35c1b672b83c0342ede3f0304c589d40129d5a6e2d9282058890883ef8b39985c5b28b0091949d14f4d9baa2ad98c9980ac553970c5f9 SHA512 709f6aa42749b4ab96a9bcdb3bc0fac8f1b9e6c2264063801eaf8766d7d91aabb073ae53d778eaed921c6bf8f993ef0e4eee3ede9febea3c5a8da52b971b8e27 +DIST 6.7.2-0-202406110334qtsvg-documentation.tar.xz 104084 BLAKE2B d2639414b4e824b23b809e01f6784f4af871977ba2a364b735001fa8fad6e0789e868502adc9c24d47e64878e5f0aea92551445fe4e5091c7de73187b994d47d SHA512 79b69d05d0a4bd2693e938e89ff44b7e7f20c455a0579e0fe700433a52aedfa0035ffe418162067098bdd3be52436697c4773e79d5de4745cf0c54a3d3210384 +DIST 6.7.2-0-202406110334qtsvg-examples-6.7.2.7z 157 BLAKE2B e458df7959196c4d9545701dcf58e2b324e78aca0b460d4e2deb289a224d5677e927fae391ea631be765a9a65535468a6380ff337e9924283ecc49e5dafa2462 SHA512 31b791b67fadce021124c49f1b498a85dda90780bf3d5f26a2d182a0d8479a5341b5352fa06af61285487acd7e3e7f7301550593c31996d18895f21bc7569327 +DIST 6.7.2-0-202406110334qttestlib-documentation.tar.xz 220500 BLAKE2B 6c296bfee9289706cfb8739fab252e2beb99b105485120d522b649ea2f5593f7828c3a89ebfaee2187337cfca06218a3b12023e2aa93a9b6ecfe084d0e6d2ad9 SHA512 1342e85a39e06aa3b751dfecd06099ca0a74a48450172984709861251c2a56fe8f56cfab4b118c49a673f534e1eae470e527ecbe59b69e2f80fb534f9fb9ecbe +DIST 6.7.2-0-202406110334qttexttospeech-documentation.tar.xz 401676 BLAKE2B f9a444a54ab89d00b7feee6a0ff38453b265de869033034e39e5c5dbd7273dd59a727d067b56b9ed5594da3db6368fd3d9aca59f8407c22179688e1d7855518e SHA512 6aa104060a48191988cd292625b6e60fe8487353fefab63c82807bb1d6585bc2262de33d703d99b175a0667d6b87c74c3f43256145a962acebedbe4c7437095a +DIST 6.7.2-0-202406110334qttools-examples-6.7.2.7z 469076 BLAKE2B 943fccdc1ecc3f0b9d4c31193671ca509fc16cb72ebc56f14a39dad463ee35e487a39cf9d0ef5bf473bf9f58e4eb435021919ed2d616c550cd7421d24a25f326 SHA512 68585f2839f68a974bf8f640c1492f7e82c89cf761c49a887105a0433aad0b9ec64867e0e45202318a3c6ee90d04201ad10c2699a57fa91abbcd4abeb7c70d37 +DIST 6.7.2-0-202406110334qtuitools-documentation.tar.xz 206528 BLAKE2B 628d8d5072934f72596dd52139928239aa093e9a21926563fe954665a594637f137b80720b0c553460d95f4fb2291db6b8085c59f0634a3155b92d82f78409d8 SHA512 d142a35f3e9a966551e91c77ebc2a99f8854c63c026a3441383f3fcca653d475278315a23d35ece2bc112422a0c4e592bdb47c517bf24e35ea14c8d16e43e9fa +DIST 6.7.2-0-202406110334qtvirtualkeyboard-documentation.tar.xz 2073996 BLAKE2B a85db2eedc43f61983a288bd4642a5a66bd6256f64e552d8f27272e101b4217b4ea9768b21e7baf00ee899981e02a3879950db2e76168449083a3810ab97518f SHA512 6b34f26701758c440ffc2221918966da27196e7fa4333896e4451e9c9f1c4a72a00c8671df2d1ac4a277a8c6dd0317c50e8382049c0fdcc950c054270b0450ee +DIST 6.7.2-0-202406110334qtvirtualkeyboard-examples-6.7.2.7z 7045 BLAKE2B 58d162662e75159ef9794fdd009b7f6edd7278c00552a28f947f342f1bbcbaccfa359b6d500c2c83216acd00461f28cdead5f024e9ffee61f0649c13336a1624 SHA512 5bf7b79e65ff4d400c2b1f05d5901457bc3c04a54f73c9cfeb26a245e3986ba4dbe2315098afc0461a7e071035b083d38c1a077953c508b769f59553688cdce4 +DIST 6.7.2-0-202406110334qtwayland-examples-6.7.2.7z 568514 BLAKE2B 439103691d2b454179ccc852feb299f0daa85860b56b6fb129f240a8877b63815cf736cfe661c99c6aeca4225f8042126e653572c0e88100d6ea683cbde66bca SHA512 36dfe3729b02562ece3421a7fe6ff77982e4f61f9bc10c49ebfd7f235794441cd0f33bc31c9dfe5beae6c3f5dd924287ef39112d384744c42bc72bf73b288c8f +DIST 6.7.2-0-202406110334qtwaylandcompositor-documentation.tar.xz 1602076 BLAKE2B e95ac0a1ffdc8fee007d4541b4d745517d108d4b556e7a783a85b064f64cce4af6247d7a03c4c2c3217aabb5b11b7a97056a2ba3674b07af3f65e61456bac87e SHA512 460563745ad61bfcad0fa23f1569ae743e987e47dad648ea5dd1ba32152c5ba11e0c931134af335950504c23a8f93bac54bae24a77de1f7899018e69b678e299 +DIST 6.7.2-0-202406110334qtwebchannel-documentation.tar.xz 166376 BLAKE2B fefa8eef18b90a5356502179b8483a66290fd44ed7590dd7ba3a3fe993de003848b51821dd95a049d053a7557794b5aca89b753c5b395dea561c3fb4e9d80401 SHA512 a9afb624dcc976ab16771c1fa2441901a0a1a97d791e05a8727ce4560a42a7d3e2832dd21ab4663ee52214e412f13f2b338ffcb02b4709d89f0340ed9f6926a0 +DIST 6.7.2-0-202406110334qtwebchannel-examples-6.7.2.7z 66110 BLAKE2B b59233f2fdea36af9efac13c21ca7607f2c77450fddfa3632fc957f2c34edc23a2187a616e758107d5b6b69174d94090e1c9af8a8fc1e892405243f175249ea3 SHA512 1e1de5b9eeb90e6f5395f5e5e825d931bb25a27976f0e2f2722ac1ea886d86deb9daac98ace80f0e2f40112ba6728edf36f71ac613a98805f3e27fc6894bc15c +DIST 6.7.2-0-202406110334qtwebengine-documentation.tar.xz 2007124 BLAKE2B 3df41500c15e05c3986d79af3816ab612c53987d1e4c95be1642b6459c13c93b231f2c94d58ccf1fe8815a0d13db15b57f2a83fd64874d68395ee605846811f4 SHA512 aa7d8dc2933865ffa91e050cf64622d05cfb65bc9c9e3c622183c63692f243571f98fdb3925ef3958d9ac1f0229329ef08af9541bf07170ae56020b2d9beba85 +DIST 6.7.2-0-202406110334qtwebengine-examples-6.7.2.7z 1115962 BLAKE2B c9e960c8b4a897f9c16be4d19ea08dabf5cda36751361c123dc2a42dd26822e1f67c4f65812b9007d5bd00f433fe30bd0ac9bfbe86d5d838aaa92a926059f4ce SHA512 d4dca761d9abc9b481c37e7de1d290d25842d0fb21100eb063cb8cbafd6f6705759b3f1015bc5603d844768cd52351b3188ac2f82187bd96f08c32236675615b +DIST 6.7.2-0-202406110334qtwebsockets-documentation.tar.xz 532424 BLAKE2B 812bd822496b900842bc59927fc08da962a050cb36511d8ddbe21536fbbe5dd447985e0a70d46f3ab26b7806b6104ad2ae33d7206972340fba557bac6814d831 SHA512 c37e2a7d34ff1f1a6e8945284483a21db42d3b620a16c10f4ab83f6bf169484d4b15975e315f70e6a5146a97afbba3da15fdcd4e54fa19088d47f88825ff349d +DIST 6.7.2-0-202406110334qtwebsockets-examples-6.7.2.7z 249019 BLAKE2B 746b05ab113ae49351fcbf7e8ef940084ca305d1b4d5ce64503f5319f9ecb18d358e10ba193000b6be7c8c0e092d1748abfbb0c0f738a54cac5e65e0e1b1c621 SHA512 959b6401fa49f79f8651afcab87b9a6aa550cefba9575c71c75ee1edbc754a4a09649c74806b3da4a19c61d248e4e29cee8f112dee1a93ebc6ee51240bd559ac +DIST 6.7.2-0-202406110334qtwebview-documentation.tar.xz 126020 BLAKE2B a8523c1e1f642a4a3cb8a08051538f1be30e9216e6c902135362e18cfe54b7d7ebe8f0d52f1e4b982cc5f4c06ab9c65293f621aaf069a8367fb2a664a697be8f SHA512 7fb8e4eb61f29f2583003a32372f49c70dc86875a354ae1aa5a88f4d233369f13ce2f4d4495a989678f1ddd7df4299d204beed8aa2121cc35b471dd3f8ce51cc +DIST 6.7.2-0-202406110334qtwebview-examples-6.7.2.7z 47314 BLAKE2B 822c3ce800c5fb12a63cb87190bfcddf1c7cb6da2420f9ac53cc5a668f68085412084714f10ae93e6e53d87bfacbee12c3bf62975aa46e8ba0c4c1813bf7fa52 SHA512 fde14ae310958dbcaf46500ebd13800bf5673be889f421ad0a8b98f2d26d3776ab2ba2c3ba1917fb94a8900e3a0aedb465e812d177c39b1c39646c9d7b226f3f +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 diff --git a/dev-qt/qt-docs/qt-docs-6.6.2_p202402121133.ebuild b/dev-qt/qt-docs/qt-docs-6.7.2_p202406110334.ebuild index 0b54b69eab26..3a0a0e855a36 100644 --- a/dev-qt/qt-docs/qt-docs-6.6.2_p202402121133.ebuild +++ b/dev-qt/qt-docs/qt-docs-6.7.2_p202406110334.ebuild @@ -10,15 +10,12 @@ 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 )" BDEPEND=" - examples? ( - $(unpacker_src_uri_depends .7z) - media-libs/libpng - ) + examples? ( $(unpacker_src_uri_depends .7z) ) " qt6_docs_generate_metadata() { @@ -26,7 +23,7 @@ qt6_docs_generate_metadata() { 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/linux_x64/desktop/qt6_${qtver//.}_src_doc_examples/qt.qt6.${qtver//.} + local baseuri=https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_${qtver//.}_src_doc_examples/qt.qt6.${qtver//.} SRC_URI= S=${WORKDIR} @@ -67,7 +64,7 @@ qt6_docs_generate_metadata() { -grpc/qtgrpc="qtgrpc qtprotobuf" +httpserver/qthttpserver +imageformats/qtimageformats: # empty examples -# -languageserver/qtlanguageserver # docs and examples are empty +# +languageserver/qtlanguageserver # docs and examples are empty +location/qtlocation -lottie/qtlottie:="qtlottieanimation" # empty examples +multimedia/qtmultimedia @@ -81,7 +78,7 @@ qt6_docs_generate_metadata() { -remoteobjects/qtremoteobjects +scxml/qtscxml +sensors/qtsensors - -serialbus/qtserialbus + +serialbus/qtserialbus +serialport/qtserialport +shadertools/qtshadertools: # empty examples +speech/qtspeech="qttexttospeech" @@ -130,18 +127,6 @@ qt6_docs_generate_metadata() { } qt6_docs_generate_metadata -src_prepare() { - default - - if use examples; then - # fix broken png from qtdoc-examples (bug #679146) - pngfix -q --suffix=.fixed \ - Examples/*/demos/tweetsearch/content/resources/anonymous.png - (( ${?} < 16 )) || die - mv "${_}"{.fixed,} || die - fi -} - src_install() { insinto /usr/share/qt6-doc # QT6_DOCDIR use qch && doins -r Docs/*/*.qch diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest index 5ff3119deba6..2ebd0b5edce4 100644 --- a/dev-qt/qt3d/Manifest +++ b/dev-qt/qt3d/Manifest @@ -1,2 +1,2 @@ -DIST qt3d-everywhere-opensource-src-5.15.12.tar.xz 118298584 BLAKE2B 212bed2b9a3e5868b611b133a92a2641111217e3518496b61b773bbc4c5c874de048d96aea8dc770c434db47f52bd413ee368fb2735c4c12ab4fa12afb23bde4 SHA512 fe66aebdfda50c75f588d5dfc1c48c4d39c1e7aa29ee342178016a10ca24dfa00284f89839810121d15aac40d47fcd471f7a3573892210a0abf14e247102a66d -DIST qt3d-everywhere-src-6.6.2.tar.xz 141560580 BLAKE2B d9fdf4ff9cfb4878068e44a188af014440f9899fd90ae270006f0437ed24c87e2bae3aee18448a34573d4755c425379be1e8bd40f349dd140551839b25c965c5 SHA512 33b5e2e2d4ba78fca31fcc17c1636c04f7092b959711589655d31bd32e8d47043977e27a28157dc44c6f47542b42d6f26d41bd145b382279fcb9cf19bf7b67a0 +DIST qt3d-everywhere-opensource-src-5.15.14.tar.xz 118269268 BLAKE2B ff083f1da2d00dc9cef1e0563b2df4f8ca0ad207e273653521ce3b5c406c084544c212d95c5d4e683b8f67f1d2986e133ac76650fa1882332f7f10d94b184a53 SHA512 502d80fddbf8d3ba18dd262c85df04abf6aa2ee76ba3eb10666588872635497a2828f34963945662b54ac9552d63e0463061d2065c34fdf8a7ea78d0871ebb2e +DIST qt3d-everywhere-src-6.7.2.tar.xz 141589248 BLAKE2B cb775f7e66a3c5a42a665605715a94cffcac8c9618a02048c453d527e87465b0adeac0f683346e6edb67de8843aa803a13e1af6e778eb5ff7e25c38f488a8d3e SHA512 d2b5ccf76f75db886acf4a73b1f2bc77e79a584f08f39915b7565179943c09a3ea90904af342a6d2d668b033161c41d6d4d20022e5e990ad55fa40fcb6746480 diff --git a/dev-qt/qt3d/qt3d-5.15.12.ebuild b/dev-qt/qt3d/qt3d-5.15.14.ebuild index 268e053052df..268e053052df 100644 --- a/dev-qt/qt3d/qt3d-5.15.12.ebuild +++ b/dev-qt/qt3d/qt3d-5.15.14.ebuild diff --git a/dev-qt/qt3d/qt3d-6.6.2.ebuild b/dev-qt/qt3d/qt3d-6.7.2.ebuild index aeb5eb8c2241..1d6c2f7e0838 100644 --- a/dev-qt/qt3d/qt3d-6.6.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" + KEYWORDS="amd64 arm arm64 ~riscv x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi @@ -30,6 +30,7 @@ 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.9999.ebuild b/dev-qt/qt3d/qt3d-6.7.9999.ebuild index fac726abc29b..5e1b7809f57e 100644 --- a/dev-qt/qt3d/qt3d-6.7.9999.ebuild +++ b/dev-qt/qt3d/qt3d-6.7.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="3D rendering module for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi @@ -30,6 +30,7 @@ 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.6.9999.ebuild b/dev-qt/qt3d/qt3d-6.8.9999.ebuild index fac726abc29b..5e1b7809f57e 100644 --- a/dev-qt/qt3d/qt3d-6.6.9999.ebuild +++ b/dev-qt/qt3d/qt3d-6.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="3D rendering module for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi @@ -30,6 +30,7 @@ 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.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild index fac726abc29b..5e1b7809f57e 100644 --- a/dev-qt/qt3d/qt3d-6.9999.ebuild +++ b/dev-qt/qt3d/qt3d-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="3D rendering module for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi @@ -30,6 +30,7 @@ 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/qt5compat/Manifest b/dev-qt/qt5compat/Manifest index 20eabb8e2e98..439bdd4f0cd9 100644 --- a/dev-qt/qt5compat/Manifest +++ b/dev-qt/qt5compat/Manifest @@ -1 +1 @@ -DIST qt5compat-everywhere-src-6.6.2.tar.xz 14632168 BLAKE2B b1020344d2c4803b9d76faee15727604b560e2b98a0699507245160df149361453a8c2082cbe37193d7dece673212dc5a6b0f1961e9cc15112152f7b31ed2ba2 SHA512 12e4142ce8e9b0863ee5d39c37f9a04ef696fd34c98b5d955464a1cfcc7d55ea8387b6238a49d9e9380f8c95f4b655ffa64fe250f27fee3d4e9f48065bcabb6a +DIST qt5compat-everywhere-src-6.7.2.tar.xz 14632348 BLAKE2B 81622db206b0902a14b5f14668464538989044506cfa417bfd2a5bb5163f0e6c09fdc10b641a3767595e4c80a554c6181118f75501d11eff997255a3bcfd50aa SHA512 31da40af3ab0a2283ead3363ee6c94a45018beccb777d2e4188f182d45ffb7e70d97543e22e5f6bc2c13df149676e44e259c8785626c54a4ed8757dcf414b4b0 diff --git a/dev-qt/qt5compat/qt5compat-6.6.2.ebuild b/dev-qt/qt5compat/qt5compat-6.7.2.ebuild index 60c6f6084bf6..4f479ea72d81 100644 --- a/dev-qt/qt5compat/qt5compat-6.6.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/qt5compat/qt5compat-6.6.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.8.9999.ebuild index 4462f312f154..4462f312f154 100644 --- a/dev-qt/qt5compat/qt5compat-6.6.9999.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.8.9999.ebuild diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index f20b2d9acb9f..24deb29182bc 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1 +1 @@ -DIST qtbase-everywhere-src-6.6.2.tar.xz 48689304 BLAKE2B e00f4ac7ede0694b7934612f7dc3acdd50139d385492034c3046625a973d8adbca059e9d4081e248502cab8c673806cdb6b8bc5cee6d9356bbb0a7845db528a2 SHA512 ea343bcf269779a4e078ed8baddfbe6c5ec4a34275c7d72b3f3928da60feece2ddc9ce4a380c6536a4e1654b483cee8918f8ad3038904725d2dd1c653ae83ece +DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch b/dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch deleted file mode 100644 index f8263d10c022..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fixes build with libglvnd[-X]. - -https://github.com/qt/qtbase/commit/929d9a4ca5c9eb0a590479182471d0bbc81589aa -From: Yaroslav Isakov <yaroslav.isakov@gmail.com> -Date: Sat, 8 Jul 2023 22:09:40 +0200 -Subject: [PATCH] Allow OpenGL to be found on X11-less Linux systems (using - libOpenGL) - -Cmake supports finding OpenGL, even if there is no GLX (for glvnd) or -old-style libGL. This change keeps old behavior, but in case, if -X11-related OpenGL libraries cannot be found on Linux, it adds logic -to check for (and link with) libOpenGL, if it is present. ---- a/cmake/FindWrapOpenGL.cmake -+++ b/cmake/FindWrapOpenGL.cmake -@@ -47,4 +47,14 @@ - target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL) - endif() -+elseif(UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "Integrity") -+ # Requesting only the OpenGL component ensures CMake does not mark the package as -+ # not found if neither GLX nor libGL are available. This allows finding OpenGL -+ # on an X11-less Linux system. -+ find_package(OpenGL ${WrapOpenGL_FIND_VERSION} COMPONENTS OpenGL) -+ if (OpenGL_FOUND) -+ set(WrapOpenGL_FOUND ON) -+ add_library(WrapOpenGL::WrapOpenGL INTERFACE IMPORTED) -+ target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::OpenGL) -+ endif() - endif() - diff --git a/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch deleted file mode 100644 index 1204dcc5c25c..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/925103 ---- a/src/corelib/thread/qthread.h -+++ b/src/corelib/thread/qthread.h -@@ -166,5 +166,9 @@ - #elif defined(Q_PROCESSOR_X86_64) && ((defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)) - // x86_64 Linux, BSD uses FS -+# if defined(__ILP32__) -+ __asm__("mov %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); -+# else - __asm__("movq %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); -+# endif - #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_WIN) - // See https://en.wikipedia.org/wiki/Win32_Thread_Information_Block diff --git a/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch b/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch new file mode 100644 index 000000000000..e7eb9dcc9209 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch @@ -0,0 +1,15 @@ +Simply disable the broken path rather than worry about it for now. + +Likely an easy fix but would rather this be handled upstream and +reported by someone that is affected and can test. + +https://bugs.gentoo.org/926287 +--- a/src/gui/painting/qrgbafloat.h ++++ b/src/gui/painting/qrgbafloat.h +@@ -20,5 +20,5 @@ + public: + using Type = F; +-#if defined(__AVX512FP16__) && QFLOAT16_IS_NATIVE ++#if 0 + // AVX512FP16 has multiplication instructions + using FastType = F; 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/metadata.xml b/dev-qt/qtbase/metadata.xml index 61564794deab..ceb3786524f7 100644 --- a/dev-qt/qtbase/metadata.xml +++ b/dev-qt/qtbase/metadata.xml @@ -14,11 +14,13 @@ <flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag> <flag name="gtk">Build the GTK platform theme plugin</flag> <flag name="gui">Build Qt6Gui module</flag> + <flag name="journald">Log messages using <pkg>sys-apps/systemd</pkg>'s journald rather than output to stderr (override with the QT_FORCE_STDERR_LOGGING=1 env var)</flag> <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag> <flag name="network">Build Qt6Network module</flag> <flag name="renderdoc">Enable support for capturing graphic's API calls using <pkg>media-gfx/renderdoc</pkg></flag> <flag name="sql">Build Qt6Sql module</flag> + <flag name="syslog">Log messages using syslog rather than output to stderr (override with the QT_FORCE_STDERR_LOGGING=1 env var)</flag> <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> <flag name="widgets">Build Qt6Widgets module</flag> </use> diff --git a/dev-qt/qtbase/qtbase-6.6.2.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild index 14520bcdd35c..37e0b5c51a97 100644 --- a/dev-qt/qtbase/qtbase-6.6.2.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild @@ -3,31 +3,32 @@ EAPI=8 -inherit flag-o-matic qt6-build toolchain-funcs +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=( [global]="+ssl +udev zstd" - [core]="icu" + [core]="icu journald syslog" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" +X accessibility eglfs evdev gles2-only +libinput - opengl tslib vulkan +widgets + opengl renderdoc tslib vulkan wayland +widgets " [network]="brotli gssapi libproxy sctp" [sql]="mysql oci8 odbc postgres +sqlite" [widgets]="cups gtk" - [optfeature]="nls wayland" #810802,864509 + [optfeature]="nls" #810802 ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" + ?? ( journald syslog ) $( printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} @@ -50,7 +51,8 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) -RDEPEND=" +# nolink: renderdoc, systemd +COMMON_DEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) @@ -61,6 +63,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) + journald? ( sys-apps/systemd ) dbus? ( sys-apps/dbus ) gui? ( @@ -90,6 +93,7 @@ RDEPEND=" gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X?] ) ) + renderdoc? ( media-gfx/renderdoc ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) @@ -113,8 +117,12 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) ) " +RDEPEND=" + ${COMMON_DEPEND} + syslog? ( virtual/logger ) +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) @@ -134,10 +142,10 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch - "${FILESDIR}"/${PN}-6.5.2-no-glx.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch - "${FILESDIR}"/${PN}-6.6.2-x32abi.patch + "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch + "${FILESDIR}"/${PN}-6.7.2-CVE-2024-39936.patch ) src_prepare() { @@ -147,6 +155,13 @@ src_prepare() { # test itself has -Werror=strict-aliasing issues, drop for simplicity sed -e '/add_subdirectory(qsharedpointer)/d' \ -i tests/auto/corelib/tools/CMakeLists.txt || die + + # workaround for __extendhfxf2 being used for tst_qfloat16.cpp + # which is unavailable with compiler-rt (assume used if clang) + if tc-is-clang; then + sed -e '/add_subdirectory(qfloat16)/d' \ + -i tests/auto/corelib/global/CMakeLists.txt || die + fi fi } @@ -168,6 +183,9 @@ src_configure() { -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" + -DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too + + -DQT_FEATURE_relocatable=OFF #927691 $(qt_feature ssl openssl) $(qt_feature ssl openssl_linked) $(qt_feature udev libudev) @@ -175,6 +193,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -200,8 +220,10 @@ src_configure() { $(qt_feature evdev) $(qt_feature evdev mtdev) $(qt_feature libinput) + $(qt_feature renderdoc graphicsframecapture) $(qt_feature tslib) $(qt_feature vulkan) + $(qt_feature wayland) $(qt_feature widgets) -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c @@ -232,37 +254,6 @@ src_configure() { $(qt_feature sqlite system_sqlite) ) - if use amd64 || use x86; then - # see bug #913400 for explanations - local cpufeats=( - # list of checked cpu features in configure.cmake - avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} - f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes - ) - # handle odd ones out not matching -m* and macros (keep same order) - local cpuflags=( "${cpufeats[@]}" aes sha ) - local cpufeats+=( aesni shani ) - - local -a intrins - IFS=' ' read -ra intrins < <( - : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" - $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 - $(printf '__%s__ ' "${cpuflags[@]^^}") - EOF - assert - ) - - # do nothing and leave to qtbase if no macros expanded (test failed?) - if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then - local -i i - for ((i=0; i<${#cpufeats[@]}; i++)); do - [[ ${intrins[i]} == __* ]] && - mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) - done - mycmakeargs+=( -DTEST_x86intrin=ON ) - fi - fi - qt6-build_src_configure } @@ -274,6 +265,10 @@ src_test() { # broken with out-of-source + if qtbase is not already installed tst_moc tst_qmake + # similarly broken when relocatable=OFF (bug #927691) + tst_qapplication + tst_qt_cmake_create + tst_uic # needs x11/opengl, we *could* run these but tend to be flaky # when opengl rendering is involved (even if software-only) tst_qopengl{,config,widget,window} @@ -288,11 +283,13 @@ src_test() { # randomly fails without -j1, and not worth it over this (bug #916181) tst_qfiledialog{,2} # may randomly hang+timeout, perhaps related to -j as well + tst_qprocess #936484 tst_qtimer # these can be flaky depending on the environment/toolchain tst_qlogging # backtrace log test can easily vary tst_q{,raw}font # affected by available fonts / settings (bug #914737) tst_qprinter # checks system's printers (bug #916216) + tst_qhighdpi # may detect users' settings and fail (bug #935364) tst_qstorageinfo # checks mounted filesystems # flaky due to using different test framework and fails with USE=-gui tst_selftests @@ -330,7 +327,6 @@ src_test() { # bug #914033 $(usev sparc ' tst_qbuffer - tst_qprocess tst_qtconcurrentiteratekernel ') # note: for linux, upstream only really runs+maintains tests for amd64 diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild index c2827c3f3ac9..66720e44d615 100644 --- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic qt6-build toolchain-funcs +inherit qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" @@ -13,7 +13,7 @@ fi declare -A QT6_IUSE=( [global]="+ssl +udev zstd" - [core]="icu" + [core]="icu journald syslog" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" @@ -28,6 +28,7 @@ declare -A QT6_IUSE=( ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" + ?? ( journald syslog ) $( printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} @@ -50,8 +51,8 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) -# dlopen: renderdoc -RDEPEND=" +# nolink: renderdoc, systemd +COMMON_DEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) @@ -62,6 +63,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) + journald? ( sys-apps/systemd ) dbus? ( sys-apps/dbus ) gui? ( @@ -115,8 +117,12 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) ) " +RDEPEND=" + ${COMMON_DEPEND} + syslog? ( virtual/logger ) +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) @@ -138,7 +144,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch - "${FILESDIR}"/${PN}-6.6.2-x32abi.patch + "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch ) src_prepare() { @@ -148,6 +154,13 @@ src_prepare() { # test itself has -Werror=strict-aliasing issues, drop for simplicity sed -e '/add_subdirectory(qsharedpointer)/d' \ -i tests/auto/corelib/tools/CMakeLists.txt || die + + # workaround for __extendhfxf2 being used for tst_qfloat16.cpp + # which is unavailable with compiler-rt (assume used if clang) + if tc-is-clang; then + sed -e '/add_subdirectory(qfloat16)/d' \ + -i tests/auto/corelib/global/CMakeLists.txt || die + fi fi } @@ -169,6 +182,9 @@ src_configure() { -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" + -DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too + + -DQT_FEATURE_relocatable=OFF #927691 $(qt_feature ssl openssl) $(qt_feature ssl openssl_linked) $(qt_feature udev libudev) @@ -176,6 +192,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -235,37 +253,6 @@ src_configure() { $(qt_feature sqlite system_sqlite) ) - if use amd64 || use x86; then - # see bug #913400 for explanations - local cpufeats=( - # list of checked cpu features in configure.cmake - avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} - f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes - ) - # handle odd ones out not matching -m* and macros (keep same order) - local cpuflags=( "${cpufeats[@]}" aes sha ) - local cpufeats+=( aesni shani ) - - local -a intrins - IFS=' ' read -ra intrins < <( - : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" - $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 - $(printf '__%s__ ' "${cpuflags[@]^^}") - EOF - assert - ) - - # do nothing and leave to qtbase if no macros expanded (test failed?) - if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then - local -i i - for ((i=0; i<${#cpufeats[@]}; i++)); do - [[ ${intrins[i]} == __* ]] && - mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) - done - mycmakeargs+=( -DTEST_x86intrin=ON ) - fi - fi - qt6-build_src_configure } @@ -277,6 +264,10 @@ src_test() { # broken with out-of-source + if qtbase is not already installed tst_moc tst_qmake + # similarly broken when relocatable=OFF (bug #927691) + tst_qapplication + tst_qt_cmake_create + tst_uic # needs x11/opengl, we *could* run these but tend to be flaky # when opengl rendering is involved (even if software-only) tst_qopengl{,config,widget,window} @@ -291,11 +282,13 @@ src_test() { # randomly fails without -j1, and not worth it over this (bug #916181) tst_qfiledialog{,2} # may randomly hang+timeout, perhaps related to -j as well + tst_qprocess #936484 tst_qtimer # these can be flaky depending on the environment/toolchain tst_qlogging # backtrace log test can easily vary tst_q{,raw}font # affected by available fonts / settings (bug #914737) tst_qprinter # checks system's printers (bug #916216) + tst_qhighdpi # may detect users' settings and fail (bug #935364) tst_qstorageinfo # checks mounted filesystems # flaky due to using different test framework and fails with USE=-gui tst_selftests @@ -333,7 +326,6 @@ src_test() { # bug #914033 $(usev sparc ' tst_qbuffer - tst_qprocess tst_qtconcurrentiteratekernel ') # note: for linux, upstream only really runs+maintains tests for amd64 diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild index a39a20691815..0f0f5cc3cd3a 100644 --- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic qt6-build toolchain-funcs +inherit qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" @@ -13,21 +13,22 @@ fi declare -A QT6_IUSE=( [global]="+ssl +udev zstd" - [core]="icu" + [core]="icu journald syslog" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" +X accessibility eglfs evdev gles2-only +libinput - opengl tslib vulkan +widgets + opengl renderdoc tslib vulkan wayland +widgets " [network]="brotli gssapi libproxy sctp" [sql]="mysql oci8 odbc postgres +sqlite" [widgets]="cups gtk" - [optfeature]="nls wayland" #810802,864509 + [optfeature]="nls" #810802 ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" + ?? ( journald syslog ) $( printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} @@ -50,7 +51,8 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) -RDEPEND=" +# nolink: renderdoc, systemd +COMMON_DEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) @@ -61,6 +63,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) + journald? ( sys-apps/systemd ) dbus? ( sys-apps/dbus ) gui? ( @@ -90,6 +93,7 @@ RDEPEND=" gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X?] ) ) + renderdoc? ( media-gfx/renderdoc ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) @@ -113,8 +117,12 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) ) " +RDEPEND=" + ${COMMON_DEPEND} + syslog? ( virtual/logger ) +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) @@ -134,10 +142,9 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch - "${FILESDIR}"/${PN}-6.5.2-no-glx.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch - "${FILESDIR}"/${PN}-6.6.2-x32abi.patch + "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch ) src_prepare() { @@ -147,6 +154,13 @@ src_prepare() { # test itself has -Werror=strict-aliasing issues, drop for simplicity sed -e '/add_subdirectory(qsharedpointer)/d' \ -i tests/auto/corelib/tools/CMakeLists.txt || die + + # workaround for __extendhfxf2 being used for tst_qfloat16.cpp + # which is unavailable with compiler-rt (assume used if clang) + if tc-is-clang; then + sed -e '/add_subdirectory(qfloat16)/d' \ + -i tests/auto/corelib/global/CMakeLists.txt || die + fi fi } @@ -168,6 +182,9 @@ src_configure() { -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" + -DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too + + -DQT_FEATURE_relocatable=OFF #927691 $(qt_feature ssl openssl) $(qt_feature ssl openssl_linked) $(qt_feature udev libudev) @@ -175,6 +192,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -188,6 +207,18 @@ src_configure() { # trivial, and is often needed (sometimes even when not building tests) -DQT_FEATURE_testlib=ON $(qt_feature xml) + + # let gentoo's defaults and/or users control security *FLAGS + -DQT_FEATURE_glibc_fortify_source=OFF + -DQT_FEATURE_intelcet=OFF + -DQT_FEATURE_libcpp_hardening=OFF + -DQT_FEATURE_libstdcpp_assertions=OFF + -DQT_FEATURE_relro_now_linker=OFF + -DQT_FEATURE_stack_clash_protection=OFF + -DQT_FEATURE_stack_protector=OFF + -DQT_FEATURE_trivial_auto_var_init_pattern=OFF + + -DQT_INTERNAL_AVOID_OVERRIDING_SYNCQT_CONFIG=ON # would force -O3 ) use gui && mycmakeargs+=( @@ -200,8 +231,10 @@ src_configure() { $(qt_feature evdev) $(qt_feature evdev mtdev) $(qt_feature libinput) + $(qt_feature renderdoc graphicsframecapture) $(qt_feature tslib) $(qt_feature vulkan) + $(qt_feature wayland) $(qt_feature widgets) -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c @@ -232,37 +265,6 @@ src_configure() { $(qt_feature sqlite system_sqlite) ) - if use amd64 || use x86; then - # see bug #913400 for explanations - local cpufeats=( - # list of checked cpu features in configure.cmake - avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} - f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes - ) - # handle odd ones out not matching -m* and macros (keep same order) - local cpuflags=( "${cpufeats[@]}" aes sha ) - local cpufeats+=( aesni shani ) - - local -a intrins - IFS=' ' read -ra intrins < <( - : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" - $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 - $(printf '__%s__ ' "${cpuflags[@]^^}") - EOF - assert - ) - - # do nothing and leave to qtbase if no macros expanded (test failed?) - if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then - local -i i - for ((i=0; i<${#cpufeats[@]}; i++)); do - [[ ${intrins[i]} == __* ]] && - mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) - done - mycmakeargs+=( -DTEST_x86intrin=ON ) - fi - fi - qt6-build_src_configure } @@ -274,6 +276,10 @@ src_test() { # broken with out-of-source + if qtbase is not already installed tst_moc tst_qmake + # similarly broken when relocatable=OFF (bug #927691) + tst_qapplication + tst_qt_cmake_create + tst_uic # needs x11/opengl, we *could* run these but tend to be flaky # when opengl rendering is involved (even if software-only) tst_qopengl{,config,widget,window} @@ -288,11 +294,13 @@ src_test() { # randomly fails without -j1, and not worth it over this (bug #916181) tst_qfiledialog{,2} # may randomly hang+timeout, perhaps related to -j as well + tst_qprocess #936484 tst_qtimer # these can be flaky depending on the environment/toolchain tst_qlogging # backtrace log test can easily vary tst_q{,raw}font # affected by available fonts / settings (bug #914737) tst_qprinter # checks system's printers (bug #916216) + tst_qhighdpi # may detect users' settings and fail (bug #935364) tst_qstorageinfo # checks mounted filesystems # flaky due to using different test framework and fails with USE=-gui tst_selftests @@ -330,7 +338,6 @@ src_test() { # bug #914033 $(usev sparc ' tst_qbuffer - tst_qprocess tst_qtconcurrentiteratekernel ') # note: for linux, upstream only really runs+maintains tests for amd64 diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index c2827c3f3ac9..0f0f5cc3cd3a 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic qt6-build toolchain-funcs +inherit qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" @@ -13,7 +13,7 @@ fi declare -A QT6_IUSE=( [global]="+ssl +udev zstd" - [core]="icu" + [core]="icu journald syslog" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" @@ -28,6 +28,7 @@ declare -A QT6_IUSE=( ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" + ?? ( journald syslog ) $( printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} @@ -50,8 +51,8 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) -# dlopen: renderdoc -RDEPEND=" +# nolink: renderdoc, systemd +COMMON_DEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) @@ -62,6 +63,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) + journald? ( sys-apps/systemd ) dbus? ( sys-apps/dbus ) gui? ( @@ -115,8 +117,12 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) ) " +RDEPEND=" + ${COMMON_DEPEND} + syslog? ( virtual/logger ) +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) @@ -138,7 +144,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch - "${FILESDIR}"/${PN}-6.6.2-x32abi.patch + "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch ) src_prepare() { @@ -148,6 +154,13 @@ src_prepare() { # test itself has -Werror=strict-aliasing issues, drop for simplicity sed -e '/add_subdirectory(qsharedpointer)/d' \ -i tests/auto/corelib/tools/CMakeLists.txt || die + + # workaround for __extendhfxf2 being used for tst_qfloat16.cpp + # which is unavailable with compiler-rt (assume used if clang) + if tc-is-clang; then + sed -e '/add_subdirectory(qfloat16)/d' \ + -i tests/auto/corelib/global/CMakeLists.txt || die + fi fi } @@ -169,6 +182,9 @@ src_configure() { -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" + -DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too + + -DQT_FEATURE_relocatable=OFF #927691 $(qt_feature ssl openssl) $(qt_feature ssl openssl_linked) $(qt_feature udev libudev) @@ -176,6 +192,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -189,6 +207,18 @@ src_configure() { # trivial, and is often needed (sometimes even when not building tests) -DQT_FEATURE_testlib=ON $(qt_feature xml) + + # let gentoo's defaults and/or users control security *FLAGS + -DQT_FEATURE_glibc_fortify_source=OFF + -DQT_FEATURE_intelcet=OFF + -DQT_FEATURE_libcpp_hardening=OFF + -DQT_FEATURE_libstdcpp_assertions=OFF + -DQT_FEATURE_relro_now_linker=OFF + -DQT_FEATURE_stack_clash_protection=OFF + -DQT_FEATURE_stack_protector=OFF + -DQT_FEATURE_trivial_auto_var_init_pattern=OFF + + -DQT_INTERNAL_AVOID_OVERRIDING_SYNCQT_CONFIG=ON # would force -O3 ) use gui && mycmakeargs+=( @@ -235,37 +265,6 @@ src_configure() { $(qt_feature sqlite system_sqlite) ) - if use amd64 || use x86; then - # see bug #913400 for explanations - local cpufeats=( - # list of checked cpu features in configure.cmake - avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} - f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes - ) - # handle odd ones out not matching -m* and macros (keep same order) - local cpuflags=( "${cpufeats[@]}" aes sha ) - local cpufeats+=( aesni shani ) - - local -a intrins - IFS=' ' read -ra intrins < <( - : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" - $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 - $(printf '__%s__ ' "${cpuflags[@]^^}") - EOF - assert - ) - - # do nothing and leave to qtbase if no macros expanded (test failed?) - if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then - local -i i - for ((i=0; i<${#cpufeats[@]}; i++)); do - [[ ${intrins[i]} == __* ]] && - mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) - done - mycmakeargs+=( -DTEST_x86intrin=ON ) - fi - fi - qt6-build_src_configure } @@ -277,6 +276,10 @@ src_test() { # broken with out-of-source + if qtbase is not already installed tst_moc tst_qmake + # similarly broken when relocatable=OFF (bug #927691) + tst_qapplication + tst_qt_cmake_create + tst_uic # needs x11/opengl, we *could* run these but tend to be flaky # when opengl rendering is involved (even if software-only) tst_qopengl{,config,widget,window} @@ -291,11 +294,13 @@ src_test() { # randomly fails without -j1, and not worth it over this (bug #916181) tst_qfiledialog{,2} # may randomly hang+timeout, perhaps related to -j as well + tst_qprocess #936484 tst_qtimer # these can be flaky depending on the environment/toolchain tst_qlogging # backtrace log test can easily vary tst_q{,raw}font # affected by available fonts / settings (bug #914737) tst_qprinter # checks system's printers (bug #916216) + tst_qhighdpi # may detect users' settings and fail (bug #935364) tst_qstorageinfo # checks mounted filesystems # flaky due to using different test framework and fails with USE=-gui tst_selftests @@ -333,7 +338,6 @@ src_test() { # bug #914033 $(usev sparc ' tst_qbuffer - tst_qprocess tst_qtconcurrentiteratekernel ') # note: for linux, upstream only really runs+maintains tests for amd64 diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest index 008bf34983f0..27c0159b7aed 100644 --- a/dev-qt/qtbluetooth/Manifest +++ b/dev-qt/qtbluetooth/Manifest @@ -1,2 +1,2 @@ -DIST qtconnectivity-5.15.12-gentoo-kde-1.tar.xz 4872 BLAKE2B 910754b2f0619f38a2b5874750e34a9b9d91068b9fbaa8be86f8a88dabfed9a7b4b02a24e998a83dfa0a294307ca19ff131e2305dc9a376ec1a2542927b3e012 SHA512 905e6135397ffd1021e53429306462c3e69fe5fc98e071d60adb61a2be0eab9fa6db30a5154832f7d3dc18bc085225fcafbc8b70010b2925209d1730ba0c045d -DIST qtconnectivity-everywhere-opensource-src-5.15.12.tar.xz 2829264 BLAKE2B bfecaee93b5d245ab9a4cfb3ed8fd8fa13a313fe79b0f53cf33e0204e43f801fa2bc07fcf132745ba0561a6b90cc31f3d45887cf60ad665f956739c895ab1d9f SHA512 36cbdaf63e7f478a5bb1b51d14b8671a24251614fc99d07cab195a596a9b60f28dd013c5f2a3af914f655a12725b1e6e2318324393ee0f0586c746a1a670f224 +DIST qtconnectivity-5.15.14-gentoo-kde-1.tar.xz 2756 BLAKE2B 93f0cc8a15d00b9489d6fe0ff2e59886467ae2ddc41a3f8d170064cdf0a1e8152123075a7e8135696ae2db317e566c311a572c9687a73529f9837771e2157171 SHA512 5dd1bdff26b0da0d4d99731a3815eda6fc5c46030e1f1ba2a14ca33239dbfdda1e804350974e78fdf299d1d0d1ac5cee28f0dc6ec423a1b4ecc16901498fdead +DIST qtconnectivity-everywhere-opensource-src-5.15.14.tar.xz 2820624 BLAKE2B a4d5d271282050af38399b08d352a4bc215db95bf3640f2977a21412f1261d2b8564ee92cde74d62bc127e67badccaeb436a7b1f8979a8d10a53850c3b511bbc SHA512 a327711dcbe8d45e33732055784246ea23399aac8efecf23500709a16caabc61cc586fd21ab385573f0cc9d5a2da39de426fd882cf2c4c07bdf8c60c683d8388 diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.12.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.14.ebuild index 199dd5baf53e..199dd5baf53e 100644 --- a/dev-qt/qtbluetooth/qtbluetooth-5.15.12.ebuild +++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.14.ebuild diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest index 4e12d8149f94..945418055c29 100644 --- a/dev-qt/qtcharts/Manifest +++ b/dev-qt/qtcharts/Manifest @@ -1,2 +1,2 @@ -DIST qtcharts-everywhere-opensource-src-5.15.12.tar.xz 4254676 BLAKE2B d2c11f58c478b8d48e14b1720652dc3471702e30e34d17a351a8da59c9c733bd71b4cf32195d61cdebbc3db1d14eff3d5e5b93168699ee86beee09b45efb2fe1 SHA512 543c9fe0dfd04f19407d3c11c2a1ed93da34b493cfb758b4b2a9e86a7325476e1f754de3281e366eff52e96d8f12fb44c9ff8f3e047069c409cb171687d11df4 -DIST qtcharts-everywhere-src-6.6.2.tar.xz 4660052 BLAKE2B d8c12564d988a906280bb0781a1a23a97b2cd81a575529906880ebcd0aaf44fcdaf605f2522ad6b6592f6792fa02c2e9be1a0ed2c635155c157a993c9fc8dfce SHA512 c6e001033aa2771288786924e2eea87840eb13227a6bb3d7a7605b33bb1d835db334a6c4023bdd79b63b6078267d16b5fdfeb2e4827752c00aefb9def24a3ec0 +DIST qtcharts-everywhere-opensource-src-5.15.14.tar.xz 4246056 BLAKE2B 5c0f0a15f9bdb6d9f5093f9fedb2f82f6b0484cbf8c16dd24c08d4f67355c66912a619085591cb7112162c8cc376f77efe2e9161e7c3906e5bd8baa6dad9d0dd SHA512 1deee169cf86bef6d92b0cc1000106e84cbbe2ccb93729e299a94e794bcc6d882e1818b1b74ddb0b2f2b7427a4dfe556218dd9988c9b31888c21907f6d1efaf3 +DIST qtcharts-everywhere-src-6.7.2.tar.xz 4661448 BLAKE2B f35a3185bd6ca684dea07390e95e1bbe0b15e9a774e9da852425afbe22dea2c52b4592eba015b64f39e4816ae2603558067f2b453d96a0af44c755d60fcf3d62 SHA512 8e142bb3a925e802ab482890363ec1b7ed8c7b1d1bbbf6b30361afc8571ddef75d82f10b7d44bc29e6d87b752f235171f282080591f1ca252b2e47ad0b58b5ef diff --git a/dev-qt/qtcharts/qtcharts-5.15.12.ebuild b/dev-qt/qtcharts/qtcharts-5.15.14.ebuild index fdd730c0d344..13d2aa5f3cd3 100644 --- a/dev-qt/qtcharts/qtcharts-5.15.12.ebuild +++ b/dev-qt/qtcharts/qtcharts-5.15.14.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Chart component library for the Qt5 framework" LICENSE="GPL-3" if [[ ${QT5_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/qtcharts/qtcharts-6.6.2.ebuild b/dev-qt/qtcharts/qtcharts-6.7.2.ebuild index cb79be240102..1a8eabee8904 100644 --- a/dev-qt/qtcharts/qtcharts-6.6.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/qtcharts/qtcharts-6.6.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.8.9999.ebuild index 264ac86f8886..264ac86f8886 100644 --- a/dev-qt/qtcharts/qtcharts-6.6.9999.ebuild +++ b/dev-qt/qtcharts/qtcharts-6.8.9999.ebuild diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest index bf5834e3f44a..93ac206e3d15 100644 --- a/dev-qt/qtconcurrent/Manifest +++ b/dev-qt/qtconcurrent/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.12.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.14.ebuild index 39dca7203cea..39dca7203cea 100644 --- a/dev-qt/qtconcurrent/qtconcurrent-5.15.12.ebuild +++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.14.ebuild diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest index 5ebe003bb590..69a0a03a9dfb 100644 --- a/dev-qt/qtconnectivity/Manifest +++ b/dev-qt/qtconnectivity/Manifest @@ -1 +1 @@ -DIST qtconnectivity-everywhere-src-6.6.2.tar.xz 1060936 BLAKE2B 561f487a55c1352a67a3a5b2166ce4d62403f3adfdfbe7f6fee27c23b23e3ed6f0917daa212ffdc023ff521328421d6af7afe3d2353a1d835fba2bf3c10444b3 SHA512 aa66652cb8bd9f44cec616922f76b02c8dccdaea2bc8d24be8b8a4b6b76f08925a5088a2559eca3042e6aa77c67c722ec90910d2e2a092705c6f74ca413e4c5a +DIST qtconnectivity-everywhere-src-6.7.2.tar.xz 1061952 BLAKE2B 2b46b255f5ca5ab7b5363f6e3584dd4318a4e4d120c8595b309fba1354d9e1c763d9fa8e84b22f5c342204b2849b27d08a7f5dbd9d00533e150c2b8fb6561db3 SHA512 381098e406ac18d87d34eb9087d1655c16e604059d69b77c04df9d444cefc77630a212f52b0fc2a1573c524044aa1837379d70460e152cd353731e52c4bd0e67 diff --git a/dev-qt/qtconnectivity/metadata.xml b/dev-qt/qtconnectivity/metadata.xml index 84c08090ba58..052592031909 100644 --- a/dev-qt/qtconnectivity/metadata.xml +++ b/dev-qt/qtconnectivity/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo Qt Project</name> </maintainer> <use> + <flag name="neard">Use <pkg>net-wireless/neard</pkg> to access NFC devices</flag> <flag name="nfc">Enable support for the Near Field Communication protocol</flag> </use> <upstream> diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.6.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild index 006963f85458..3f4404399c47 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.6.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 ~arm64 ~loong" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" fi IUSE="+bluetooth nfc smartcard" @@ -30,6 +30,7 @@ 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_qbluetoothdevicediscoveryagent #936485 tst_qbluetoothlocaldevice tst_qbluetoothserver tst_qbluetoothservicediscoveryagent diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild index ee563938e4e6..da4242aa89dc 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.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 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi IUSE="+bluetooth nfc smartcard" @@ -30,6 +30,7 @@ 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_qbluetoothdevicediscoveryagent #936485 tst_qbluetoothlocaldevice tst_qbluetoothserver tst_qbluetoothservicediscoveryagent diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild index ee563938e4e6..9f8e25a38f2c 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.6.9999.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild @@ -8,28 +8,38 @@ inherit qt6-build DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi -IUSE="+bluetooth nfc smartcard" -REQUIRED_USE="|| ( bluetooth nfc )" +IUSE="+bluetooth neard nfc smartcard" +REQUIRED_USE=" + || ( bluetooth nfc ) + nfc? ( ?? ( neard smartcard ) ) +" -RDEPEND=" +DEPEND=" ~dev-qt/qtbase-${PV}:6[network] bluetooth? ( ~dev-qt/qtbase-${PV}:6[dbus] net-wireless/bluez:= ) nfc? ( + neard? ( ~dev-qt/qtbase-${PV}:6[dbus] ) smartcard? ( sys-apps/pcsc-lite ) ) " -DEPEND="${RDEPEND}" +RDEPEND=" + ${DEPEND} + nfc? ( + neard? ( net-wireless/neard ) + ) +" 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_qbluetoothdevicediscoveryagent #936485 tst_qbluetoothlocaldevice tst_qbluetoothserver tst_qbluetoothservicediscoveryagent @@ -48,7 +58,10 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(usev nfc $(qt_feature smartcard pcsclite)) + $(usev nfc " + $(qt_feature neard) + $(qt_feature smartcard pcsclite) + ") ) qt6-build_src_configure diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild index ee563938e4e6..9f8e25a38f2c 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild @@ -8,28 +8,38 @@ inherit qt6-build DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi -IUSE="+bluetooth nfc smartcard" -REQUIRED_USE="|| ( bluetooth nfc )" +IUSE="+bluetooth neard nfc smartcard" +REQUIRED_USE=" + || ( bluetooth nfc ) + nfc? ( ?? ( neard smartcard ) ) +" -RDEPEND=" +DEPEND=" ~dev-qt/qtbase-${PV}:6[network] bluetooth? ( ~dev-qt/qtbase-${PV}:6[dbus] net-wireless/bluez:= ) nfc? ( + neard? ( ~dev-qt/qtbase-${PV}:6[dbus] ) smartcard? ( sys-apps/pcsc-lite ) ) " -DEPEND="${RDEPEND}" +RDEPEND=" + ${DEPEND} + nfc? ( + neard? ( net-wireless/neard ) + ) +" 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_qbluetoothdevicediscoveryagent #936485 tst_qbluetoothlocaldevice tst_qbluetoothserver tst_qbluetoothservicediscoveryagent @@ -48,7 +58,10 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(usev nfc $(qt_feature smartcard pcsclite)) + $(usev nfc " + $(qt_feature neard) + $(qt_feature smartcard pcsclite) + ") ) qt6-build_src_configure diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 5e79c7375530..93ac206e3d15 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 333328 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.14.ebuild index f719b5d123dc..8a419f7c95fb 100644 --- a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.14.ebuild @@ -4,7 +4,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=3 + QT5_KDEPATCHSET_REV=1 KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest index 0084514377c6..459fad273e43 100644 --- a/dev-qt/qtdatavis3d/Manifest +++ b/dev-qt/qtdatavis3d/Manifest @@ -1 +1 @@ -DIST qtdatavis3d-everywhere-opensource-src-5.15.12.tar.xz 5193584 BLAKE2B ab7f1fe9cbef64b776c167d2e848e3cb62a28b75d8bc62816de43eff4debdc02be27624cc09950d318594bd1bc6190c8e6796d09075360d85539a091f918dab2 SHA512 6a734bd1e3296aaae94358e2315a7c4b033b113b27b9e1e75f0d888231c11c2fdf1caa17c40c4ed545ad8e4a735766368c1bf04e6b36e53ba3164f0f8d66a1c6 +DIST qtdatavis3d-everywhere-opensource-src-5.15.14.tar.xz 5184732 BLAKE2B 330888b0a79fab30fc181fd17af187856faaeb1ac7b2805d863c25a4a41dac4c882b4229d518411b56db00796ab9d795f4a7bae2ff82b5b36c94bfd19b91f463 SHA512 b1778a2a1124caa01ec931d2c018f79a6810b8931a40a1ee7889acb0f9a47fb0d6547375f0dd3435009359be73e873a2acfe16fac918bb17b9f99a55094efca3 diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.12.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.14.ebuild index 3f51132a6a8f..3f51132a6a8f 100644 --- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.12.ebuild +++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.14.ebuild diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest index bf5834e3f44a..93ac206e3d15 100644 --- a/dev-qt/qtdbus/Manifest +++ b/dev-qt/qtdbus/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qtdbus/qtdbus-5.15.12.ebuild b/dev-qt/qtdbus/qtdbus-5.15.14.ebuild index 6d45c7d06d1f..6d45c7d06d1f 100644 --- a/dev-qt/qtdbus/qtdbus-5.15.12.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.15.14.ebuild diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 1066e5ca9f35..2ded5cc810da 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,3 +1,3 @@ -DIST qtdeclarative-5.15.12-gentoo-kde-1.tar.xz 31060 BLAKE2B 5ba538d765febd0b32faa6632616041425f37128087f5862b2701e0fecf46bdca1eb3235fa87d383b555205be4081a466447e36ba98d6268454fd264722af295 SHA512 f07f48f88cc336f2d5877fb6e744c09405ce2e51f0f8487b08903222d73b11033d48c1c3ee711da7f2a29c43421e4110ee2c13d52f0a71ac1c92980dff122ae1 -DIST qtdeclarative-everywhere-opensource-src-5.15.12.tar.xz 21602960 BLAKE2B 45f44de33801648ffc8c641ac65525ed6ac36a4484e21ef1e7706fd5b005c4f271aadfddd05b1be8a369695962e1675f39cf072d335550f1c14e8abc5c4b334a SHA512 3ebe195dac22efa2e71a4520e4816592204431bc724d94a38d9f426424624990199f7e99b72c7d96f6ae324bb18b7eec89ea2b5db63ff2f1d24a997be25a0589 -DIST qtdeclarative-everywhere-src-6.6.2.tar.xz 34361600 BLAKE2B bc748ed06e2e7ed9c789971e76d92047a847f3afd7be79eb7364149608dcb153586cf5157bc34a0ddc17c89818e80b7d1f13b94522ad1c9fb4ce1848d881846b SHA512 944e9f824dd8ec47d9e23e716d09142c5942f4478238f207d70f1144993440afa7925f85f3fd4cb5659191dee6a142524db40c7144c69c8bec9817591324cee1 +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.2.tar.xz 35629324 BLAKE2B a2c5a17e2f88dd91dd7ae21950d8bb7bc0856f1f05a093405c68e1b3b584a75fee474a9a7116a1797c464e2ca92778ebec774d4afa5ac6eebb1022daabad8868 SHA512 ca172e79af317f481d6f5e6388dc074fc6f99966b896135ab9991fa1a9502e46b0ac21b7f2bc38278448939e77882c5fd17252e3e6460c1665f8156fa99bceaf diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 2d0b3fc41d29..b6df94c4541c 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -9,6 +9,7 @@ <flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag> <flag name="network">Enable QtNetwork support</flag> <flag name="opengl">Enable OpenGL support</flag> + <flag name="qmlls">Build the qmlls tool using <pkg>dev-qt/qtlanguageserver</pkg></flag> <flag name="sql">Enable QtSQL support</flag> <flag name="widgets">Enable QtWidgets support</flag> </use> diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.12.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.14.ebuild index 05448ba255e6..05448ba255e6 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.12.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.14.ebuild diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.6.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.6.2.ebuild deleted file mode 100644 index 16a044e685e6..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-6.6.2.ebuild +++ /dev/null @@ -1,33 +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 Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -IUSE="opengl +sql vulkan +widgets" - -# behaves very badly when qtdeclarative is not already installed, also -# other more minor issues (installs junk, sandbox/offscreen issues) -RESTRICT="test" - -RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network,opengl=,sql?,vulkan=,widgets=]" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND="~dev-qt/qtshadertools-${PV}:6" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package sql Qt6Sql) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild deleted file mode 100644 index 1eadca9fb01c..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild +++ /dev/null @@ -1,33 +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 Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -IUSE="opengl +sql vulkan +widgets" - -# behaves very badly when qtdeclarative is not already installed, also -# other more minor issues (installs junk, sandbox/offscreen issues) -RESTRICT="test" - -RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network,opengl=,sql?,vulkan=,widgets=]" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND="~dev-qt/qtshadertools-${PV}:6" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package sql Qt6Sql) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild new file mode 100644 index 000000000000..c2f0ed6a0516 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild @@ -0,0 +1,47 @@ +# 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.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild index a4e5c61fd98d..347c469cee90 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild @@ -3,7 +3,12 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +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)" @@ -12,13 +17,13 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="+network opengl +sql +ssl vulkan +widgets" +IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets" -# behaves very badly when qtdeclarative is not already installed, also -# other more minor issues (installs junk, sandbox/offscreen issues) -RESTRICT="test" - -RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network=,opengl=,sql?,ssl?,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 ) @@ -30,7 +35,10 @@ BDEPEND=" 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) ) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.9999.ebuild new file mode 100644 index 000000000000..347c469cee90 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.9999.ebuild @@ -0,0 +1,47 @@ +# 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.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index a4e5c61fd98d..347c469cee90 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -3,7 +3,12 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +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)" @@ -12,13 +17,13 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="+network opengl +sql +ssl vulkan +widgets" +IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets" -# behaves very badly when qtdeclarative is not already installed, also -# other more minor issues (installs junk, sandbox/offscreen issues) -RESTRICT="test" - -RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network=,opengl=,sql?,ssl?,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 ) @@ -30,7 +35,10 @@ BDEPEND=" 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) ) diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/qtdiag/Manifest +++ b/dev-qt/qtdiag/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/qtdiag/qtdiag-5.15.12.ebuild b/dev-qt/qtdiag/qtdiag-5.15.14.ebuild index 52479a5ac725..52479a5ac725 100644 --- a/dev-qt/qtdiag/qtdiag-5.15.12.ebuild +++ b/dev-qt/qtdiag/qtdiag-5.15.14.ebuild diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest index 55454b96e3e1..f4c317e68db0 100644 --- a/dev-qt/qtgamepad/Manifest +++ b/dev-qt/qtgamepad/Manifest @@ -1 +1 @@ -DIST qtgamepad-everywhere-opensource-src-5.15.12.tar.xz 389876 BLAKE2B dc553cfc145077c0587983ef9705a0ab0dbe95ab74f68e82807da71f92950df7b6ae918b459e304faf75194b6eee4a9e1a179bf6d27bc5ea4a0e1b889ad42a06 SHA512 8a5f6c8fac4e7977b1c93efda698e27c6bc1e66b844f86642ae05ba104d8f14f30e6cb95ba4b3923e2e43d117af52354cfb5a6d35ffd159e29a336710fc63f93 +DIST qtgamepad-everywhere-opensource-src-5.15.14.tar.xz 380932 BLAKE2B 0129f5e5f3f58df132ecc1bdfde5901509dfee5ba2a99a35d125094d4116196cc613d38cd738edc26ce7b197e82365135700d137b1a1be29845c3476a8bd2766 SHA512 a6fffbf01fd9e022949c99e926c9f877e9802b61e9517f36a574e90b60c3cb045061907114c6aaed1da0d2d068758617931ca123facd79ead9bae3b445174e26 diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.12.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.14.ebuild index 2eb0ece47843..2eb0ece47843 100644 --- a/dev-qt/qtgamepad/qtgamepad-5.15.12.ebuild +++ b/dev-qt/qtgamepad/qtgamepad-5.15.14.ebuild diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest index 69d15bd1c07b..697df75973ec 100644 --- a/dev-qt/qtgraphicaleffects/Manifest +++ b/dev-qt/qtgraphicaleffects/Manifest @@ -1 +1 @@ -DIST qtgraphicaleffects-everywhere-opensource-src-5.15.12.tar.xz 14045416 BLAKE2B 37c44d89ee6c8b029bd1e6352ea2b8e254d3ac907f268cb0e660e0fad0382a902f071ebc1de8db93d842a5b44038a5b6864ef98f833d83002a0445022d662507 SHA512 c0993082e96c5d8e26cc4e2e45320542d21fb7c716dfb6b087b385a985fff358cdff7e3d5d4ca3fc8fc9813e7c110165aa034d5e8d32e8082ad007b7bf929531 +DIST qtgraphicaleffects-everywhere-opensource-src-5.15.14.tar.xz 14034720 BLAKE2B 65f9be5a4dbf9adc1bce274ffb35b571c4f338098b6df632cf130c27a2fdb181c0a6b61a0fb102eab89ac5faf5192d0ee9d6eaacca015acca639abd0c25745f7 SHA512 774411e6fdcec6e91fa2368d4e8d0326581c638daad0b5b9fb7bba210fad854e51fe59555ccabf9bd331f601d93e8c5e3652095daa993dbc74b205db4b46e506 diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.12.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.14.ebuild index af898ff7ad54..af898ff7ad54 100644 --- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.12.ebuild +++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.14.ebuild diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 5e79c7375530..93ac206e3d15 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 333328 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qtgui/files/qtgui-5.15.12-CVE-2024-25580.patch b/dev-qt/qtgui/files/qtgui-5.15.12-CVE-2024-25580.patch deleted file mode 100644 index 41a500c82578..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.15.12-CVE-2024-25580.patch +++ /dev/null @@ -1,228 +0,0 @@ -From c8061284095abebebbcd6fea7167477aef44a00c Mon Sep 17 00:00:00 2001 -From: Jonas Karlsson <jonas.karlsson@qt.io> -Date: Thu, 8 Feb 2024 17:01:05 +0100 -Subject: [PATCH] Improve KTX file reading memory safety - -* Use qAddOverflow/qSubOverflow methods for catching additions and - subtractions with overflow and handle these scenarios when reading the - file. -* Add 'safeView' method that checks that the byte array view constructed - is not out of bounds. -* Return error if number of levels is higher than what is reasonable. -* Return error if number of faces is incorrect. -* Add unit test with invalid KTX file previously causing a segmentation - fault. - -This fixes CVE-2024-25580. - -Fixes: QTBUG-121918 -Pick-to: 6.7 6.6 6.5 6.2 5.15 -Change-Id: Ie0824c32a5921de30cf07c1fc1b49a084e6d07b2 -Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> -Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> -(cherry picked from commit 28ecb523ce8490bff38b251b3df703c72e057519) ---- - src/gui/util/qktxhandler.cpp | 138 +++++++++++++++++++++++++++-------- - src/gui/util/qktxhandler_p.h | 2 +- - 2 files changed, 110 insertions(+), 30 deletions(-) - -diff --git a/src/gui/util/qktxhandler.cpp b/src/gui/util/qktxhandler.cpp -index 7eda4c46fb..2853e46c3d 100644 ---- a/src/gui/util/qktxhandler.cpp -+++ b/src/gui/util/qktxhandler.cpp -@@ -73,7 +73,7 @@ struct KTXHeader { - quint32 bytesOfKeyValueData; - }; - --static const quint32 headerSize = sizeof(KTXHeader); -+static constexpr quint32 qktxh_headerSize = sizeof(KTXHeader); - - // Currently unused, declared for future reference - struct KTXKeyValuePairItem { -@@ -103,11 +103,36 @@ struct KTXMipmapLevel { - */ - }; - --bool QKtxHandler::canRead(const QByteArray &suffix, const QByteArray &block) -+static bool qAddOverflow(quint32 v1, quint32 v2, quint32 *r) { -+ // unsigned additions are well-defined -+ *r = v1 + v2; -+ return v1 > quint32(v1 + v2); -+} -+ -+// Returns the nearest multiple of 4 greater than or equal to 'value' -+static bool nearestMultipleOf4(quint32 value, quint32 *result) -+{ -+ constexpr quint32 rounding = 4; -+ *result = 0; -+ if (qAddOverflow(value, rounding - 1, result)) -+ return true; -+ *result &= ~(rounding - 1); -+ return false; -+} -+ -+// Returns a slice with prechecked bounds -+static QByteArray safeSlice(const QByteArray& array, quint32 start, quint32 length) - { -- Q_UNUSED(suffix) -+ quint32 end = 0; -+ if (qAddOverflow(start, length, &end) || end > quint32(array.length())) -+ return {}; -+ return QByteArray(array.data() + start, length); -+} - -- return (qstrncmp(block.constData(), ktxIdentifier, KTX_IDENTIFIER_LENGTH) == 0); -+bool QKtxHandler::canRead(const QByteArray &suffix, const QByteArray &block) -+{ -+ Q_UNUSED(suffix); -+ return block.startsWith(QByteArray::fromRawData(ktxIdentifier, KTX_IDENTIFIER_LENGTH)); - } - - QTextureFileData QKtxHandler::read() -@@ -115,42 +140,97 @@ QTextureFileData QKtxHandler::read() - if (!device()) - return QTextureFileData(); - -- QByteArray buf = device()->readAll(); -- const quint32 dataSize = quint32(buf.size()); -- if (dataSize < headerSize || !canRead(QByteArray(), buf)) { -- qCDebug(lcQtGuiTextureIO, "Invalid KTX file %s", logName().constData()); -+ const QByteArray buf = device()->readAll(); -+ if (size_t(buf.size()) > std::numeric_limits<quint32>::max()) { -+ qWarning(lcQtGuiTextureIO, "Too big KTX file %s", logName().constData()); -+ return QTextureFileData(); -+ } -+ -+ if (!canRead(QByteArray(), buf)) { -+ qWarning(lcQtGuiTextureIO, "Invalid KTX file %s", logName().constData()); -+ return QTextureFileData(); -+ } -+ -+ if (buf.size() < qsizetype(qktxh_headerSize)) { -+ qWarning(lcQtGuiTextureIO, "Invalid KTX header size in %s", logName().constData()); - return QTextureFileData(); - } - -- const KTXHeader *header = reinterpret_cast<const KTXHeader *>(buf.constData()); -- if (!checkHeader(*header)) { -- qCDebug(lcQtGuiTextureIO, "Unsupported KTX file format in %s", logName().constData()); -+ KTXHeader header; -+ memcpy(&header, buf.data(), qktxh_headerSize); -+ if (!checkHeader(header)) { -+ qWarning(lcQtGuiTextureIO, "Unsupported KTX file format in %s", logName().constData()); - return QTextureFileData(); - } - - QTextureFileData texData; - texData.setData(buf); - -- texData.setSize(QSize(decode(header->pixelWidth), decode(header->pixelHeight))); -- texData.setGLFormat(decode(header->glFormat)); -- texData.setGLInternalFormat(decode(header->glInternalFormat)); -- texData.setGLBaseInternalFormat(decode(header->glBaseInternalFormat)); -- -- texData.setNumLevels(decode(header->numberOfMipmapLevels)); -- quint32 offset = headerSize + decode(header->bytesOfKeyValueData); -- const int maxLevels = qMin(texData.numLevels(), 32); // Cap iterations in case of corrupt file. -- for (int i = 0; i < maxLevels; i++) { -- if (offset + sizeof(KTXMipmapLevel) > dataSize) // Corrupt file; avoid oob read -- break; -- const KTXMipmapLevel *level = reinterpret_cast<const KTXMipmapLevel *>(buf.constData() + offset); -- quint32 levelLen = decode(level->imageSize); -- texData.setDataOffset(offset + sizeof(KTXMipmapLevel::imageSize), i); -- texData.setDataLength(levelLen, i); -- offset += sizeof(KTXMipmapLevel::imageSize) + levelLen + (3 - ((levelLen + 3) % 4)); -+ texData.setSize(QSize(decode(header.pixelWidth), decode(header.pixelHeight))); -+ texData.setGLFormat(decode(header.glFormat)); -+ texData.setGLInternalFormat(decode(header.glInternalFormat)); -+ texData.setGLBaseInternalFormat(decode(header.glBaseInternalFormat)); -+ -+ texData.setNumLevels(decode(header.numberOfMipmapLevels)); -+ -+ const quint32 bytesOfKeyValueData = decode(header.bytesOfKeyValueData); -+ quint32 headerKeyValueSize; -+ if (qAddOverflow(qktxh_headerSize, bytesOfKeyValueData, &headerKeyValueSize)) { -+ qWarning(lcQtGuiTextureIO, "Overflow in size of key value data in header of KTX file %s", -+ logName().constData()); -+ return QTextureFileData(); -+ } -+ -+ if (headerKeyValueSize >= quint32(buf.size())) { -+ qWarning(lcQtGuiTextureIO, "OOB request in KTX file %s", logName().constData()); -+ return QTextureFileData(); -+ } -+ -+ // Technically, any number of levels is allowed but if the value is bigger than -+ // what is possible in KTX V2 (and what makes sense) we return an error. -+ // maxLevels = log2(max(width, height, depth)) -+ const int maxLevels = (sizeof(quint32) * 8) -+ - qCountLeadingZeroBits(std::max( -+ { header.pixelWidth, header.pixelHeight, header.pixelDepth })); -+ -+ if (texData.numLevels() > maxLevels) { -+ qWarning(lcQtGuiTextureIO, "Too many levels in KTX file %s", logName().constData()); -+ return QTextureFileData(); -+ } -+ -+ quint32 offset = headerKeyValueSize; -+ for (int level = 0; level < texData.numLevels(); level++) { -+ const auto imageSizeSlice = safeSlice(buf, offset, sizeof(quint32)); -+ if (imageSizeSlice.isEmpty()) { -+ qWarning(lcQtGuiTextureIO, "OOB request in KTX file %s", logName().constData()); -+ return QTextureFileData(); -+ } -+ -+ const quint32 imageSize = decode(qFromUnaligned<quint32>(imageSizeSlice.data())); -+ offset += sizeof(quint32); // overflow checked indirectly above -+ -+ texData.setDataOffset(offset, level); -+ texData.setDataLength(imageSize, level); -+ -+ // Add image data and padding to offset -+ quint32 padded = 0; -+ if (nearestMultipleOf4(imageSize, &padded)) { -+ qWarning(lcQtGuiTextureIO, "Overflow in KTX file %s", logName().constData()); -+ return QTextureFileData(); -+ } -+ -+ quint32 offsetNext; -+ if (qAddOverflow(offset, padded, &offsetNext)) { -+ qWarning(lcQtGuiTextureIO, "OOB request in KTX file %s", logName().constData()); -+ return QTextureFileData(); -+ } -+ -+ offset = offsetNext; - } - - if (!texData.isValid()) { -- qCDebug(lcQtGuiTextureIO, "Invalid values in header of KTX file %s", logName().constData()); -+ qWarning(lcQtGuiTextureIO, "Invalid values in header of KTX file %s", -+ logName().constData()); - return QTextureFileData(); - } - -@@ -191,7 +271,7 @@ bool QKtxHandler::checkHeader(const KTXHeader &header) - (decode(header.numberOfFaces) == 1)); - } - --quint32 QKtxHandler::decode(quint32 val) -+quint32 QKtxHandler::decode(quint32 val) const - { - return inverseEndian ? qbswap<quint32>(val) : val; - } -diff --git a/src/gui/util/qktxhandler_p.h b/src/gui/util/qktxhandler_p.h -index 19f7b0e79a..8da990aaac 100644 ---- a/src/gui/util/qktxhandler_p.h -+++ b/src/gui/util/qktxhandler_p.h -@@ -68,7 +68,7 @@ public: - - private: - bool checkHeader(const KTXHeader &header); -- quint32 decode(quint32 val); -+ quint32 decode(quint32 val) const; - - bool inverseEndian = false; - }; --- -2.43.0 - diff --git a/dev-qt/qtgui/qtgui-5.15.12-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.14.ebuild index 907ac3454882..9ed93471cf64 100644 --- a/dev-qt/qtgui/qtgui-5.15.12-r2.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.14.ebuild @@ -4,7 +4,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=3 + QT5_KDEPATCHSET_REV=1 KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi @@ -128,8 +128,6 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) -PATCHES=( "${FILESDIR}/${P}-CVE-2024-25580.patch" ) # bug 924647 - src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/qthelp/Manifest +++ b/dev-qt/qthelp/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/qthelp/qthelp-5.15.12.ebuild b/dev-qt/qthelp/qthelp-5.15.14.ebuild index 9aacb12ebef3..9aacb12ebef3 100644 --- a/dev-qt/qthelp/qthelp-5.15.12.ebuild +++ b/dev-qt/qthelp/qthelp-5.15.14.ebuild diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest index 3e3cd76ebd7e..86fdabbd2684 100644 --- a/dev-qt/qthttpserver/Manifest +++ b/dev-qt/qthttpserver/Manifest @@ -1 +1 @@ -DIST qthttpserver-everywhere-src-6.6.2.tar.xz 162152 BLAKE2B dc83b39aa99d39f0255bc841e8d7ac171ef477f4327e9447adff54624cfc7e698336786dd59b51450ea2d1f0e899c9ad38e32c8b9c2668514923b369fc4cce8e SHA512 e436c8525febbf58071159032d3d115c1eb9780e1b261aa7bb2d33e29979cc2a24be559d9db348e8b5356079e469644fa10865b8d042d91d64c86aa72c0682b4 +DIST qthttpserver-everywhere-src-6.7.2.tar.xz 163640 BLAKE2B e8ab499db3e91c95685a41645ed1992b669f5049d39f6ae232dcaf527ab1c9fa5fe69be145bf0a67310be8e4ee192449be3734ef2230ea590b9c76552f93b331 SHA512 0830fb4c5968ec5e23576f58e117dcca9f012cf742043c8b4786fb7bdcd68cd86f49d15d1ba66ee64e80d5a50d3c797dbffdf6f977ad7c101bb5be1bc02c1323 diff --git a/dev-qt/qthttpserver/qthttpserver-6.6.2.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.2.ebuild index a4b020165245..a4b020165245 100644 --- a/dev-qt/qthttpserver/qthttpserver-6.6.2.ebuild +++ b/dev-qt/qthttpserver/qthttpserver-6.7.2.ebuild diff --git a/dev-qt/qthttpserver/qthttpserver-6.6.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.8.9999.ebuild index 49febbf2b658..7583ea864f5f 100644 --- a/dev-qt/qthttpserver/qthttpserver-6.6.9999.ebuild +++ b/dev-qt/qthttpserver/qthttpserver-6.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index d354f78f6fab..8d32d8729fe6 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -1,3 +1,3 @@ -DIST qtimageformats-5.15.12-gentoo-kde-1.tar.xz 395548 BLAKE2B 422b80dfa1ee676eb8ebb06db05208ac463983773b0ae5c4dbb27fbe0257487f047d2d1a3e273bbd1a489a4de94d8c305a22ba0f2995a838afa39538a60df7b9 SHA512 3bcbdca71d56230ae61d8956410c9f4c41a9bcd916e265fed40da2aad8ca04bb9b27048960d098cc21cabf645e711c88606346b7be39f4f3776a849d41ae524d -DIST qtimageformats-everywhere-opensource-src-5.15.12.tar.xz 1865016 BLAKE2B 74dac2b362a593054d85af0629efe0d0137da2ee8870bc904f1a793c7cc0e69a308f08ca706cc6280a1f232daa5651863a2fda7b4ce0df766ab0ef9a9fbb46c7 SHA512 c56e70e17ed29ff126257ce41e2b9fd03807f0325ac60bd307779406dcea39ff929e49d2ea99ab17f07f19a6dda5f5103d4def6bb70a52f761141fc4b2c46e7c -DIST qtimageformats-everywhere-src-6.6.2.tar.xz 1964116 BLAKE2B 1fe0c428dd9602d7b9abd7e2cfdda8f179511c912fcf4f501400619ac91a5cde6b57f8f38c6c1d22a1efd6fc285b49cbf2ee23132faea516c55f552819ea0850 SHA512 64704becdd6f1a50f4a4c0edabc6be2f8a114c978728a62b2a5c9502e2457699f6e86135146c56afef715f865dd1c10062cf485ad97c890884bace8a163c24a5 +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.2.tar.xz 1974768 BLAKE2B d57ba2cc12b3af02b0b15bb9836328ff0586c53cdb0acec7ba72ec4c089092f54677ee7faae18bd6e352c9105bb441e9173d33c8bf73c92205e01490728163fb SHA512 78871edcdf1ea0dec172e5d17fb7fee75c0512d18a7830ddcdcabb04719f57fc41faa7d1a82bcf4639213dbe98f495f817f5680745eb43a80b2e321f141d562a diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.12.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.14.ebuild index 8054f491986d..99db2df41a13 100644 --- a/dev-qt/qtimageformats/qtimageformats-5.15.12.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-5.15.14.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~sparc x86" fi inherit qt5-build diff --git a/dev-qt/qtimageformats/qtimageformats-6.6.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.2.ebuild index e0dfc42d99a7..ac6f299f55a0 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.6.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" @@ -21,6 +21,12 @@ RDEPEND=" " 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 diff --git a/dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild index 677332aa56b3..9d1a9a6f9685 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild @@ -21,6 +21,12 @@ RDEPEND=" " 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 diff --git a/dev-qt/qtimageformats/qtimageformats-6.6.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.8.9999.ebuild index 677332aa56b3..9d1a9a6f9685 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.6.9999.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-6.8.9999.ebuild @@ -21,6 +21,12 @@ RDEPEND=" " 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 diff --git a/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild index 677332aa56b3..9d1a9a6f9685 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild @@ -21,6 +21,12 @@ RDEPEND=" " 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 diff --git a/dev-qt/qtlanguageserver/Manifest b/dev-qt/qtlanguageserver/Manifest new file mode 100644 index 000000000000..9a0677d35887 --- /dev/null +++ b/dev-qt/qtlanguageserver/Manifest @@ -0,0 +1 @@ +DIST qtlanguageserver-everywhere-src-6.7.2.tar.xz 145660 BLAKE2B adef11c166335fca41eceb4f48321cb1df84937663351f35e007476232d857221cd25ea1bbbc211e450858cebce95a6ca0b54f2a09d5d423defaeea7e722fa90 SHA512 15ece6a24b43502a66b992404230d4561fe3e3ac561bfbf75b1e56ca4b6f5e0110a95155207b844692b72e43fbaa44ab7c9ea39bfb21c30b2c3fd30f92ec3303 diff --git a/dev-qt/qtlanguageserver/metadata.xml b/dev-qt/qtlanguageserver/metadata.xml new file mode 100644 index 000000000000..59773d989592 --- /dev/null +++ b/dev-qt/qtlanguageserver/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugreports.qt.io/</bugs-to> + <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtlanguageserver</remote-id> + </upstream> + <slots> + <subslots> + Must only be used by packages that are known to use private parts of the Qt API. + </subslots> + </slots> +</pkgmetadata> diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild new file mode 100644 index 000000000000..3dbf250ac2cc --- /dev/null +++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild @@ -0,0 +1,15 @@ +# 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.9999.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild new file mode 100644 index 000000000000..b02596ef5aab --- /dev/null +++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild @@ -0,0 +1,15 @@ +# 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.8.9999.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.8.9999.ebuild new file mode 100644 index 000000000000..b02596ef5aab --- /dev/null +++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.8.9999.ebuild @@ -0,0 +1,15 @@ +# 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.9999.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.9999.ebuild new file mode 100644 index 000000000000..b02596ef5aab --- /dev/null +++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.9999.ebuild @@ -0,0 +1,15 @@ +# 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/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index 36c1e901ea5e..c7cba3023acb 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -1,4 +1,5 @@ DIST qtlocation-5.15.11-patchset.tar.xz 4796 BLAKE2B dcfa75bd3fb2e9069e1a530c27e2b4e9ac921fcf0ccb712f0894375b575ba25103948c6e5b85b56a8f9c9f2d7edf7df8e38501e93356e69f060b577a04c2d221 SHA512 14bd2864abc6f446dc4fbac03548cb42305685b46db757d856360780144095a021130bc0ebf1d07a516dc7991dc0cfbf733bd0ef6be58237bc15822c21af1d0b -DIST qtlocation-everywhere-opensource-src-5.15.12.tar.xz 6553488 BLAKE2B e9cab8e6f62cc1cfc6586fa4a1b252bce915479fca5f9fbeac66a2494d77047af4af1ba840786799637edae3af7c6d2000f640af018548cfcd7bd624c6a31b15 SHA512 c480762cea2cd1a00e6061bab05c402d5aab2d12e7decebcd606c930d2029a93f2a46f8edbb188b73c7cdcad473b03c15037ea10e0b3538de0a99b1d7d7fb333 -DIST qtlocation-everywhere-src-6.6.2.tar.xz 3028592 BLAKE2B 060dbe1d4ea3d761900f1f2e8eff0ae255b1b75edc8c23e1ce04d6d3a7b3ea278b9121d417e347bc589a5445b35f52db5447de0f0d1154d8859bfe83d4d5e7da SHA512 a2c4b9d9fb3b3675d25d3e7abeb8eec42f5998a9b275648a355df61c7d21258fb6bf5ecefeb635bab1a37f3382fc71b588a05eafc1bd7b57580c0f9999c9f1cd -DIST qtlocation-mapboxgl-5.15.12-4c88f2c0.tar.gz 3726387 BLAKE2B e9b818505ace86516262d1407450c14be82122bb91363a57708795844089371ac7d511a857f713c7cb4e6f8b54867aab0bc5dcdb9c49aa28aa3f8363271378e0 SHA512 e4d9133db892fd8b7b1bcf584bf7dae30c0f0353f3b0a696a6cabc9485067f262d42554b583640521734498572e5480b5e8d0143d5be47bb92077f3192fefa4d +DIST qtlocation-everywhere-opensource-src-5.15.14.tar.xz 6549056 BLAKE2B 831c7091a7b9d1355121f7e1e89f62c8aaa8819bef98c80f90b1521eea9c11a35452557c97d1dd49d13e0e810bd70f5038f8682f6ac42b68622cd269664eadd3 SHA512 5a6271d61bb9ede80b8483e784d8cc15170cf3f7b019472b2362c742e1e1fd52d811c2132b751574dacee6f7274b81e6049b8a3dc934ba7612c0aef6643062dd +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 diff --git a/dev-qt/qtlocation/qtlocation-5.15.14-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.14-r1.ebuild new file mode 100644 index 000000000000..8041f5561688 --- /dev/null +++ b/dev-qt/qtlocation/qtlocation-5.15.14-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PATCHSET="${PN}-5.15.11-patchset" +inherit qt5-build + +DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + MAPBOXGL_COMMIT=35d566724c48180c9a372c2ed50a253871a51574 + SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" +fi + +RDEPEND=" + dev-libs/icu:= + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qtpositioning-${QT5_PV}*[qml] + =dev-qt/qtsql-${QT5_PV}* + sys-libs/zlib +" +DEPEND="${RDEPEND} + =dev-qt/qtconcurrent-${QT5_PV}* +" + +QT5_TARGET_SUBDIRS=( + src/3rdparty/clipper + src/3rdparty/poly2tri + src/3rdparty/clip2tri + src/3rdparty/mapbox-gl-native + src/location + src/imports/location + src/imports/locationlabs + src/plugins/geoservices +) + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + +PATCHES=( "${WORKDIR}/${PATCHSET}" ) + +src_prepare() { + rm -rf src/3rdparty/mapbox-gl-native/* || die + mv "${WORKDIR}"/${PN}-mapboxgl-${MAPBOXGL_COMMIT}/* src/3rdparty/mapbox-gl-native || die + qt5-build_src_prepare +} +fi + +src_configure() { + # src/plugins/geoservices requires files that are only generated when + # qmake is run in the root directory. Bug 633776. + qt5_configure_oos_quirk qtlocation-config.pri src/location + qt5-build_src_configure +} diff --git a/dev-qt/qtlocation/qtlocation-5.15.12.ebuild b/dev-qt/qtlocation/qtlocation-5.15.14.ebuild index 757b177274ba..ddbc8cffd58c 100644 --- a/dev-qt/qtlocation/qtlocation-5.15.12.ebuild +++ b/dev-qt/qtlocation/qtlocation-5.15.14.ebuild @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then MAPBOXGL_COMMIT=4c88f2c0e61daa89f584a8a9a3eba210221c6920 SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" - KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" fi RDEPEND=" diff --git a/dev-qt/qtlocation/qtlocation-6.6.2.ebuild b/dev-qt/qtlocation/qtlocation-6.7.2.ebuild index 321eff47e2b6..2eb3c22bc232 100644 --- a/dev-qt/qtlocation/qtlocation-6.6.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" + KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" fi RDEPEND=" diff --git a/dev-qt/qtlocation/qtlocation-6.7.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.7.9999.ebuild index 05a2dc329b2f..d407e2f12e54 100644 --- a/dev-qt/qtlocation/qtlocation-6.7.9999.ebuild +++ b/dev-qt/qtlocation/qtlocation-6.7.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi RDEPEND=" diff --git a/dev-qt/qtlocation/qtlocation-6.6.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.8.9999.ebuild index 05a2dc329b2f..d407e2f12e54 100644 --- a/dev-qt/qtlocation/qtlocation-6.6.9999.ebuild +++ b/dev-qt/qtlocation/qtlocation-6.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi RDEPEND=" diff --git a/dev-qt/qtlocation/qtlocation-6.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.9999.ebuild index 05a2dc329b2f..d407e2f12e54 100644 --- a/dev-qt/qtlocation/qtlocation-6.9999.ebuild +++ b/dev-qt/qtlocation/qtlocation-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi RDEPEND=" diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 47455f43bb73..d701db23541e 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,3 +1,3 @@ -DIST qtmultimedia-5.15.12-gentoo-kde-1.tar.xz 1496 BLAKE2B 890f90accb60438bcceae2a4f0bf928eb91341b36af278f7deef7f0b1964940cdfdc0f82e21f6b03ac6c609cfffb77a2d00563390237b965a66f4224df70fabb SHA512 d400f0d2694f9b09d645f5ca1c76aed7891614162de36213bac3febd5b0f80f893e26a26b2a899a7fcdf57cae88d10d151c102da8ba610a7734a14094ca3a29b -DIST qtmultimedia-everywhere-opensource-src-5.15.12.tar.xz 3830956 BLAKE2B c6fa2b5f01262af0ddb510e344adc2aa69b1d4fd82962bb6ff2962d50c9f43a99e445538466c0a9d794dfc0cca27dccd32d5faaa1baf59a630c8b490c43b7963 SHA512 2cef917df20da1381ea64834e4110e25ea0d5e12249176ddbe2e0314c25490926ccbf2f7cc3f89b2969d113a645ec88244fabe691aff851ffb4b2be9766bcf76 -DIST qtmultimedia-everywhere-src-6.6.2.tar.xz 8305476 BLAKE2B 8f252b236ef5fdbc7c4e2be498e2cdaaaf3c901a1d1890c7dfe1f6e8256bc656526e2a6a96649b29bb20baf882f46160f3d76b97cd80466b44a2dcc1b7aabfa5 SHA512 311f47acd7658d725855df06c25b4d516d4046922cc92ad44c91c48f1696fbcbb25a0d778b1a72f15834ce2e74ce64199814476ac04fc705fc19af73c91f2006 +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.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70 diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch new file mode 100644 index 000000000000..0f61539b00d2 --- /dev/null +++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch @@ -0,0 +1,20 @@ +# https://bugs.gentoo.org/934582 + +--- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp ++++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp +@@ -718,6 +718,7 @@ int QGstreamerCamera::getV4L2Parameter(quint32 id) const + return control.value; + }); + } ++#endif // QT_CONFIG(linux_v4l) + + QGstreamerCustomCamera::QGstreamerCustomCamera(QCamera *camera) + : QGstreamerCameraBase{ +@@ -766,6 +767,4 @@ void QGstreamerCustomCamera::setActive(bool active) + emit activeChanged(active); + } + +-#endif +- + QT_END_NAMESPACE + diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.8.0-gst-x11-wayland-detect.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.0-gst-x11-wayland-detect.patch new file mode 100644 index 000000000000..dab821a3bdb3 --- /dev/null +++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.0-gst-x11-wayland-detect.patch @@ -0,0 +1,19 @@ +Temporary workaround while waiting for upstream's fix. + +https://bugreports.qt.io/browse/QTBUG-127484 +--- a/cmake/FindGStreamer.cmake ++++ b/cmake/FindGStreamer.cmake +@@ -163,5 +163,5 @@ + HEADER gst/gl/x11/gstgldisplay_x11.h + LIBRARY gstgl-1.0 +- DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl XCB::XCB ) ++ DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl ) + endif() + +@@ -171,5 +171,5 @@ + HEADER gst/gl/wayland/gstgldisplay_wayland.h + LIBRARY gstgl-1.0 +- DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl Wayland::Client ) ++ DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl ) + endif() + diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.12.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.14.ebuild index 135e11b14425..135e11b14425 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.15.12.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.14.ebuild diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild deleted file mode 100644 index bb4dfe70b0e0..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild +++ /dev/null @@ -1,87 +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? ( media-libs/alsa-lib ) - ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,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=( - # 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 - # 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 alsa) - $(qt_feature ffmpeg) - $(qt_feature gstreamer) - $(usev gstreamer $(qt_feature opengl gstreamer_gl)) - $(qt_feature pulseaudio) - $(qt_feature v4l linux_v4l) - $(qt_feature vaapi) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild index 7a0c7fa01e1c..f86755c55902 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.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" @@ -22,9 +22,11 @@ REQUIRED_USE=" RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] - alsa? ( media-libs/alsa-lib ) + alsa? ( + !pulseaudio? ( media-libs/alsa-lib ) + ) ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,eglfs=] + ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11 @@ -53,7 +55,13 @@ DEPEND=" " BDEPEND="~dev-qt/qtshadertools-${PV}:6" +PATCHES=( + "${FILESDIR}"/${P}-gstreamer-no-v4l.patch +) + 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 @@ -63,6 +71,7 @@ CMAKE_SKIP_TESTS=( # 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 @@ -74,7 +83,6 @@ src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) - $(qt_feature alsa) $(qt_feature ffmpeg) $(qt_feature gstreamer) $(usev gstreamer $(qt_feature opengl gstreamer_gl)) @@ -83,5 +91,31 @@ src_configure() { $(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.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild index 7a0c7fa01e1c..3b8589664575 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild @@ -22,9 +22,11 @@ REQUIRED_USE=" RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] - alsa? ( media-libs/alsa-lib ) + alsa? ( + !pulseaudio? ( media-libs/alsa-lib ) + ) ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,eglfs=] + ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11 @@ -54,6 +56,8 @@ DEPEND=" 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 @@ -63,6 +67,7 @@ CMAKE_SKIP_TESTS=( # 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 @@ -74,7 +79,6 @@ src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) - $(qt_feature alsa) $(qt_feature ffmpeg) $(qt_feature gstreamer) $(usev gstreamer $(qt_feature opengl gstreamer_gl)) @@ -83,5 +87,31 @@ src_configure() { $(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.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild new file mode 100644 index 000000000000..59aa5849582b --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild @@ -0,0 +1,144 @@ +# 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 screencast v4l vaapi vulkan wayland +" +# tst_qmediaplayerbackend hard requires qml, review in case becomes optional +REQUIRED_USE=" + || ( ffmpeg gstreamer ) + eglfs? ( ffmpeg opengl ) + screencast? ( ffmpeg ) + test? ( qml ) + vaapi? ( ffmpeg opengl ) +" + +# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto +# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto) +# := skipped on pipewire due to only being used through dbus +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=] + media-libs/gstreamer:1.0 + opengl? ( + ~dev-qt/qtbase-${PV}:6[X?,wayland?] + media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?] + ) + ) + opengl? ( media-libs/libglvnd ) + pulseaudio? ( media-libs/libpulse ) + qml? ( + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtquick3d-${PV}:6 + ) + screencast? ( + ~dev-qt/qtbase-${PV}:6[dbus] + media-video/pipewire + ) +" +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 +) + +PATCHES=( + "${FILESDIR}"/${PN}-6.8.0-gst-x11-wayland-detect.patch +) + +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) + $(usev opengl " + $(qt_feature X gstreamer_gl_x11) + $(qt_feature wayland gstreamer_gl_wayland) + ") + ") + $(qt_feature pulseaudio) + $(qt_feature screencast pipewire) + $(qt_feature v4l linux_v4l) + $(qt_feature vaapi) + -DQT_UNITY_BUILD=OFF # currently fails to build with + ) + + # 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.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index 7a0c7fa01e1c..59aa5849582b 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -11,20 +11,29 @@ 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" +IUSE=" + +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio + qml screencast v4l vaapi vulkan wayland +" # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl ) - vaapi? ( ffmpeg opengl ) + screencast? ( ffmpeg ) test? ( qml ) + vaapi? ( ffmpeg opengl ) " +# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto +# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto) +# := skipped on pipewire due to only being used through dbus RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] - alsa? ( media-libs/alsa-lib ) + alsa? ( + !pulseaudio? ( media-libs/alsa-lib ) + ) ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,eglfs=] + ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11 @@ -35,8 +44,12 @@ RDEPEND=" gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0[X=,opengl?] + media-libs/gst-plugins-base:1.0[X=] media-libs/gstreamer:1.0 + opengl? ( + ~dev-qt/qtbase-${PV}:6[X?,wayland?] + media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?] + ) ) opengl? ( media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse ) @@ -44,6 +57,10 @@ RDEPEND=" ~dev-qt/qtdeclarative-${PV}:6 ~dev-qt/qtquick3d-${PV}:6 ) + screencast? ( + ~dev-qt/qtbase-${PV}:6[dbus] + media-video/pipewire + ) " DEPEND=" ${RDEPEND} @@ -54,6 +71,8 @@ DEPEND=" 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 @@ -63,25 +82,63 @@ CMAKE_SKIP_TESTS=( # 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 ) +PATCHES=( + "${FILESDIR}"/${PN}-6.8.0-gst-x11-wayland-detect.patch +) + 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 alsa) $(qt_feature ffmpeg) $(qt_feature gstreamer) - $(usev gstreamer $(qt_feature opengl gstreamer_gl)) + $(usev gstreamer " + $(qt_feature opengl gstreamer_gl) + $(usev opengl " + $(qt_feature X gstreamer_gl_x11) + $(qt_feature wayland gstreamer_gl_wayland) + ") + ") $(qt_feature pulseaudio) + $(qt_feature screencast pipewire) $(qt_feature v4l linux_v4l) $(qt_feature vaapi) + -DQT_UNITY_BUILD=OFF # currently fails to build with ) + # 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/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 5e79c7375530..93ac206e3d15 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 333328 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 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.12-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild index 5b4fd756d498..884af22b8f17 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=3 + QT5_KDEPATCHSET_REV=1 KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi @@ -25,6 +25,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-CVE-2024-39936.patch" ) # bug 935869 + QT5_TARGET_SUBDIRS=( src/network src/plugins/bearer/generic diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest index c04a3e6e4045..937cb5fd8610 100644 --- a/dev-qt/qtnetworkauth/Manifest +++ b/dev-qt/qtnetworkauth/Manifest @@ -1,2 +1,3 @@ -DIST qtnetworkauth-everywhere-opensource-src-5.15.12.tar.xz 144752 BLAKE2B 9e7eca2bba637d3916fc29153620ba68339dc2ae4cc12d8dc365fd528b5bc881a4c74a1eac01d169c4da4573ace1c3b3118a80327b259d925d3fa5ff36a8b9ea SHA512 f0c48453e21ad14a4fbac25d35e6257c4d8bbb5f2ac87dad0deee44ca86aec8def618f102cd1d9af05e1611f37ea722e1630165f15a238d3d8c38d161771bc3d -DIST qtnetworkauth-everywhere-src-6.6.2.tar.xz 143612 BLAKE2B 585eda8466ba89d79b73697a90572bd171a814b2d3d95ec40ed9ee7c2247ea6fdbf675e9cf29ba06c26d4a6a0663d692c4f8c1fd7fc8b0194ee323b30fe025c1 SHA512 1fff9c52d47c8f97569bf201aa3051da57dbcf10f63c7e7334286b40042b6437f9636f8fd1db3a8d1a519036dae162ae57d6a24908441df84003134cfdb5cfd3 +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.2.tar.xz 146892 BLAKE2B d2d788edbf0bc8c6a33cd7303cd593d8415ee7f006ee00bc19b4659052ad02032dddbcad4eaeedcba56f782fd2b5607304720a9b131781eeb12ca7daea6b301b SHA512 8357b2b833da9f652c88e706c7bf15b19b2c5b8f054914bfc16d33ea69dce86999b03fb7dd5b79e2a58d8d4e16af0fd2ff6dcf8e621ed251e63171fc8151f75b diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.12.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.14.ebuild index a609f61ec1a7..9793417c27ce 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.12.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.14.ebuild @@ -3,12 +3,14 @@ EAPI=8 +PATCHSET="${PN}-5.15.14-gentoo-kde-1" inherit qt5-build DESCRIPTION="Network authorization library for the Qt5 framework" LICENSE="GPL-3" if [[ ${QT5_BUILD_TYPE} == release ]]; then + SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" fi @@ -19,3 +21,9 @@ DEPEND=" =dev-qt/qtnetwork-${QT5_PV}* " RDEPEND="${DEPEND}" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + + PATCHES=( "${WORKDIR}/${PATCHSET}" ) + +fi diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.6.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.2.ebuild index b90e405edc1f..a9c901a07baf 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.6.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" + KEYWORDS="amd64 arm64 ppc64 ~riscv x86" fi RDEPEND="~dev-qt/qtbase-${PV}:6[network]" diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild index c0c8c0b51bf7..606ca90b42f8 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Network authorization library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi RDEPEND="~dev-qt/qtbase-${PV}:6[network]" diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.6.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.8.9999.ebuild index c0c8c0b51bf7..e5e7961d25ba 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.6.9999.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,8 +8,8 @@ inherit qt6-build DESCRIPTION="Network authorization library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi -RDEPEND="~dev-qt/qtbase-${PV}:6[network]" +RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network]" DEPEND="${RDEPEND}" diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild index c0c8c0b51bf7..e5e7961d25ba 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,8 +8,8 @@ inherit qt6-build DESCRIPTION="Network authorization library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi -RDEPEND="~dev-qt/qtbase-${PV}:6[network]" +RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network]" DEPEND="${RDEPEND}" diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest index bf5834e3f44a..93ac206e3d15 100644 --- a/dev-qt/qtopengl/Manifest +++ b/dev-qt/qtopengl/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qtopengl/qtopengl-5.15.12.ebuild b/dev-qt/qtopengl/qtopengl-5.15.14.ebuild index f8c62aa70a01..f8c62aa70a01 100644 --- a/dev-qt/qtopengl/qtopengl-5.15.12.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.15.14.ebuild diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/qtpaths/Manifest +++ b/dev-qt/qtpaths/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/qtpaths/qtpaths-5.15.12.ebuild b/dev-qt/qtpaths/qtpaths-5.15.14.ebuild index 18d2be6723f4..18d2be6723f4 100644 --- a/dev-qt/qtpaths/qtpaths-5.15.12.ebuild +++ b/dev-qt/qtpaths/qtpaths-5.15.14.ebuild diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest index 61e076d3335a..7c75cdf08a61 100644 --- a/dev-qt/qtplugininfo/Manifest +++ b/dev-qt/qtplugininfo/Manifest @@ -1,2 +1,2 @@ -DIST qttools-5.15.12-gentoo-kde-1.tar.xz 3940 BLAKE2B 63dd5fb92d6ac9aeb2aa4015033067a6cee9b2f662fed54d7d699210ceb29bf15d11f6fbb2ace2eecb1a43a1b310a6f853f056fa03adb50722de49783b906556 SHA512 d0b0f614e244728789e8fee5390efd7380980c396b1b674f10ec488565921b5662e3d65b542c077093ba4a9a5ef49aee085a8cb258040527ac800c7878e0e484 -DIST qttools-everywhere-opensource-src-5.15.12.tar.xz 8900672 BLAKE2B 897e05d8de54b50b47262d1b2606d78d2591bda1d7d4bf9e5d3be084a9a8156da3b8ec7e3b95b44e58e9a94562068b24129844ab1330426ec9b1a00d1409cd92 SHA512 d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e +DIST qttools-5.15.14-gentoo-kde-1.tar.xz 3944 BLAKE2B 2a90ad35a743b36144be44ad15add4aa1a867776b78a97f98e656570bcae1e8ad4f9dc571bd0cb6587b7a70b5075e35222b39b7747fe4d59b6f8295d33dfe9ae SHA512 c7347b6dcc845dd312d035f83fcccfc43778961519d009371b30ae98bf110bd473f3191495302cfb1ae4de4ab0494c5899f1abe2ba6bc686f35d3f9163a245d3 +DIST qttools-everywhere-opensource-src-5.15.14.tar.xz 8890236 BLAKE2B 738441eb9d7d860c9007b957724726d6d98aa378006f1761ceb1f4106005f0f287b51b29072fa7069b187b5311e044dbb2aef40a35e98a03544d2902575da195 SHA512 c936ed67a7c5d36fadf55ab8ebb9d22d6697a86b34b1c162f472341de31fa14fc2a3116b50d847d46ba953dab0231eae8131634c4ad0dfd4009b7d7f9ba960ae diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.12.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.14.ebuild index c42c99644f6b..c42c99644f6b 100644 --- a/dev-qt/qtplugininfo/qtplugininfo-5.15.12.ebuild +++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.14.ebuild diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest index f6405e6f8da4..3dbae956c0f8 100644 --- a/dev-qt/qtpositioning/Manifest +++ b/dev-qt/qtpositioning/Manifest @@ -1,2 +1,2 @@ -DIST qtlocation-everywhere-opensource-src-5.15.12.tar.xz 6553488 BLAKE2B e9cab8e6f62cc1cfc6586fa4a1b252bce915479fca5f9fbeac66a2494d77047af4af1ba840786799637edae3af7c6d2000f640af018548cfcd7bd624c6a31b15 SHA512 c480762cea2cd1a00e6061bab05c402d5aab2d12e7decebcd606c930d2029a93f2a46f8edbb188b73c7cdcad473b03c15037ea10e0b3538de0a99b1d7d7fb333 -DIST qtpositioning-everywhere-src-6.6.2.tar.xz 1504848 BLAKE2B c34d253b31176f532c6c5f23416c084652f913379bbdb44a96739a5f22b9220564408a700910a102ca45db12342d1bc267cba7c9a66d01affb641b14e678652a SHA512 f2f67c7b25ff79e085a4a36421295f4ec4ef97a7df9fedcfb90ebd60483755109d0b595b30f7ff1881ad635ddbd2c6a227771df3549d7933fda03cf63f935cd3 +DIST qtlocation-everywhere-opensource-src-5.15.14.tar.xz 6549056 BLAKE2B 831c7091a7b9d1355121f7e1e89f62c8aaa8819bef98c80f90b1521eea9c11a35452557c97d1dd49d13e0e810bd70f5038f8682f6ac42b68622cd269664eadd3 SHA512 5a6271d61bb9ede80b8483e784d8cc15170cf3f7b019472b2362c742e1e1fd52d811c2132b751574dacee6f7274b81e6049b8a3dc934ba7612c0aef6643062dd +DIST qtpositioning-everywhere-src-6.7.2.tar.xz 658112 BLAKE2B ef32068ae5d718df1ad10fddf735d65f9f90edb559211978f7112d6228a69ef37e92dcd7c124d3fff3887f1032e970c8735f92397751bdcd482451251afb4cc6 SHA512 2983fde05cbccf86288cd989279551b5babeddcf9be2848870e59dbbfc2d91749465bf43c17e291d6df37ee746b5490c0bb1e6b3fd4298b4f0a22cc6d67db04e diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.12.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.14.ebuild index a3d3f33c6b1a..a3d3f33c6b1a 100644 --- a/dev-qt/qtpositioning/qtpositioning-5.15.12.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-5.15.14.ebuild diff --git a/dev-qt/qtpositioning/qtpositioning-6.6.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.2.ebuild index dd340867377d..ccc9e5fd0f6c 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.6.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/qtpositioning/qtpositioning-6.6.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.8.9999.ebuild index c872768c9bd8..c872768c9bd8 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.6.9999.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-6.8.9999.ebuild diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest index bf5834e3f44a..93ac206e3d15 100644 --- a/dev-qt/qtprintsupport/Manifest +++ b/dev-qt/qtprintsupport/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.12.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.14.ebuild index b5da706c81fc..b5da706c81fc 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.15.12.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.14.ebuild diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest index a495aed30b28..a6d4329a8afd 100644 --- a/dev-qt/qtquick3d/Manifest +++ b/dev-qt/qtquick3d/Manifest @@ -1 +1 @@ -DIST qtquick3d-everywhere-src-6.6.2.tar.xz 65602548 BLAKE2B e1ee955a1f66c669d52a73513c7442b70863b6fa738f6e1716dfab1c7dc41f5f09780ec97f7c5fd6c452ed3ea9809ab0d907dbe28f0425d208508f69b61d50ac SHA512 d8b32ec1a5f9233e79612b5d9b56890c04a921edcc6369f4a047f8e58af92f5e6dc936fdde707df4afca81da53f9fb8959f03b00af24077c3dc723f3445e8123 +DIST qtquick3d-everywhere-src-6.7.2.tar.xz 66202160 BLAKE2B 1f3741bb11d21804ec56aa5bfa00b590d94258cb119b4284aa2757fa00785a69aba243e06bf68ca625355a8e8a392249be2ac9679226c8d250320aeb6c4ccf0f SHA512 d5a4557a6f0ea73b43de9238b8cd42fc037c417e72443a8cae96e8be779f82d5fd9efe1a09258a4d5dd55c4791b84192cb72e31bb1d744b618951080fe6fa1e2 diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch new file mode 100644 index 000000000000..981f2f87b3c6 --- /dev/null +++ b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/926094 +https://bugreports.qt.io/browse/QTBUG-122955 + +https://bugs.gentoo.org/926093 +https://github.com/embree/embree/issues/477 +--- a/src/3rdparty/embree/common/sys/platform.h ++++ b/src/3rdparty/embree/common/sys/platform.h +@@ -34,3 +34,3 @@ + /* detect 64 bit platform */ +-#if defined(__X86_64__) || defined(__aarch64__) ++#if (defined(__X86_64__) || defined(__aarch64__)) && ! defined(__ILP32__) + #define __64BIT__ diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch b/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch new file mode 100644 index 000000000000..37a0ea9c30e9 --- /dev/null +++ b/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch @@ -0,0 +1,24 @@ +Newly caught as an error by gcc15. +https://bugs.gentoo.org/936410 +https://github.com/RenderKit/embree/issues/486 +https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d +From: Daniel Opitz <daniel.opitz@intel.com> +Date: Mon, 13 May 2024 10:17:51 +0200 +Subject: [PATCH] fix output operator, issue #486 +--- a/src/3rdparty/embree/kernels/geometry/pointi.h ++++ b/src/3rdparty/embree/kernels/geometry/pointi.h +@@ -212,5 +212,5 @@ + /*! output operator */ +- friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line) ++ friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point) + { +- return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}"; ++ return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}"; + } +--- a/src/3rdparty/embree/kernels/subdiv/bezier_curve.h ++++ b/src/3rdparty/embree/kernels/subdiv/bezier_curve.h +@@ -137,3 +137,3 @@ + friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) { +- return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")"; ++ return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")"; + } diff --git a/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild index 365c08549b82..a5bf7527d264 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.6.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 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi @@ -31,6 +31,8 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.6.2-gcc14.patch + "${FILESDIR}"/${PN}-6.6.2-x32abi.patch + "${FILESDIR}"/${PN}-6.7.2-gcc15.patch ) CMAKE_SKIP_TESTS=( diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild index f1ff25e4b555..21502bc53a04 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.7.9999.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 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi @@ -31,6 +31,8 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.6.2-gcc14.patch + "${FILESDIR}"/${PN}-6.6.2-x32abi.patch + "${FILESDIR}"/${PN}-6.7.2-gcc15.patch ) CMAKE_SKIP_TESTS=( diff --git a/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild index f1ff25e4b555..aba06df17246 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.8.9999.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 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi @@ -31,6 +31,8 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.6.2-gcc14.patch + "${FILESDIR}"/${PN}-6.6.2-x32abi.patch + "${FILESDIR}"/${PN}-6.7.2-gcc15.patch ) CMAKE_SKIP_TESTS=( @@ -40,7 +42,11 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( + # TODO: if someone wants it, openxr should likely have its own + # USE and be packaged rather than use the bundled copy + -DQT_FEATURE_quick3dxr_openxr=OFF -DQT_FEATURE_system_assimp=ON + -DQT_FEATURE_system_openxr=ON ) qt6-build_src_configure diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild index f1ff25e4b555..aba06df17246 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.9999.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 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi @@ -31,6 +31,8 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.6.2-gcc14.patch + "${FILESDIR}"/${PN}-6.6.2-x32abi.patch + "${FILESDIR}"/${PN}-6.7.2-gcc15.patch ) CMAKE_SKIP_TESTS=( @@ -40,7 +42,11 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( + # TODO: if someone wants it, openxr should likely have its own + # USE and be packaged rather than use the bundled copy + -DQT_FEATURE_quick3dxr_openxr=OFF -DQT_FEATURE_system_assimp=ON + -DQT_FEATURE_system_openxr=ON ) qt6-build_src_configure diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest index f0cc20e6df68..88dbb07c33bb 100644 --- a/dev-qt/qtquickcontrols/Manifest +++ b/dev-qt/qtquickcontrols/Manifest @@ -1 +1 @@ -DIST qtquickcontrols-everywhere-opensource-src-5.15.12.tar.xz 5982828 BLAKE2B 6536813d8f206aeaad81dcfc8df771c3d4bfbbd59bc459db8cea38b3f1843f7fb2cc2f51eb66549b89e6f41f1f64e670ac1bf73631da1ffdcd4573cd628404e3 SHA512 980b233f83991d12029bac90b0875b3a001399d4358c58185a21bbb30911f0d6fec5dfc5f157e9c3c4d17e82c3ff5302e55c62b4cd63731f23a655bd55d300bb +DIST qtquickcontrols-everywhere-opensource-src-5.15.14.tar.xz 5974368 BLAKE2B b64c60a65e765c590ada4d8ee11d6885ca2cdf6837698fb44eb3dd8ae8c4f82f32a04f66e2761852e5e6c8f4473810d669a00f2fa0ec6b8f2bb87f21fbe5983b SHA512 1fdfda2cd1922801dc59c0cae8dfcd3e7e342cc820e092921a7c1e40123740c527df1777209b90109ad277cac47964c40a30ad1a5d4184b9283c015c91d43ce3 diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.12.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.14.ebuild index b0bbd28a2d21..b0bbd28a2d21 100644 --- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.12.ebuild +++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.14.ebuild diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest index 7811fba98445..9ad529ed33be 100644 --- a/dev-qt/qtquickcontrols2/Manifest +++ b/dev-qt/qtquickcontrols2/Manifest @@ -1,2 +1,2 @@ -DIST qtquickcontrols2-5.15.12-gentoo-kde-1.tar.xz 7032 BLAKE2B 7eb7bbeba7f5b70ff6a20452ff91bf1217f85d73b5a0cf939b11e04de93f05b4b9bff6a5db06a0eab29c2116f67a2596bf0c0fb5aa2267e31d4398fd4f5ccc09 SHA512 0bf7af2459f197596a2e3dc226385019ffd13806b5e5a55f8c3bf63462e2ea6fe7c6e0b7ec24c328d2a540619eb7046715f89095edd3dae611da9441ea27e3a1 -DIST qtquickcontrols2-everywhere-opensource-src-5.15.12.tar.xz 8294356 BLAKE2B 2c0232feb70c81437e475df87a784cdc3faae4a695360e285b63f2bc917e3d864214d742dab7334a675d430ca37ba2ff924b8b389f78739d2f27dea06781efca SHA512 725fb03907973fdca4479017b8f792110a4620a6e4d39f97c81c3be16280b81135394f6ce5be507fd734926307d33a249e790234139e01f387d2362cd7027128 +DIST qtquickcontrols2-5.15.14-gentoo-kde-1.tar.xz 7036 BLAKE2B 173665a33fb7f87490e09e103243e6cbc3e0ff634d31985018c5f66acd7468852bc91d9c2644cd982d6f2c2065ec7316861c141879e031e3d5ea3e372cdba26f SHA512 f25d334fe903ddacee7f27e877f6cf7286600e0ec7bb6dcccdb190a34433f9a78d91ceab057ef3ffa2607094aeb2ceaab793509affd1b1863f3398faa96bccae +DIST qtquickcontrols2-everywhere-opensource-src-5.15.14.tar.xz 8285604 BLAKE2B 3f8c1592e106c3d685a869b42fcffd7e774d5445e40c052510648a424800b37bfc65296dfc47c019cf8dbee8fe5e7a94e29a55daeb516d04acc97d6ff5afe442 SHA512 acf6a03086fd840e13eafda20e8aef3803edfdd90ea9932e9ef8ef3c1f029375010624b1ce2b8f1386c1f0dcf08c1abc86182ceec8a00f480f1cef13e8b693cf diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.12.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.14.ebuild index d23198b2f81e..d23198b2f81e 100644 --- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.12.ebuild +++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.14.ebuild diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest index 0b9c32c5c599..7a137cfc22b6 100644 --- a/dev-qt/qtquicktimeline/Manifest +++ b/dev-qt/qtquicktimeline/Manifest @@ -1,2 +1,2 @@ -DIST qtquicktimeline-everywhere-opensource-src-5.15.12.tar.xz 105600 BLAKE2B f1d7f04137f577ada1b85ca8592c475bb17c41ed695c4b8ab58320de93b9f027640e15c194038958f2d43f53285a18896e70defa25d9b2ca0ae4a88217262663 SHA512 2cd4d582d879ad33e378c3396b8b6e37a112b33011aa51a7dd93931fcdbda91b0eb2dd4a46c7d01a9be6fd65e812e9f656dfd4a981f3206fc5b88d4c8e071570 -DIST qtquicktimeline-everywhere-src-6.6.2.tar.xz 104816 BLAKE2B 82176c3a3eee4360ec1d41178e9120ecd61144279f92b538320dddb1a2b255c81194273d2677174b6cdf5e063d5707e6a1b07126ab85611e10a419dcc52596a5 SHA512 e3ec90ff0bb8646a2804abe9663b58953b768a727a5305882de0fc0abf054901ed6138b95f9e88b845150cfd437ba4328245aef42a93dc3071e43baede0f4dd3 +DIST qtquicktimeline-everywhere-opensource-src-5.15.14.tar.xz 96560 BLAKE2B fba190b4d3a2adbd93823628936edb9ba409fe20f1e6652afaa704c0480c1841ae57ff8170975306d83f7f5702198d75f65f829853be3ed52fe6ab881dc034d9 SHA512 29457540834a0452f20069615f2d2c7e22c36ff6f42ecb0e8e9519eaca22bf8af09cd24559e4087b3641204644806d956552ea2ec8ca6261854d890713d3249c +DIST qtquicktimeline-everywhere-src-6.7.2.tar.xz 110200 BLAKE2B ab181ced9e06bbf4ac9d9c3e558749a14d038a2bc741a67461f901f013b0e5da328485747499934829b60d3ee125a674033caad69dec3b2255fb36ed206a55c1 SHA512 cb460db34b726216f539bcd305e257375b01250a4f2df546a9a27c53bf78287e2c9d1ecc81edc336e5d55b87006a271ddc435e5fb57a898947bcf93cf5ea1b90 diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.12.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.14.ebuild index 03fdfedfebd2..03fdfedfebd2 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.12.ebuild +++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.14.ebuild diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.6.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.2.ebuild index 6178506223f9..53b50c299892 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.6.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/qtquicktimeline/qtquicktimeline-6.6.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.8.9999.ebuild index 393a5c2037bc..393a5c2037bc 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.6.9999.ebuild +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.8.9999.ebuild diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest index 64a236db7453..a7ee7c773a72 100644 --- a/dev-qt/qtscript/Manifest +++ b/dev-qt/qtscript/Manifest @@ -1 +1 @@ -DIST qtscript-everywhere-opensource-src-5.15.12.tar.xz 2664960 BLAKE2B 2754a33a4c3f3965201c166fab9f96f71938867a597fa14a1862f2d0ba2e149f8e33d7f7dd2b3758f9580776821346a6e458b987ae61bd4f96c2c41a1cc05bb8 SHA512 48a00763686a5455d0429d1ecd6b32e3e96a13f05faa6625361c49b91275b8a8b3a1de3627cc3db5c69d346686c07b9466022cf37abf394a6f097933b9dbed4a +DIST qtscript-everywhere-opensource-src-5.15.14.tar.xz 2656824 BLAKE2B d8ad32eaa1e4381bd78b902730cc5cfbda01eb7a0d1a81c4193c2b54fe36c30ccc8b077e2abf655ded37222bb20d26bb64dcd10e3dc1b25d15d7c2da9ef60805 SHA512 b1b5e700be35e9c063e15f2a53b97a78368642d3287dea67cc4f97a049cc6ffa1a9a39da61ac49608cfeac435215c544a6cd80d67da673fd16f341f2aa0628e1 diff --git a/dev-qt/qtscript/qtscript-5.15.12.ebuild b/dev-qt/qtscript/qtscript-5.15.14.ebuild index 463d26748afe..463d26748afe 100644 --- a/dev-qt/qtscript/qtscript-5.15.12.ebuild +++ b/dev-qt/qtscript/qtscript-5.15.14.ebuild diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest index 49a4c1480ebf..ecd597d67955 100644 --- a/dev-qt/qtscxml/Manifest +++ b/dev-qt/qtscxml/Manifest @@ -1,2 +1,2 @@ -DIST qtscxml-everywhere-opensource-src-5.15.12.tar.xz 437972 BLAKE2B 11bd9a22eada2927e98d7d22f8e17150f7e225b1036173cddd82859b84073dd547278c5df6f096a6318755aa853bc16d8ed2a9721282feedde9ff758b404d80c SHA512 c451fa8fc5999aa7e3b3a336503bcf1ccc8992ef27645d003c938166384508d2cc9b35fbd21e9da641ea98a2aaa58834ac85e8713bce25b96e4aef79c3cda976 -DIST qtscxml-everywhere-src-6.6.2.tar.xz 1167628 BLAKE2B c1c32a815bf10eaa9b30241a3dbd6302d75131ef10f6ad2aeff10c0698fa82c937b1086e7f4f157c86659be0fa720d863b1723fbd119291ce549ebe5903e0ad6 SHA512 b7058d310dd82d09ca859dae5529d63bcde68a985a4c3f8f00474e2ffcd8f2f1162ffdafe3bb0cfc29769bc53ea4725dc8b68b04a09dcbea653d9afafca2643c +DIST qtscxml-everywhere-opensource-src-5.15.14.tar.xz 429224 BLAKE2B 67936258bfb67bddf5b711bc97bebb123f56d8f7dca9b46424a33d1205b0a3a6dfc89ae7bc429ffedb928d4f1b88c62abdabee301c09a0e3b0bf65128f174d67 SHA512 1490824b0108300b1924f404431e3871ce067def15993aed9af768c871b3d0eae4cd0b8f467671d3ebcada98d5e11dfe86e250467b7dbf9708ce9f37766861d5 +DIST qtscxml-everywhere-src-6.7.2.tar.xz 1168452 BLAKE2B 7cb06fd09758aaea28ccada62aa51b427c265416afa3f152601cadd1c9586050e87d36f8cf9679ca3ef83777bfec1119d861bd9491a176460d58beb5376e4ce4 SHA512 4eba366c2c10593cfc0fdeeff92aa9951b838837cacf113bf849b5da68da4d41d550490bc4be28620f766ab412ca4066c71ee7a1ff18651dd08267b01df6c2fe diff --git a/dev-qt/qtscxml/qtscxml-5.15.12.ebuild b/dev-qt/qtscxml/qtscxml-5.15.14.ebuild index 1a299c680c85..50425941a1c8 100644 --- a/dev-qt/qtscxml/qtscxml-5.15.12.ebuild +++ b/dev-qt/qtscxml/qtscxml-5.15.14.ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~riscv x86" fi IUSE="" diff --git a/dev-qt/qtscxml/qtscxml-6.6.2.ebuild b/dev-qt/qtscxml/qtscxml-6.7.2.ebuild index 8c9613c8ea99..c856510d3f29 100644 --- a/dev-qt/qtscxml/qtscxml-6.6.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" + 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 3baf824212bc..0f087eb496fc 100644 --- a/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi IUSE="qml" diff --git a/dev-qt/qtscxml/qtscxml-6.6.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.8.9999.ebuild index 3baf824212bc..0f087eb496fc 100644 --- a/dev-qt/qtscxml/qtscxml-6.6.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" + 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 3baf824212bc..0f087eb496fc 100644 --- a/dev-qt/qtscxml/qtscxml-6.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi IUSE="qml" diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest index 402d5f19f494..d2cd0c741a19 100644 --- a/dev-qt/qtsensors/Manifest +++ b/dev-qt/qtsensors/Manifest @@ -1,2 +1,2 @@ -DIST qtsensors-everywhere-opensource-src-5.15.12.tar.xz 2059976 BLAKE2B d25926784f3468dc07f2cd797a9b8db30eca2d93e3cd4d16eb9e7cf9c7a893a97c1cee14be5421ae07cebdefea33dd7742b83d370651dfad24252a6fa49beb69 SHA512 25d4eb1ea43c5d7819a7b9cee22604b774007f84bdc86433f673766b1943134c5880be14ab06fac7f05fb2708491cb8b7e03f8656aae0d74538d732e31ffd917 -DIST qtsensors-everywhere-src-6.6.2.tar.xz 1494024 BLAKE2B 4f3fb8d79dc1c7c429e0034fe4622e2327eee648b0c2736b4d68dc205bb94b240555e6b40c0290bb62a0eb95258854df46ed5e42477f888d7063ed5659aa1377 SHA512 9b64605f5a6dca205249480f3dfbc8f1ff247ad1acc6468417bd25a91c216a8d99ee608e68ba1b5aa39c659bb5027e7abeccddce772d10109d33877626228a3d +DIST qtsensors-everywhere-opensource-src-5.15.14.tar.xz 2051164 BLAKE2B 100f6e6c11b4ab9f25753b2f40c25920993e2b3b14173d36da1ec6fab0ee47e4bf29c44d45d6bfda431d95d62514aaa4bf7db0d2504982f11a469beda65341c7 SHA512 777882f3bf3ddbfe053132f123c14590538fdf483479877779cfdd3dc242021d86aedc6484a453b67282f1ba4447c73e4f7a04bf3d4b741789b37e646ab67f35 +DIST qtsensors-everywhere-src-6.7.2.tar.xz 1497432 BLAKE2B 6bec19a047e8331cc3b7a6f8f3965f4dce0435a57374fb28bb38651dbb6e758727e5e2116d38f2ee6ebb3ca82f935ca9103b1a928514bdb714a0e770751e2c65 SHA512 fcc437407191ea8d56f54bdbef07d0c25f15e1eefa74f5bb2c3a49af4418fb75cd8f7a16a9afc9efcba7e14ed842ca6bddeff6225949e1d193bb6e8ff55fe565 diff --git a/dev-qt/qtsensors/qtsensors-5.15.12.ebuild b/dev-qt/qtsensors/qtsensors-5.15.14.ebuild index 89e803fd2176..89e803fd2176 100644 --- a/dev-qt/qtsensors/qtsensors-5.15.12.ebuild +++ b/dev-qt/qtsensors/qtsensors-5.15.14.ebuild diff --git a/dev-qt/qtsensors/qtsensors-6.6.9999.ebuild b/dev-qt/qtsensors/qtsensors-6.7.2.ebuild index 10bdcfe73164..d1c5cf9d6455 100644 --- a/dev-qt/qtsensors/qtsensors-6.6.9999.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 ~arm64 ~loong" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi IUSE="qml" diff --git a/dev-qt/qtsensors/qtsensors-6.7.9999.ebuild b/dev-qt/qtsensors/qtsensors-6.7.9999.ebuild index 10bdcfe73164..5a576fcfd7cc 100644 --- a/dev-qt/qtsensors/qtsensors-6.7.9999.ebuild +++ b/dev-qt/qtsensors/qtsensors-6.7.9999.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 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" fi IUSE="qml" diff --git a/dev-qt/qtsensors/qtsensors-6.6.2.ebuild b/dev-qt/qtsensors/qtsensors-6.8.9999.ebuild index edef3f77dfbd..5a576fcfd7cc 100644 --- a/dev-qt/qtsensors/qtsensors-6.6.2.ebuild +++ b/dev-qt/qtsensors/qtsensors-6.8.9999.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 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" fi IUSE="qml" diff --git a/dev-qt/qtsensors/qtsensors-6.9999.ebuild b/dev-qt/qtsensors/qtsensors-6.9999.ebuild index 10bdcfe73164..5a576fcfd7cc 100644 --- a/dev-qt/qtsensors/qtsensors-6.9999.ebuild +++ b/dev-qt/qtsensors/qtsensors-6.9999.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 ~arm64 ~loong" + 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 906d81e979f4..17eb43ff0ad9 100644 --- a/dev-qt/qtserialbus/Manifest +++ b/dev-qt/qtserialbus/Manifest @@ -1 +1,2 @@ -DIST qtserialbus-everywhere-opensource-src-5.15.12.tar.xz 359492 BLAKE2B b27e5e26e7c881602dfcd6daf287ae3d7f52011abe78303e51119242e550d73c8d11c259ddd96f067aebb6d19602e996ddebe46fe7ab87fc0938a167e2e20caa SHA512 d6571b6d54fe91ff945c0bd51bcecb97ae3d001ee3e1f30deb042a52bab17ad7e059ae943c0a3f2a4d6e7a952cb3f68b71275cef0fda1875fd233c8dc17d0d3c +DIST qtserialbus-everywhere-opensource-src-5.15.14.tar.xz 350748 BLAKE2B 88571e730c6a81d8db8be02550b0abc1f72bf8c40a5f0616cf879f17043b775f992d19d1b2429acfa0cf86634f9430d7b16f812e9b436f7f1403059298274057 SHA512 ac30e163fd2ef7a3d6dbb8f8f3cac06d68f915d29c87d1d49be541c38c3dd09873d89525508062b7cf6dc17d750167e0cc13bb48718f2a42b80b2e7f04e7633d +DIST qtserialbus-everywhere-src-6.7.2.tar.xz 547596 BLAKE2B de990e57a8139e540d906ba11a4a396db8bf5c6f719e366585251e513364cbd531bf8a31638b29aec0bc8fb5c2208745395de07569a5358c918b0c95c40f1656 SHA512 ba4d8c698e68508080f851d96428908b83f3d2f5d36dbcb00586567beb3001a8ca3f1d79fd9895aefb32c7d1a8400024e43cee2cdd4f427e80d47949593a3055 diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.12.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.14.ebuild index 13855b803b1e..13855b803b1e 100644 --- a/dev-qt/qtserialbus/qtserialbus-5.15.12.ebuild +++ b/dev-qt/qtserialbus/qtserialbus-5.15.14.ebuild diff --git a/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild new file mode 100644 index 000000000000..f545d9e396f3 --- /dev/null +++ b/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild @@ -0,0 +1,38 @@ +# 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.9999.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.9999.ebuild new file mode 100644 index 000000000000..7f316fa23bbc --- /dev/null +++ b/dev-qt/qtserialbus/qtserialbus-6.7.9999.ebuild @@ -0,0 +1,38 @@ +# 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.8.9999.ebuild b/dev-qt/qtserialbus/qtserialbus-6.8.9999.ebuild new file mode 100644 index 000000000000..7f316fa23bbc --- /dev/null +++ b/dev-qt/qtserialbus/qtserialbus-6.8.9999.ebuild @@ -0,0 +1,38 @@ +# 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.9999.ebuild b/dev-qt/qtserialbus/qtserialbus-6.9999.ebuild new file mode 100644 index 000000000000..7f316fa23bbc --- /dev/null +++ b/dev-qt/qtserialbus/qtserialbus-6.9999.ebuild @@ -0,0 +1,38 @@ +# 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/qtserialport/Manifest b/dev-qt/qtserialport/Manifest index 9e485f53c4d3..96fa5794361f 100644 --- a/dev-qt/qtserialport/Manifest +++ b/dev-qt/qtserialport/Manifest @@ -1,2 +1,2 @@ -DIST qtserialport-everywhere-opensource-src-5.15.12.tar.xz 323500 BLAKE2B 31343804f3e523b8200b6605b4fa43ef65e76f5d67999d57249b4f9ec5592c3a4dc5ca4e7ab013c1c1bff2732e5a89dc87e34ef0c874a9e50a2dc2c6aa5f455b SHA512 f27adbc07a3c3e946761e033105377ae26ac48d2c796f281947e950de1b7b9fb5a25627fd1a2c30cccd2de19181867cfd7d4a740a3318348e57885b5d96c7192 -DIST qtserialport-everywhere-src-6.6.2.tar.xz 270564 BLAKE2B 15176bb0a399cc645f2187a14ab82c8d3d503589ab796565b6b1c45441a2d8dd576bebcad820aae048ad713129129237ffd765379728ab07c203bbf08334e0a4 SHA512 1925c1a319ce734c9b9d52b7a69cb92ac593d29bf86c89472d9e2df73eb2e6c8bbd148e511f9014680c3a05b9f2f92a7e16f83712022570b9cb3fdc2d67a07db +DIST qtserialport-everywhere-opensource-src-5.15.14.tar.xz 315004 BLAKE2B 51f7353d373d258e2e9ed7fb5d6831cea66e9c29b2a632a67aa66936ec9b43a71792094e2fc5be6621edae6e0bc117282a3c278aad0446d391720859c15fa213 SHA512 64980191cf8bc27a7a28bc8d373f1ee4d16bec5ab6b1e3296d4bc245498bb59d29bec49ebe609f8242bffb205f923acff7ab736f80d01d7689032896ee8f9bad +DIST qtserialport-everywhere-src-6.7.2.tar.xz 271320 BLAKE2B 14283d2a7452a828e5b238003ed1762d0c502b9abab9d42af4f56b5aad29d5f26a263fc8f9d68988b2d4b038c1169b0a8999cc5aacb2af67a43a643103f40700 SHA512 faedff39212a98e6b3d96e0fb530c6b63c5fec519f5226b015771b8c5122528c8b087b6ccf74aed42ee87f61ffe324ac5c87152dad282395013a84e3f5cb2d3f diff --git a/dev-qt/qtserialport/qtserialport-5.15.12.ebuild b/dev-qt/qtserialport/qtserialport-5.15.14.ebuild index 14cd2075f774..14cd2075f774 100644 --- a/dev-qt/qtserialport/qtserialport-5.15.12.ebuild +++ b/dev-qt/qtserialport/qtserialport-5.15.14.ebuild diff --git a/dev-qt/qtserialport/qtserialport-6.6.2.ebuild b/dev-qt/qtserialport/qtserialport-6.7.2.ebuild index 55501d8695b0..050871411f2f 100644 --- a/dev-qt/qtserialport/qtserialport-6.6.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/qtserialport/qtserialport-6.6.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.8.9999.ebuild index 95b360fac6cf..95b360fac6cf 100644 --- a/dev-qt/qtserialport/qtserialport-6.6.9999.ebuild +++ b/dev-qt/qtserialport/qtserialport-6.8.9999.ebuild diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest index 49b95c5279f9..1a86c371abb2 100644 --- a/dev-qt/qtshadertools/Manifest +++ b/dev-qt/qtshadertools/Manifest @@ -1 +1 @@ -DIST qtshadertools-everywhere-src-6.6.2.tar.xz 1054668 BLAKE2B 7515c717799fe8ddced213da4968e49647065591e70acee86959fed4dba7e3eb090f122ec6139fe7f043a238b601d70ed3fb767603096eca83772436303e51e1 SHA512 f016b55d229bf331141bf439de2b094080c601efca524f2f904e8767e6c3d82f097e62e671014e44680bd63c966509eb45f55d1b661b56ed65b13f987e9bb9c5 +DIST qtshadertools-everywhere-src-6.7.2.tar.xz 1111256 BLAKE2B a0bdf6f27882a903819c580c37a3dc7f361101345b66542dda162e99adf9a62983bfa7321881d6dac7e662178a125674606b08973bd55b77743fee19cbad8737 SHA512 b33e55f81d6878518dfe05db8ea3b319614dda10e215784496a61daaf8415fdeed1a3d802efc3cddc4fbca6c9894faf13475b35b3bb7d9a215b91238f9b38233 diff --git a/dev-qt/qtshadertools/qtshadertools-6.6.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild index 27d237185c9e..e3cbab00e5f0 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.6.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/qtshadertools/qtshadertools-6.6.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild index 68dae044e31f..68dae044e31f 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.6.9999.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest index 0f64fbd25d8e..ae3370437025 100644 --- a/dev-qt/qtspeech/Manifest +++ b/dev-qt/qtspeech/Manifest @@ -1,3 +1,3 @@ -DIST qtspeech-5.15.12-gentoo-kde-1.tar.xz 1044 BLAKE2B 680ec75681359279fab886816c078b3178e6b29af257d5163b9f5794e5ee90ad186d13029ff9a806e55f5c28d66b8e8870b15d531af8067fbed4ac86646bb00b SHA512 7773439748b85d2dd0c4d21d9e1a5e574eae848087d25b89c2cb07240021d73ea6fe62627ab061a049f7062a4b97a4316871873decc2abe0ea2cdad29ed88b1d -DIST qtspeech-everywhere-opensource-src-5.15.12.tar.xz 104816 BLAKE2B 8a64688c8ee24788498ad8eb3827cf55d4ba124230ef5f451cbf7720808d6586e48e5f0344b8546fceaf7fe048243b940f8c0bd6b44fcd5d303a1749c380ca7c SHA512 960eb661cfeb8a4fc01337ac998bc8ce101da73782155e75a7b128987d9809fa1e4cc6fee30cfa3cbd39f7fff9bbe7e49e55430681ac6582e7c8110242d7183a -DIST qtspeech-everywhere-src-6.6.2.tar.xz 262008 BLAKE2B 6d9ae5b42f96fa02a15ac82e9e1c6a378c3b0ceccd278af9ef99346ad79a256e41d1d2ae10cfef75f311bdfad457271357b09fd067ddc902bff3e4ee31eda12e SHA512 e43793931b81bb86cc074a2153ec0160991c86bc255ea1b11e5b4a272b8d067fcfc6788261d4b2f6f7630eadbcab7be23249b980d2792cb9a109137af614601e +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.2.tar.xz 262360 BLAKE2B 0faceb7e8425ccb03574fa6db5a9f8dab967197341fce497fc2600a6200d417dba8b83a6a7616fed7cbce3d2c34b48b77e37814518996f917aeadc7ca628ebff SHA512 f6e598834ab455c9feb5836b0add05802261210be088f7860b746a214a5be7d332a43d7c09bd03eef48d362165f2739b858e966249c061c9ef537346453bd588 diff --git a/dev-qt/qtspeech/qtspeech-5.15.12.ebuild b/dev-qt/qtspeech/qtspeech-5.15.14.ebuild index 07a269a79b0d..07a269a79b0d 100644 --- a/dev-qt/qtspeech/qtspeech-5.15.12.ebuild +++ b/dev-qt/qtspeech/qtspeech-5.15.14.ebuild diff --git a/dev-qt/qtspeech/qtspeech-6.6.2.ebuild b/dev-qt/qtspeech/qtspeech-6.7.2.ebuild index 9ee33d282179..cbeae1e0894f 100644 --- a/dev-qt/qtspeech/qtspeech-6.6.2.ebuild +++ b/dev-qt/qtspeech/qtspeech-6.7.2.ebuild @@ -3,26 +3,23 @@ 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 ~arm64 ~loong" + 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 )" -# TODO: tests are known failing with clang and needs looking into, albeit -# it is still usable at runtime save for applications segfaulting on exit -# similarly to QTBUG-90626 (not that this has in-tree revdeps as of writing -# of this). Restricting because also seen this result in hanging. Note that -# qtspeech:6 is still somewhat new (started in 6.4.0), and should review -# status on new major versions. -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6 ~dev-qt/qtmultimedia-${PV}:6 diff --git a/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild index 867d3ddc19b8..b668e25bbabd 100644 --- a/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild +++ b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild @@ -3,26 +3,23 @@ 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 ~arm64 ~loong" + 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 )" -# TODO: tests are known failing with clang and needs looking into, albeit -# it is still usable at runtime save for applications segfaulting on exit -# similarly to QTBUG-90626 (not that this has in-tree revdeps as of writing -# of this). Restricting because also seen this result in hanging. Note that -# qtspeech:6 is still somewhat new (started in 6.4.0), and should review -# status on new major versions. -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6 ~dev-qt/qtmultimedia-${PV}:6 diff --git a/dev-qt/qtspeech/qtspeech-6.6.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild index 867d3ddc19b8..b668e25bbabd 100644 --- a/dev-qt/qtspeech/qtspeech-6.6.9999.ebuild +++ b/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild @@ -3,26 +3,23 @@ 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 ~arm64 ~loong" + 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 )" -# TODO: tests are known failing with clang and needs looking into, albeit -# it is still usable at runtime save for applications segfaulting on exit -# similarly to QTBUG-90626 (not that this has in-tree revdeps as of writing -# of this). Restricting because also seen this result in hanging. Note that -# qtspeech:6 is still somewhat new (started in 6.4.0), and should review -# status on new major versions. -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6 ~dev-qt/qtmultimedia-${PV}:6 diff --git a/dev-qt/qtspeech/qtspeech-6.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.9999.ebuild index 867d3ddc19b8..b668e25bbabd 100644 --- a/dev-qt/qtspeech/qtspeech-6.9999.ebuild +++ b/dev-qt/qtspeech/qtspeech-6.9999.ebuild @@ -3,26 +3,23 @@ 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 ~arm64 ~loong" + 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 )" -# TODO: tests are known failing with clang and needs looking into, albeit -# it is still usable at runtime save for applications segfaulting on exit -# similarly to QTBUG-90626 (not that this has in-tree revdeps as of writing -# of this). Restricting because also seen this result in hanging. Note that -# qtspeech:6 is still somewhat new (started in 6.4.0), and should review -# status on new major versions. -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6 ~dev-qt/qtmultimedia-${PV}:6 diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index bf5834e3f44a..93ac206e3d15 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qtsql/qtsql-5.15.12.ebuild b/dev-qt/qtsql/qtsql-5.15.14.ebuild index 9c8476b0b1ae..9c8476b0b1ae 100644 --- a/dev-qt/qtsql/qtsql-5.15.12.ebuild +++ b/dev-qt/qtsql/qtsql-5.15.14.ebuild diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index bff965935173..7267001f2af0 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,3 +1,3 @@ -DIST qtsvg-5.15.12-gentoo-kde-1.tar.xz 3552 BLAKE2B 24588da0f0490f59663e978bd6fa89790b335d1c6747a40e60683913468a6415d12eab992b619aaed98dd0823346422912a27cab1081773c53a5d6219f047a1e SHA512 7eb3d304cfb6d5952a657f8e2d51ebdf75b3941487b909f46515258903c09197e06250fdf4608e41c8bbd32baa3a0014226a1213c4f16b0508fad7cb0bede19d -DIST qtsvg-everywhere-opensource-src-5.15.12.tar.xz 1890112 BLAKE2B 727ee7fc593bf9b080b4fb3ebeb117f6b0390a724f98587e8387f2e59d72facec6aa6bc519f8b1cb9c54e3a5ad1d48eaf8bc17840d271641f25240d6648439dc SHA512 c68fa1bc8e3dc782a70049aeddca62731b48ff7de972d6e1a245b06d23c0795fd6a3e3538aa39a92016d5c15a068f7b8ae1d3b6bd950fb7857a7aa2ed556f857 -DIST qtsvg-everywhere-src-6.6.2.tar.xz 1643056 BLAKE2B 3294178addb3a7096294065b9326ca22b3e25ac3cef62533ac949b68e67aaaf9320bdc389453c8e97ac9c03f88cbd894088402bb21f9280d7bbff3ee0ba0b6ee SHA512 cdfc3fb9aa00eaedd232c2b93482154f97e4e37d48db62b91142ae0dcc9d03bb9aa07cdfaa77e2973e6bfb5fdcdbf4365e6b9c855ffc82b3542d4cd07c1857a7 +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.2.tar.xz 1791468 BLAKE2B e72cf5b153141942c7aa92f7433b19317549deacc5d9bf981dd41f80ce25b0bc60c81185eb9134146aa93a6ce830aa3afcaced9e92902b9aa8c4a321718a5f86 SHA512 5a4209134afd3265d4b4b02a388a3078f2f915613c83e8a4aafd292e6b49d77019597f820468c8a9fe6c046c64e6890ac94ebc52e6b321a9b57a5ef3b51552e4 diff --git a/dev-qt/qtsvg/qtsvg-5.15.12.ebuild b/dev-qt/qtsvg/qtsvg-5.15.14.ebuild index dd66d0447f8c..dd66d0447f8c 100644 --- a/dev-qt/qtsvg/qtsvg-5.15.12.ebuild +++ b/dev-qt/qtsvg/qtsvg-5.15.14.ebuild diff --git a/dev-qt/qtsvg/qtsvg-6.6.2.ebuild b/dev-qt/qtsvg/qtsvg-6.6.2.ebuild deleted file mode 100644 index f98534a89017..000000000000 --- a/dev-qt/qtsvg/qtsvg-6.6.2.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="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}" diff --git a/dev-qt/qtsvg/qtsvg-6.7.2.ebuild b/dev-qt/qtsvg/qtsvg-6.7.2.ebuild new file mode 100644 index 000000000000..a715121ada1c --- /dev/null +++ b/dev-qt/qtsvg/qtsvg-6.7.2.ebuild @@ -0,0 +1,26 @@ +# 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.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild index 566af04442ed..e7ea7c613b25 100644 --- a/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit qt6-build +inherit qt6-build toolchain-funcs DESCRIPTION="SVG rendering library for the Qt6 framework" @@ -16,3 +16,11 @@ RDEPEND=" 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.6.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.8.9999.ebuild index 566af04442ed..e7ea7c613b25 100644 --- a/dev-qt/qtsvg/qtsvg-6.6.9999.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.8.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit qt6-build +inherit qt6-build toolchain-funcs DESCRIPTION="SVG rendering library for the Qt6 framework" @@ -16,3 +16,11 @@ RDEPEND=" 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.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.9999.ebuild index 566af04442ed..e7ea7c613b25 100644 --- a/dev-qt/qtsvg/qtsvg-6.9999.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit qt6-build +inherit qt6-build toolchain-funcs DESCRIPTION="SVG rendering library for the Qt6 framework" @@ -16,3 +16,11 @@ RDEPEND=" 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/qttest/Manifest b/dev-qt/qttest/Manifest index bf5834e3f44a..93ac206e3d15 100644 --- a/dev-qt/qttest/Manifest +++ b/dev-qt/qttest/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qttest/qttest-5.15.12.ebuild b/dev-qt/qttest/qttest-5.15.14.ebuild index 4ffe5ec8e862..4ffe5ec8e862 100644 --- a/dev-qt/qttest/qttest-5.15.12.ebuild +++ b/dev-qt/qttest/qttest-5.15.14.ebuild diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index 135f5bcd15f7..28b66d153b03 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1 +1 @@ -DIST qttools-everywhere-src-6.6.2.tar.xz 8594492 BLAKE2B 17d4385df9c0a70e8c3c135bd56f835c80d98008694331a2c2e8381b1489aafd56ca140ad300d868bdf795742326771358fc18f9c4e27b9aceb937a59536ddd9 SHA512 bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90 +DIST qttools-everywhere-src-6.7.2.tar.xz 9019636 BLAKE2B c4324275adddefc2399ce4ff1305d285c9e4bc7fb6cebf6bd310573773ada5cf91f14561b855df685bdcce0a39897c3b9e0b62544083af2794d7eaaf35660146 SHA512 311467d0e6970711b4d984fe792d2b75609f38c04121073d5c3c34c682fcee89787f6982c886e62206a76b1f647de60e56510439b0288f8bd1ae21a2683a37cd diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml index 80f6a033c31d..b08d3bc7e49b 100644 --- a/dev-qt/qttools/metadata.xml +++ b/dev-qt/qttools/metadata.xml @@ -15,6 +15,7 @@ <flag name="qdbus">Build the Qt D-Bus Interface (D-Bus Viewer requires USE=widgets)</flag> <flag name="qdoc">Build Qt Documentation Generator</flag> <flag name="qml">Build QML/QtQuick bindings and imports</flag> + <flag name="qmlls">Build the QtHelp plugin for the QML language server</flag> <flag name="qtattributionsscanner">Build Qt Source Code Attribution Scanner</flag> <flag name="qtdiag">Build Qt Diag</flag> <flag name="qtplugininfo">Build Qt Plugin Info</flag> diff --git a/dev-qt/qttools/qttools-6.6.2.ebuild b/dev-qt/qttools/qttools-6.7.2.ebuild index 1b00112f08e6..ac30a31faddf 100644 --- a/dev-qt/qttools/qttools-6.6.2.ebuild +++ b/dev-qt/qttools/qttools-6.7.2.ebuild @@ -3,19 +3,25 @@ EAPI=8 -LLVM_COMPAT=( {15..18} ) +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" + 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 + +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 @@ -29,11 +35,6 @@ REQUIRED_USE=" qdoc? ( clang qml ) " -# behaves very badly when qttools is not already installed, also -# other more minor issues (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6[network,widgets?] assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) @@ -85,6 +86,8 @@ src_configure() { # 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 diff --git a/dev-qt/qttools/qttools-6.7.9999.ebuild b/dev-qt/qttools/qttools-6.7.9999.ebuild index da3b0ac4c251..fd8e80ea6380 100644 --- a/dev-qt/qttools/qttools-6.7.9999.ebuild +++ b/dev-qt/qttools/qttools-6.7.9999.ebuild @@ -5,6 +5,12 @@ 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" @@ -15,7 +21,7 @@ fi IUSE=" +assistant clang designer distancefieldgenerator gles2-only - +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner + +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 @@ -29,11 +35,6 @@ REQUIRED_USE=" qdoc? ( clang qml ) " -# behaves very badly when qttools is not already installed, also -# other more minor issues (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6[network,widgets?] assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) @@ -85,6 +86,8 @@ src_configure() { # 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 diff --git a/dev-qt/qttools/qttools-6.6.9999.ebuild b/dev-qt/qttools/qttools-6.8.9999.ebuild index 49dfe820f8ac..5ad1c0f2b81d 100644 --- a/dev-qt/qttools/qttools-6.6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.8.9999.ebuild @@ -3,8 +3,14 @@ EAPI=8 -LLVM_COMPAT=( {15..18} ) +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" @@ -14,9 +20,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +assistant clang designer distancefieldgenerator gles2-only - +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner - qtdiag qtplugininfo vulkan +widgets zstd + +assistant clang designer distancefieldgenerator gles2-only +linguist + opengl pixeltool +qdbus qdoc qml qmlls 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) @@ -27,20 +33,16 @@ REQUIRED_USE=" distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) qdoc? ( clang qml ) + qmlls? ( assistant qml ) " -# behaves very badly when qttools is not already installed, also -# other more minor issues (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -RESTRICT="test" - 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} + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= ') ) designer? ( @@ -49,6 +51,7 @@ RDEPEND=" ) qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) + qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] ) qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) " @@ -85,6 +88,13 @@ src_configure() { # 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) + + # USE=qmlls' help plugin may be temporary, upstream has plans to split + # QtHelp into another package so that qtdeclarative can depend on it + # without a circular dependency with qttools + $(cmake_use_find_package qmlls Qt6QmlLSPrivate) + + $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634) ) qt6-build_src_configure diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index da3b0ac4c251..5ad1c0f2b81d 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -5,6 +5,12 @@ 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" @@ -14,9 +20,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +assistant clang designer distancefieldgenerator gles2-only - +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner - qtdiag qtplugininfo vulkan +widgets zstd + +assistant clang designer distancefieldgenerator gles2-only +linguist + opengl pixeltool +qdbus qdoc qml qmlls 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) @@ -27,13 +33,9 @@ REQUIRED_USE=" distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) qdoc? ( clang qml ) + qmlls? ( assistant qml ) " -# behaves very badly when qttools is not already installed, also -# other more minor issues (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6[network,widgets?] assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) @@ -49,6 +51,7 @@ RDEPEND=" ) qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) + qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] ) qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) " @@ -85,6 +88,13 @@ src_configure() { # 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) + + # USE=qmlls' help plugin may be temporary, upstream has plans to split + # QtHelp into another package so that qtdeclarative can depend on it + # without a circular dependency with qttools + $(cmake_use_find_package qmlls Qt6QmlLSPrivate) + + $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634) ) qt6-build_src_configure diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest index e024fbb7fc55..64dae3c8e025 100644 --- a/dev-qt/qttranslations/Manifest +++ b/dev-qt/qttranslations/Manifest @@ -1,2 +1,2 @@ -DIST qttranslations-everywhere-opensource-src-5.15.12.tar.xz 1635924 BLAKE2B 0df216fb44e1831ee16f51473aa716fcb468ee441d5461735f8bf5401508f7a9b13c11952b1c7ab27b0ff2af425f53b1ddc0061ce1f7362a54fbc6be90ff5073 SHA512 675e0902bbd6a1f910ffc0473e1e865239cf820886fff9ccc3c5cf69f6a9af862fa1e44d86538f2884f1a34ab433dc2615707487b426d56742bd26f8f0d9924a -DIST qttranslations-everywhere-src-6.6.2.tar.xz 1472416 BLAKE2B 42b11dedfaf029c2daffe82cf394097ad813af1043fdded3e17f78243f188fcf5efa0a646a107ab4b3a9e7584cbd393bfbbaddf46ee435d88e59f02a8ef97223 SHA512 4df875fd0194d7a7f60459be9736202858465d1cdfe4f27a311139c9f12a3bd48d9a5b25277b2df9a7facfb61cea108750c78a0102e11b9a2caed55d629960bb +DIST qttranslations-everywhere-opensource-src-5.15.14.tar.xz 1626976 BLAKE2B 61263b9b28fb0d8feb715ebd7cfd85a7fb3e4a6a1e13841d5c4a38dfbf0a57cafa2484e8f4352e0ed16bf820153df0b4c192cf7e906fe29cb56c5de040368523 SHA512 bf41fea921151c10f78804e274919805ccee12c13c57fe50e8f6df863aa955e4a1aa939d23a7500cd3b5fe6aa5656b1a12628cdbed1e9c8dc1f126e2cf7d7176 +DIST qttranslations-everywhere-src-6.7.2.tar.xz 1547608 BLAKE2B 93d6dcd62a0dd4210be5d0f00957dd89d32d6362d8e3a1459eb819d32eeb05f354185df4ae8cc2fe705b0b964f73dbf01ed5b8d8fd89c679f99cb2953a065505 SHA512 a1937f117af71a6896ebaf89f05bcb9c61c34711105609ac80a0f85d96cd427786e902ae4e2dccc38060c4fd9161f42a0cfdd7e39e618e3996fbe1c7f05c84d9 diff --git a/dev-qt/qttranslations/qttranslations-5.15.12.ebuild b/dev-qt/qttranslations/qttranslations-5.15.14.ebuild index 06dc79da720c..06dc79da720c 100644 --- a/dev-qt/qttranslations/qttranslations-5.15.12.ebuild +++ b/dev-qt/qttranslations/qttranslations-5.15.14.ebuild diff --git a/dev-qt/qttranslations/qttranslations-6.6.2.ebuild b/dev-qt/qttranslations/qttranslations-6.7.2.ebuild index ac37347613a6..d15dc95a0d36 100644 --- a/dev-qt/qttranslations/qttranslations-6.6.2.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.7.2.ebuild @@ -3,12 +3,13 @@ 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" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi DEPEND="~dev-qt/qtbase-${PV}:6" diff --git a/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild index 816f945a5646..4957b280c2a2 100644 --- a/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild @@ -3,6 +3,7 @@ EAPI=8 +QT6_RESTRICT_TESTS=1 # no tests inherit qt6-build DESCRIPTION="Translation files for the Qt6 framework" diff --git a/dev-qt/qttranslations/qttranslations-6.6.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.8.9999.ebuild index 816f945a5646..4957b280c2a2 100644 --- a/dev-qt/qttranslations/qttranslations-6.6.9999.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.8.9999.ebuild @@ -3,6 +3,7 @@ EAPI=8 +QT6_RESTRICT_TESTS=1 # no tests inherit qt6-build DESCRIPTION="Translation files for the Qt6 framework" diff --git a/dev-qt/qttranslations/qttranslations-6.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.9999.ebuild index 816f945a5646..4957b280c2a2 100644 --- a/dev-qt/qttranslations/qttranslations-6.9999.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.9999.ebuild @@ -3,6 +3,7 @@ EAPI=8 +QT6_RESTRICT_TESTS=1 # no tests inherit qt6-build DESCRIPTION="Translation files for the Qt6 framework" diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest index a4615631c7f8..b8fee4e72ab2 100644 --- a/dev-qt/qtvirtualkeyboard/Manifest +++ b/dev-qt/qtvirtualkeyboard/Manifest @@ -1,2 +1,2 @@ -DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.12.tar.xz 10959460 BLAKE2B 8d64dc4b8c395f6a0092fb3763447416fe069f1fe6611146bcece83a72983f4cee49400af833aca39e2805b9277d7ec37fa20e31e522832b61f002d977dbfebd SHA512 17c63ea6287f7dbc84c82762ea43da9fbb4d1c7281a4e81971c10eacfbfe7293a855dde35a37ed9c8cf5ccc289a0e1d0a0c970e6908cea5cae15f149b9f5e3c4 -DIST qtvirtualkeyboard-everywhere-src-6.6.2.tar.xz 3723036 BLAKE2B e459bbdd195a824df44fdc72599dd04181cdeaa0ec2849fb75b9ff3ee7b4f86317b64df364c6883181397b5a1e09091966be3b7cfd29b2226956e799ddf7237b SHA512 bafff245ca6340e57a7abf312369ad2196beb85fd6dee4920e0cd5dc08f35f1f1ae3f861e6f3ac8766ef4e1059cca34ae9fc15a4eca806e7b5c7a9319e56bf2c +DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.14.tar.xz 10952936 BLAKE2B 258584cfe09100fa35b8b6293a6fb29f7d7631a7ca8e3b27d121bfa8a86e96c5a346dae1aed3aca6d80501210f5cc594f1c133adc41f12dcdfde6d12d2f91a0c SHA512 d6ff2770282e460a8d9fff3746225918cb21c65ef0d0d89e1c6876428ca1e860ecf45b44d57c9ef6e9a85cb050a4a67ecc1b20ae5c5be0a37d8b73ca439587c3 +DIST qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz 3722296 BLAKE2B 316ee5e2204ebabd97c0d6ceb8bd9775bc456eb404f6ffee43a163823c43d86a94e900a06d8a1124506385aa8b17d67efd70caec64cded9dcd747d667186c9fd SHA512 016400a65e14a5ec960f20ecf6b2b7c32fa0c67d530c5046b423633b02efce200e0967642a072ff825c54c334dfe45be3e569c16d641a735f181d233fa414782 diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.12.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.14.ebuild index 4980321fc38e..051b615e1141 100644 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.12.ebuild +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.14.ebuild @@ -4,7 +4,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86" fi inherit qt5-build diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.6.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.2.ebuild index 4da95f48bdd5..8c917e41434e 100644 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.6.9999.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 ~loong" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" fi IUSE="+spell" @@ -31,10 +31,15 @@ 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" - local CMAKE_SKIP_TESTS=( + CMAKE_SKIP_TESTS+=( tst_inputpanel tst_inputpanelcontrols2 ) @@ -42,6 +47,5 @@ src_test() { einfo "tst_inputpanel can take >5mins, not known to actually hang" fi - # tst_layoutfilesystem seems to fail randomly without -j1 - qt6-build_src_test -j1 + qt6-build_src_test } diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild index 4da95f48bdd5..4639b2cf069d 100644 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.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 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi IUSE="+spell" @@ -31,10 +31,15 @@ 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" - local CMAKE_SKIP_TESTS=( + CMAKE_SKIP_TESTS+=( tst_inputpanel tst_inputpanelcontrols2 ) @@ -42,6 +47,5 @@ src_test() { einfo "tst_inputpanel can take >5mins, not known to actually hang" fi - # tst_layoutfilesystem seems to fail randomly without -j1 - qt6-build_src_test -j1 + qt6-build_src_test } diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.6.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.8.9999.ebuild index b0f29270f97d..4639b2cf069d 100644 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.6.2.ebuild +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.8.9999.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 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi IUSE="+spell" @@ -31,10 +31,15 @@ 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" - local CMAKE_SKIP_TESTS=( + CMAKE_SKIP_TESTS+=( tst_inputpanel tst_inputpanelcontrols2 ) @@ -42,6 +47,5 @@ src_test() { einfo "tst_inputpanel can take >5mins, not known to actually hang" fi - # tst_layoutfilesystem seems to fail randomly without -j1 - qt6-build_src_test -j1 + qt6-build_src_test } diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild index 4da95f48bdd5..4639b2cf069d 100644 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.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 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi IUSE="+spell" @@ -31,10 +31,15 @@ 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" - local CMAKE_SKIP_TESTS=( + CMAKE_SKIP_TESTS+=( tst_inputpanel tst_inputpanelcontrols2 ) @@ -42,6 +47,5 @@ src_test() { einfo "tst_inputpanel can take >5mins, not known to actually hang" fi - # tst_layoutfilesystem seems to fail randomly without -j1 - qt6-build_src_test -j1 + qt6-build_src_test } diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 0a6befbb334b..28d50801c143 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,3 +1,3 @@ -DIST qtwayland-5.15.12-gentoo-kde-1.tar.xz 48548 BLAKE2B 706547b35251116550b7d838df489f770a58140b2ece34e22cf5cd13929fa801d9a057a38f66a34c47321e1c0958049774928a68f859082ad3664acee0f1bb73 SHA512 756edb0657580c3d65d6e4bb74e3ab31c326f2f25bf501c2761e8b3e538287792955c91c0e57e32d8a04c31577546481673bdd14f1abdc2aa28513edba3a670e -DIST qtwayland-everywhere-opensource-src-5.15.12.tar.xz 569180 BLAKE2B 456b02d061ef6c57237463dd7b8387e4c6353648af0475a6ff6036ab2438417ecd3c60a8f3429aa52a98e9d213c0097fa3189602657611ae3657a2a520eb8c71 SHA512 acd78018665db3d0d77a84bb80ce7dbb65a33e0e813c3308e09a27195df204029b5e580f353eae2536e6fdde249aa34411e37f4f1663f7645448d96c9df67a66 -DIST qtwayland-everywhere-src-6.6.2.tar.xz 1118996 BLAKE2B db54b7708f01a7e4e59561eb209d9c0cd79400ec477603d826061f3c2cf6683dccbbb48e73dc7b5ebe674ef7c5b438fd75eccbd4bab9191219598f526e6b395f SHA512 ed5539ac9515ba93822ee1dfdedd3ece46a51c50b23efd0fb90ead2728b651c41bec42a6e2e2caf72bda0f274940e9f00049bae42c1315e0226e4a42c708f664 +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.2.tar.xz 1123220 BLAKE2B 70c2d8942afc4e1629d2ef34b6c062ecb5800185bb37e150c1d66a5216606028d2f59668991bddb5036572c962e92c3658d336167a7f9ffbf3d2f4d609a771f9 SHA512 2cd4f45f05ae60bc7f82b94f2e9c217ee4b8322f60381e1b079b90e0687e51cfbeb10b5dd724e1cca7e422b1b101d2b91c0ee47b1a732411cef330fb052c97c2 diff --git a/dev-qt/qtwayland/files/qtwayland-6.6.2-nvidia-threaded-gl.patch b/dev-qt/qtwayland/files/qtwayland-6.6.2-nvidia-threaded-gl.patch deleted file mode 100644 index f7f7607024c5..000000000000 --- a/dev-qt/qtwayland/files/qtwayland-6.6.2-nvidia-threaded-gl.patch +++ /dev/null @@ -1,30 +0,0 @@ -Backport from 6.6 branch which failed to make it in 6.6.2. - -https://bugreports.qt.io/browse/QTBUG-95817 -https://codereview.qt-project.org/c/qt/qtwayland/+/536732 -https://github.com/qt/qtwayland/commit/e4156bad6398dcbe8740041148d95ee9ed437d8b -From: David Redondo <qt@david-redondo.de> -Date: Wed, 31 Jan 2024 09:01:48 +0100 -Subject: [PATCH] client: Disable threaded GL on desktop NVIDIA - -Otherwise QtQuick windows freeze when resized. -In order to still use threaded rendering on -embedded platforms where resizing is not required -we check if XDG_CURRENT_DESKTOP which should be -set by desktop environments. ---- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp -+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp -@@ -92,6 +92,13 @@ void QWaylandEglClientBufferIntegration::initialize(QWaylandDisplay *display) - break; - } - } -+ -+ // On desktop NVIDIA resizing QtQuick freezes them when using threaded rendering QTBUG-95817 -+ // In order to support threaded rendering on embedded platforms where resizing is not needed -+ // we check if XDG_CURRENT_DESKTOP is set which desktop environments should set -+ if (qstrcmp(vendor, "NVIDIA") == 0 && qEnvironmentVariableIsSet("XDG_CURRENT_DESKTOP")) { -+ m_supportsThreading = false; -+ } - } - - bool QWaylandEglClientBufferIntegration::isValid() const 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/metadata.xml b/dev-qt/qtwayland/metadata.xml index 1509a2e738a9..69ca9f641c1c 100644 --- a/dev-qt/qtwayland/metadata.xml +++ b/dev-qt/qtwayland/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="compositor">Enable support for the wayland compositor / server APIs</flag> + <flag name="gnome">Build the GNOME-like decoration plugin (loaded by default with GNOME)</flag> <flag name="qml">Build QML/QtQuick bindings and imports</flag> <flag name="vulkan">Enable support for Vulkan-based server buffer integration</flag> </use> diff --git a/dev-qt/qtwayland/qtwayland-5.15.12-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.14.ebuild index 6a87c8a1a4e7..6a87c8a1a4e7 100644 --- a/dev-qt/qtwayland/qtwayland-5.15.12-r1.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15.14.ebuild diff --git a/dev-qt/qtwayland/qtwayland-6.6.2.ebuild b/dev-qt/qtwayland/qtwayland-6.7.2-r1.ebuild index 38aa148dcb8b..359827ec4690 100644 --- a/dev-qt/qtwayland/qtwayland-6.6.2.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.7.2-r1.ebuild @@ -8,14 +8,14 @@ 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="compositor qml vulkan" +IUSE="accessibility compositor qml vulkan" RDEPEND=" dev-libs/wayland - ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=] + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( @@ -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) @@ -35,10 +39,12 @@ CMAKE_SKIP_TESTS=( # needs a compositor/opengl, skip the extra trouble tst_surface tst_xdgdecorationv1 -) - -PATCHES=( - "${FILESDIR}"/${P}-nvidia-threaded-gl.patch + # known failing with wayland-1.23.0 (or at least with offscreen), not + # believed to result in critical runtime issues so skip until this is + # looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379) + tst_client + tst_compositor + tst_scaling ) src_configure() { @@ -49,3 +55,11 @@ src_configure() { qt6-build_src_configure } + +src_test() { + # users' session setting may break tst_clientextension (bug #927030) + unset DESKTOP_SESSION XDG_CURRENT_DESKTOP + unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION + + qt6-build_src_test +} diff --git a/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild b/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild new file mode 100644 index 000000000000..b597f8cb8897 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild @@ -0,0 +1,68 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +fi + +IUSE="accessibility compositor qml vulkan" + +RDEPEND=" + dev-libs/wayland + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland] + media-libs/libglvnd + x11-libs/libxkbcommon + compositor? ( + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +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) + tst_seatv4 + # needs a compositor/opengl, skip the extra trouble + tst_surface + tst_xdgdecorationv1 + # known failing with wayland-1.23.0 (or at least with offscreen), not + # believed to result in critical runtime issues so skip until this is + # looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379) + tst_client + tst_compositor + tst_scaling +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Quick) + $(qt_feature compositor wayland_server) + ) + + qt6-build_src_configure +} + +src_test() { + # users' session setting may break tst_clientextension (bug #927030) + unset DESKTOP_SESSION XDG_CURRENT_DESKTOP + unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION + + qt6-build_src_test +} diff --git a/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild index 005196d57b76..11f94d7bd709 100644 --- a/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild @@ -11,11 +11,11 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="compositor qml vulkan" +IUSE="accessibility compositor qml vulkan" RDEPEND=" dev-libs/wayland - ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=,wayland] + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( @@ -35,6 +35,12 @@ CMAKE_SKIP_TESTS=( # needs a compositor/opengl, skip the extra trouble tst_surface tst_xdgdecorationv1 + # known failing with wayland-1.23.0 (or at least with offscreen), not + # believed to result in critical runtime issues so skip until this is + # looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379) + tst_client + tst_compositor + tst_scaling ) src_configure() { @@ -45,3 +51,11 @@ src_configure() { qt6-build_src_configure } + +src_test() { + # users' session setting may break tst_clientextension (bug #927030) + unset DESKTOP_SESSION XDG_CURRENT_DESKTOP + unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION + + qt6-build_src_test +} diff --git a/dev-qt/qtwayland/qtwayland-6.6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild index 03045fcde32a..cb3c8f5542c4 100644 --- a/dev-qt/qtwayland/qtwayland-6.6.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild @@ -11,16 +11,20 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="compositor qml vulkan" +IUSE="accessibility compositor gnome qml vulkan" RDEPEND=" dev-libs/wayland - ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=] + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) ) + gnome? ( + ~dev-qt/qtbase-${PV}:6[dbus] + ~dev-qt/qtsvg-${PV}:6 + ) " DEPEND=" ${RDEPEND} @@ -35,13 +39,28 @@ CMAKE_SKIP_TESTS=( # needs a compositor/opengl, skip the extra trouble tst_surface tst_xdgdecorationv1 + # known failing with wayland-1.23.0 (or at least with offscreen), not + # believed to result in critical runtime issues so skip until this is + # looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379) + tst_client + tst_compositor + tst_scaling ) src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt6Quick) $(qt_feature compositor wayland_server) + $(qt_feature gnome wayland_decoration_adwaita) ) qt6-build_src_configure } + +src_test() { + # users' session setting may break tst_clientextension (bug #927030) + unset DESKTOP_SESSION XDG_CURRENT_DESKTOP + unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION + + qt6-build_src_test +} diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild index 005196d57b76..cb3c8f5542c4 100644 --- a/dev-qt/qtwayland/qtwayland-6.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild @@ -11,16 +11,20 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="compositor qml vulkan" +IUSE="accessibility compositor gnome qml vulkan" RDEPEND=" dev-libs/wayland - ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=,wayland] + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) ) + gnome? ( + ~dev-qt/qtbase-${PV}:6[dbus] + ~dev-qt/qtsvg-${PV}:6 + ) " DEPEND=" ${RDEPEND} @@ -35,13 +39,28 @@ CMAKE_SKIP_TESTS=( # needs a compositor/opengl, skip the extra trouble tst_surface tst_xdgdecorationv1 + # known failing with wayland-1.23.0 (or at least with offscreen), not + # believed to result in critical runtime issues so skip until this is + # looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379) + tst_client + tst_compositor + tst_scaling ) src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt6Quick) $(qt_feature compositor wayland_server) + $(qt_feature gnome wayland_decoration_adwaita) ) qt6-build_src_configure } + +src_test() { + # users' session setting may break tst_clientextension (bug #927030) + unset DESKTOP_SESSION XDG_CURRENT_DESKTOP + unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION + + qt6-build_src_test +} diff --git a/dev-qt/qtwaylandscanner/Manifest b/dev-qt/qtwaylandscanner/Manifest index 5be41223a39e..2955623b9f07 100644 --- a/dev-qt/qtwaylandscanner/Manifest +++ b/dev-qt/qtwaylandscanner/Manifest @@ -1 +1 @@ -DIST qtwayland-everywhere-opensource-src-5.15.12.tar.xz 569180 BLAKE2B 456b02d061ef6c57237463dd7b8387e4c6353648af0475a6ff6036ab2438417ecd3c60a8f3429aa52a98e9d213c0097fa3189602657611ae3657a2a520eb8c71 SHA512 acd78018665db3d0d77a84bb80ce7dbb65a33e0e813c3308e09a27195df204029b5e580f353eae2536e6fdde249aa34411e37f4f1663f7645448d96c9df67a66 +DIST qtwayland-everywhere-opensource-src-5.15.14.tar.xz 560916 BLAKE2B a5edb21446348f20e6f65736b402c3075a4bde0d7fa02c24cbfc5de65739ca8d7ac2186bd17a995bfb3de23106e696e2b1321dc3ae401984bdafaa3479c9aa1e SHA512 9e8add52353f7a146759511c49c001cd76a56790a81af5222f6f2d3d1a2f1ee9cc62048c72efe69708eb3444c6115272d4af8d738df7b1e1da959359d7420dbb diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.12.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.14.ebuild index 678752ce8612..678752ce8612 100644 --- a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.12.ebuild +++ b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.14.ebuild diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest index 2c716b3e4309..0db35d8390d7 100644 --- a/dev-qt/qtwebchannel/Manifest +++ b/dev-qt/qtwebchannel/Manifest @@ -1,3 +1,3 @@ -DIST qtwebchannel-5.15.12-gentoo-kde-1.tar.xz 5808 BLAKE2B be5029849561105842db546aff48433187c27b2e1026ec10260d2d414962282fffb4bf3237d89803c15e3ecdadb5b297ab2eced46bd2813475d5ab2bb4cb9252 SHA512 37e424daf4a7d21af48ae960248dd0284794f9279b4d322154cf0940b862659478937cef29e8412b6db11537526a47b91b261ff143f0a2a1d326ef1d96de6eb9 -DIST qtwebchannel-everywhere-opensource-src-5.15.12.tar.xz 211996 BLAKE2B f91d8a3f953173f0392177b945b19b85230b82d378897976d797d02555a894a203b8187f26ebb804658fee94d4ac154cd9b3af6450cc8941b561f55c743b5021 SHA512 8b4f3c787e88a68a9b850c7c700e37b491ff17435871223fd70373a532e4d8c6d809d4b8ca0036b68f99852dbd80e21e45aa2ee2d89efffab1182fdf792d0d59 -DIST qtwebchannel-everywhere-src-6.6.2.tar.xz 206440 BLAKE2B 0fb5f72cb515a2d51bc1fc610bac322def1f8a46e260ba93a164884b7b79fbf17fcc3a20784ff5848bd24d8c17cb7dae6f7dc8d6b05b48c26b7c59c3248d0c35 SHA512 5a56c88847dd107dae00ccc65d8e2410892ac7a64a71df0295007af9512ff1a05f05474b677f08c7f1c51512bd198a8aa612e6afe2e9c15e572d082952ad2644 +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.2.tar.xz 206584 BLAKE2B fb990da23a2228a49a5e4eb99d1c8085265b25e7371c3cafb565c3977772ac0a47bdc6cad7e4ea4493c4c25897e8ac4993e3718cb893fcc299f8e1c5b56c6fdf SHA512 6d9dae2925acfe560c2c1b4382d6e7ce7762f840e76b513f03f5e9e892fb4ad3fb0059ffef725210d88ee4210a8a09678af9b7d3dfbc6d7ff55f3e65396153dc diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.12.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.14.ebuild index 7b301c538628..7b301c538628 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-5.15.12.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.14.ebuild diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.6.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.2.ebuild index 29746c9175fe..3d70b781aaa8 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.6.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 ~arm64 ~loong" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi IUSE="qml" @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_configure() { - has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692 + 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.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild index 196c658b4733..e0cac52a6b5d 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt WebChannel" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi IUSE="qml" @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_configure() { - has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692 + 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.6.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.8.9999.ebuild index 196c658b4733..e0cac52a6b5d 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.6.9999.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.8.9999.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt WebChannel" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi IUSE="qml" @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_configure() { - has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692 + 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.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild index 196c658b4733..e0cac52a6b5d 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt WebChannel" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi IUSE="qml" @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_configure() { - has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692 + 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/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 59c73123ec26..b3f79b883766 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,7 +1,5 @@ -DIST qtwebengine-5.15-ffmpeg-ppc64le.tar.xz 12080 BLAKE2B cfab4f02b8fac8ae7585eda0539f8adf988413aa52503caca3a347a62f75584efb42bcfa4832aadfc51fb98073f4ed3ddfc9701caf570e7186e0e1357af9569f SHA512 e0275ac4eb8d113581fc4fdf42be831903496b6ed95dca5b3d88113107e5453ee8c40df0e2956dd4e343b08e09c57607b1b82a78bf77a780225ff0030a249cef -DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3 -DIST qtwebengine-5.15.12_p20240122.tar.xz 299226288 BLAKE2B a16a2f428c4a3e7c681e8a8631ddff135fdf1f802cba9e1c827cfec25e0e0dd0bc5c5308b7547b30009709974f7efa950cef1640a24dba4ebbf55def265c90f8 SHA512 31e26d7c76e50eb110d5cf31ea01b47693efca0dd0a6814c881491349b535b9b02c4ef50b45fc6a59e7b8955942a6cc28aa17a6730effdec640be032d14e4f75 -DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e -DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4 SHA512 33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1 -DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203 -DIST qtwebengine-everywhere-src-6.6.2.tar.xz 421147952 BLAKE2B a0317faf9ff2d81cd2418652c297821bd8451e0564b8b9af8cb005b0c96a4ec74305ff814c3ab355d84bbacaaccd9ebf6bf591e01b485e243cc485aedf3e6e5b SHA512 8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d +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-10.tar.xz 7940 BLAKE2B f3ed0e75731f29f37714ef7c0536f92a758bb1f204cf3b6aa3b9b32ab9baae27a7649d030bee5962964619692dd5888d089bf4437505d1c1c330cc4c05aca17e SHA512 db3a566a073daa34d678a06b51cf57e8818f2d42847dc9e606522040bbd3b75ae56fd41ce466880855cfdf558d680204dc5ccea8046749b18784e75aa12efe47 +DIST qtwebengine-6.8-patchset-2.tar.xz 7932 BLAKE2B 3642f619c66075e26703200818e833786a8686bf39258eee9bba95e234f79878f0b98680e8228a5b2cc39b02b0ecc36074ac96eb09f3bca145bb7aa9fd023310 SHA512 4a248d6e7bd052b5681a531fe503954aa519a8ed46cce2b3fafe8de603818f20e80a365e304f919817a6a0c12fdc517a0471f5c6dc499e648fd5405456c9fba3 +DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch new file mode 100644 index 000000000000..d17e4ae602f2 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch @@ -0,0 +1,102 @@ +Thanks to Arch Linux: +https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/blob/main/qt5-webengine-icu-75.patch?ref_type=heads + +diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn +index b511a58c5a8..abd78a74ead 100644 +--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn ++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn +@@ -566,7 +566,7 @@ config("compiler") { + # Override Chromium's default for projects that wish to stay on C++11. + cflags_cc += [ "-std=${standard_prefix}++11" ] + } else { +- cflags_cc += [ "-std=${standard_prefix}++14" ] ++ cflags_cc += [ "-std=${standard_prefix}++17" ] + } + } else if (!is_win && !is_nacl) { + if (target_os == "android") { +diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h +index f03ba1e4ab4..b1495f7ae74 100644 +--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h ++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h +@@ -195,7 +195,7 @@ NumPartitionPagesPerSuperPage() { + // + // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all + // platforms, as Chrome's requirement is C++14 as of 2020. +-#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__) ++#if 0 + static constexpr size_t kAlignment = + std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__); + #else +diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h +index 76e627d27a3..942435f44a0 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h ++++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H264_SPS_PARSER_H_ + + #include "absl/types/optional.h" ++#include <cstdint> + + namespace rtc { + class BitBuffer; +diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h +index d6c31b06887..d8852dfd186 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h ++++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H264_PPS_PARSER_H_ + + #include "absl/types/optional.h" ++#include <cstdint> + + namespace rtc { + class BitBuffer; +diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h +index 3b9971abae1..d4458038527 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h ++++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h +@@ -13,6 +13,7 @@ + + #include <array> + #include <vector> ++#include <memory> + + #include "absl/types/optional.h" + #include "api/array_view.h" +diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h +index 345e45ce127..e686e5d691a 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h ++++ b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h +@@ -12,6 +12,7 @@ + #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ + + #include <limits> ++#include <cstdint> + + #include "absl/types/optional.h" + +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc +index 8fcc799b795..bc69ddcf18c 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc +@@ -15,6 +15,7 @@ + #include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics.h" + #include "third_party/blink/renderer/core/page/scrolling/text_fragment_finder.h" + #include "third_party/blink/renderer/platform/text/text_boundaries.h" ++#include "absl/base/attributes.h" + + namespace blink { + +diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h +index df506f0fae6..1de105fed4a 100644 +--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h ++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h +@@ -180,7 +180,7 @@ + // absl::variant is a typedef of std::variant, use the feature macro + // ABSL_USES_STD_VARIANT. + +-#define ABSL_OPTION_USE_STD_VARIANT 2 ++#define ABSL_OPTION_USE_STD_VARIANT 0 + + + // ABSL_OPTION_USE_INLINE_NAMESPACE diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch deleted file mode 100644 index 4fb19ccdd2e5..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001 -From: q66 <daniel@octaforge.org> -Date: Sat, 18 Jan 2020 23:52:55 +0100 -Subject: [PATCH 1/3] Enable ppc64 builds - ---- - configure.pri | 1 + - mkspecs/features/functions.prf | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure.pri b/configure.pri -index 3a144e3f8..cabe8b24a 100644 ---- a/configure.pri 2021-02-24 10:45:58.000000000 +0100 -+++ - 2021-03-07 21:18:43.124754796 +0100 -@@ -144,6 +144,7 @@ - contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true) - contains(QT_ARCH, "mips"): return(true) - contains(QT_ARCH, "mips64"): return(true) -+ contains(QT_ARCH, "power64"): return(true) - qtLog("Architecture not supported.") - return(false) - } -diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf -index 512e2523b..e31123654 100644 ---- a/mkspecs/features/functions.prf 2021-02-24 10:45:58.000000000 +0100 -+++ - 2021-03-07 21:19:21.345036293 +0100 -@@ -107,6 +107,7 @@ - contains(qtArch, "mips"): return(mipsel) - contains(qtArch, "mips64"): return(mips64el) - contains(qtArch, "mips64el"): return(mips64el) -+ contains(qtArch, "power64"): return(ppc64) - return(unknown) - } - --- -2.26.0 - diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch new file mode 100644 index 000000000000..d8a9158c8a01 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch @@ -0,0 +1,41 @@ +Backport of [1] from 6.8/6.9 for [2]. + +[1] https://codereview.qt-project.org/c/qt/qtwebengine/+/569910 +[2] https://bugreports.qt.io/browse/QTBUG-113574 + +From 21a9add47def34322b799683e1e1daff88dc4a06 Mon Sep 17 00:00:00 2001 +From: David Edmundson <davidedmundson@kde.org> +Date: Wed, 19 Jun 2024 10:37:45 +0100 +Subject: [PATCH] Use device pixel ratio of the window rather than the screen + +Window device pixel ratio can differ from the screen depending on the +platform. The window is the more authorative source with new events in +Qt to support that. + +In Chromium the rendering is still based off a screen factor, but each +view will have a completely independent set of screen variables, so we +can adjust the screen to match our current view. + +Chromium itself also alters the screen scale factor on a per window +basis for their own native Wayland backend or if recording a window. +--- a/src/core/render_widget_host_view_qt.cpp ++++ b/src/core/render_widget_host_view_qt.cpp +@@ -875,4 +875,9 @@ + + display::ScreenInfos newScreenInfos = screenInfosFromQtForUpdate(window->screen()); ++ ++ // We always want to use the scale from our current window ++ // This screen information is stored on a per-view basis ++ auto &screen = newScreenInfos.mutable_current(); ++ screen.device_scale_factor = window->devicePixelRatio(); + if (screen_infos_ == newScreenInfos) + return false; +--- a/src/core/render_widget_host_view_qt_delegate_item.cpp ++++ b/src/core/render_widget_host_view_qt_delegate_item.cpp +@@ -346,4 +346,6 @@ + onHide(); + } ++ } else if (change == QQuickItem::ItemDevicePixelRatioHasChanged) { ++ m_client->visualPropertiesChanged(); + } + } diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml index b7754632ca20..026c10e856ad 100644 --- a/dev-qt/qtwebengine/metadata.xml +++ b/dev-qt/qtwebengine/metadata.xml @@ -11,6 +11,7 @@ <flag name="pdfium">Build the QtPdf module based on chromium's PDFium library</flag> <flag name="qml">Build QML/QtQuick bindings and imports</flag> <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag> + <flag name="webdriver">Build tool for automated testing (ChromeDriver equivalent)</flag> <flag name="widgets">Enable QtWidgets support</flag> </use> <upstream> diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild index 50fb9a051ea4..9eea881bc404 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild @@ -3,8 +3,8 @@ EAPI=8 -PATCHSET="${PN}-5.15.10_p20230815-patchset" -PYTHON_COMPAT=( python3_{10..11} ) +PATCHSET="${PN}-5.15.14_p20240510-patchset" +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs @@ -12,10 +12,10 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic HOMEPAGE="https://www.qt.io/" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm64 ~x86" if [[ ${PV} == ${QT5_PV}_p* ]]; then - SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" - S="${WORKDIR}/${P}" + SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.13_p20240510.tar.xz" + S="${WORKDIR}/${PN}-5.15.13_p20240510" QT5_BUILD_DIR="${S}_build" fi else @@ -27,13 +27,7 @@ else inherit git-r3 fi -# ppc64 patchset based on https://github.com/chromium-ppc64le releases -# ppc64 ffmpeg patchset backported from chromium 98 on https://ppa.quickbuild.io/raptor-engineering-public/chromium/ubuntu/pool/main/c/chromium/ -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz - ppc64? ( - https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15-ffmpeg-ppc64le.tar.xz - )" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets" REQUIRED_USE="designer? ( widgets )" @@ -96,17 +90,21 @@ DEPEND="${RDEPEND} media-libs/libglvnd " BDEPEND="${PYTHON_DEPS} - dev-util/gperf app-alternatives/ninja + $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') + dev-util/gperf dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex - ppc64? ( >=dev-build/gn-0.1807 ) " PATCHES=( "${WORKDIR}/${PATCHSET}" ) +python_check_deps() { + python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" +} + qtwebengine_check-reqs() { # bug #307861 eshopts_push -s extglob @@ -159,9 +157,6 @@ src_unpack() { } src_prepare() { - # upstreamed, but not spinning new patchset just yet - rm "${WORKDIR}"/${PATCHSET}/018-gcc13-includes.patch || die - if [[ ${PV} == ${QT5_PV}_p* ]]; then # This is made from git, and for some reason will fail w/o .git directories. mkdir -p .git src/3rdparty/chromium/.git || die @@ -182,6 +177,9 @@ src_prepare() { xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die if use system-icu; then + if has_version ">=dev-libs/icu-75.1"; then + eapply "${FILESDIR}/${PN}-5.15.14_p20240510-icu-75.patch" # too invasive to apply unconditionally + fi # Sanity check to ensure that bundled copy of ICU is not used. # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. @@ -208,32 +206,7 @@ src_prepare() { qt_use_disable_mod widgets widgets src/src.pro - if use ppc64; then - einfo "Patching for ppc64le and generating build files" - eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" - pushd src/3rdparty/chromium > /dev/null || die - eapply -p0 "${WORKDIR}/${PN}-ppc64le" - eapply -p1 "${WORKDIR}/${PN}-ffmpeg-ppc64le" - popd > /dev/null || die - fi - qt5-build_src_prepare - - # we need to generate ppc64 stuff because upstream does not ship it yet - if use ppc64; then - einfo "Generating ppc64le build files" - pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die - mkdir -vp source/config/linux/ppc64 || die - mkdir -p source/libvpx/test || die - touch source/libvpx/test/test.mk || die - # clang-format is used to re-format sources - # but we'd rather make it a no-op than introduce a clang dependency - # https://bugs.gentoo.org/849458 - clang-format() { : ; } - export -f clang-format || die - ./generate_gni.sh || die - popd >/dev/null || die - fi } src_configure() { @@ -244,6 +217,7 @@ src_configure() { -- -no-build-qtpdf -printing-and-pdf + --webengine-python-version=python3 -system-opus -system-webp $(qt_use alsa) diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild index bc443553d97b..558e4e9ca86c 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild @@ -3,30 +3,31 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +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.6-patchset-9.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm64" + KEYWORDS="amd64 arm64" fi IUSE=" - +alsa bindist custom-cflags designer geolocation +jumbo-build - kerberos opengl pdfium pulseaudio qml screencast +system-icu - vaapi vulkan +widgets + 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 @@ -35,7 +36,8 @@ RDEPEND=" dev-libs/libxslt dev-libs/nspr dev-libs/nss - ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?] + ~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 @@ -44,11 +46,13 @@ RDEPEND=" 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 @@ -58,6 +62,7 @@ RDEPEND=" x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst + x11-libs/libdrm x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile @@ -66,27 +71,22 @@ RDEPEND=" geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) screencast? ( dev-libs/glib:2 - media-libs/mesa[gbm(+)] media-video/pipewire:= - x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) - vaapi? ( - media-libs/libva:=[X] - media-libs/mesa[gbm(+)] - x11-libs/libdrm - ) + vaapi? ( media-libs/libva:=[X] ) !vaapi? ( media-libs/libvpx:= ) - widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) " 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? ( @@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch ) python_check_deps() { @@ -128,8 +129,8 @@ qtwebengine_check-reqs() { ewarn "If run into issues, please try disabling before reporting a bug." fi - local CHECKREQS_DISK_BUILD=7G - local CHECKREQS_DISK_USR=220M + 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 @@ -170,6 +171,7 @@ 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) @@ -211,9 +213,9 @@ src_configure() { # not necessary to pass these (default), but in case detection fails $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ - freetype glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libtiff libwebp \ - libxml minizip opus poppler snappy zlib) + 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 @@ -221,8 +223,10 @@ src_configure() { local mygnargs=( # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true + $(usev pulseaudio link_pulseaudio=true) + $(usev screencast rtc_link_pipewire=true) + # reduce default disk space usage + symbol_level=0 ) if use !custom-cflags; then @@ -240,6 +244,15 @@ src_configure() { 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" @@ -269,10 +282,16 @@ src_test() { 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 @@ -292,6 +311,10 @@ 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() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index db61cb1b8cff..73f482a28fcd 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -3,14 +3,14 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +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-4.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -18,15 +18,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +alsa bindist custom-cflags designer geolocation +jumbo-build - kerberos opengl pdfium pulseaudio qml screencast +system-icu - vaapi vulkan +widgets + 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 @@ -35,7 +36,8 @@ RDEPEND=" dev-libs/libxslt dev-libs/nspr dev-libs/nss - ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?] + ~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 @@ -44,11 +46,13 @@ RDEPEND=" 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 @@ -58,6 +62,7 @@ RDEPEND=" x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst + x11-libs/libdrm x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile @@ -66,27 +71,22 @@ RDEPEND=" geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) screencast? ( dev-libs/glib:2 - media-libs/mesa[gbm(+)] media-video/pipewire:= - x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) - vaapi? ( - media-libs/libva:=[X] - media-libs/mesa[gbm(+)] - x11-libs/libdrm - ) + vaapi? ( media-libs/libva:=[X] ) !vaapi? ( media-libs/libvpx:= ) - widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) " 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? ( @@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch ) python_check_deps() { @@ -170,6 +171,7 @@ 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) @@ -221,8 +223,10 @@ src_configure() { local mygnargs=( # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true + $(usev pulseaudio link_pulseaudio=true) + $(usev screencast rtc_link_pipewire=true) + # reduce default disk space usage + symbol_level=0 ) if use !custom-cflags; then @@ -240,6 +244,15 @@ src_configure() { 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" @@ -269,10 +282,16 @@ src_test() { 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 @@ -292,6 +311,10 @@ 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() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 3b1f69bd687c..66f2a52045b6 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -3,14 +3,14 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +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.6-patchset-9.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -18,15 +18,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +alsa bindist custom-cflags designer geolocation +jumbo-build - kerberos opengl pdfium pulseaudio qml screencast +system-icu - vaapi vulkan +widgets + 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 @@ -35,7 +36,8 @@ RDEPEND=" dev-libs/libxslt dev-libs/nspr dev-libs/nss - ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?] + ~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 @@ -44,11 +46,13 @@ RDEPEND=" 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 @@ -58,6 +62,7 @@ RDEPEND=" x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst + x11-libs/libdrm x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile @@ -66,27 +71,22 @@ RDEPEND=" geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) screencast? ( dev-libs/glib:2 - media-libs/mesa[gbm(+)] media-video/pipewire:= - x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) - vaapi? ( - media-libs/libva:=[X] - media-libs/mesa[gbm(+)] - x11-libs/libdrm - ) + vaapi? ( media-libs/libva:=[X] ) !vaapi? ( media-libs/libvpx:= ) - widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) " 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? ( @@ -128,8 +128,8 @@ qtwebengine_check-reqs() { ewarn "If run into issues, please try disabling before reporting a bug." fi - local CHECKREQS_DISK_BUILD=7G - local CHECKREQS_DISK_USR=220M + 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 @@ -170,6 +170,7 @@ 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) @@ -211,9 +212,9 @@ src_configure() { # not necessary to pass these (default), but in case detection fails $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ - freetype glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libtiff libwebp \ - libxml minizip opus poppler snappy zlib) + 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 @@ -221,8 +222,10 @@ src_configure() { local mygnargs=( # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true + $(usev pulseaudio link_pulseaudio=true) + $(usev screencast rtc_link_pipewire=true) + # reduce default disk space usage + symbol_level=0 ) if use !custom-cflags; then @@ -240,6 +243,15 @@ src_configure() { 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" @@ -269,10 +281,16 @@ src_test() { 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 @@ -292,6 +310,10 @@ 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() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index db61cb1b8cff..66f2a52045b6 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -3,14 +3,14 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +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-4.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -18,15 +18,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +alsa bindist custom-cflags designer geolocation +jumbo-build - kerberos opengl pdfium pulseaudio qml screencast +system-icu - vaapi vulkan +widgets + 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 @@ -35,7 +36,8 @@ RDEPEND=" dev-libs/libxslt dev-libs/nspr dev-libs/nss - ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?] + ~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 @@ -44,11 +46,13 @@ RDEPEND=" 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 @@ -58,6 +62,7 @@ RDEPEND=" x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst + x11-libs/libdrm x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile @@ -66,27 +71,22 @@ RDEPEND=" geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) screencast? ( dev-libs/glib:2 - media-libs/mesa[gbm(+)] media-video/pipewire:= - x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) - vaapi? ( - media-libs/libva:=[X] - media-libs/mesa[gbm(+)] - x11-libs/libdrm - ) + vaapi? ( media-libs/libva:=[X] ) !vaapi? ( media-libs/libvpx:= ) - widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) " 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? ( @@ -170,6 +170,7 @@ 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) @@ -221,8 +222,10 @@ src_configure() { local mygnargs=( # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true + $(usev pulseaudio link_pulseaudio=true) + $(usev screencast rtc_link_pipewire=true) + # reduce default disk space usage + symbol_level=0 ) if use !custom-cflags; then @@ -240,6 +243,15 @@ src_configure() { 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" @@ -269,10 +281,16 @@ src_test() { 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 @@ -292,6 +310,10 @@ 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() { diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest index 60a3e43d1383..9ba5eb718807 100644 --- a/dev-qt/qtwebsockets/Manifest +++ b/dev-qt/qtwebsockets/Manifest @@ -1,3 +1,3 @@ -DIST qtwebsockets-5.15.12-gentoo-kde-1.tar.xz 1512 BLAKE2B ab34b4fbcf9149716cb8e8481f381c72abe8e502b808c06552e91e800a9d0c6d22cb7603709e3b6f1aa89790b4b694badcadfab174c8c9781785abe661b72235 SHA512 3acbd70651a34e4c454306561c8c500ac086407903e917278d310fed0df668e66c008af93d3923f9dec99d05bc53dc051e517f9a0fad1fb077c8eaf87d89b5ca -DIST qtwebsockets-everywhere-opensource-src-5.15.12.tar.xz 261924 BLAKE2B 4c65f56d5a2308a3b7c2d119f9e79c44f9b9fa5e981a2538d533e4de2a9264e48de556f36777efb45fa2cfd1892169d7e8517070b436455485aada8aced8e02e SHA512 01195f4b2f11baa66e1b3d08148c234ac979d1a80be28d72b2bb8cd57f053102f432f59b7b89daa66d0e27c6e5ee792da12772d70c76aa88fa1bbe114b6f675a -DIST qtwebsockets-everywhere-src-6.6.2.tar.xz 455088 BLAKE2B 481b3fa823df9991c1079bbb1f7d113850704a13aa92c7ef7ac948fe7954358aa00cfea4f26882c680cffd5911a718e6693cd4abc62136a50b54270f0bc863b9 SHA512 ea3390088ab1c0ff61288c736e8a6d8e5270b3d0450264ac26d291658a2fc49b0866df9c4257ba4157a07937cae348aad385a664d92062969ad4f4c0f8c457a9 +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.2.tar.xz 459636 BLAKE2B c639132f9a4b029d52172bf50aa3b4534f7dc39dad12a1ea85d6bb6a9f72a61d9043688734713fd553952cf63be034102a9c22daa9306fd112d75bd3bd756930 SHA512 ccd2bde6f68aa0993f099b4755f6e79f64d8ff85be8891b2682194984851e0ec0f71dfa69aec53df6c7f49df7f123eff30920c9b1f5c79da5285ab5605d22dee diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.12.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.14.ebuild index 219c9af3754e..219c9af3754e 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-5.15.12.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.14.ebuild diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.6.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.2.ebuild index 0871fbdc6113..af33451a2582 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.6.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 ~arm64 ~loong" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi IUSE="qml +ssl" diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild index 579c0f9dceb5..d7e808f49cf7 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.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 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" fi IUSE="qml +ssl" diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.8.9999.ebuild index 579c0f9dceb5..d7e808f49cf7 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.6.9999.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-6.8.9999.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 ~arm64 ~loong" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" fi IUSE="qml +ssl" diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild index 579c0f9dceb5..d7e808f49cf7 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-6.9999.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 ~arm64 ~loong" + 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 ec8e8f1778e2..57f9b48465aa 100644 --- a/dev-qt/qtwebview/Manifest +++ b/dev-qt/qtwebview/Manifest @@ -1,2 +1,2 @@ -DIST qtwebview-everywhere-opensource-src-5.15.12.tar.xz 136852 BLAKE2B 0d374133ef94dc0002e5eb285c80daacfabf8116b17d750c0b319a45ae8f4ac499810f87c7046a04c2fd28a53014d838496e01c61f89347eb8a4836376cafbb6 SHA512 eaabc534a116617dee0394afdb4d35525aa367d01d974c4759c02781a7e4af2fa2d096c638109b421d2b061df4476348d8471a9a02f6f05b97170366c973ef61 -DIST qtwebview-everywhere-src-6.6.2.tar.xz 138792 BLAKE2B 512a80a355cfe3643ac8f45411fe1ba1811bdddc533cc97b0f76f9ba4afa85bf72460cf9768527e09366e0f41efd650546ac7cc9a6b98d65e2924d2acdc0d605 SHA512 a3e017ffee8adffe9c091c8b00f0b0a4133af57d1959e5999cf4baaa2f890064fe2cd5cb1628bbc2cb35948a7c51be135912cccf27c2b751ac88c9b6dbcdb534 +DIST qtwebview-everywhere-opensource-src-5.15.14.tar.xz 128212 BLAKE2B 89f3d770b6a23eb9dd4750e65d9b40e55379374a87c66d319f534d68e4a70ab1656497fe7ccf4df9b62553acb9231dfc3c79b69cd76c284b7d745b01f09a46ff SHA512 5a48688439a8d4eaa13c4a5c8453e6a399413d28a8cbdcb1d04a4723b9a0a527d64c2c48bc040cf960300335db958add05a63fb39a6a94fbe1ad19f4989864f6 +DIST qtwebview-everywhere-src-6.7.2.tar.xz 138764 BLAKE2B 3c7d51dfa8f82a30c92eed804e9f51986947e3f8042b6a3a8d777b02bd7369b98c53686e5032b855bee2200958df00b0e779720bfbe91aae9df154133ca765be SHA512 9cae6f415941049c975a86f99afbb62f3177285a15d182655b9fbab5b3d9ff19d7fb0b646c243db75f382fd971f5b89bf29659c150294e9c4e7ced2921b77c2d diff --git a/dev-qt/qtwebview/qtwebview-5.15.12.ebuild b/dev-qt/qtwebview/qtwebview-5.15.14.ebuild index 984392251f2f..cc68815da63d 100644 --- a/dev-qt/qtwebview/qtwebview-5.15.12.ebuild +++ b/dev-qt/qtwebview/qtwebview-5.15.14.ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm64 ~x86" fi IUSE="" diff --git a/dev-qt/qtwebview/qtwebview-6.6.2.ebuild b/dev-qt/qtwebview/qtwebview-6.7.2.ebuild index 55069dbb40a2..39a6aa99e416 100644 --- a/dev-qt/qtwebview/qtwebview-6.6.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" + KEYWORDS="amd64 arm64" fi RDEPEND=" diff --git a/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild index 81210cfc2b80..76539b793b79 100644 --- a/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild +++ b/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" + KEYWORDS="~amd64 ~arm64" fi RDEPEND=" diff --git a/dev-qt/qtwebview/qtwebview-6.6.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.8.9999.ebuild index 81210cfc2b80..76539b793b79 100644 --- a/dev-qt/qtwebview/qtwebview-6.6.9999.ebuild +++ b/dev-qt/qtwebview/qtwebview-6.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" + KEYWORDS="~amd64 ~arm64" fi RDEPEND=" diff --git a/dev-qt/qtwebview/qtwebview-6.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.9999.ebuild index 81210cfc2b80..76539b793b79 100644 --- a/dev-qt/qtwebview/qtwebview-6.9999.ebuild +++ b/dev-qt/qtwebview/qtwebview-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" + KEYWORDS="~amd64 ~arm64" fi RDEPEND=" diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index 5e79c7375530..93ac206e3d15 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 333328 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.12-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.14.ebuild index ff1b7d811d41..bc60a7b408d3 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.12-r1.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.15.14.ebuild @@ -4,7 +4,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=3 + QT5_KDEPATCHSET_REV=1 KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest index f083f5c0c970..9288fc64b1da 100644 --- a/dev-qt/qtx11extras/Manifest +++ b/dev-qt/qtx11extras/Manifest @@ -1 +1 @@ -DIST qtx11extras-everywhere-opensource-src-5.15.12.tar.xz 146816 BLAKE2B 412aa991980560486fe655ca25a3411df59af00a86bad1d71e0d8c1f5178c2a9430dd3ca8f2bf638ae6c6cd6569fdfe7ca00ce02d1e2e9182706a7f53caa2820 SHA512 f346f399a79aece2635e3871d86302042834d17be143adbfa130ea91a6cd692211804c50e74cecb072a5d7c388f3fbf774b2b40b0fc86498b84552da7b213fe7 +DIST qtx11extras-everywhere-opensource-src-5.15.14.tar.xz 137884 BLAKE2B 60c66f7d9ce83435305b03d3e8985c508750470297fe6fc0d36e50fb9fc50db0672650225a07e7bb232a3808364e30483a8a52706fccd949fcf1996b2145b5a0 SHA512 32825110fb272b03cda432c25ca26eb645685d2c70beaf10045256cfc2837c64307d2475c8dabc7daeb4e19341e282d23cb4a1579fddaf17853525ad232d55f1 diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.12.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.14.ebuild index c967b890e41a..c967b890e41a 100644 --- a/dev-qt/qtx11extras/qtx11extras-5.15.12.ebuild +++ b/dev-qt/qtx11extras/qtx11extras-5.15.14.ebuild diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest index bf5834e3f44a..93ac206e3d15 100644 --- a/dev-qt/qtxml/Manifest +++ b/dev-qt/qtxml/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +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 diff --git a/dev-qt/qtxml/qtxml-5.15.12.ebuild b/dev-qt/qtxml/qtxml-5.15.14.ebuild index 5b41857cbc5a..5b41857cbc5a 100644 --- a/dev-qt/qtxml/qtxml-5.15.12.ebuild +++ b/dev-qt/qtxml/qtxml-5.15.14.ebuild diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest index d5e2cd33b6c7..cf1c6672dee2 100644 --- a/dev-qt/qtxmlpatterns/Manifest +++ b/dev-qt/qtxmlpatterns/Manifest @@ -1 +1 @@ -DIST qtxmlpatterns-everywhere-opensource-src-5.15.12.tar.xz 5192924 BLAKE2B 37d26167e31a24254da1788e7846b957e69c6959d60b923cf8805ccdd06ef3e20bc8e02fd5dd375cfbe20d10d48fa01b0beff4a4fdcf2d062efba858b77f4780 SHA512 762c1c64e8ab269bf74de86f08afd50822859716024f3b13a70b719aeedfd35fd705fa03e32220f5cfab579361e754823d8bd584b30bde5965b026aa54b97142 +DIST qtxmlpatterns-everywhere-opensource-src-5.15.14.tar.xz 5183664 BLAKE2B ed0653e5cccf55bba95ea8c156d1d25f3e83ed21d56dcc211ee37b200142d35e573e06600f0484122cab11b9f88c5612f8218bd20f94ac84fc932476a83e950c SHA512 a9c46ffd6c13221d981d4a5b3cb31cdcdd8250fbe11262c1778815e83892d8c299e4c78b2cf31f7c33eb573e38c8e18255d501c8b95e809d877e2c981a6e7c8a diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.12.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.14.ebuild index 6d99a122aaa9..6d99a122aaa9 100644 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.12.ebuild +++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.14.ebuild |