qt5-webengine
This commit is contained in:
Rmys
+1819
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,99 @@
|
||||
diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
|
||||
index b511a58c5a8..abd78a74ead 100644
|
||||
--- a/chromium/build/config/compiler/BUILD.gn
|
||||
+++ b/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/chromium/base/allocator/partition_allocator/partition_alloc_constants.h b/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
index f03ba1e4ab4..b1495f7ae74 100644
|
||||
--- a/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
+++ b/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/chromium/third_party/webrtc/common_video/h264/sps_parser.h b/chromium/third_party/webrtc/common_video/h264/sps_parser.h
|
||||
index 76e627d27a3..942435f44a0 100644
|
||||
--- a/chromium/third_party/webrtc/common_video/h264/sps_parser.h
|
||||
+++ b/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/chromium/third_party/webrtc/common_video/h264/pps_parser.h b/chromium/third_party/webrtc/common_video/h264/pps_parser.h
|
||||
index d6c31b06887..d8852dfd186 100644
|
||||
--- a/chromium/third_party/webrtc/common_video/h264/pps_parser.h
|
||||
+++ b/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/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
|
||||
index 3b9971abae1..d4458038527 100644
|
||||
--- a/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
|
||||
+++ b/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/chromium/third_party/webrtc/modules/include/module_common_types_public.h b/chromium/third_party/webrtc/modules/include/module_common_types_public.h
|
||||
index 345e45ce127..e686e5d691a 100644
|
||||
--- a/chromium/third_party/webrtc/modules/include/module_common_types_public.h
|
||||
+++ b/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/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc b/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
|
||||
index 8fcc799b795..bc69ddcf18c 100644
|
||||
--- a/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
|
||||
+++ b/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/chromium/third_party/abseil-cpp/absl/base/options.h b/chromium/third_party/abseil-cpp/absl/base/options.h
|
||||
index df506f0fae6..1de105fed4a 100644
|
||||
--- a/chromium/third_party/abseil-cpp/absl/base/options.h
|
||||
+++ b/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
|
||||
+12
@@ -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/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",
|
||||
+290
@@ -0,0 +1,290 @@
|
||||
diff --git a/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
||||
index ac0b31a75..5d1c421d0 100644
|
||||
--- a/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
||||
+++ b/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
|
||||
diff --git a/chromium/ui/events/gesture_event_details.h b/chromium/ui/events/gesture_event_details.h
|
||||
index d20416738..8dadab3d0 100644
|
||||
--- a/chromium/ui/events/gesture_event_details.h
|
||||
+++ b/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 <cstdint>
|
||||
#include <string.h>
|
||||
|
||||
#include "base/check_op.h"
|
||||
diff --git a/chromium/ui/gl/gl_surface_glx.cc b/chromium/ui/gl/gl_surface_glx.cc
|
||||
index 1d5527691..ef9d5ce13 100644
|
||||
--- a/chromium/ui/gl/gl_surface_glx.cc
|
||||
+++ b/chromium/ui/gl/gl_surface_glx.cc
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include "ui/gl/gl_surface_glx.h"
|
||||
|
||||
+#include <cstdint>
|
||||
#include <utility>
|
||||
|
||||
#include "base/bind.h"
|
||||
diff --git a/chromium/ui/gl/gl_surface_glx.h b/chromium/ui/gl/gl_surface_glx.h
|
||||
index ab612cd87..2178d8514 100644
|
||||
--- a/chromium/ui/gl/gl_surface_glx.h
|
||||
+++ b/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 <cstdint>
|
||||
#include <stdint.h>
|
||||
|
||||
#include <memory>
|
||||
diff --git a/chromium/third_party/webrtc/api/task_queue/task_queue_base.h b/chromium/third_party/webrtc/api/task_queue/task_queue_base.h
|
||||
index 90b1efd31..63526a738 100644
|
||||
--- a/chromium/third_party/webrtc/api/task_queue/task_queue_base.h
|
||||
+++ b/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"
|
||||
diff --git a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.cc b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.cc
|
||||
index 8a30c7f32..4934432cc 100644
|
||||
--- a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.cc
|
||||
+++ b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.cc
|
||||
@@ -20,6 +20,8 @@
|
||||
#include "perfetto/base/build_config.h"
|
||||
#include "perfetto/base/compiler.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
#if PERFETTO_BUILDFLAG(PERFETTO_ZLIB)
|
||||
#include <zlib.h>
|
||||
#else
|
||||
diff --git a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h
|
||||
index 624363ff6..6d717fba4 100644
|
||||
--- a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h
|
||||
+++ b/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;
|
||||
diff --git a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h b/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h
|
||||
index 4ce66fdea..3f3932b22 100644
|
||||
--- a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h
|
||||
+++ b/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>
|
||||
diff --git a/chromium/third_party/perfetto/src/tracing/core/trace_packet.cc b/chromium/third_party/perfetto/src/tracing/core/trace_packet.cc
|
||||
index 0dea150c1..c3def1683 100644
|
||||
--- a/chromium/third_party/perfetto/src/tracing/core/trace_packet.cc
|
||||
+++ b/chromium/third_party/perfetto/src/tracing/core/trace_packet.cc
|
||||
@@ -19,6 +19,8 @@
|
||||
#include "perfetto/base/logging.h"
|
||||
#include "perfetto/protozero/proto_utils.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace perfetto {
|
||||
|
||||
TracePacket::TracePacket() = default;
|
||||
diff --git a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h b/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
|
||||
index 67b0d2eb5..3c2462de5 100644
|
||||
--- a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
|
||||
+++ b/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>
|
||||
|
||||
diff --git a/chromium/base/task/thread_pool.h b/chromium/base/task/thread_pool.h
|
||||
index 085c249ba..afc674ca7 100644
|
||||
--- a/chromium/base/task/thread_pool.h
|
||||
+++ b/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/chromium/net/tools/huffman_trie/trie_entry.h b/chromium/net/tools/huffman_trie/trie_entry.h
|
||||
index fe70260f9..eac6a7fc2 100644
|
||||
--- a/chromium/net/tools/huffman_trie/trie_entry.h
|
||||
+++ b/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>
|
||||
diff --git a/chromium/third_party/webrtc/api/fec_controller.h b/chromium/third_party/webrtc/api/fec_controller.h
|
||||
index 3e5f7bb21..87777a53f 100644
|
||||
--- a/chromium/third_party/webrtc/api/fec_controller.h
|
||||
+++ b/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>
|
||||
|
||||
diff --git a/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h b/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h
|
||||
index c85666c9a..dfb90e447 100644
|
||||
--- a/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h
|
||||
+++ b/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 {
|
||||
diff --git a/chromium/third_party/webrtc/api/network_state_predictor.h b/chromium/third_party/webrtc/api/network_state_predictor.h
|
||||
index 9cf5ab6f0..2d165baa5 100644
|
||||
--- a/chromium/third_party/webrtc/api/network_state_predictor.h
|
||||
+++ b/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>
|
||||
|
||||
diff --git a/chromium/gpu/command_buffer/common/skia_utils.h b/chromium/gpu/command_buffer/common/skia_utils.h
|
||||
index 6508d79a1..a9f9528f1 100644
|
||||
--- a/chromium/gpu/command_buffer/common/skia_utils.h
|
||||
+++ b/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"
|
||||
diff --git a/chromium/gpu/command_buffer/service/gpu_fence_manager.h b/chromium/gpu/command_buffer/service/gpu_fence_manager.h
|
||||
index ee50d6fdd..576f6e3bc 100644
|
||||
--- a/chromium/gpu/command_buffer/service/gpu_fence_manager.h
|
||||
+++ b/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>
|
||||
|
||||
diff --git a/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h b/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h
|
||||
index fd68b6b49..dc7c015d5 100644
|
||||
--- a/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h
|
||||
+++ b/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>
|
||||
diff --git a/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h b/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h
|
||||
index 9bcdd371e..5921794f1 100644
|
||||
--- a/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h
|
||||
+++ b/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>
|
||||
diff --git a/chromium/third_party/pdfium/third_party/base/span.h b/chromium/third_party/pdfium/third_party/base/span.h
|
||||
index bb07f43a0..0b7daf775 100644
|
||||
--- a/chromium/third_party/pdfium/third_party/base/span.h
|
||||
+++ b/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>
|
||||
diff --git a/chromium/third_party/webrtc/video/stats_counter.h b/chromium/third_party/webrtc/video/stats_counter.h
|
||||
index fb6017f41..ed5530ca0 100644
|
||||
--- a/chromium/third_party/webrtc/video/stats_counter.h
|
||||
+++ b/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>
|
||||
|
||||
diff --git a/chromium/third_party/woff2/include/woff2/output.h b/chromium/third_party/woff2/include/woff2/output.h
|
||||
index c325f67be..5c4dc4d18 100644
|
||||
--- a/chromium/third_party/woff2/include/woff2/output.h
|
||||
+++ b/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>
|
||||
diff --git a/chromium/cc/input/main_thread_scrolling_reason.h b/chromium/cc/input/main_thread_scrolling_reason.h
|
||||
index 4ddd536afcc..dc1bc072790 100644
|
||||
--- a/chromium/cc/input/main_thread_scrolling_reason.h
|
||||
+++ b/chromium/cc/input/main_thread_scrolling_reason.h
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
+#include <cstdint>
|
||||
#include "cc/cc_export.h"
|
||||
|
||||
namespace base {
|
||||
@@ -0,0 +1,58 @@
|
||||
Patch-Source: https://sources.debian.org/data/main/q/qtwebengine-opensource-src/5.15.16+dfsg-3/debian/patches/python3.12-six.patch
|
||||
--
|
||||
Description: implement find_spec() for _SixMetaPathImporter
|
||||
Origin: upstream, https://github.com/benjaminp/six/commit/25916292d96f5f09
|
||||
Last-Update: 2024-03-17
|
||||
|
||||
--- a/chromium/third_party/protobuf/third_party/six/six.py
|
||||
+++ b/chromium/third_party/protobuf/third_party/six/six.py
|
||||
@@ -71,6 +71,11 @@ else:
|
||||
MAXSIZE = int((1 << 63) - 1)
|
||||
del X
|
||||
|
||||
+if PY34:
|
||||
+ from importlib.util import spec_from_loader
|
||||
+else:
|
||||
+ spec_from_loader = None
|
||||
+
|
||||
|
||||
def _add_doc(func, doc):
|
||||
"""Add documentation to a function."""
|
||||
@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
|
||||
return self
|
||||
return None
|
||||
|
||||
+ def find_spec(self, fullname, path, target=None):
|
||||
+ if fullname in self.known_modules:
|
||||
+ return spec_from_loader(fullname, self)
|
||||
+ return None
|
||||
+
|
||||
def __get_module(self, fullname):
|
||||
try:
|
||||
return self.known_modules[fullname]
|
||||
--- a/chromium/tools/grit/third_party/six/__init__.py
|
||||
+++ b/chromium/tools/grit/third_party/six/__init__.py
|
||||
@@ -71,6 +71,11 @@ else:
|
||||
MAXSIZE = int((1 << 63) - 1)
|
||||
del X
|
||||
|
||||
+if PY34:
|
||||
+ from importlib.util import spec_from_loader
|
||||
+else:
|
||||
+ spec_from_loader = None
|
||||
+
|
||||
|
||||
def _add_doc(func, doc):
|
||||
"""Add documentation to a function."""
|
||||
@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
|
||||
return self
|
||||
return None
|
||||
|
||||
+ def find_spec(self, fullname, path, target=None):
|
||||
+ if fullname in self.known_modules:
|
||||
+ return spec_from_loader(fullname, self)
|
||||
+ return None
|
||||
+
|
||||
def __get_module(self, fullname):
|
||||
try:
|
||||
return self.known_modules[fullname]
|
||||
@@ -0,0 +1,79 @@
|
||||
https://unicode-org.github.io/icu-docs/apidoc/dev/icu4c/uchar_8h_source.html
|
||||
https://github.com/unicode-org/icu/blame/main/icu4c/source/common/unicode/uchar.h
|
||||
/usr/include/unicode/uchar.h
|
||||
|
||||
ICU78 adds LineBreak U_LB_UNAMBIGUOUS_HYPHEN = 48,/*[HH]*/.
|
||||
U_LB_COUNT goes from 48 to 49.
|
||||
|
||||
kBreakAllLineBreakClassTable is expected to be square with
|
||||
the same number of bits across as the lines down for every
|
||||
U_LB_COUNT LineBreak. This table should have U_LB_COUNT=49
|
||||
bit columns and 49 rows with a bunch of 1 bits sprinkled
|
||||
all over and should expand each time a new LineBreak is
|
||||
added. Rather than fiddling with the BA_LB_COUNT math or
|
||||
keep extending the table with zeros across and down as they
|
||||
did here:
|
||||
|
||||
https://src.opensuse.org/nodejs/nodejs-electron/src/commit/ee8e43b84d0e17b17d817943357e74dee3e5474ae7e6eaff93c60926bfc3780a/text_break_iterator-icu74-breakAllLineBreakClassTable-should-be-consistent.patch
|
||||
|
||||
we just hard set the table to 40 lines to support 0XX-39RI.
|
||||
ShouldBreakAfterBreakAll for LineBreak >= 40EB always
|
||||
return 0/false which is what the recent table patches were
|
||||
doing anyways. Look at the columns RI to VI and lines
|
||||
[RI]-[VI]. It's all zeros so everyone gave up extending
|
||||
this table with cleverly placed 1's years ago and just came
|
||||
up with Whatever Works (TM) patches. LineBreak support >=
|
||||
39RI running with 0 may be less than optimal. Here's
|
||||
another patch.
|
||||
|
||||
https://bugs.gentoo.org/917635
|
||||
|
||||
The original table code and patches since are all garbage
|
||||
anyways. Noone seems to understand what this table does. I
|
||||
don't either but I do know its limits and proper shape and
|
||||
that it's not required to have lines and columns added for
|
||||
each new LineBreak unless you want perfect support for new
|
||||
LineBreak.
|
||||
|
||||
The NodeJS patch adds a 6th array column which won't
|
||||
compile on earlier ICU versions where U_LB_COUNT is small.
|
||||
|
||||
static const unsigned char kBreakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = {
|
||||
|
||||
This line is written wrong. It creates an extra byte
|
||||
column when BA_LB_COUNT is divisible by 8. Our example of
|
||||
40 LineBreak can be stored in 40/8=5 column bytes yet this
|
||||
sets the column count to 40/8+1=6. This would be correct
|
||||
though with the size of this code I don't see a problem
|
||||
allocating 40 extra bytes.
|
||||
|
||||
static const unsigned char kBreakAllLineBreakClassTable[][(BA_LB_COUNT-1) / 8 + 1] = {
|
||||
|
||||
severach@aur
|
||||
https://aur.archlinux.org/packages/qt5-webengine
|
||||
|
||||
$ notepadqq
|
||||
Cannot mix incompatible Qt library (5.15.17) with this library (5.15.18)
|
||||
|
||||
If you have trouble with an application not working, look
|
||||
through this list for packages with old versions.
|
||||
|
||||
pacman -Qs qt5-
|
||||
|
||||
local/qt5-base 5.15.18+kde+r109-2 (qt5)
|
||||
* A cross-platform application and UI framework
|
||||
local/qt5-webchannel 5.15.17+kde+r3-1 (qt5)
|
||||
* Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients
|
||||
|
||||
diff -pNaru3 a/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc b/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
|
||||
--- a/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc 2025-11-11 01:42:16.454081862 -0500
|
||||
+++ b/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc 2025-11-11 01:49:41.838185933 -0500
|
||||
@@ -163,7 +163,7 @@ static const unsigned char kAsciiLineBre
|
||||
// clang-format on
|
||||
|
||||
#if U_ICU_VERSION_MAJOR_NUM >= 74
|
||||
-#define BA_LB_COUNT (U_LB_COUNT - 8)
|
||||
+#define BA_LB_COUNT (40) /* (U_LB_COUNT - 8) */
|
||||
#elif U_ICU_VERSION_MAJOR_NUM >= 58
|
||||
#define BA_LB_COUNT (U_LB_COUNT - 3)
|
||||
#else
|
||||
@@ -0,0 +1,15 @@
|
||||
#!/bin/sh
|
||||
set -x
|
||||
VERSION=5.15.18
|
||||
CHROMIUMHASH=`wget https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/3rdparty?h=$VERSION -q --content-on-error -O - | grep "Bad object name: " | sed 's/^.*Bad object name: \([0-9a-f]\{40\}\).*$/\1/g'`
|
||||
rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION
|
||||
wget https://github.com/qt/qtwebengine/archive/$VERSION.tar.gz -O qtwebengine-$VERSION.tar.gz || exit $?
|
||||
tar xzf qtwebengine-$VERSION.tar.gz || exit $?
|
||||
wget https://github.com/qt/qtwebengine-chromium/archive/$CHROMIUMHASH.tar.gz -O qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $?
|
||||
tar xzf qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $?
|
||||
mv qtwebengine-$VERSION qtwebengine-everywhere-src-$VERSION || exit $?
|
||||
(cd qtwebengine-everywhere-src-$VERSION ; syncqt.pl -version $VERSION ) || exit $?
|
||||
rmdir qtwebengine-everywhere-src-$VERSION/src/3rdparty || exit $?
|
||||
mv qtwebengine-chromium-$CHROMIUMHASH qtwebengine-everywhere-src-$VERSION/src/3rdparty || exit $?
|
||||
XZ_OPT="-9 -T2" tar cJf qtwebengine-everywhere-src-$VERSION.tar.xz qtwebengine-everywhere-src-$VERSION || exit $?
|
||||
rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION
|
||||
Reference in New Issue
Block a user