diff options
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r-- | dev-qt/qtwebengine/Manifest | 8 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.6.2-clang18.patch | 80 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch | 96 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild | 1 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 1 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 1 |
6 files changed, 184 insertions, 3 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 376cdf9a0282..812674a672ad 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,5 +1,7 @@ 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.6.2-clang18.patch 4565 BLAKE2B 73059ca5a86e8e7098e6d6228bcadef4477d7c21b02e9dcfaa8cb3525545c255f31d8a3b2608a91b7aa90cc6090effd18ba41f4969457e6af68614f74a80da90 SHA512 688ff84d742753e4c6ae235f09b32e5894e0cf704eca78f221b1511e4dec498d5b7615240fdeed27e9eeeadeca8822e51cb86172cc17eb271ee2578853b07b40 +AUX qtwebengine-6.7.0-clang18.patch 4862 BLAKE2B 0267bb9c9140cf9baa6264979297d1c218af2e68fde04cbf176b07d52a9e800f6758dad4b31372f9b8a09b7cfe3c6af2be556ea40b7fc07646d7a34f552bb720 SHA512 c13c38f7bbe6d40325fd41b56311cd94fe3a91f19795b2d59c420cb608251bba08146668d156e77f9ecf8e306b2da842b0440abea0b5f44455f1ab74ac245d44 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 @@ -8,8 +10,8 @@ DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad2 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 EBUILD qtwebengine-5.15.12_p20240122.ebuild 8737 BLAKE2B bd97671fb3f4434bd649da758edc7ecccdbbc756bf9f563387f536e35900d2debd171e58fa9929f7a45de2fd880deb39dc32f8e2432e51da35ed76eb3099185d SHA512 98c61985999c97c4c9c33ecb236e4253062ee549c97a100150c89bdb934386e086e8c165408d205c2091d91f1ff73daa503709e9fdcb24e1c772ce485fe01001 -EBUILD qtwebengine-6.6.2.ebuild 9364 BLAKE2B 04ccb4d600a7158679369a84896d75d9ce0bf8432e50f28680cf935ac81034f9095eae27585d5d81bb340788da6199385a0745422058d143656cde4f45e15977 SHA512 2f644339a8b45480290017b474295fb5b48c211fc5c11b97d03579d138769ee63a3bb1a60b826ed9638fecb3baec48a967ce9238d904979e7691a28da89b4c07 -EBUILD qtwebengine-6.6.9999.ebuild 9365 BLAKE2B eb12c6ed50e63450e829539c9e27155943185dd290946f872fea6f2217d9be3d3920b096dfb90dd7b8faef9204b77b2ef7ceaef931078bfc84a2ba694dcb59db SHA512 c192c4db6441c5b39d654c2414a401b5c414cce5a50757754c92b328c5f5bee42a6095005ccc1ccc6acec31d88f5e99eb487ad9cecf297587283fb618406ec7a -EBUILD qtwebengine-6.7.9999.ebuild 9369 BLAKE2B 3306255f8bd4325bc64831ce17624b0323fef47e18716ad033c431bf4215c4ac227075e4264145b2607c9d02dec3be00f586c3f5eebdb7a505cb3c06f907f3e3 SHA512 9cbb7bd7b9bced1f59418315051be0bbc89e2d2aacecd145225c55f849d859457424b29604d839ff15b04fbac125328244e4e45a859b96cc4ef3385f62bebcf6 +EBUILD qtwebengine-6.6.2.ebuild 9405 BLAKE2B ba76e595f6d34e407f1ed982493ba680b9ca2580877d94708afbfdc748dc4ebb4a2f3684293272b68f2f9758f7c80c24804f288dd63341a7cea5e8a783a85296 SHA512 d944bb8d0dbead5054e52533b5d8ec05cc432f40006beb54bdabd8a0bb91ca76ba4eceaa0a9914b0756846c6df22da2f5e145da6485a09fbee0baf478caf9054 +EBUILD qtwebengine-6.6.9999.ebuild 9406 BLAKE2B 52078691d178f1aae23042679529695629f3dd2793829f42db59ba840454584d1977abe71dfb628444af7bf4fbfe42269d8f30d803dd644236c1a70a6441e95d SHA512 4c6af773fae3b6c5ede91ea9439a5c239114dc8347b468279b4fec0a710ece955d5489e093a770f3097acee2bc2257e3d17e26ecd9116de46565355a55572303 +EBUILD qtwebengine-6.7.9999.ebuild 9410 BLAKE2B 800657e36150d3f0ad43d86079b10459fa06e19fb816194ea0006509a91158e61060e518b0fab450efbea4bd7980758a34841c1ca8a1838718da146fc496f8d5 SHA512 c73a9150ae77e227819e6eb1bfdd7a01ad8472dd2ce17bee6860f1165cf93f38d94c72ee3329f35e23c6a168062842922ed0f9156026753565c1ae28c52739c7 EBUILD qtwebengine-6.9999.ebuild 9369 BLAKE2B 3306255f8bd4325bc64831ce17624b0323fef47e18716ad033c431bf4215c4ac227075e4264145b2607c9d02dec3be00f586c3f5eebdb7a505cb3c06f907f3e3 SHA512 9cbb7bd7b9bced1f59418315051be0bbc89e2d2aacecd145225c55f849d859457424b29604d839ff15b04fbac125328244e4e45a859b96cc4ef3385f62bebcf6 MISC metadata.xml 1145 BLAKE2B b752c41e5f9797306957aef1cbb702dc7e681ee26d1d9df289f9212bc4d9b03dc34bdace56c867b118e1707aa485639c603247d954de253a37d912a03a2b5a82 SHA512 66ce74124470bdb9c59a6be0de4cc75014f9af6a7ab864f85370b35762b2f9d3ab91664d09ddd456bae51038a4efb3effe08082e9ec124fe0f33f6845f6d56e4 diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.6.2-clang18.patch b/dev-qt/qtwebengine/files/qtwebengine-6.6.2-clang18.patch new file mode 100644 index 000000000000..97dbe299c2b3 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.6.2-clang18.patch @@ -0,0 +1,80 @@ +Patch status: fixed in >=chromium-122.0.6200.0 + +https://bugs.gentoo.org/925486 +https://webrtc.googlesource.com/src/+/267f9bdd5 +https://webrtc-review.googlesource.com/c/src/+/332240 +--- a/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc ++++ b/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc +@@ -190,7 +190,7 @@ + {StatsReport::kStatsValueNamePreemptiveExpandRate, + info.preemptive_expand_rate}, +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, static_cast<float>(info.total_output_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_output_duration}}; ++ static_cast<float>(info.total_output_duration)}}; + + const IntForAdd ints[] = { +@@ -246,7 +246,7 @@ + + const FloatForAdd floats[] = { +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, static_cast<float>(info.total_input_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_input_duration}}; ++ static_cast<float>(info.total_input_duration)}}; + + RTC_DCHECK_GE(info.audio_level, 0); +@@ -342,5 +342,5 @@ + {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, + {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, +- {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, ++ {StatsReport::kStatsValueNameFramesDecoded, static_cast<int>(info.frames_decoded)}, + }; + +@@ -386,13 +386,13 @@ + {StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd}, + {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, +- {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, ++ {StatsReport::kStatsValueNameFrameRateInput, static_cast<int>(round(info.framerate_input))}, + {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, + {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, +- {StatsReport::kStatsValueNameNacksReceived, info.nacks_rcvd}, ++ {StatsReport::kStatsValueNameNacksReceived, static_cast<int>(info.nacks_rcvd)}, + {StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, + {StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, + {StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd}, +- {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, +- {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, ++ {StatsReport::kStatsValueNameFramesEncoded, static_cast<int>(info.frames_encoded)}, ++ {StatsReport::kStatsValueNameHugeFramesSent, static_cast<int>(info.huge_frames_sent)}, + }; + +@@ -783,17 +783,17 @@ + + const Int64ForAdd int64s[] = { +- {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, +- {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, +- {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, +- {StatsReport::kStatsValueNameRtt, info.rtt}, ++ {StatsReport::kStatsValueNameBytesReceived, static_cast<long>(info.recv_total_bytes)}, ++ {StatsReport::kStatsValueNameBytesSent, static_cast<long>(info.sent_total_bytes)}, ++ {StatsReport::kStatsValueNamePacketsSent, static_cast<long>(info.sent_total_packets)}, ++ {StatsReport::kStatsValueNameRtt, static_cast<long>(info.rtt)}, + {StatsReport::kStatsValueNameSendPacketsDiscarded, +- info.sent_discarded_packets}, ++ static_cast<long>(info.sent_discarded_packets)}, + {StatsReport::kStatsValueNameSentPingRequestsTotal, +- info.sent_ping_requests_total}, ++ static_cast<long>(info.sent_ping_requests_total)}, + {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, +- info.sent_ping_requests_before_first_response}, +- {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, +- {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, +- {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, ++ static_cast<long>(info.sent_ping_requests_before_first_response)}, ++ {StatsReport::kStatsValueNameSentPingResponses, static_cast<long>(info.sent_ping_responses)}, ++ {StatsReport::kStatsValueNameRecvPingRequests, static_cast<long>(info.recv_ping_requests)}, ++ {StatsReport::kStatsValueNameRecvPingResponses, static_cast<long>(info.recv_ping_responses)}, + }; + for (const auto& i : int64s) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch new file mode 100644 index 000000000000..c5ae8cc17c5a --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch @@ -0,0 +1,96 @@ +Patch status: fixed in >=chromium-122.0.6200.0 + +https://bugs.gentoo.org/925486 +https://webrtc-review.googlesource.com/c/src/+/332240 +https://webrtc.googlesource.com/src/+/267f9bdd5 +From: Tommi <tommi@webrtc.org> +Date: Thu, 21 Dec 2023 14:08:26 +0100 +Subject: [PATCH] Update LegacyStatsCollector to conform with Wc++11-narrowing +--- a/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc ++++ b/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc +@@ -189,7 +189,8 @@ + {StatsReport::kStatsValueNamePreemptiveExpandRate, + info.preemptive_expand_rate}, +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast<float>(info.total_output_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_output_duration}}; ++ static_cast<float>(info.total_output_duration)}}; + + const IntForAdd ints[] = { +@@ -245,7 +246,8 @@ + + const FloatForAdd floats[] = { +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast<float>(info.total_input_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_input_duration}}; ++ static_cast<float>(info.total_input_duration)}}; + + RTC_DCHECK_GE(info.audio_level, 0); +@@ -341,5 +343,6 @@ + {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, + {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, +- {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, ++ {StatsReport::kStatsValueNameFramesDecoded, ++ static_cast<int>(info.frames_decoded)}, + }; + +@@ -385,13 +388,17 @@ + {StatsReport::kStatsValueNameFirsReceived, info.firs_received}, + {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, +- {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, ++ {StatsReport::kStatsValueNameFrameRateInput, ++ static_cast<int>(round(info.framerate_input))}, + {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, + {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, +- {StatsReport::kStatsValueNameNacksReceived, info.nacks_received}, ++ {StatsReport::kStatsValueNameNacksReceived, ++ static_cast<int>(info.nacks_received)}, + {StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, + {StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, + {StatsReport::kStatsValueNamePlisReceived, info.plis_received}, +- {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, +- {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, ++ {StatsReport::kStatsValueNameFramesEncoded, ++ static_cast<int>(info.frames_encoded)}, ++ {StatsReport::kStatsValueNameHugeFramesSent, ++ static_cast<int>(info.huge_frames_sent)}, + }; + +@@ -781,17 +788,23 @@ + + const Int64ForAdd int64s[] = { +- {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, +- {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, +- {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, +- {StatsReport::kStatsValueNameRtt, info.rtt}, ++ {StatsReport::kStatsValueNameBytesReceived, ++ static_cast<int64_t>(info.recv_total_bytes)}, ++ {StatsReport::kStatsValueNameBytesSent, ++ static_cast<int64_t>(info.sent_total_bytes)}, ++ {StatsReport::kStatsValueNamePacketsSent, ++ static_cast<int64_t>(info.sent_total_packets)}, ++ {StatsReport::kStatsValueNameRtt, static_cast<int64_t>(info.rtt)}, + {StatsReport::kStatsValueNameSendPacketsDiscarded, +- info.sent_discarded_packets}, ++ static_cast<int64_t>(info.sent_discarded_packets)}, + {StatsReport::kStatsValueNameSentPingRequestsTotal, +- info.sent_ping_requests_total}, ++ static_cast<int64_t>(info.sent_ping_requests_total)}, + {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, +- info.sent_ping_requests_before_first_response}, +- {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, +- {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, +- {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, ++ static_cast<int64_t>(info.sent_ping_requests_before_first_response)}, ++ {StatsReport::kStatsValueNameSentPingResponses, ++ static_cast<int64_t>(info.sent_ping_responses)}, ++ {StatsReport::kStatsValueNameRecvPingRequests, ++ static_cast<int64_t>(info.recv_ping_requests)}, ++ {StatsReport::kStatsValueNameRecvPingResponses, ++ static_cast<int64_t>(info.recv_ping_responses)}, + }; + for (const auto& i : int64s) diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild index bc443553d97b..90b8a1371f8b 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild @@ -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.6.2-clang18.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 3b1f69bd687c..d21e533a2dbe 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -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.6.2-clang18.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index db61cb1b8cff..08af1005ed95 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -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.0-clang18.patch ) python_check_deps() { |