Bump
This commit is contained in:
12
dev-qt/qtwebengine/files/qt5-webengine-ninja-1.12.patch
Normal file
12
dev-qt/qtwebengine/files/qt5-webengine-ninja-1.12.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff --git a/chromium/content/public/browser/BUILD.gn b/chromium/content/public/browser/BUILD.gn
|
||||
index 7cf82a4aacf..0e0dda2c3ca 100644
|
||||
--- a/chromium/content/public/browser/BUILD.gn
|
||||
+++ b/src/3rdparty/chromium/content/public/browser/BUILD.gn
|
||||
@@ -469,6 +469,7 @@ jumbo_source_set("browser_sources") {
|
||||
"//build:chromeos_buildflags",
|
||||
"//cc",
|
||||
"//components/viz/host",
|
||||
+ "//components/spellcheck:buildflags",
|
||||
"//content/browser", # Must not be public_deps!
|
||||
"//device/fido",
|
||||
"//gpu",
|
||||
@@ -0,0 +1,35 @@
|
||||
https://bugs.gentoo.org/936416
|
||||
|
||||
Backport of two upstream commits:
|
||||
* https://chromium-review.googlesource.com/c/chromium/src/+/5512719
|
||||
* https://quiche.googlesource.com/quiche/+/c1af894e0f5c4f732a983e7c93227854e203570e%5E%21/#F0
|
||||
--- a/src/3rdparty/chromium/base/containers/id_map.h
|
||||
+++ b/src/3rdparty/chromium/base/containers/id_map.h
|
||||
@@ -153,8 +153,8 @@ class IDMap final {
|
||||
}
|
||||
|
||||
const Iterator& operator=(const Iterator& iter) {
|
||||
- map_ = iter.map;
|
||||
- iter_ = iter.iter;
|
||||
+ map_ = iter.map_;
|
||||
+ iter_ = iter.iter_;
|
||||
Init();
|
||||
return *this;
|
||||
}
|
||||
--- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h
|
||||
+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h
|
||||
@@ -198,12 +198,12 @@ class QUIC_NO_EXPORT QuicIntervalDeque {
|
||||
Iterator operator+(difference_type amount) const {
|
||||
Iterator copy = *this;
|
||||
copy.index_ += amount;
|
||||
- DCHECK(copy.index_ < copy.deque_->size());
|
||||
+ DCHECK(copy.index_ < copy.deque_->Size());
|
||||
return copy;
|
||||
}
|
||||
Iterator& operator+=(difference_type amount) {
|
||||
index_ += amount;
|
||||
- DCHECK(index_ < deque_->size());
|
||||
+ DCHECK(index_ < deque_->Size());
|
||||
return *this;
|
||||
}
|
||||
difference_type operator-(const Iterator& rhs) const {
|
||||
@@ -0,0 +1,170 @@
|
||||
--- 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>
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
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) {}
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
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
|
||||
@@ -0,0 +1,14 @@
|
||||
# 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",
|
||||
@@ -0,0 +1,21 @@
|
||||
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)
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
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)
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
--- 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\"
|
||||
}
|
||||
Reference in New Issue
Block a user