diff options
Diffstat (limited to 'dev-qt')
-rw-r--r-- | dev-qt/Manifest.gz | bin | 11896 -> 11895 bytes | |||
-rw-r--r-- | dev-qt/qtmultimedia/Manifest | 4 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild | 2 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 2 | ||||
-rw-r--r-- | dev-qt/qtwebengine/Manifest | 8 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch | 38 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch | 33 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild | 2 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild | 1 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 1 |
10 files changed, 86 insertions, 5 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 8dbc0ccd903d..f262ffe1f044 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 127cc7df1604..f57d14f05605 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -10,6 +10,6 @@ EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef63595 EBUILD qtmultimedia-6.7.2-r2.ebuild 3286 BLAKE2B 59566faeeb43449047c4829393193bb3f23ccf0bb02cc79885d3e8ff103c5bc191f79b26677ca460c18f3709802e310ef8abbdc414937f1141045f0848d43ba2 SHA512 4b99fb509091805e90d022c08e5f0de87fe6dc378318500cba843aacfb4a6cd613f0069d34286c3510f05282391be1b92618e0fe6f21badfa5e6433193e2cd84 EBUILD qtmultimedia-6.7.3.ebuild 3791 BLAKE2B 27e2f4221e030c0daa3e2cb82963b4bf5f46a316ac2a47f7cfea3b2c443a2b694c4cdc3c2a786e76baa8fb509ebd05934ae55d30fb4ae809669523f666fd8d79 SHA512 4c4d68c7785bb8cf77a87b75ab8b210013e36ec2f06032b4ea6c4fbb7dc2f22b264010d76581490f6c71ee21aad6b92fb67fed02d3e98f72752588215b9492cd EBUILD qtmultimedia-6.8.0.ebuild 4098 BLAKE2B 96e050d43d91de0a1b04ae7528a1a74e6350ca8fcbe882350895880d847008800269721f381f42fab7739b8a273f094f638f3e76176f914adc2adf9fbbb59b47 SHA512 2c34750c129c5e0db6e98f73c7b302db023f3adffc385b63362be68ee38af36ec6d8a5c22d6a47969cc078b216d6ae7f02644485eb9b10ff1173b8e1821d7a38 -EBUILD qtmultimedia-6.8.9999.ebuild 4043 BLAKE2B d52704ca1336b1cfa8f893f195f2cca00a874a5d4fb37eca960daf5d80af4fce93027dc6d416a53755e0e7ae48ecfafb784e507a52f69c2e7da5febb8de34080 SHA512 9aee59af92d453bbe50f0244a2d6df92047175821c5aed323675c33f9b8a93676dedf9c0b8176f43035dfcb2214224db02dac74a0a8a155f559404869821fded -EBUILD qtmultimedia-6.9999.ebuild 4043 BLAKE2B d52704ca1336b1cfa8f893f195f2cca00a874a5d4fb37eca960daf5d80af4fce93027dc6d416a53755e0e7ae48ecfafb784e507a52f69c2e7da5febb8de34080 SHA512 9aee59af92d453bbe50f0244a2d6df92047175821c5aed323675c33f9b8a93676dedf9c0b8176f43035dfcb2214224db02dac74a0a8a155f559404869821fded +EBUILD qtmultimedia-6.8.9999.ebuild 4098 BLAKE2B 90dcb1b7937298b99ec10e16c247f038d4629fe97350951ba9327e115022686c417b55d1302bcf05d95c16757d8db8a38b1a6ef322a43d8b48e141bc556a2408 SHA512 98cfae6b8f7e89b06de3a420a60c34331b3b701c26db6d4f110979db88eec857bc59db5091d6c1b3b4c4e041ef273f144c459a0aebc7443118f719413b4e3741 +EBUILD qtmultimedia-6.9999.ebuild 4098 BLAKE2B 90dcb1b7937298b99ec10e16c247f038d4629fe97350951ba9327e115022686c417b55d1302bcf05d95c16757d8db8a38b1a6ef322a43d8b48e141bc556a2408 SHA512 98cfae6b8f7e89b06de3a420a60c34331b3b701c26db6d4f110979db88eec857bc59db5091d6c1b3b4c4e041ef273f144c459a0aebc7443118f719413b4e3741 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild index dccb2e3e1506..5c9d4372dcb4 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild @@ -79,9 +79,11 @@ CMAKE_SKIP_TESTS=( tst_qmediacapture_gstreamer tst_qmediacapturesession tst_qmediaframeinputsbackend + tst_qmediaplayer_gstreamer tst_qmediaplayerbackend tst_qsoundeffect # may try to use v4l2 or hardware acceleration depending on availability + tst_qmediarecorderbackend tst_qscreencapture_integration tst_qscreencapturebackend tst_qvideoframebackend diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index dccb2e3e1506..5c9d4372dcb4 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -79,9 +79,11 @@ CMAKE_SKIP_TESTS=( tst_qmediacapture_gstreamer tst_qmediacapturesession tst_qmediaframeinputsbackend + tst_qmediaplayer_gstreamer tst_qmediaplayerbackend tst_qsoundeffect # may try to use v4l2 or hardware acceleration depending on availability + tst_qmediarecorderbackend tst_qscreencapture_integration tst_qscreencapturebackend tst_qvideoframebackend diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 059543538cd0..31b0eaaef0d2 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -5,6 +5,8 @@ AUX qtwebengine-5.15.14_p20240510-icu-75.patch 5107 BLAKE2B fc61801f5bbf5583610a AUX qtwebengine-5.15.14_p20240510-re2.patch 915 BLAKE2B a29abbec923f78dd7baafdc36b42ed9e0467885ecc04349cbbcec6727628627e84e0172f01e24b34c231d437b75f992b7a173532695085773d899dc94085c66b SHA512 45af510bafc1c838fe273652813d4130ecdef30152f57506b5b6580131cdbcf510acc5ae7bb8d44ac90072c8be7d75b4e0c187240a6522e184db8a11a204f2fc AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da AUX qtwebengine-6.7.2-musl-cstdint.patch 463 BLAKE2B ebc2d97974e960d295a6f5d908b7af68faee59715580bf23bca367f982411686d6667706ed1e75aebb4fc2f0253c3b935e830b96cb6947760c190de5d9023ddf SHA512 677865bcc626a0adfc7e992115dfdb276bb0fbbe6f0a69e97331aa422210008ea4039654bc483901facd3f40e2f800316325f516299939922bf59adaa0053161 +AUX qtwebengine-6.7.3-missing-gn-deps-blink.patch 1677 BLAKE2B 6081d8e60712e50b6cd043ed4db645727f38676d91ec3b05e2bcf9acf790273a95e9f67adda7bda573cc73b331b0b565a6b485f91c1a34bbb20b1c4814ce16de SHA512 5e059420feaba3fa3fdf9ac1aabfc655550e4a47f2416d009a5e79643052511f14fe9758dde42026932e1f10976cea2f5d9129c807011eae5efe1d823253a0cc +AUX qtwebengine-6.7.3-missing-gn-deps.patch 924 BLAKE2B b3c9301c8e42365388893e37e2404a1b27cee85a44eafdd25dfc65d0a03489d0920dbbf5430d1c04f08b200d891422ee06cfd676a38c07af7c241c039ebdec4c SHA512 ab8f800c15ac7cadba7c0313eee7b6bfff6a8b961fed37e51f4cea77796bcb62a9a155a821cfb848fdf9a9173701154facd346c3d58e0ce1987bf47cc58823ee 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-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f @@ -16,8 +18,8 @@ DIST qtwebengine-everywhere-src-6.7.3.tar.xz 550988288 BLAKE2B e506e8bd950be478a DIST qtwebengine-everywhere-src-6.8.0.tar.xz 566569136 BLAKE2B af2ccc4900ff96d36900bfd4bcb370017231776e211af512e73944dc47b62e6517e85658c436e91f904efae013c4a9035122f78694b4a3fc696f0790725862e0 SHA512 80137c6e1d9aaddddb5d81716acb2ddee620a1416e6318104ace377f0259906d3f79b0fbf9d57e13f581554bc14d7f13abc13396022406d3530f5d9014a7eed4 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7886 BLAKE2B ec9b228c2c8952415a6a8ea7a693642bf09625ae084279e5992580084006a25bf77b0ebe2176e406b3a32356269302b48cb8dd16fbe573ce3817fc7d91d42b62 SHA512 3c6686561b36d59aa07473ff73cf5642f203d37a59f7496c04a656b60e03151471b79c965f065cd9f492e87e7fa398cd5f71b17059bdc6e9a4f0bd451edf088d EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 6f20f921189366edc8f501ee0e1d3811fb1e57dfa75b2ff4ac80a50028e6394068415f65ae1bfb84dd9ae7d08a546fdb13050a4c42035dbe0ce6baa1c753534f SHA512 2292f3a7e9b24cdb312b6e9c725d8ad1ed33ee160038bd15d8fac568e53473ef18fe3f4f8bf484009221521325933b7e568b90546a157d10c74faa119c6bf44d -EBUILD qtwebengine-6.7.3.ebuild 9875 BLAKE2B eb5e0e9bce1446cb524a1591c4ac63c47e959d8df31f4070c4179ed2582976acfd16d2dbe825f74a60392d1652cd09936977e6749342c032e40e0f27615bac26 SHA512 52bf3c39ae27a65808422146bb0b010f53cbb59faf578c1c8d933cc50befe48a0e25d2a0b91ff9cb728e2897f468533664896465ed4b1662927fdbf70c3bdd7c -EBUILD qtwebengine-6.8.0.ebuild 10027 BLAKE2B efd6905762b7572ed824bde13dc03716215433fc8edb757a18acc094e970f7ad6974f5b121ee9f8160c26cb90765698f2ab0f5ca3c21aa60c9cf7e860e354271 SHA512 6bb13b648c1a4498f137efb88de5320531b7b7b826f51368c4b7cf10fe47f3eb795e697cac5b80ab9032a81ad6968703208805fb23f81dd713fbe4275a2e6e1a -EBUILD qtwebengine-6.8.9999.ebuild 10027 BLAKE2B 832346594fbe74d7ca914c434f616a7e8a2647d749c6f854fae6f88ed5f6a8f0f69fbf7e3a0c6582f6321ef45def2bcf85772c74dd54cb64219ffdffce3a1573 SHA512 fbaa4130f39672aec9227200e40bc874e4ccfd9cf9df6992ae84ba54a803bb8f190079983049ef9c31ddf0327ed7c10a744ad536a06e255652e10f6a1cb28268 +EBUILD qtwebengine-6.7.3.ebuild 9979 BLAKE2B 17fb965f42ceba78dea107944b68141281c164dd4a86d06cbe8f8a62281af044b84d9e249944aa9f0995610010a97ec55b152fda255545f48440be9852fa01c3 SHA512 b08934fba065e79143b804511e871eb32359290b8156343ebc27e019e65c36a4e6eeb1699f57b5b96980a5c52591e11386113913b900fddbb22a53357fccdf62 +EBUILD qtwebengine-6.8.0.ebuild 10076 BLAKE2B 55baf539b02042fbfcf1a831be96f3d693cc7f240ef0a2e5c0565fbe220ab0c413f292c08f9bdbccf55bd49506e0fccc81845f8a79bff5beb65a4bb5bea09c83 SHA512 f6dd74dbf9b010b035465f4457f32ae52c4df13018243926f31f99e53792be500c4b4d3dde7e381f3c91b628ebfc0855af451face4b4ba502591d20f4b02a969 +EBUILD qtwebengine-6.8.9999.ebuild 10076 BLAKE2B f537d738c15f5982146567ae6419260fe437b249273b2bbef13992629c7c11ef0392595e94e2a595d53d3d146bcf16646ce2259881a960a30883fc8eec5f4ceb SHA512 d0851a51655eba9553ffb8a7037e92509840f5eb76b514c493b409725ccdfc9ec9af91d7b03f0a1cdb273100f522710f4d14cc9057bbf91d2899dfdb2f9731a1 EBUILD qtwebengine-6.9999.ebuild 10027 BLAKE2B 832346594fbe74d7ca914c434f616a7e8a2647d749c6f854fae6f88ed5f6a8f0f69fbf7e3a0c6582f6321ef45def2bcf85772c74dd54cb64219ffdffce3a1573 SHA512 fbaa4130f39672aec9227200e40bc874e4ccfd9cf9df6992ae84ba54a803bb8f190079983049ef9c31ddf0327ed7c10a744ad536a06e255652e10f6a1cb28268 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch new file mode 100644 index 000000000000..87f19dcceef4 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch @@ -0,0 +1,38 @@ +Patch status: fixed in >=chromium-120.0.6088.0 / Qt6.8.0 + +Backport from [1] for [2] to fix a race condition. + +[1] https://crrev.com/ac2ad9c9f01bf255fd123785bd37d3b0ec44e410 +[2] https://bugs.gentoo.org/942142 +--- a/src/3rdparty/chromium/third_party/blink/public/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/blink/public/BUILD.gn +@@ -437,4 +437,5 @@ + "//third_party/blink/public/common", + "//third_party/blink/public/common:headers", ++ "//third_party/blink/renderer/platform:make_platform_generated", + "//ui/accessibility:ax_base", + "//ui/base/dragdrop/mojom:mojom_shared", +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn +@@ -142,5 +142,8 @@ + group("make_platform_generated") { + visibility = [] # Allow re-assignment of list. +- visibility = [ "//third_party/blink/renderer/*" ] ++ visibility = [ ++ "//third_party/blink/public:blink_headers", ++ "//third_party/blink/renderer/*", ++ ] + public_deps = [ + ":bindings_buildflags", +@@ -151,4 +154,5 @@ + ":runtime_feature_state_override_context", + "//third_party/blink/public/common:buildflags", ++ "//third_party/blink/renderer/platform/heap:blink_heap_buildflags", + "//third_party/blink/renderer/platform/network:make_generated", + ] +@@ -197,5 +201,4 @@ + "//third_party/blink/public/mojom:mojom_platform_blink", + "//third_party/blink/public/mojom:web_bluetooth_mojo_bindings_blink", +- "//third_party/blink/renderer/platform/heap:blink_heap_buildflags", + "//third_party/blink/renderer/platform/network:make_generated", + "//third_party/blink/renderer/platform/wtf", diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch new file mode 100644 index 000000000000..b9723a59d859 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch @@ -0,0 +1,33 @@ +Patch status: needs upstreaming + +Add missing dependencies for rare race conditions, these are all +related to Qt-specific changes as far as I can see. + +https://bugs.gentoo.org/942142 +--- a/src/3rdparty/chromium/components/history/core/browser/BUILD.gn ++++ b/src/3rdparty/chromium/components/history/core/browser/BUILD.gn +@@ -184,4 +184,8 @@ + "//components/sync", + ] ++ ++ deps += [ ++ "//components/signin/public/base:signin_buildflags", ++ ] + } + +--- a/src/3rdparty/chromium/qtwebengine/browser/extensions/api/BUILD.gn ++++ b/src/3rdparty/chromium/qtwebengine/browser/extensions/api/BUILD.gn +@@ -46,4 +46,5 @@ + deps = [ + "//content/public/browser", ++ "//qtwebengine/common/extensions/api:api", + ] + } +--- a/src/core/ozone/BUILD.gn ++++ b/src/core/ozone/BUILD.gn +@@ -22,4 +22,5 @@ + deps = [ + "//base", ++ "//media/gpu:buildflags", + "//ui/base:buildflags", + "//ui/ozone:ozone_base", diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild index 5d685e365f2a..d9b580efb949 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild @@ -110,6 +110,8 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.3-missing-gn-deps.patch + "${FILESDIR}"/${PN}-6.7.3-missing-gn-deps-blink.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild index 6b40caa515b0..4bf68d74e0a3 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild @@ -108,6 +108,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.3-missing-gn-deps.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index baac705a7f5d..9e3a5cd53a3d 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -108,6 +108,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.3-missing-gn-deps.patch ) python_check_deps() { |