* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, profiles/, dev-qt/qtwebengine/files/
@ 2025-04-28 17:21 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2025-04-28 17:21 UTC (permalink / raw
To: gentoo-commits
commit: 951d2f5c3d1df1a37315280bcce3fff1c681daef
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 27 21:31:52 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 28 17:12:55 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951d2f5c
dev-qt/qtwebengine: drop 5.15.16_p20241115
Closes: https://bugs.gentoo.org/925718
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 -
...webengine-5.15.14_p20240510-gcc15-cstdint.patch | 170 --------------
...5.15.14_p20240510-gcc15-template-id-cdtor.patch | 93 --------
.../qtwebengine-5.15.14_p20240510-icu-75.patch | 102 --------
.../files/qtwebengine-5.15.14_p20240510-re2.patch | 14 --
...twebengine-5.15.16_p20241115-py3.13-pipes.patch | 21 --
...qtwebengine-5.15.2_p20210521-clang-libc++.patch | 10 -
.../qtwebengine-5.15.16_p20241115.ebuild | 259 ---------------------
profiles/package.mask | 4 -
9 files changed, 675 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 288c01a9529b..9c8f582d161a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
-DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2a603a28881d9cf97f339d951217f3837d614ebb58aff9b0963220be04cc9a17869b6021a6d7687848bd8ccd1c8c49115a5e6944be84b SHA512 50e0bc7b4236859b4419f2f8eaf37e47c1994c30ca3bf584dd2f4996b5f8ba7cd31c8aae48c28f0fcd39c144490f5e451c7ecf5d340e7b10fa2e37666ef21100
DIST qtwebengine-6.8-patchset-7.tar.xz 9096 BLAKE2B 58a95b198a6c8180a71a4365e7c2e3bee2d3798ecff18b01fe23e228a4ceafe2aae43088f503a98fa2d5097271ec442985d993fb24e1b2d2c09014b3309bef4d SHA512 489caa5f7cc3d3091e5896c2eb4d489a40fc220738c2240ec406928c7c948ab8962817024c2fbe3c393294e70ef6ce8c02e47964952a3656ff6ebf7908069fc3
DIST qtwebengine-6.9-patchset-4.tar.xz 8164 BLAKE2B 69ccd9802bbfc95fa1b646d80b5eb7bcfda092660adbbb5b32fac6695613e32b0de42a5aad5dc3bf75fa79c90e91e648c70857cbb506b8f879a47262486bdba1 SHA512 c41f91d0a9293610afedf0c56caef1d6feaef1e9fc3e411ee5a8a6dac0c297ad9edb49605bd74cb9bfc8649e5310833b7da859e3258bb194324bfb6ff6987362
DIST qtwebengine-everywhere-src-6.8.2.tar.xz 566518084 BLAKE2B 312fda4150bdc1aee25625440baca45b532ecd7a1ce24d3dc3ba990cdf208c3ba42f159e02c881f38b56c29b75677d9001e6222d35b4c96fc39eecf65502e9c7 SHA512 27590ec53845fa36f48a5a0506d505995850027d85bf33fe0413733cbde5c2744e8ea49f445c91d84b8d43454b9f12c1cf7005d614bbcae1a29d432fdacdc0e4
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch
deleted file mode 100644
index 13dd63d7b9f6..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- a/src/3rdparty/chromium/third_party/webrtc/api/task_queue/task_queue_base.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/api/task_queue/task_queue_base.h
-@@ -10,6 +10,7 @@
- #ifndef API_TASK_QUEUE_TASK_QUEUE_BASE_H_
- #define API_TASK_QUEUE_TASK_QUEUE_BASE_H_
-
-+#include <cstdint>
- #include <memory>
-
- #include "api/task_queue/queued_task.h"
---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h
-+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h
-@@ -17,6 +17,7 @@
- #ifndef SRC_TRACE_PROCESSOR_IMPORTERS_GZIP_GZIP_UTILS_H_
- #define SRC_TRACE_PROCESSOR_IMPORTERS_GZIP_GZIP_UTILS_H_
-
-+#include <cstdint>
- #include <memory>
-
- struct z_stream_s;
---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h
-+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h
-@@ -20,6 +20,7 @@
- #include <stddef.h>
- #include <string.h>
-
-+#include <cstdint>
- #include <memory>
- #include <string>
- #include <vector>
---- a/src/3rdparty/chromium/cc/input/main_thread_scrolling_reason.h
-+++ b/src/3rdparty/chromium/cc/input/main_thread_scrolling_reason.h
-@@ -5,6 +5,7 @@
- #ifndef CC_INPUT_MAIN_THREAD_SCROLLING_REASON_H_
- #define CC_INPUT_MAIN_THREAD_SCROLLING_REASON_H_
-
-+#include <cstdint>
- #include <memory>
- #include <string>
- #include "cc/cc_export.h"
---- a/src/3rdparty/chromium/gpu/command_buffer/common/skia_utils.h
-+++ b/src/3rdparty/chromium/gpu/command_buffer/common/skia_utils.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_
- #define GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_
-
-+#include <cstdint>
- #include <memory>
-
- #include "base/optional.h"
---- a/src/3rdparty/chromium/gpu/command_buffer/service/gpu_fence_manager.h
-+++ b/src/3rdparty/chromium/gpu/command_buffer/service/gpu_fence_manager.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_FENCE_MANAGER_H_
- #define GPU_COMMAND_BUFFER_SERVICE_GPU_FENCE_MANAGER_H_
-
-+#include <cstdint>
- #include <memory>
- #include <vector>
-
---- a/src/3rdparty/chromium/net/tools/huffman_trie/trie_entry.h
-+++ b/src/3rdparty/chromium/net/tools/huffman_trie/trie_entry.h
-@@ -5,6 +5,7 @@
- #ifndef NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_
- #define NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_
-
-+#include <cstdint>
- #include <memory>
- #include <string>
- #include <vector>
---- a/src/3rdparty/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h
-+++ b/src/3rdparty/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h
-@@ -7,6 +7,7 @@
- #ifndef CORE_FPDFAPI_PAGE_CPDF_FUNCTION_H_
- #define CORE_FPDFAPI_PAGE_CPDF_FUNCTION_H_
-
-+#include <cstdint>
- #include <memory>
- #include <set>
- #include <vector>
---- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h
-+++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h
-@@ -7,6 +7,7 @@
- #ifndef CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_
- #define CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_
-
-+#include <cstdint>
- #include <list>
- #include <memory>
- #include <utility>
---- a/src/3rdparty/chromium/third_party/pdfium/third_party/base/span.h
-+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/base/span.h
-@@ -9,6 +9,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <cstdint>
- #include <iterator>
- #include <type_traits>
- #include <utility>
---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
-+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
-@@ -17,6 +17,7 @@
- #ifndef INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_
- #define INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_
-
-+#include <cstdint>
- #include <memory>
- #include <string>
-
---- a/src/3rdparty/chromium/third_party/webrtc/api/fec_controller.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/api/fec_controller.h
-@@ -11,6 +11,7 @@
- #ifndef API_FEC_CONTROLLER_H_
- #define API_FEC_CONTROLLER_H_
-
-+#include <cstdint>
- #include <memory>
- #include <vector>
-
---- a/src/3rdparty/chromium/third_party/webrtc/api/network_state_predictor.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/api/network_state_predictor.h
-@@ -11,6 +11,7 @@
- #ifndef API_NETWORK_STATE_PREDICTOR_H_
- #define API_NETWORK_STATE_PREDICTOR_H_
-
-+#include <cstdint>
- #include <memory>
- #include <vector>
-
---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h
-@@ -11,6 +11,7 @@
- #ifndef MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_
- #define MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_
-
-+#include <cstdint>
- #include <memory>
-
- namespace webrtc {
---- a/src/3rdparty/chromium/third_party/webrtc/video/stats_counter.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/video/stats_counter.h
-@@ -11,6 +11,7 @@
- #ifndef VIDEO_STATS_COUNTER_H_
- #define VIDEO_STATS_COUNTER_H_
-
-+#include <cstdint>
- #include <memory>
- #include <string>
-
---- a/src/3rdparty/chromium/third_party/woff2/include/woff2/output.h
-+++ b/src/3rdparty/chromium/third_party/woff2/include/woff2/output.h
-@@ -10,6 +10,7 @@
- #define WOFF2_WOFF2_OUT_H_
-
- #include <algorithm>
-+#include <cstdint>
- #include <cstring>
- #include <memory>
- #include <string>
---- a/src/3rdparty/chromium/base/task/thread_pool.h
-+++ b/src/3rdparty/chromium/base/task/thread_pool.h
-@@ -5,6 +5,7 @@
- #ifndef BASE_TASK_THREAD_POOL_H_
- #define BASE_TASK_THREAD_POOL_H_
-
-+#include <cstdint>
- #include <memory>
- #include <utility>
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-template-id-cdtor.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-template-id-cdtor.patch
deleted file mode 100644
index b1e14c5d3f80..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-template-id-cdtor.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-Date: Wed, 23 Oct 2024 01:04:16 +0200
-Subject: template-id-cdtor
-
-warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor]
-
-Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
-
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_concatenate.h
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_concatenate.h
-@@ -45,7 +45,7 @@ class StringTypeAdapter<char> {
- DISALLOW_NEW();
-
- public:
-- explicit StringTypeAdapter<char>(char buffer) : buffer_(buffer) {}
-+ explicit StringTypeAdapter(char buffer) : buffer_(buffer) {}
-
- unsigned length() const { return 1; }
- bool Is8Bit() const { return true; }
-@@ -62,7 +62,7 @@ class StringTypeAdapter<LChar> {
- DISALLOW_NEW();
-
- public:
-- explicit StringTypeAdapter<LChar>(LChar buffer) : buffer_(buffer) {}
-+ explicit StringTypeAdapter(LChar buffer) : buffer_(buffer) {}
-
- unsigned length() const { return 1; }
- bool Is8Bit() const { return true; }
-@@ -79,7 +79,7 @@ class StringTypeAdapter<UChar> {
- DISALLOW_NEW();
-
- public:
-- explicit StringTypeAdapter<UChar>(UChar buffer) : buffer_(buffer) {}
-+ explicit StringTypeAdapter(UChar buffer) : buffer_(buffer) {}
-
- unsigned length() const { return 1; }
- bool Is8Bit() const { return buffer_ <= 0xff; }
-@@ -100,7 +100,7 @@ class WTF_EXPORT StringTypeAdapter<char*> {
- DISALLOW_NEW();
-
- public:
-- explicit StringTypeAdapter<char*>(char* buffer)
-+ explicit StringTypeAdapter(char* buffer)
- : StringTypeAdapter(buffer, strlen(buffer)) {}
-
- unsigned length() const { return length_; }
-@@ -110,7 +110,7 @@ class WTF_EXPORT StringTypeAdapter<char*> {
- void WriteTo(UChar* destination) const;
-
- private:
-- StringTypeAdapter<char*>(char* buffer, size_t length);
-+ StringTypeAdapter(char* buffer, size_t length);
-
- const char* buffer_;
- unsigned length_;
-@@ -121,7 +121,7 @@ class WTF_EXPORT StringTypeAdapter<LChar*> {
- DISALLOW_NEW();
-
- public:
-- explicit StringTypeAdapter<LChar*>(LChar* buffer);
-+ explicit StringTypeAdapter(LChar* buffer);
-
- unsigned length() const { return length_; }
- bool Is8Bit() const { return true; }
-@@ -157,7 +157,7 @@ class WTF_EXPORT StringTypeAdapter<const char*> {
- DISALLOW_NEW();
-
- public:
-- explicit StringTypeAdapter<const char*>(const char* buffer);
-+ explicit StringTypeAdapter(const char* buffer);
-
- unsigned length() const { return length_; }
- bool Is8Bit() const { return true; }
-@@ -175,7 +175,7 @@ class WTF_EXPORT StringTypeAdapter<const LChar*> {
- DISALLOW_NEW();
-
- public:
-- explicit StringTypeAdapter<const LChar*>(const LChar* buffer);
-+ explicit StringTypeAdapter(const LChar* buffer);
-
- unsigned length() const { return length_; }
- bool Is8Bit() const { return true; }
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_operators.h
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_operators.h
-@@ -115,7 +115,7 @@ class StringTypeAdapter<StringAppend<StringType1, StringType2>> {
- STACK_ALLOCATED();
-
- public:
-- StringTypeAdapter<StringAppend<StringType1, StringType2>>(
-+ StringTypeAdapter(
- const StringAppend<StringType1, StringType2>& buffer)
- : buffer_(buffer) {}
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch
deleted file mode 100644
index d17e4ae602f2..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Thanks to Arch Linux:
-https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/blob/main/qt5-webengine-icu-75.patch?ref_type=heads
-
-diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
-index b511a58c5a8..abd78a74ead 100644
---- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
-+++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
-@@ -566,7 +566,7 @@ config("compiler") {
- # Override Chromium's default for projects that wish to stay on C++11.
- cflags_cc += [ "-std=${standard_prefix}++11" ]
- } else {
-- cflags_cc += [ "-std=${standard_prefix}++14" ]
-+ cflags_cc += [ "-std=${standard_prefix}++17" ]
- }
- } else if (!is_win && !is_nacl) {
- if (target_os == "android") {
-diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
-index f03ba1e4ab4..b1495f7ae74 100644
---- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
-+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
-@@ -195,7 +195,7 @@ NumPartitionPagesPerSuperPage() {
- //
- // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all
- // platforms, as Chrome's requirement is C++14 as of 2020.
--#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
-+#if 0
- static constexpr size_t kAlignment =
- std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
- #else
-diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
-index 76e627d27a3..942435f44a0 100644
---- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
-@@ -12,6 +12,7 @@
- #define COMMON_VIDEO_H264_SPS_PARSER_H_
-
- #include "absl/types/optional.h"
-+#include <cstdint>
-
- namespace rtc {
- class BitBuffer;
-diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
-index d6c31b06887..d8852dfd186 100644
---- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
-@@ -12,6 +12,7 @@
- #define COMMON_VIDEO_H264_PPS_PARSER_H_
-
- #include "absl/types/optional.h"
-+#include <cstdint>
-
- namespace rtc {
- class BitBuffer;
-diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
-index 3b9971abae1..d4458038527 100644
---- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
-@@ -13,6 +13,7 @@
-
- #include <array>
- #include <vector>
-+#include <memory>
-
- #include "absl/types/optional.h"
- #include "api/array_view.h"
-diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
-index 345e45ce127..e686e5d691a 100644
---- a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
-@@ -12,6 +12,7 @@
- #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
-
- #include <limits>
-+#include <cstdint>
-
- #include "absl/types/optional.h"
-
-diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
-index 8fcc799b795..bc69ddcf18c 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
-@@ -15,6 +15,7 @@
- #include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics.h"
- #include "third_party/blink/renderer/core/page/scrolling/text_fragment_finder.h"
- #include "third_party/blink/renderer/platform/text/text_boundaries.h"
-+#include "absl/base/attributes.h"
-
- namespace blink {
-
-diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
-index df506f0fae6..1de105fed4a 100644
---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
-+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
-@@ -180,7 +180,7 @@
- // absl::variant is a typedef of std::variant, use the feature macro
- // ABSL_USES_STD_VARIANT.
-
--#define ABSL_OPTION_USE_STD_VARIANT 2
-+#define ABSL_OPTION_USE_STD_VARIANT 0
-
-
- // ABSL_OPTION_USE_INLINE_NAMESPACE
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch
deleted file mode 100644
index cbfa44edce31..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# https://bugs.gentoo.org/913923
-
- Fix missing {-no,}-webengine-re2 command line options
-
---- a/src/core/configure.json
-+++ b/src/core/configure.json
-@@ -16,6 +16,7 @@
- "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } },
- "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
- "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
-+ "webengine-re2": { "type": "enum", "name": "webengine-system-re2", "values": { "system": "yes", "qt": "no" } },
- "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
- "webengine-pepper-plugins": "boolean",
- "webengine-printing-and-pdf": "boolean",
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch
deleted file mode 100644
index b04f6a4667bb..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/3rdparty/chromium/build/android/gyp/util/build_utils.py b/src/3rdparty/chromium/build/android/gyp/util/build_utils.py
-index 022980517..e3f82704a 100644
---- a/src/3rdparty/chromium/build/android/gyp/util/build_utils.py
-+++ b/src/3rdparty/chromium/build/android/gyp/util/build_utils.py
-@@ -12,7 +12,6 @@ import fnmatch
- import json
- import logging
- import os
--import pipes
- import re
- import shutil
- import stat
-@@ -198,7 +197,7 @@ class CalledProcessError(Exception):
- # A user should be able to simply copy and paste the command that failed
- # into their shell.
- copyable_command = '( cd {}; {} )'.format(os.path.abspath(self.cwd),
-- ' '.join(map(pipes.quote, self.args)))
-+ printed_cmd)
- return 'Command failed: {}\n{}'.format(copyable_command, self.output)
-
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch
deleted file mode 100644
index fdcc787971ca..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/buildtools/gn.pro
-+++ b/src/buildtools/gn.pro
-@@ -25,6 +25,7 @@
- msvc:!clang_cl: gn_gen_args += --use-lto
-
- gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args
-+ gn_configure += --no-static-libstdc++
- macos {
- gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\"
- }
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild
deleted file mode 100644
index 23d826a3566c..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCHSET="${PN}-5.15.14_p20240510-patchset"
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm64"
- if [[ ${PV} == ${QT5_PV}_p* ]]; then
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
- S="${WORKDIR}/${P}"
- QT5_BUILD_DIR="${S}_build"
- fi
-else
- EGIT_BRANCH="5.15"
- EGIT_REPO_URI=(
- "https://code.qt.io/qt/${QT5_MODULE}.git"
- "https://github.com/qt/${QT5_MODULE}.git"
- )
- inherit git-r3
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-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-qt/qtcore-${QT5_PV}*
- =dev-qt/qtdeclarative-${QT5_PV}*
- =dev-qt/qtgui-${QT5_PV}*
- =dev-qt/qtnetwork-${QT5_PV}*
- =dev-qt/qtprintsupport-${QT5_PV}*
- =dev-qt/qtwebchannel-${QT5_PV}*[qml]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=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/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( =dev-qt/designer-${QT5_PV}* )
- geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse )
- screencast? ( media-video/pipewire:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtdeclarative-${QT5_PV}*[widgets]
- =dev-qt/qtwidgets-${QT5_PV}*
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-BDEPEND="${PYTHON_DEPS}
- app-alternatives/ninja
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=(
- "${WORKDIR}/${PATCHSET}"
- "${FILESDIR}/${PN}-5.15.14_p20240510-re2.patch" # bug 913923
- "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-cstdint.patch"
- "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-template-id-cdtor.patch"
- "${FILESDIR}/${P}-py3.13-pipes.patch" # thx to Fedora
-)
-
-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
-}
-
-src_unpack() {
- case ${QT5_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- if [[ ${PV} == ${QT5_PV}_p* ]]; then
- # This is made from git, and for some reason will fail w/o .git directories.
- mkdir -p .git src/3rdparty/chromium/.git || die
- fi
- # We need to make sure this integrates well into Qt 5.15.3 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
- sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
-
- # QTBUG-88657 - jumbo-build could still make trouble
- if ! use jumbo-build; then
- sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
- src/buildtools/config/common.pri || die
- fi
-
- # bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | \
- xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
- if use system-icu; then
- if has_version ">=dev-libs/icu-75.1"; then
- eapply "${FILESDIR}/${PN}-5.15.14_p20240510-icu-75.patch" # too invasive to apply unconditionally
- fi
- # 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
-
- # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
- if tc-is-clang ; then
- if has_version 'llvm-core/clang[default-libcxx(-)]' || has_version 'llvm-core/clang-common[default-libcxx(-)]' ; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- fi
- fi
-
- qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
- qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -no-build-qtpdf
- -printing-and-pdf
- --webengine-python-version=python3
- -system-opus
- -system-webp
- $(qt_use alsa)
- $(qt_use !bindist proprietary-codecs)
- $(qt_use geolocation webengine-geolocation)
- $(qt_use kerberos webengine-kerberos)
- $(qt_use pulseaudio)
- $(usex screencast -webengine-webrtc-pipewire '')
- -qt-ffmpeg # bug 831487
- $(qt_use system-icu webengine-icu)
- -no-webengine-re2 # bug 913923
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 601472
- if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
- fi
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
- elog "with additional security fixes from newer versions. 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."
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 4279eceddc86..4e9d851bb86c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -48,10 +48,6 @@ sci-visualization/scidavis
x11-libs/qwtplot3d
x11-libs/qwt:5
-# Andreas Sturmlechner <asturm@gentoo.org> (2025-04-24)
-# A pain to maintain. No more revdeps. Bug #925718
-dev-qt/qtwebengine:5
-
# Andreas Sturmlechner <asturm@gentoo.org> (2025-04-24)
# Requires Qt5WebEngine; bug #925722
# Removal on 2025-05-24 - with a good chance to be kept if ported by then.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-04-28 17:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-28 17:21 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, profiles/, dev-qt/qtwebengine/files/ Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox