diff options
| author | Ionen Wolkens <ionen@gentoo.org> | 2024-06-08 01:40:59 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-06-08 09:39:37 -0400 |
| commit | bcc5ab3323a7554b02228ce7ffb0feec6a04cab8 (patch) | |
| tree | 619c211afa9ee085929214390b7286d22693fa42 /dev-qt/qtwebengine/files | |
| parent | 29e28074ec6d637f945d2addfe6a764ee0850f86 (diff) | |
| download | gentoo-bcc5ab3323a7554b02228ce7ffb0feec6a04cab8.tar.gz gentoo-bcc5ab3323a7554b02228ce7ffb0feec6a04cab8.tar.bz2 gentoo-bcc5ab3323a7554b02228ce7ffb0feec6a04cab8.zip | |
dev-qt/qtwebengine: drop 6.7.0
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtwebengine/files')
3 files changed, 0 insertions, 138 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch deleted file mode 100644 index c5ae8cc17c5a..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch +++ /dev/null @@ -1,96 +0,0 @@ -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/files/qtwebengine-6.7.0-displaykey-header.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch deleted file mode 100644 index 84dce821f80f..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -TODO: merge with glx-headers patch in patchset, similar -issues that seem to stem from Qt's GLX restoration. - -https://bugs.gentoo.org/930107#c8 ---- a/src/3rdparty/chromium/ui/gl/gl_display.h -+++ b/src/3rdparty/chromium/ui/gl/gl_display.h -@@ -12,4 +12,5 @@ - - #include "ui/gl/gl_export.h" -+#include "ui/gl/gpu_preference.h" - - #if defined(USE_EGL) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch deleted file mode 100644 index 2d12daccd224..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch status: pending being looked at upstream - -Issue[1][2][3] also exist in chromium itself[4], and unclear -why this started happening only with ninja-1.12.0 at the moment. - -Just a quickfix, likely not fully correct and seems there may -be further unresolved race issues. - -[1] https://bugs.gentoo.org/930107 -[2] https://bugreports.qt.io/browse/QTBUG-124375 -[3] https://github.com/ninja-build/ninja/issues/2417 -[4] https://bugs.gentoo.org/930112 ---- a/src/3rdparty/chromium/content/browser/BUILD.gn -+++ b/src/3rdparty/chromium/content/browser/BUILD.gn -@@ -198,2 +198,3 @@ - "//components/services/storage/public/mojom", -+ "//components/spellcheck:buildflags", - "//components/sqlite_proto", ---- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn -+++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn -@@ -22,2 +22,3 @@ - "//content/public/browser", -+ "//components/web_cache/public/mojom", - "//extensions/common", ---- a/src/core/configure/BUILD.root.gn.in -+++ b/src/core/configure/BUILD.root.gn.in -@@ -235,2 +235,3 @@ - deps = [ -+ "//chrome/app:generated_resources", - "//components/zoom", |
