summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebengine
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r--dev-qt/qtwebengine/Manifest7
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch394
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch112
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch99
-rw-r--r--dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild (renamed from dev-qt/qtwebengine/qtwebengine-6.5.0-r2.ebuild)9
5 files changed, 105 insertions, 516 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 65142b91fd1b..f82ed5330084 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,11 +1,10 @@
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.0-gcc-13-build.patch 17896 BLAKE2B b8aaecb917e3375027ec0a7feffe0842c2e393c597362ef01317ae05744baa837942d9021aaa152505a46af325add61d22d3218b8a32b1b5a80e539d3b88ff5b SHA512 fa7ff29cee454741916b83732b86738e10925c62826e3f5db18c6becd99d27b2523622bd787706df876c0df7fd3b385c59e7e7133bc0e393a4e323a3a0cd1e11
-AUX qtwebengine-6.5.0-userscripts-loading.patch 3711 BLAKE2B 6ad83d8db818f9b5e4a9212b60e3e042b260059cf29bf95a2ee221383bcc7bc14e7ac7f4d55d0f73a80cdd797b94b0930a0d461e7aea8139018f60784e286139 SHA512 c6ebf4a4d33dfc82cab60551e20d6c607baf4c773c80fc9649af92bed10af3209f77db5b6864339db1211aae857ff53b46d8daae91823e8ab3c3408aea15f9e1
+AUX qtwebengine-6.5.1-normalise-clipboard-permissions.patch 5103 BLAKE2B b4929694e409a74a7ffafe3ae683cd2688385cd282c024ec08eab2fe484fb49816c8e4d3cffe201c5549846a3a42a1d65581dca21625de5ab5c606cee15002e4 SHA512 0280a9fccab1fe35d3c4e2de02af9ca24c1fc6dd3e98540990a8a4eb5b69a7f3289a8c1bd8347baa3ada9064105042f1b26484a6ed7b6ce483c379f796df213d
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
DIST qtwebengine-5.15.9_p20230505.tar.xz 298713240 BLAKE2B 835e93a0b33e7294d72571c9031524a0e3002100e36433501cc83bac91646b788c1030ee9ce90edce39c6ee2ee61a1d697e021b6346804d3be0f0b930e6084d0 SHA512 61d16399a7d8f5c135c5c097c2dcb7ebeccfe7e31769e950443ffa8178f55ad22d90307b7bd2b2ebdcb3ee0dd2064266159c27da4fc5b35ddac346ca9f336cc1
-DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 42aa5023462ee2db6ef24da1858873897ac5d6bd170adc389617525745708529578dcbcf694d1cadf3b591770f4e925ad24f61500cd13ef90236bda412797cb7 SHA512 02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0
+DIST qtwebengine-everywhere-src-6.5.1.tar.xz 412377436 BLAKE2B 1ff179daf1433246b931558f52f1cf193eff4a1d646e6f6037a40fe85fa28cf944b7f361fd68cb01b1247680d376762c2c5317be125f5b24cc08e4bbfa6f0def SHA512 68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428
EBUILD qtwebengine-5.15.9_p20230505.ebuild 8404 BLAKE2B 0b82f31c53c3391042014b1e0f953169b74bb83221958717f645b585815388ae945343aa153f44c9754c2e4160a113d994156cfec77a4c3d683fceaf074f3920 SHA512 83ef513c0d3afe9e216ca477a30a96db233a67b70ca0570e15587f96cf525b06877f7e40115019b367e8166742ec2c5d527a750afa1445a9549f44b4158b392f
-EBUILD qtwebengine-6.5.0-r2.ebuild 7558 BLAKE2B 672b105ee7b36d4c327687d7fe44b24df085b0787a7477ec23387543830c0d83ba8833fb65c9a98bdca61111f636932bb412e69c3e09a151c38a9af5b80e6fbd SHA512 c7fa13dfbdd0d4c90d0ccc5285460e0368b54e90d66c276d12a5a929bf6de281b065692a27fee57c8c6d5e2d1ee049a94693ac8dd5e5623d047d1512dd14ef73
+EBUILD qtwebengine-6.5.1.ebuild 7523 BLAKE2B 13dcff549ee7cc6277ad70db8fbdd6afb775e4b31db5adeceaa8a9e8d0c338fbcbd0374dc3d13ae9d287b921407ec41c631f09a8ef8516f158f917762a4a3396 SHA512 a612a406e55a1709269b897ea320374b5e43d7f9207bf05652c3bc0ac2a173a92463cd78a3c1c7ce3c0de21fc4513402292752dbd912274a35373936a4beb91f
MISC metadata.xml 1152 BLAKE2B 2975a3fabc6464a6207a6b1a9da943baa16bc9a3b77a987cffeb6ea7c8791c5d09171b74825e6f218612144d862de1f2865c60fb6c4c187a1c5f6940112117e9 SHA512 aa3ed598b19be8adceb5a9b90bbc5d5d2521aa1a742210f536d11cf0466204ac3dc373ccee5a9a6cf523827589d17022ca2b54c8e142e6bb3b2afcfc98fa242d
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch
deleted file mode 100644
index 0993771177b4..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch
+++ /dev/null
@@ -1,394 +0,0 @@
-Upstream: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=108-based&id=9de0d8a90d9
-
-From 9de0d8a90d9b0176542db8b54d678a9fcbb69337 Mon Sep 17 00:00:00 2001
-From: Martin Negyokru <negyokru@inf.u-szeged.hu>
-Date: Fri, 3 Mar 2023 16:56:50 +0100
-Subject: Fixes for building with GCC-13
-
-Pick-to: 102-based
-Pick-to: 87-based
-Fixes: QTBUG-111697
-Change-Id: I51fca3b3eb627b2617ff5c6c051fa1182671244d
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/464490
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/base/debug/profiler.h | 1 +
- chromium/cc/trees/target_property.cc | 2 ++
- chromium/components/metrics/psi_memory_parser.h | 2 ++
- chromium/components/viz/common/shared_element_resource_id.h | 1 +
- chromium/content/public/browser/browsing_data_remover_delegate.h | 1 +
- chromium/device/base/synchronization/one_writer_seqlock.h | 1 +
- chromium/device/bluetooth/public/cpp/bluetooth_uuid.h | 1 +
- chromium/extensions/common/constants.h | 2 ++
- chromium/extensions/renderer/bindings/api_invocation_errors.h | 1 +
- chromium/gpu/config/gpu_feature_info.h | 1 +
- chromium/net/base/parse_number.h | 2 ++
- chromium/net/cookies/cookie_inclusion_status.h | 1 +
- .../net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h | 1 +
- .../net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h | 1 +
- chromium/pdf/document_attachment_info.h | 1 +
- chromium/sandbox/linux/syscall_broker/broker_file_permission.h | 1 +
- chromium/third_party/angle/include/GLSLANG/ShaderVars.h | 1 +
- .../blink/public/common/bluetooth/web_bluetooth_device_id.h | 1 +
- .../third_party/blink/public/common/interest_group/auction_config.h | 1 +
- .../blink/public/common/origin_trials/origin_trial_public_key.h | 1 +
- .../renderer/platform/graphics/paint/effect_paint_property_node.h | 2 +-
- chromium/third_party/pdfium/constants/annotation_flags.h | 2 ++
- chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h | 1 +
- chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h | 4 ++++
- chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h | 1 +
- chromium/ui/base/prediction/kalman_filter.h | 2 ++
- chromium/ui/events/types/scroll_types.h | 2 ++
- chromium/ui/gfx/geometry/linear_gradient.h | 1 +
- 28 files changed, 38 insertions(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h
-index 5f0deadd5d3..80c73feb922 100644
---- a/src/3rdparty/chromium/base/debug/profiler.h
-+++ b/src/3rdparty/chromium/base/debug/profiler.h
-@@ -6,6 +6,7 @@
- #define BASE_DEBUG_PROFILER_H_
-
- #include <stddef.h>
-+#include <cstdint>
-
- #include <string>
-
-diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc
-index f6e873a01a1..714bd5efed1 100644
---- a/src/3rdparty/chromium/cc/trees/target_property.cc
-+++ b/src/3rdparty/chromium/cc/trees/target_property.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include <cstdint>
-+
- #include "cc/trees/target_property.h"
-
- #include "ui/gfx/animation/keyframe/target_property.h"
-diff --git a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h
-index b8b22f4ab74..3d7ec9ca63a 100644
---- a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h
-+++ b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h
-@@ -5,6 +5,8 @@
- #ifndef COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
- #define COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
-
-+#include <cstdint>
-+
- #include <string>
-
- #include "base/gtest_prod_util.h"
-diff --git a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-index b39a2d3dc18..ca3d8aedaef 100644
---- a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-+++ b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
- #define COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-index ee75332f05f..c0168281e81 100644
---- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-+++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-@@ -5,6 +5,7 @@
- #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "base/callback_forward.h"
-diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-index 528b6683ca2..e37a16b81be 100644
---- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-@@ -6,6 +6,7 @@
- #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
-
- #include <atomic>
-+#include <cstdint>
- #include <type_traits>
-
- #include "base/atomicops.h"
-diff --git a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-index 816d3405eb0..15c4004c013 100644
---- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-+++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
-
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h
-index bf6bac2b47c..b1a0d56ea64 100644
---- a/src/3rdparty/chromium/extensions/common/constants.h
-+++ b/src/3rdparty/chromium/extensions/common/constants.h
-@@ -5,6 +5,8 @@
- #ifndef EXTENSIONS_COMMON_CONSTANTS_H_
- #define EXTENSIONS_COMMON_CONSTANTS_H_
-
-+#include <cstdint>
-+
- #include "base/files/file_path.h"
- #include "base/strings/string_piece_forward.h"
- #include "build/chromeos_buildflags.h"
-diff --git a/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h b/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-index e21700ecfc4..3b704e83b06 100644
---- a/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-+++ b/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- #define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
-
-+#include <cstdint>
- #include <set>
- #include <string>
-
-diff --git a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-index 1a7028e4717..b9e951c0a4f 100644
---- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-+++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
- #define GPU_CONFIG_GPU_FEATURE_INFO_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h
-index d6adf388e6f..ea360d1c927 100644
---- a/src/3rdparty/chromium/net/base/parse_number.h
-+++ b/src/3rdparty/chromium/net/base/parse_number.h
-@@ -5,6 +5,8 @@
- #ifndef NET_BASE_PARSE_NUMBER_H_
- #define NET_BASE_PARSE_NUMBER_H_
-
-+#include <cstdint>
-+
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
-
-diff --git a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-index 5f289ddcd94..44f2f9eb1ff 100644
---- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-+++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-@@ -6,6 +6,7 @@
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
-
- #include <bitset>
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-index 6a300ed0c0b..3e30f1cb02f 100644
---- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
-
-+#include <cstdint>
- #include <vector>
-
- #include "absl/strings/string_view.h"
-diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-index 52f15017283..db4d3108497 100644
---- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/pdf/document_attachment_info.h b/src/3rdparty/chromium/pdf/document_attachment_info.h
-index e0fffc2ca4e..095463fcb5b 100644
---- a/src/3rdparty/chromium/pdf/document_attachment_info.h
-+++ b/src/3rdparty/chromium/pdf/document_attachment_info.h
-@@ -5,6 +5,7 @@
- #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
- #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
-
-+#include <cstdint>
- #include <string>
-
-
-diff --git a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-index b167ffb099a..2347d546167 100644
---- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-+++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-@@ -6,6 +6,7 @@
- #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
-
- #include <bitset>
-+#include <cstdint>
- #include <string>
-
- #include "sandbox/sandbox_export.h"
-diff --git a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-index 4b76d33af2f..4db1902d1b7 100644
---- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-+++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-@@ -12,6 +12,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
-index 7a74887af96..058870eef35 100644
---- a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
-+++ b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_BLUETOOTH_WEB_BLUETOOTH_DEVICE_ID_H_
-
- #include <array>
-+#include <cstdint>
- #include <string>
-
- #include "third_party/blink/public/common/common_export.h"
-diff --git a/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h b/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h
-index 5151ab7483f..51e7e1a58f0 100644
---- a/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h
-+++ b/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h
-@@ -7,6 +7,7 @@
-
- #include <stdint.h>
-
-+#include <cstdint>
- #include <limits>
- #include <string>
- #include <vector>
-diff --git a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-index c1b5f59f57e..246200991a5 100644
---- a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-+++ b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_
-
- #include <array>
-+#include <cstdint>
-
- namespace blink {
-
-diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-index e40a7620795..745b7b0891f 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-@@ -122,7 +122,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode
-
- // An identifier for a document transition shared element. `id.valid()`
- // returns true if this has been set, and false otherwise.
-- DocumentTransitionSharedElementId document_transition_shared_element_id;
-+ blink::DocumentTransitionSharedElementId document_transition_shared_element_id;
-
- // An identifier to tag shared element resources generated and cached in the
- // Viz process. This generated resource can be used as content for other
-diff --git a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-index d2731dac7a3..46bc87ef92a 100644
---- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-+++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-@@ -5,6 +5,8 @@
- #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
- #define CONSTANTS_ANNOTATION_FLAGS_H_
-
-+#include <cstdint>
-+
- namespace pdfium {
- namespace annotation_flags {
-
-diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-index 1b4c53815bc..472042fabc4 100644
---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
-
- #include <array>
-+#include <cstdint>
- #include <string>
-
- #include "perfetto/ext/base/optional.h"
-diff --git a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-index b7c586b80eb..9e073d4e1b8 100644
---- a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-+++ b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-@@ -2393,6 +2393,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock V
- #include <cstring>
- #include <utility>
-
-+#if VMA_STATS_STRING_ENABLED
-+#include <cstdio>
-+#endif // VMA_STATS_STRING_ENABLED
-+
- #if VMA_RECORDING_ENABLED
- #include <chrono>
- #if defined(_WIN32)
-diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-index 4190a79dc09..5a9285f0071 100644
---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-@@ -12,6 +12,7 @@
- #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h
-index bee3f946e9c..f7c8716ca33 100644
---- a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h
-+++ b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h
-@@ -5,6 +5,8 @@
- #ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_
- #define UI_BASE_PREDICTION_KALMAN_FILTER_H_
-
-+#include <cstdint>
-+
- #include "base/component_export.h"
- #include "ui/gfx/geometry/matrix3_f.h"
-
-diff --git a/src/3rdparty/chromium/ui/events/types/scroll_types.h b/src/3rdparty/chromium/ui/events/types/scroll_types.h
-index be6b2779f41..dbe2e5cf746 100644
---- a/src/3rdparty/chromium/ui/events/types/scroll_types.h
-+++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h
-@@ -5,6 +5,8 @@
- #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
- #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
-
-+#include <cstdint>
-+
- namespace ui {
-
- enum class ScrollGranularity : uint8_t {
-diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-index 65cd4cb07c7..ab0ce5808c3 100644
---- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-+++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-@@ -6,6 +6,7 @@
- #define UI_GFX_LINEAR_GRADIENT_H_
-
- #include <array>
-+#include <cstdint>
- #include <string>
-
- #include "ui/gfx/geometry/geometry_skia_export.h"
---
-cgit v1.2.3
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch
deleted file mode 100644
index 6a5802829bb4..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-https://github.com/qutebrowser/qutebrowser/issues/7662
-https://bugreports.qt.io/browse/QTBUG-113109
-
-https://codereview.qt-project.org/c/qt/qtwebengine/+/474114
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Mon, 24 Apr 2023 17:33:17 +0200
-Subject: [PATCH] Fix user script management when subframes are present
-
-Only the main frames should administer scripts associated with it.
-
-Pick-to: 6.5
-Fixes: QTBUG-113109
-Change-Id: Ibda66f55ef99da632134a9de1425797262faba9b
---- a/src/core/renderer/user_resource_controller.cpp
-+++ b/src/core/renderer/user_resource_controller.cpp
-@@ -289,10 +289,11 @@
- FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(renderFrame);
- if (it == m_frameUserScriptMap.end()) // ASSERT maybe?
- return;
-- for (uint64_t id : std::as_const(it.value())) {
-- m_scripts.remove(id);
-+ if (renderFrame->IsMainFrame()) {
-+ for (uint64_t id : std::as_const(it.value()))
-+ m_scripts.remove(id);
- }
-- m_frameUserScriptMap.remove(renderFrame);
-+ m_frameUserScriptMap.erase(it);
- }
-
- void UserResourceController::addScriptForFrame(const QtWebEngineCore::UserScriptData &script,
-@@ -304,7 +305,8 @@
-
- if (!(*it).contains(script.scriptId))
- (*it).append(script.scriptId);
-- m_scripts.insert(script.scriptId, script);
-+ if (!frame || frame->IsMainFrame())
-+ m_scripts.insert(script.scriptId, script);
- }
-
- void UserResourceController::removeScriptForFrame(const QtWebEngineCore::UserScriptData &script,
-@@ -315,7 +317,8 @@
- return;
-
- (*it).removeOne(script.scriptId);
-- m_scripts.remove(script.scriptId);
-+ if (!frame || frame->IsMainFrame())
-+ m_scripts.remove(script.scriptId);
- }
-
- void UserResourceController::clearScriptsForFrame(content::RenderFrame *frame)
-@@ -323,8 +326,10 @@
- FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(frame);
- if (it == m_frameUserScriptMap.end())
- return;
-- for (uint64_t id : std::as_const(it.value()))
-- m_scripts.remove(id);
-+ if (!frame || frame->IsMainFrame()) {
-+ for (uint64_t id : std::as_const(it.value()))
-+ m_scripts.remove(id);
-+ }
-
- m_frameUserScriptMap.remove(frame);
- }
---- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
-+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
-@@ -76,6 +76,7 @@
- void scriptsInNestedIframes();
- void matchQrcUrl();
- void injectionOrder();
-+ void reloadWithSubframes();
- };
-
- void tst_QWebEngineScript::domEditing()
-@@ -694,6 +695,38 @@
- QTRY_COMPARE(page.log, expected);
- }
-
-+void tst_QWebEngineScript::reloadWithSubframes()
-+{
-+ class Page : public QWebEnginePage
-+ {
-+ public:
-+ Page() : QWebEnginePage() {}
-+ QVector<QString> log;
-+
-+ protected:
-+ void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel, const QString &message, int,
-+ const QString &) override
-+ {
-+ log.append(message);
-+ }
-+ } page;
-+
-+ QWebEngineScript s;
-+ s.setInjectionPoint(QWebEngineScript::DocumentCreation);
-+ s.setSourceCode(QStringLiteral("console.log('Hello');"));
-+ page.scripts().insert(s);
-+
-+ page.setHtml(QStringLiteral("<body>"
-+ " <h1>Test scripts working on reload </h1>"
-+ " <iframe src='about://blank'>"
-+ " </iframe>"
-+ "</body>"));
-+ QTRY_COMPARE(page.log.size(), 1);
-+
-+ page.triggerAction(QWebEnginePage::Reload);
-+ QTRY_COMPARE(page.log.size(), 2);
-+}
-+
- QTEST_MAIN(tst_QWebEngineScript)
-
- #include "tst_qwebenginescript.moc"
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch
new file mode 100644
index 000000000000..7caf202072c7
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch
@@ -0,0 +1,99 @@
+Qt Upstream: https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=6.5&id=281174f5e010d819a49562b48b2c2067255a41c6
+
+From 281174f5e010d819a49562b48b2c2067255a41c6 Mon Sep 17 00:00:00 2001
+From: Szabolcs David <davidsz@inf.u-szeged.hu>
+Date: Fri, 19 May 2023 01:00:41 +0200
+Subject: Normalize clipboard permissions
+
+Handle clipboard read and write permissions the same way everywhere.
+
+Fixes: QTBUG-113579
+Change-Id: If1f271e8591c54f4ee2f935486502df19d5f6b3e
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit 79e4a37668a9176373e81fe4fc8dfe29f6c8c37b)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+ src/core/permission_manager_qt.cpp | 46 +++++++++++++++++++-------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp
+index 9d98c0592..28e1c981d 100644
+--- a/src/core/permission_manager_qt.cpp
++++ b/src/core/permission_manager_qt.cpp
+@@ -84,6 +84,22 @@ static blink::mojom::PermissionStatus toBlink(ProfileAdapter::PermissionState re
+ }
+ }
+
++static blink::mojom::PermissionStatus getStatusFromSettings(blink::PermissionType type, WebEngineSettings *settings)
++{
++ switch (type) {
++ case blink::PermissionType::CLIPBOARD_READ_WRITE:
++ if (!settings->testAttribute(QWebEngineSettings::JavascriptCanPaste))
++ return blink::mojom::PermissionStatus::DENIED;
++ Q_FALLTHROUGH();
++ case blink::PermissionType::CLIPBOARD_SANITIZED_WRITE:
++ if (!settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard))
++ return blink::mojom::PermissionStatus::DENIED;
++ return blink::mojom::PermissionStatus::GRANTED;
++ default:
++ return blink::mojom::PermissionStatus::ASK;
++ }
++}
++
+ PermissionManagerQt::PermissionManagerQt()
+ : m_requestIdCount(0)
+ {
+@@ -179,13 +195,8 @@ void PermissionManagerQt::RequestPermission(blink::PermissionType permission,
+ Q_ASSERT(contentsDelegate);
+
+ ProfileAdapter::PermissionType permissionType = toQt(permission);
+- if (permissionType == ProfileAdapter::ClipboardRead) {
+- WebEngineSettings *settings = contentsDelegate->webEngineSettings();
+- if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)
+- && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste))
+- std::move(callback).Run(blink::mojom::PermissionStatus::GRANTED);
+- else
+- std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
++ if (permissionType == ProfileAdapter::ClipboardRead || permissionType == ProfileAdapter::ClipboardWrite) {
++ std::move(callback).Run(getStatusFromSettings(permission, contentsDelegate->webEngineSettings()));
+ return;
+ } else if (!canRequestPermissionFor(permissionType)) {
+ std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
+@@ -220,14 +231,9 @@ void PermissionManagerQt::RequestPermissions(const std::vector<blink::Permission
+ const ProfileAdapter::PermissionType permissionType = toQt(permission);
+ if (permissionType == ProfileAdapter::UnsupportedPermission)
+ result.push_back(blink::mojom::PermissionStatus::DENIED);
+- else if (permissionType == ProfileAdapter::ClipboardRead) {
+- WebEngineSettings *settings = contentsDelegate->webEngineSettings();
+- if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)
+- && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste))
+- result.push_back(blink::mojom::PermissionStatus::GRANTED);
+- else
+- result.push_back(blink::mojom::PermissionStatus::DENIED);
+- } else {
++ else if (permissionType == ProfileAdapter::ClipboardRead || permissionType == ProfileAdapter::ClipboardWrite)
++ result.push_back(getStatusFromSettings(permission, contentsDelegate->webEngineSettings()));
++ else {
+ answerable = false;
+ break;
+ }
+@@ -280,14 +286,8 @@ blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForCurren
+ permission == blink::PermissionType::CLIPBOARD_SANITIZED_WRITE) {
+ WebContentsDelegateQt *delegate = static_cast<WebContentsDelegateQt *>(
+ content::WebContents::FromRenderFrameHost(render_frame_host)->GetDelegate());
+- if (!delegate->webEngineSettings()->testAttribute(
+- QWebEngineSettings::JavascriptCanAccessClipboard))
+- return blink::mojom::PermissionStatus::DENIED;
+- if (permission == blink::PermissionType::CLIPBOARD_READ_WRITE
+- && !delegate->webEngineSettings()->testAttribute(
+- QWebEngineSettings::JavascriptCanPaste))
+- return blink::mojom::PermissionStatus::DENIED;
+- return blink::mojom::PermissionStatus::GRANTED;
++ Q_ASSERT(delegate);
++ return getStatusFromSettings(permission, delegate->webEngineSettings());
+ }
+
+ return GetPermissionStatus(
+--
+cgit v1.2.3
+
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.0-r2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild
index 912effe24979..93f241ac06e2 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.0-r2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="108.0.5359.181"
-CHROMIUM_PATCHES_VER="110.0.5481.104"
+CHROMIUM_PATCHES_VER="112.0.5615.138"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
@@ -87,10 +87,7 @@ DEPEND="${RDEPEND}
media-libs/libglvnd
"
-PATCHES=(
- "${FILESDIR}/${PN}-6.5.0-gcc-13-build.patch"
- "${FILESDIR}/${PN}-6.5.0-userscripts-loading.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-6.5.1-normalise-clipboard-permissions.patch" )
python_check_deps() {
python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
@@ -234,7 +231,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
-DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine-system-libopenjpeg2=on
+ -DQT_FEATURE_webengine_system_libopenjpeg2=on
-DQT_FEATURE_webengine_system_libpci=on
-DQT_FEATURE_webengine_system_libpng=on
-DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)