From 232a872b2d1f6ba60d91f3ee05b58a5f2449191c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Oct 2023 23:55:49 +0100 Subject: gentoo auto-resync : 05:10:2023 - 23:55:49 --- dev-qt/qtwebengine/Manifest | 10 +++++--- .../files/qtwebengine-6.5.2-cstdint.patch | 30 ++++++++++++++++++++++ .../files/qtwebengine-6.6.0-cstdint.patch | 20 +++++++++++++++ dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 1 + 7 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch (limited to 'dev-qt/qtwebengine') diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 2cca1a436582..80ca6456a8eb 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -2,7 +2,9 @@ AUX qtwebengine-5.15.10_p20230623-clang16.patch 594 BLAKE2B bedc481394382d3ba80f AUX qtwebengine-5.15.10_p20230623-ffmpeg-binutils-2.41.patch 2319 BLAKE2B dad3b5af16377f15cf16e0ee5ef9424439a20bb863bbbe705a59cd7d5afffcfdac09c71f5e713883654ce1ffdfe8bd75df12c8be3d4b531118c79c1d70d2fed4 SHA512 a02ea0f7d2ae99db587ae2d74024802c8d2e1da90838df374b3e3e74f8009f1c4059ff72569ed051b86ab1fa5b7ff58bc5079251232b3e1b80ab3631a70aa1a8 AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da +AUX qtwebengine-6.5.2-cstdint.patch 1082 BLAKE2B 0d3376d82ef1758451c8e9ce56ede52e16be486610431357eea9061e19cd78c8f53b66d46ad969b148ff847d921c78ae25fd329efc5cff776e6c99aa16c2c2fa SHA512 fe88703eb39ba713a166c211b17619fa6e31124339b8736a3c5b511556c5249ab8302d9ec8d8702292a318c5df201a1bd96ac2c82e6742fbc5d3782b7cd0207b AUX qtwebengine-6.5.2-libcxx17.patch 2548 BLAKE2B bd2ebe5f51505dd20d0fd65a0ad90b7afb106719f5f531c2de95fccc7720255e13dfa7161dda1284fa9da668e81c7df00a59136ed8e355c6ac0f8d335ad76220 SHA512 ec2f96691bd739ad4f3f4d7c0909491ea3a0942e33d701210b368c49c24e99d09c8ea29afeddf6d24678b92d985022dd39e8d05defece0e6a624d794c5f412d8 +AUX qtwebengine-6.6.0-cstdint.patch 704 BLAKE2B 2bb94ef42667a1ef6cc9540ce092171aa8ede56730548451ba028119a706c1a5665f8dcc9afc7443499577028b37182a2dfeb76ceb8daf7aaded3da9c5e2a9be SHA512 d2b64696e3ca1ec7fd00970263b324d925f2d7c767b820df5f07d4203fea71c088add4ce67bc4f38b9efbd01cc5cd7bbe6d3ccf211cbf2c3ff128edee770ff22 DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B 93afb88f79a6675dc58123831d0555a60d28428b93d32e185c21eb25401dfeeeee727ca20fc0ba3bda4ff2a298950e081a2eadcaeea095261941fe0d56b0d668 SHA512 9027899474d9d9dec5a5ca1e80e49404a0df2e23fe1666a437c07e99cbbbf787afd619eccf3d901545ed0a865c5fb439dce64f8339cbeb09213a0d4404456543 DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3 DIST qtwebengine-5.15.10_p20230815.tar.xz 299275336 BLAKE2B 9c64f09d982086d51af7d4134f174db9c23162bc3317ea4f19e44d91a52ad63aff56bacc7ae64a2bf693d900ef3ef5231c7333eb56237123799066055fc49450 SHA512 4e6abd825d124fddc63bc8ff92e94940b829289277aa17423403c6ce168c12fff1d52b604ae127c1a0fdbca852e3795482acefbe6e506a3059c0d32bec45a709 @@ -16,9 +18,9 @@ DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1 DIST qtwebengine-everywhere-src-6.6.0-rc.tar.xz 421029904 BLAKE2B 414980115fc97697f54f9becb6dc5e76fe18300067c0d52b8f2b8694864d376a5fb3301fa0f4f421c9c771006d415fa96290f3ad3666ef0b873a9db0d00d4776 SHA512 281aa5539940d8a43bbd24bad9420401cc8667e96a5be37d5cbfbad29cb6076c3e0ab4ea1e28b30846c255df2c6dea857d8b14330f1c68eb03e23f1a81c6c185 EBUILD qtwebengine-5.15.10_p20230623.ebuild 8524 BLAKE2B cce6249550a5574ab7763c042117186201da9c006982eb99efc1da72d1d339e90f9c6e9a60371a25d314f3372234e9d976d2cd292d0abcc08a4442a699a95495 SHA512 95138584a3644d86b9835288446dd2d01997379f894a38f101bbf899e853235600c9c80b571ed8380a15d179cb72fb0b68324e83b1b230847325ff476fa992e3 EBUILD qtwebengine-5.15.10_p20230815.ebuild 8257 BLAKE2B 39758756b91f16dca3830f86bac2553ead6798baffd27fedf7c35ddb4306cd8036c28a1fe9febe92b76939efe9c0f57a4a8ac3c469b69d20c73d900010797526 SHA512 eb730b0510f799f3526bfcc5835ddb9b31f639db8104ddeb2aedcccbec86907d840478ad009998506c651ef2cb3693739421daa3c596ba4839d325142c458e75 -EBUILD qtwebengine-6.5.2-r1.ebuild 8320 BLAKE2B 9c03f2553149ec9de273031deba18d5d02006f59d1338ee05bcbc2cf70a2395189522481617816a19a51be0000c2112bd0967db514e02015ad2f3bb5ac579172 SHA512 554dabd7b447a379214175f00317290368bfae8bba85ab0d4cd9718ceb13825dacff7e83b6e3ea24b1980a7f47c2ef573868b093bfe9531a609a123b0098a82f -EBUILD qtwebengine-6.5.3.ebuild 8358 BLAKE2B bd49b50846941900217839511f88b96236c75101dcf96d4ad18287d7fe6bbb3adf35e14ba512ba2498623ad8e9b0ff67ef85d64e42fcd8565827238598c0a5c2 SHA512 0f1e6ce028a1b975549137afa73090264320684e035b9f93ceb82ff9cd08a9be6cfb4b827c9dbf8c251b5a86224d9a26914b729235fe58452ffbdad7f1eb81ba -EBUILD qtwebengine-6.6.0_rc.ebuild 8682 BLAKE2B 1eb47d8ab24018bc524878150d963cd5ddcaddd21e210e5846211143adbea49c0d29de231bac1e7bc3a774d16d5f117b6a2c433af9b8c0ddce02664682d0b0bb SHA512 51d62fccbd9816bca5deb657b4dc50aed8ff2ca4b8b0b562534f37e3efdf3c04b57ae11730a60acbd0a4a983caee1be8537f21c340ea213b3ef083d0c0f24dbc -EBUILD qtwebengine-6.6.9999.ebuild 8682 BLAKE2B 1eb47d8ab24018bc524878150d963cd5ddcaddd21e210e5846211143adbea49c0d29de231bac1e7bc3a774d16d5f117b6a2c433af9b8c0ddce02664682d0b0bb SHA512 51d62fccbd9816bca5deb657b4dc50aed8ff2ca4b8b0b562534f37e3efdf3c04b57ae11730a60acbd0a4a983caee1be8537f21c340ea213b3ef083d0c0f24dbc +EBUILD qtwebengine-6.5.2-r1.ebuild 8361 BLAKE2B ce8299f36904258873382aff4fc5268a4a741b6607b218c304c15641281deaf0b8448ad177495a04c69a69b428994ad438cd201e3cf5d04843023f1dec9c8a6e SHA512 04a4b9e2f4aee747ac36fe9efaac5b299385938f10452c7145717f821836853634706f6efefa0a19022e65b859c7156492776886288d15218e475cb4762fc3ab +EBUILD qtwebengine-6.5.3.ebuild 8399 BLAKE2B 75062f0bc301f62aa2e230ad61b4ab7b5828205d098dbe5f4688413ba86f06030596671fb83b0f264e62742e2225f423a60e2004d1e76d696b6a14dcb962f03b SHA512 dafe6fc330ed2087f7f9bad745b73d172b990bfee2bda23cb0e87eaedbd3b7f2b2c194512f69d40749b58227ddcc516f2856869c50100e31ddb1d99bd383e3a6 +EBUILD qtwebengine-6.6.0_rc.ebuild 8723 BLAKE2B 46e6a570bc9c1624bb0baec88feba82d1e0070ec3c99174298d964cbfd9059fdd4af31557e80c2b85a67f43c47620e38a81a27ad88745d8e95fda393987071e7 SHA512 1875f528f73fbb4a51f652998516ef4ec9171afb736a6dd31399ade16687f64c174556893c16b52018e529f206df67f04dd6afd261de01ce7ba3a89ea8b682eb +EBUILD qtwebengine-6.6.9999.ebuild 8723 BLAKE2B 46e6a570bc9c1624bb0baec88feba82d1e0070ec3c99174298d964cbfd9059fdd4af31557e80c2b85a67f43c47620e38a81a27ad88745d8e95fda393987071e7 SHA512 1875f528f73fbb4a51f652998516ef4ec9171afb736a6dd31399ade16687f64c174556893c16b52018e529f206df67f04dd6afd261de01ce7ba3a89ea8b682eb EBUILD qtwebengine-6.9999.ebuild 8682 BLAKE2B 39813c9c2a6a9be5826da559190faef0546e12ffdd5881127dcfb9c8459831bd3bfe3236b9739008641b93c605c95eecf27a8d5e6f4d4b95a6c1121ee483ed7e SHA512 84b8806de8e8722f6749beeb2d24711c41ae31af7107d521ec659822b71ee37f05dfbb2325f894c9d419e53d8edbb0c0b0dc30df8a6f3e4dd3077a00a8f62c4d MISC metadata.xml 1312 BLAKE2B 4473aad7240926735bbabbeaeff862f3bc253c3e79e09086c17fb9b603ba5e9dc25ecbbc423a60a344bf471e11634c9b4728222e66f3d19022e3f3d2c9cc2f60 SHA512 797e67cf05a37dcb5ad5712cabef051b4a8f5dcb9601b627bcf029e4c99d0a09fa62b03cb9dcb64b5b6e5f29104e72711136d4c9aa79928c34f6bfe212742e2d diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch new file mode 100644 index 000000000000..7de101830553 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch @@ -0,0 +1,30 @@ +Patch status: limbo, partially needs upstreaming + +Only manifests as an issue with gcc-13+musl which does not transitively +include cstdint / stdint.h for the int32/64_t usage. + +Partially fixed by [1] (>=chromium-110.0.5434.0) given it removes the +int64_t usage altogether in seed_response.h. + +See also [2] which fixed this for the 87 branch in Qt5. + +[1] https://crrev.com/01e21a077a0354d85e8359195613c2781f67a3a2 +[2] https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/489133 +--- a/src/3rdparty/chromium/components/variations/seed_response.h ++++ b/src/3rdparty/chromium/components/variations/seed_response.h +@@ -7,2 +7,3 @@ + ++#include + #include +--- a/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h +@@ -7,2 +7,3 @@ + ++#include + #include +--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h ++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h +@@ -16,2 +16,3 @@ + ++#include + #include diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch new file mode 100644 index 000000000000..a39da477ace2 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch @@ -0,0 +1,20 @@ +Patch status: limbo, needs upstreaming + +Only manifests as an issue with gcc-13+musl which does not transitively +include cstdint / stdint.h for the int32/64_t usage. + +See also [1] which fixed this for the 87 branch in Qt5. + +[1] https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/489133 +--- a/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h +@@ -7,2 +7,3 @@ + ++#include + #include +--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h ++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h +@@ -16,2 +16,3 @@ + ++#include + #include diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild index 01b5cf6327c3..0d9285e3a57c 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild @@ -102,6 +102,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch + "${FILESDIR}"/${PN}-6.5.2-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild index 26cc25ef040a..cf093a70d1af 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild @@ -103,6 +103,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch + "${FILESDIR}"/${PN}-6.5.2-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild index 876a6ad25d54..768571ff7ca4 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild @@ -112,6 +112,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.6.0-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild index 876a6ad25d54..768571ff7ca4 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -112,6 +112,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.6.0-cstdint.patch ) python_check_deps() { -- cgit v1.2.3