From 115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Mar 2023 09:49:11 +0100 Subject: gentoo auto-resync : 28:03:2023 - 09:49:10 --- dev-qt/qtwebengine/Manifest | 5 +- .../files/qtwebengine-5.15.8_p20230112-gcc13.patch | 431 +++++++++++++++++++++ .../qtwebengine-5.15.8_p20230112.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild | 243 ------------ 4 files changed, 434 insertions(+), 246 deletions(-) create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch delete mode 100644 dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild (limited to 'dev-qt/qtwebengine') diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 946c32b999cc..931dedef95f9 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -10,13 +10,12 @@ AUX qtwebengine-5.15.3_p20220406-gcc12-includes.patch 1139 BLAKE2B ba451fcef0dd2 AUX qtwebengine-5.15.3_p20220505-extra-gn.patch 458 BLAKE2B 0595f06d31fd83a04cc0ef9fb7567374c28c4d09c8774e6584d288aa18c2386efe699bd1d155fdee96f5960d3575baff6a6aa7a694d0c953401f80add9daf6c3 SHA512 81498f04c1ad4d73e888bba31fb1129e24990bcddb1d68111b004bba2e4fdab91698b3fe1d01bd94a0bf904e52f614cddc4ba6f70ffaf6a1d45e37a53e583629 AUX qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch 1911 BLAKE2B fb59f9ae06031bd52460856951653e193ee9a2d6f965fe0aab940822d8a7a90aea830ba9548a5879ac8644b5b80fb1ffbaf14dfb91de44e07c2ef4f5c470db6d SHA512 c490c2650f061e584523b06d28b3986a2ba940a478fa0aff1f1f4891495423c5dd432cc96a690ad02871e8e626d77978aaa9b97b4a8d0122e0638849e4225b3c AUX qtwebengine-5.15.8_p20230106-widevine.patch 4482 BLAKE2B 25cb06e27d51011df57b63053bc97f20bf0062167d0915b2d4da5b5b7164b5f35ef66b19da69acd3fac16bf9264e85e5d69987a6c38284033c77058b9146ea20 SHA512 f05969ce3355ca23cdaad822e052f4a12350598cd9a5bf5af72f9f10e1cf43bbbc86f2af3b5e27cd6a9198bd025a7afddb4db35444542d57c9963f3f47a6de97 +AUX qtwebengine-5.15.8_p20230112-gcc13.patch 13359 BLAKE2B d53cfd67c5e72a9f6f3d5e99c1ec6d5b90d9a4fdb5d462bc5d4e44e0c70b27fff2ab0128ea8f07a4f21429ddb33a3ec94b59b1459ebc6930290409e7cfdda6b7 SHA512 7bd8089a7fcd4603b0af41d3ff1c6be22d8074c6e5a2463884304cca94565ce720c30826678dd73509d042b0ae11ea213cbe9e8244c1dcd0c3fc6305cbe77de2 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840 DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e -DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39 -EBUILD qtwebengine-5.15.8_p20230112.ebuild 9440 BLAKE2B e07a42c70a32e2d89bab03ba76b8d5ee435fa705c904558bbab992910a2557439454a3de6d2f73a80685be01790512870096f2b754f026e987bc9e420dfd66da SHA512 d1425b52dc2e4567084fab3d21418eb92490648b2ddd0a36d58a5ea6b8302e5bb20817756d9969312699d7cdefd9e988e65e762193382bae32ac52183003d5fd -EBUILD qtwebengine-6.4.2.ebuild 7414 BLAKE2B 6d25d60291c227c6bf52adaef94d8b13aafc98a3946472d191c8311e42fe8afd9b3799510afa58ea01a83a393adcaffef4842ef7df5f5ffdaa73b5344ede59a4 SHA512 f5947f1440041ec126b571d570c6cb13ed8f27d0deb703945a47491735ae2ac04e0d5cbda6bec23d6233de7583a757220910d113058535835367615c1284eeed +EBUILD qtwebengine-5.15.8_p20230112.ebuild 9539 BLAKE2B da7abf15aef811b8d1339e72a3b3a820b745fe942c5d35099cb76924aaa01f71441792b02f92aeb436e3a57437c4cd394110403fbd844ad24786d4d9037b029c SHA512 4e001b9fc77762ba864931a4a55e3e4032fc8f217b357bbb7a0bfa67de4a54a6bb2f2b071daa1f9cbbae781f47d446263fbe5266f0c8cdf2657913ef332bb07c EBUILD qtwebengine-6.4.3.ebuild 7634 BLAKE2B b7a9e50c5653c8fbe50d180e48de9c52c6135ffe23869d58b9b703b52e667c24afe918b365fe9c0397834d4688d54fca1432985f6f5b848a3d21416ce880f3a6 SHA512 a10a58f330d9dbb480107cfe67fe79747c98fb70451c14e87430759ce49e902cad791cdd919cf1218baeba67dabe3a1835d64d70495f5522758e7657bdaa4d0f MISC metadata.xml 1258 BLAKE2B 450cb9e683a52475729881c910e7b0b79587d3d672d4eb90613b91194ec19ab7c0fb86bf4ff4bf631686ed3cad49859eed07405b1f7d6129f40b5f4edba68e43 SHA512 971dbe74479e6bf3ed3cda00724bb4a60d6382c4020ee6ce3a730646a69af0a66785fb135706a2a0cc00ff3190674e724aa3def03f43c8e9ed5e5d317ae271f0 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch new file mode 100644 index 000000000000..b9df5b0fe445 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch @@ -0,0 +1,431 @@ +Upstream: +- https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/468198 + +Gentoo bugs: +- https://bugs.gentoo.org/889724 +- https://bugs.gentoo.org/895196 +- https://bugs.gentoo.org/898902 +- https://bugs.gentoo.org/898634 (bundled abseil) + +Based on the following from Fedora: +- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/14bbdcc0567223a4c96421ab2dfe2a668831ec98?branch=rawhide +- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/9a37c86a90d1d3c0684aa1428657fc7ed22390ac?branch=rawhide +- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/5dc49e01024ab2adae3705d14a9be76d706b7e52?branch=rawhide +- Whole thing: https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-fix-build.patch +--- a/src/3rdparty/chromium/base/debug/profiler.h ++++ b/src/3rdparty/chromium/base/debug/profiler.h +@@ -5,6 +5,7 @@ + #ifndef BASE_DEBUG_PROFILER_H_ + #define BASE_DEBUG_PROFILER_H_ + ++#include + #include + + #include +--- a/src/3rdparty/chromium/base/debug/stack_trace.h ++++ b/src/3rdparty/chromium/base/debug/stack_trace.h +@@ -7,6 +7,7 @@ + + #include + ++#include + #include + #include + +--- a/src/3rdparty/chromium/cc/trees/target_property.cc ++++ b/src/3rdparty/chromium/cc/trees/target_property.cc +@@ -4,6 +4,8 @@ + + #include "cc/trees/target_property.h" + ++#include ++ + namespace cc { + + static_assert(TargetProperty::LAST_TARGET_PROPERTY < kMaxTargetPropertyIndex, +--- 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 + #include + #include + #include "base/callback_forward.h" +--- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc ++++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc +@@ -4,6 +4,8 @@ + + #include "device/base/synchronization/one_writer_seqlock.h" + ++#include ++ + namespace device { + + OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {} +--- 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 + #include + #include + +--- a/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h ++++ b/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h +@@ -5,6 +5,7 @@ + #ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_ + #define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_ + ++#include + #include + #include + +--- a/src/3rdparty/chromium/extensions/common/constants.h ++++ b/src/3rdparty/chromium/extensions/common/constants.h +@@ -11,6 +11,8 @@ + #include "components/version_info/channel.h" + #include "ui/base/layout.h" + ++#include ++ + namespace extensions { + + // Scheme we serve extension content from. +--- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h ++++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h +@@ -5,6 +5,8 @@ + #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ + #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ + ++#include ++ + namespace gpu { + namespace webgpu { + +--- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h ++++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h +@@ -5,6 +5,7 @@ + #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_ + #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_ + ++#include + #include + + #include "gpu/command_buffer/common/gl2_types.h" +--- a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h ++++ b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h +@@ -5,6 +5,7 @@ + #ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_ + #define GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_ + ++#include + #include + #include + +--- a/src/3rdparty/chromium/gpu/config/device_perf_info.h ++++ b/src/3rdparty/chromium/gpu/config/device_perf_info.h +@@ -5,6 +5,7 @@ + #ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_ + #define GPU_CONFIG_DEVICE_PERF_INFO_H_ + ++#include + #include + #include + +--- 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 + #include + #include + +--- a/src/3rdparty/chromium/gpu/config/gpu_preferences.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_preferences.h +@@ -5,6 +5,7 @@ + #ifndef GPU_CONFIG_GPU_PREFERENCES_H_ + #define GPU_CONFIG_GPU_PREFERENCES_H_ + ++#include + #include + #include + #include +--- a/src/3rdparty/chromium/gpu/config/gpu_util.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_util.h +@@ -5,6 +5,8 @@ + #ifndef GPU_CONFIG_GPU_UTIL_H_ + #define GPU_CONFIG_GPU_UTIL_H_ + ++#include ++ + #include "build/build_config.h" + #include "gpu/config/gpu_feature_info.h" + #include "gpu/gpu_export.h" +--- a/src/3rdparty/chromium/net/base/parse_number.h ++++ b/src/3rdparty/chromium/net/base/parse_number.h +@@ -9,6 +9,8 @@ + #include "base/strings/string_piece.h" + #include "net/base/net_export.h" + ++#include ++ + // This file contains utility functions for parsing numbers, in the context of + // network protocols. + // +--- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h ++++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h +@@ -5,6 +5,7 @@ + #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ + #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ + ++#include + #include + #include + +--- a/src/3rdparty/chromium/pdf/document_attachment_info.h ++++ b/src/3rdparty/chromium/pdf/document_attachment_info.h +@@ -7,6 +7,8 @@ + + #include "base/strings/string16.h" + ++#include ++ + namespace chrome_pdf { + + struct DocumentAttachmentInfo { +--- a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h ++++ b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h +@@ -38,6 +38,10 @@ namespace pp { + /// As a further optimization, we can add support for this later. + class ThreadSafeThreadTraits { + public: ++ ++ typedef pp::Lock Lock; ++ typedef pp::AutoLock AutoLock; ++ + class RefCount { + public: + /// Default constructor. In debug mode, this checks that the object is being +@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits { + int32_t ref_; + }; + +- typedef pp::Lock Lock; +- typedef pp::AutoLock AutoLock; + }; + + /// The non-thread-safe version of thread traits. Using this class as the +--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h ++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h +@@ -19,6 +19,7 @@ + #include + + #include ++#include + #include + #include + +--- 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 + #include ++#include + #include + #include + +--- a/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h ++++ b/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h +@@ -15,6 +15,7 @@ + # include "absl/container/flat_hash_map.h" + #endif // defined(ANGLE_USE_ABSEIL) + ++#include + #include + #include + #include +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h +@@ -33,6 +33,7 @@ + #include + #include + ++#include + #include + + #include "client/linux/handler/microdump_extra_info.h" +--- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc ++++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + +--- 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 ++ + namespace pdfium { + namespace annotation_flags { + +--- 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 ++#include + #include + + #include "perfetto/ext/base/optional.h" +--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h ++++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h +@@ -21,6 +21,8 @@ + #include "perfetto/trace_processor/status.h" + #include "src/trace_processor/trace_blob_view.h" + ++#include ++ + namespace perfetto { + + namespace protos { +--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp ++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp +@@ -9,6 +9,9 @@ + #include "include/utils/SkParse.h" + + #include // std::lower_bound ++#include ++#include ++#include + + static constexpr const char* gColorNames[] = { + "aliceblue", +--- a/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h ++++ b/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h +@@ -11,6 +11,7 @@ + #ifndef CALL_RTP_DEMUXER_H_ + #define CALL_RTP_DEMUXER_H_ + ++#include + #include + #include + #include +--- 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 + #include + #include + +--- a/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml ++++ b/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml +@@ -89,7 +89,7 @@ OF THIS SOFTWARE. + + + +- ++ + + + +--- a/src/3rdparty/chromium/ui/events/gesture_event_details.h ++++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h +@@ -5,6 +5,7 @@ + #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_ + #define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_ + ++#include + #include + + #include "base/check_op.h" +--- 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 ++ + namespace ui { + + enum class ScrollGranularity : uint8_t { +--- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc ++++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc +@@ -4,6 +4,7 @@ + + #include "ui/gl/gl_surface_glx.h" + ++#include + #include + + #include "base/bind.h" +--- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.h ++++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.h +@@ -5,6 +5,7 @@ + #ifndef UI_GL_GL_SURFACE_GLX_H_ + #define UI_GL_GL_SURFACE_GLX_H_ + ++#include + #include + + #include +--- a/src/3rdparty/chromium/v8/src/base/logging.h ++++ b/src/3rdparty/chromium/v8/src/base/logging.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_LOGGING_H_ + #define V8_BASE_LOGGING_H_ + ++#include + #include + #include + #include +--- a/src/3rdparty/chromium/v8/src/base/macros.h ++++ b/src/3rdparty/chromium/v8/src/base/macros.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_MACROS_H_ + #define V8_BASE_MACROS_H_ + ++#include + #include + #include + +--- a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h ++++ b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h +@@ -5,6 +5,7 @@ + #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + ++#include + #include + + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may +--- a/src/core/browsing_data_remover_delegate_qt.h ++++ b/src/core/browsing_data_remover_delegate_qt.h +@@ -42,6 +42,8 @@ + + #include "content/public/browser/browsing_data_remover_delegate.h" + ++#include ++ + namespace QtWebEngineCore { + + class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate { + diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild index eacf340d227b..a9eb384e9067 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild @@ -114,6 +114,7 @@ PATCHES=( "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3 "${FILESDIR}/${PN}-5.15.8_p20230106-v8-opcode-constexpr.patch" # bug 889042 "${FILESDIR}/${PN}-5.15.8_p20230106-widevine.patch" # bug 888783 + "${FILESDIR}/${PN}-5.15.8_p20230112-gcc13.patch" # bug 889724, bug 895196, bug 898902, bug 898634 ) qtwebengine_check-reqs() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild deleted file mode 100644 index c1a7dff6aa69..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="xml(+)" -CHROMIUM_VER="102.0.5005.177" -CHROMIUM_PATCHES_VER="108.0.5359.94" - -inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build - -DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE=" - alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast - +system-ffmpeg +system-icu widgets -" -REQUIRED_USE="designer? ( widgets )" - -BDEPEND=" - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') - dev-util/gperf - dev-util/ninja - dev-util/re2c - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex -" -RDEPEND=" - app-arch/snappy:= - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - dev-libs/expat - dev-libs/libevent:= - dev-libs/libxml2[icu] - dev-libs/libxslt - dev-libs/re2:= - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtwebchannel-${PV}* - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - >=media-libs/libvpx-1.5:=[svc(+)] - media-libs/libwebp:= - media-libs/opus - sys-apps/dbus - sys-apps/pciutils - sys-libs/zlib[minizip] - virtual/libudev - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libxcb:= - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libxshmfence:= - x11-libs/libXtst - alsa? ( media-libs/alsa-lib ) - geolocation? ( =dev-qt/qtpositioning-${PV}* ) - kerberos? ( virtual/krb5 ) - pulseaudio? ( media-libs/libpulse:= ) - screencast? ( media-video/pipewire:= ) - system-ffmpeg? ( media-video/ffmpeg:= ) - system-icu? ( >=dev-libs/icu-69.1:= ) - widgets? ( - =dev-qt/qtbase-${PV}*[widgets] - ) -" -DEPEND="${RDEPEND} - media-libs/libglvnd -" - -python_check_deps() { - python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" -} - -qtwebengine_check-reqs() { - # bug #307861 - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." - fi - eshopts_pop - - [[ ${MERGE_TYPE} == binary ]] && return - - # (check-reqs added for bug #570534) - # - # Estimate the amount of RAM required - # Multiplier is *10 because Bash doesn't do floating point maths. - # Let's crudely assume ~2GB per compiler job for GCC. - local multiplier=20 - - # And call it ~1.5GB for Clang. - if tc-is-clang ; then - multiplier=15 - fi - - local CHECKREQS_DISK_BUILD="7G" - local CHECKREQS_DISK_USR="150M" - if ! has "distcc" ${FEATURES} ; then - # bug #830661 - # Not super realistic to come up with good estimates for distcc right now - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G - fi - - check-reqs_${EBUILD_PHASE_FUNC} -} - -pkg_pretend() { - qtwebengine_check-reqs -} - -pkg_setup() { - qtwebengine_check-reqs - python-any-r1_pkg_setup -} - -pkg_preinst() { - elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with" - elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the" - elog "list of backports is impossible to evaluate, but always bound to be behind" - elog "Chromium's release schedule." - elog "In addition, various online services may deny service based on an outdated" - elog "user agent version (and/or other checks). Google is already known to do so." - elog - elog "tldr: Your web browsing experience will be compromised." -} - -src_unpack() { - # bug 307861 - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - ewarn - ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." - ewarn - fi - eshopts_pop - - case ${QT6_BUILD_TYPE} in - live) git-r3_src_unpack ;& - release) default ;; - esac -} - -src_prepare() { - # bug 620444 - ensure local headers are used - find . -type f -name "*.pr[fio]" -exec \ - sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die - - if use system-icu; then - # Sanity check to ensure that bundled copy of ICU is not used. - # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because - # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. - # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in - # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in - # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated. - local file - while read file; do - echo "#error This file should not be used!" > "${file}" || die - done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) - fi - - qt6-build_src_prepare -} - -src_configure() { - export NINJA_PATH="${BROOT}"/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" - - local mycmakeargs=( - #-DQT_FEATURE_accessibility=off - #-DQT_FEATURE_force_asserts=off - #-DQT_FEATURE_opengl=off - #-DQT_FEATURE_printer=off - -DQT_FEATURE_qtpdf_build=off - -DQT_FEATURE_qtpdf_quick_build=off - -DQT_FEATURE_qtpdf_widgets_build=off - -DQT_FEATURE_qtwebengine_build=on - -DQT_FEATURE_qtwebengine_quick_build=on - -DQT_FEATURE_qtwebengine_widgets_build=on - #-DQT_FEATURE_ssl=off - #-DQT_FEATURE_static=off - #-DQT_FEATURE_system_zlib=off - #-DQT_FEATURE_system_png=off - #-DQT_FEATURE_system_jpeg=off - #-DQT_FEATURE_system_freetype=off - #-DQT_FEATURE_system_harfbuzz=off - #-DQT_FEATURE_use_gold_linker=off - #-DQT_FEATURE_use_lld_linker=off - -DQT_FEATURE_webengine_embedded_build=off - -DQT_FEATURE_webengine_extensions=on - #-DQT_FEATURE_webengine_full_debug_info=$(usex debug) - -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off) - -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build) - #-DQT_FEATURE_webengine_jumbo_file_merge_limit - -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off) - -DQT_FEATURE_webengine_native_spellchecker=off - -DQT_FEATURE_webengine_ozone_x11=on - -DQT_FEATURE_webengine_pepper_plugins=on - -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on) - -DQT_FEATURE_webengine_printing_and_pdf=on - -DQT_FEATURE_webengine_sanitizer=on - -DQT_FEATURE_webengine_spellchecker=on - -DQT_FEATURE_webengine_system_opus=on - -DQT_FEATURE_webengine_system_libwebp=on - -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off) - -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg) - -DQT_FEATURE_webengine_system_icu=$(usex system-icu) - -DQT_FEATURE_webengine_system_libevent=on - -DQT_FEATURE_webengine_system_libpci=on - -DQT_FEATURE_webengine_system_libpng=on - -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off) - -DQT_FEATURE_webengine_system_zlib=on - -DQT_FEATURE_webengine_webchannel=on - -DQT_FEATURE_webengine_webrtc=on - -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off) - #-DQT_FEATURE_xcb=off - ) - - qt6-build_src_configure -} -- cgit v1.2.3