commit: 218cd03d9bb0e0856782f172f677b4e48b8a7831 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Mon Apr 17 18:25:19 2023 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Mon Apr 17 19:39:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218cd03d
dev-qt/qtwebengine: fix build with GCC-13 Also add a dependency on 'media-libs/openjpeg', so that the system package is used. Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> .../files/qtwebengine-6.5.0-gcc-13-build.patch | 394 +++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-6.5.0-r1.ebuild | 246 +++++++++++++ 2 files changed, 640 insertions(+) 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 new file mode 100644 index 000000000000..0993771177b4 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch @@ -0,0 +1,394 @@ +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 <[email protected]> +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 <[email protected]> +--- + 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/qtwebengine-6.5.0-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.0-r1.ebuild new file mode 100644 index 000000000000..f8bac25f51b1 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.5.0-r1.ebuild @@ -0,0 +1,246 @@ +# 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="108.0.5359.181" +CHROMIUM_PATCHES_VER="110.0.5481.104" + +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-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/openjpeg:2= + 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-icu? ( >=dev-libs/icu-69.1:= ) + widgets? ( + =dev-qt/qtbase-${PV}*[widgets] + ) +" +DEPEND="${RDEPEND} + media-libs/libglvnd +" + +PATCHES=( "${FILESDIR}/${PN}-6.5.0-gcc-13-build.patch" ) + +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=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_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 +}
