[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chromium 62
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Nov 5 02:54:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit c30721ea74bc38825cef5fc7e788b1507518e3a1
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Nov 5 02:52:50 2017 +0000
refresh patches for chromium 62
---
.../{system/icu.patch => disable/fuzzers.patch} | 4 +-
debian/patches/fixes/atk.patch | 13 ---
debian/patches/fixes/crc32.patch | 14 ++++
debian/patches/fixes/declaration.patch | 14 ----
debian/patches/fixes/gtk3theme.patch | 30 -------
debian/patches/fixes/mojo.patch | 94 +++++++++++-----------
debian/patches/gn/bootstrap.patch | 45 +++++++++++
debian/patches/gn/parallel.patch | 4 +-
debian/patches/gn/profiler.patch | 11 ---
debian/patches/gn/safemath.patch | 15 ----
debian/patches/series | 10 +--
debian/patches/system/event.patch | 8 +-
debian/patches/system/gtk2.patch | 60 --------------
debian/patches/system/icu.patch | 41 +++++++---
debian/patches/system/nspr.patch | 6 +-
debian/patches/system/vpx.patch | 8 +-
16 files changed, 157 insertions(+), 220 deletions(-)
diff --git a/debian/patches/system/icu.patch b/debian/patches/disable/fuzzers.patch
similarity index 77%
copy from debian/patches/system/icu.patch
copy to debian/patches/disable/fuzzers.patch
index f36f796..56044fa 100644
--- a/debian/patches/system/icu.patch
+++ b/debian/patches/disable/fuzzers.patch
@@ -1,9 +1,9 @@
-description: maintain compatibility with system icu library
+description: fuzzers aren't built, so don't depend on them
author: Michael Gilbert <mgilbert at debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
-@@ -680,8 +680,7 @@ group("gn_all") {
+@@ -688,8 +688,7 @@ group("gn_all") {
}
}
diff --git a/debian/patches/fixes/atk.patch b/debian/patches/fixes/atk.patch
deleted file mode 100644
index 17c5311..0000000
--- a/debian/patches/fixes/atk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-description: fix variable name error when using system libatk
-
---- a/content/browser/accessibility/browser_accessibility_auralinux.cc
-+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc
-@@ -571,7 +571,7 @@ static AtkStateSet* browser_accessibilit
- // it's best to leave this out rather than break people's builds:
- #if defined(ATK_CHECK_VERSION)
- #if ATK_CHECK_VERSION(2, 16, 0)
-- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY);
-+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
- #endif
- #endif
- break;
diff --git a/debian/patches/fixes/crc32.patch b/debian/patches/fixes/crc32.patch
new file mode 100644
index 0000000..c8f2544
--- /dev/null
+++ b/debian/patches/fixes/crc32.patch
@@ -0,0 +1,14 @@
+description: fix inverted check
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/third_party/crc32c/src/include/crc32c/crc32c.h
++++ b/third_party/crc32c/src/include/crc32c/crc32c.h
+@@ -37,7 +37,7 @@ inline uint32_t Crc32c(const std::string
+ #if __has_include(<string_view>)
+ // Visual Studio provides a <string_view> header even in C++11 mode. When
+ // included, the header issues an #error. (C1189)
+-#if !defined(_MSC_VER) || __cplusplus >= 201703L
++#if !defined(_MSC_VER) && __cplusplus >= 201703L
+ #include <string_view>
+
+ // Comptues the CRC32C of the bytes in the string_view.
diff --git a/debian/patches/fixes/declaration.patch b/debian/patches/fixes/declaration.patch
deleted file mode 100644
index 83662ce..0000000
--- a/debian/patches/fixes/declaration.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-description: forward declare method that is defined after it is used
-author: Michael Gilbert <mgilbert at debian.org>
-
---- a/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h
-+++ b/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h
-@@ -685,6 +685,8 @@ inline LinkedHashSet<T, U, V, W>& Linked
- return *this;
- }
-
-+inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
-+
- template <typename T, typename U, typename V, typename W>
- inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) {
- impl_.swap(other.impl_);
diff --git a/debian/patches/fixes/gtk3theme.patch b/debian/patches/fixes/gtk3theme.patch
deleted file mode 100644
index b211209..0000000
--- a/debian/patches/fixes/gtk3theme.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-description: better integration with gtk3 themes
-origin: https://bugs.archlinux.org/task/47682
-
---- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
-+++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
-@@ -138,6 +138,11 @@ SkColor GetBGColor(GtkWidget* widget, Wi
- gtk_widget_get_style_context(widget), stateMap[state], &color);
- G_GNUC_END_IGNORE_DEPRECATIONS
-
-+ if (color.alpha == 0.0)
-+ gtk_style_context_get_background_color(
-+ gtk_widget_get_style_context(gtk_widget_get_toplevel(widget)),
-+ stateMap[state], &color);
-+
- // Hack for default color
- if (color.alpha == 0.0)
- color = {1, 1, 1, 1};
-@@ -507,8 +512,11 @@ GtkWidget* NativeThemeGtk2::GetEntry() c
- GtkWidget* NativeThemeGtk2::GetLabel() const {
- static GtkWidget* fake_label = NULL;
-
-- if (!fake_label)
-+ if (!fake_label) {
- fake_label = gtk_label_new("");
-+ gtk_style_context_add_class(
-+ gtk_widget_get_style_context(fake_label), "gtkstyle-fallback");
-+ }
-
- return fake_label;
- }
diff --git a/debian/patches/fixes/mojo.patch b/debian/patches/fixes/mojo.patch
index ee711cd..6157103 100644
--- a/debian/patches/fixes/mojo.patch
+++ b/debian/patches/fixes/mojo.patch
@@ -1,51 +1,6 @@
description: fix mojo layout test build error
author: Michael Gilbert <mgilbert at debian.org>
---- a/content/shell/browser/shell_content_browser_client.cc
-+++ b/content/shell/browser/shell_content_browser_client.cc
-@@ -39,7 +39,6 @@
- #include "content/shell/common/shell_messages.h"
- #include "content/shell/common/shell_switches.h"
- #include "content/shell/grit/shell_resources.h"
--#include "content/test/data/mojo_layouttest_test.mojom.h"
- #include "media/mojo/features.h"
- #include "mojo/public/cpp/bindings/strong_binding.h"
- #include "net/ssl/client_cert_identity.h"
-@@ -128,26 +127,6 @@ int GetCrashSignalFD(const base::Command
- }
- #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-
--class MojoLayoutTestHelper : public mojom::MojoLayoutTestHelper {
-- public:
-- MojoLayoutTestHelper() {}
-- ~MojoLayoutTestHelper() override {}
--
-- // mojom::MojoLayoutTestHelper:
-- void Reverse(const std::string& message, ReverseCallback callback) override {
-- std::move(callback).Run(std::string(message.rbegin(), message.rend()));
-- }
--
-- private:
-- DISALLOW_COPY_AND_ASSIGN(MojoLayoutTestHelper);
--};
--
--void BindLayoutTestHelper(mojom::MojoLayoutTestHelperRequest request,
-- RenderFrameHost* render_frame_host) {
-- mojo::MakeStrongBinding(base::MakeUnique<MojoLayoutTestHelper>(),
-- std::move(request));
--}
--
- } // namespace
-
- ShellContentBrowserClient* ShellContentBrowserClient::Get() {
-@@ -162,7 +141,6 @@ ShellContentBrowserClient::ShellContentB
- : shell_browser_main_parts_(NULL) {
- DCHECK(!g_browser_client);
- g_browser_client = this;
-- frame_interfaces_.AddInterface(base::Bind(&BindLayoutTestHelper));
- }
-
- ShellContentBrowserClient::~ShellContentBrowserClient() {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -237,9 +237,7 @@ static_library("content_shell_lib") {
@@ -58,3 +13,52 @@ author: Michael Gilbert <mgilbert at debian.org>
"//content/test:test_support",
"//device/bluetooth",
"//device/bluetooth:fake_bluetooth",
+--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
++++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+@@ -19,7 +19,6 @@
+ #include "content/shell/browser/layout_test/layout_test_message_filter.h"
+ #include "content/shell/browser/layout_test/layout_test_notification_manager.h"
+ #include "content/shell/browser/layout_test/layout_test_resource_dispatcher_host_delegate.h"
+-#include "content/shell/browser/layout_test/mojo_layout_test_helper.h"
+ #include "content/shell/browser/shell_browser_context.h"
+ #include "content/shell/common/layout_test/layout_test_switches.h"
+ #include "content/shell/common/shell_messages.h"
+@@ -32,11 +31,6 @@ namespace {
+
+ LayoutTestContentBrowserClient* g_layout_test_browser_client;
+
+-void BindLayoutTestHelper(mojom::MojoLayoutTestHelperRequest request,
+- RenderFrameHost* render_frame_host) {
+- MojoLayoutTestHelper::Create(std::move(request));
+-}
+-
+ } // namespace
+
+ LayoutTestContentBrowserClient::LayoutTestContentBrowserClient() {
+@@ -98,7 +92,6 @@ void LayoutTestContentBrowserClient::Exp
+
+ registry->AddInterface(base::Bind(&bluetooth::FakeBluetooth::Create),
+ ui_task_runner);
+- registry->AddInterface(base::Bind(&MojoLayoutTestHelper::Create));
+ }
+
+ void LayoutTestContentBrowserClient::OverrideWebkitPrefs(
+@@ -192,7 +185,6 @@ bool LayoutTestContentBrowserClient::Can
+ void LayoutTestContentBrowserClient::ExposeInterfacesToFrame(
+ service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>*
+ registry) {
+- registry->AddInterface(base::Bind(&BindLayoutTestHelper));
+ }
+
+ } // namespace content
+--- a/content/shell/BUILD.gn
++++ b/content/shell/BUILD.gn
+@@ -92,8 +92,6 @@ static_library("content_shell_lib") {
+ "browser/layout_test/layout_test_resource_dispatcher_host_delegate.h",
+ "browser/layout_test/layout_test_url_request_context_getter.cc",
+ "browser/layout_test/layout_test_url_request_context_getter.h",
+- "browser/layout_test/mojo_layout_test_helper.cc",
+- "browser/layout_test/mojo_layout_test_helper.h",
+ "browser/layout_test/secondary_test_window_observer.cc",
+ "browser/layout_test/secondary_test_window_observer.h",
+ "browser/layout_test/test_info_extractor.cc",
diff --git a/debian/patches/gn/bootstrap.patch b/debian/patches/gn/bootstrap.patch
new file mode 100644
index 0000000..ba2bb3d
--- /dev/null
+++ b/debian/patches/gn/bootstrap.patch
@@ -0,0 +1,45 @@
+description: fix errors in gn's bootstrapping script
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -451,7 +451,6 @@ def write_gn_ninja(path, root_gen_dir, o
+ 'base/memory/ref_counted_memory.cc',
+ 'base/memory/singleton.cc',
+ 'base/memory/shared_memory_handle.cc',
+- 'base/memory/shared_memory_tracker.cc',
+ 'base/memory/weak_ptr.cc',
+ 'base/message_loop/incoming_task_queue.cc',
+ 'base/message_loop/message_loop.cc',
+@@ -460,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, o
+ 'base/message_loop/message_pump_default.cc',
+ 'base/metrics/bucket_ranges.cc',
+ 'base/metrics/field_trial.cc',
++ 'base/metrics/field_trial_params.cc',
+ 'base/metrics/field_trial_param_associator.cc',
+ 'base/metrics/histogram.cc',
+ 'base/metrics/histogram_base.cc',
+@@ -510,6 +510,7 @@ def write_gn_ninja(path, root_gen_dir, o
+ 'base/task_scheduler/scheduler_lock_impl.cc',
+ 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
+ 'base/task_scheduler/scheduler_worker.cc',
++ 'base/task_scheduler/scheduler_worker_pool.cc',
+ 'base/task_scheduler/scheduler_worker_pool_impl.cc',
+ 'base/task_scheduler/scheduler_worker_pool_params.cc',
+ 'base/task_scheduler/scheduler_worker_stack.cc',
+@@ -529,6 +530,7 @@ def write_gn_ninja(path, root_gen_dir, o
+ 'base/threading/sequence_local_storage_map.cc',
+ 'base/threading/sequenced_task_runner_handle.cc',
+ 'base/threading/sequenced_worker_pool.cc',
++ 'base/threading/scoped_blocking_call.cc',
+ 'base/threading/simple_thread.cc',
+ 'base/threading/thread.cc',
+ 'base/threading/thread_checker_impl.cc',
+@@ -580,7 +582,6 @@ def write_gn_ninja(path, root_gen_dir, o
+ 'base/tracked_objects.cc',
+ 'base/tracking_info.cc',
+ 'base/unguessable_token.cc',
+- 'base/value_iterators.cc',
+ 'base/values.cc',
+ 'base/value_iterators.cc',
+ 'base/vlog.cc',
diff --git a/debian/patches/gn/parallel.patch b/debian/patches/gn/parallel.patch
index 70b461c..1618c6b 100644
--- a/debian/patches/gn/parallel.patch
+++ b/debian/patches/gn/parallel.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -103,6 +103,7 @@ def main(argv):
+@@ -111,6 +111,7 @@ def main(argv):
parser.add_option('--gn-gen-args', help='Args to pass to gn gen --args')
parser.add_option('-v', '--verbose', action='store_true',
help='Log more details')
@@ -11,7 +11,7 @@ author: Michael Gilbert <mgilbert at debian.org>
options, args = parser.parse_args(argv)
if args:
-@@ -199,6 +200,8 @@ def build_gn_with_ninja_manually(tempdir
+@@ -207,6 +208,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir]
if options.verbose:
cmd.append('-v')
diff --git a/debian/patches/gn/profiler.patch b/debian/patches/gn/profiler.patch
deleted file mode 100644
index 5fb060e..0000000
--- a/debian/patches/gn/profiler.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -534,7 +534,7 @@ def write_gn_ninja(path, root_gen_dir, o
- 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
- 'base/trace_event/heap_profiler_allocation_register.cc',
- 'base/trace_event/heap_profiler_event_filter.cc',
-- 'base/trace_event/heap_profiler_event_writer.cc',
-+ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
- 'base/trace_event/heap_profiler_serialization_state.cc',
- 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
- 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
diff --git a/debian/patches/gn/safemath.patch b/debian/patches/gn/safemath.patch
deleted file mode 100644
index f486a40..0000000
--- a/debian/patches/gn/safemath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-description: safe math implementation does not yet support gcc
-origin: https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-gcc-r1.patch
-
---- a/base/numerics/safe_math_shared_impl.h
-+++ b/base/numerics/safe_math_shared_impl.h
-@@ -21,8 +21,7 @@
- #if !defined(__native_client__) && \
- ((defined(__clang__) && \
- ((__clang_major__ > 3) || \
-- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
-- (defined(__GNUC__) && __GNUC__ >= 5))
-+ (__clang_major__ == 3 && __clang_minor__ >= 4))))
- #include "base/numerics/safe_math_clang_gcc_impl.h"
- #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
- #else
diff --git a/debian/patches/series b/debian/patches/series
index 77a85fe..0cac1f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,21 +1,22 @@
manpage.patch
master-preferences.patch
-gn/profiler.patch
-gn/safemath.patch
gn/parallel.patch
+gn/bootstrap.patch
+gn/narrowing.patch
gn/buildflags.patch
disable/promo.patch
+disable/fuzzers.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
disable/external-components.patch
-fixes/atk.patch
fixes/mojo.patch
+fixes/crc32.patch
+fixes/chromecast.patch
fixes/ps-print.patch
fixes/gpu-timeout.patch
-fixes/declaration.patch
fixes/widevine-revision.patch
fixes/connection-message.patch
fixes/chromedriver-revision.patch
@@ -24,4 +25,3 @@ system/icu.patch
system/vpx.patch
system/nspr.patch
system/event.patch
-system/gtk2.patch
diff --git a/debian/patches/system/event.patch b/debian/patches/system/event.patch
index 08d845c..7ed24ed 100644
--- a/debian/patches/system/event.patch
+++ b/debian/patches/system/event.patch
@@ -11,10 +11,10 @@ author: Michael Gilbert <mgilbert at debian.org>
+#include <event.h>
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/logging.h"
- #include "webrtc/rtc_base/task_queue_posix.h"
+ #include "webrtc/rtc_base/platform_thread.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -608,26 +608,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -622,26 +622,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_now_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc',
])
@@ -41,7 +41,7 @@ author: Michael Gilbert <mgilbert at debian.org>
if is_linux or is_aix:
ldflags.extend(['-pthread'])
-@@ -659,13 +639,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -673,13 +653,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
])
@@ -56,7 +56,7 @@ author: Michael Gilbert <mgilbert at debian.org>
else:
libs.extend(['-lrt'])
static_libraries['base']['sources'].extend([
-@@ -702,12 +676,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -716,12 +690,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_mac.cc',
'base/threading/platform_thread_mac.mm',
])
diff --git a/debian/patches/system/gtk2.patch b/debian/patches/system/gtk2.patch
deleted file mode 100644
index 61230b6..0000000
--- a/debian/patches/system/gtk2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-description: scale factor calculation support for gtk2
-origin: implementation from chromium 59.0.3071.86
-
---- a/chrome/browser/ui/libgtkui/gtk_ui.cc
-+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
-@@ -1048,12 +1048,54 @@ void GtkUi::ResetStyle() {
- native_theme_->NotifyObservers();
- }
-
-+float GtkDpiToScaleFactor(int dpi) {
-+ // GTK multiplies the DPI by 1024 before storing it.
-+ return dpi / (1024 * kDefaultDPI);
-+}
-+
-+gint GetGdkScreenSettingInt(const char* setting_name) {
-+ GValue value = G_VALUE_INIT;
-+ g_value_init(&value, G_TYPE_INT);
-+ if (!gdk_screen_get_setting(gdk_screen_get_default(), setting_name, &value))
-+ return -1;
-+ return g_value_get_int(&value);
-+}
-+
-+float GetScaleFromGdkScreenSettings() {
-+ gint window_scale = GetGdkScreenSettingInt("gdk-window-scaling-factor");
-+ if (window_scale <= 0)
-+ return -1;
-+ gint font_dpi = GetGdkScreenSettingInt("gdk-unscaled-dpi");
-+ if (font_dpi <= 0)
-+ return -1;
-+ return window_scale * GtkDpiToScaleFactor(font_dpi);
-+}
-+
-+float GetScaleFromXftDPI() {
-+ GtkSettings* gtk_settings = gtk_settings_get_default();
-+ CHECK(gtk_settings);
-+ gint gtk_dpi = -1;
-+ g_object_get(gtk_settings, "gtk-xft-dpi", >k_dpi, nullptr);
-+ if (gtk_dpi <= 0)
-+ return -1;
-+ return GtkDpiToScaleFactor(gtk_dpi);
-+}
-+
- float GtkUi::GetRawDeviceScaleFactor() {
- if (display::Display::HasForceDeviceScaleFactor())
- return display::Display::GetForcedDeviceScaleFactor();
-
- GdkScreen* screen = gdk_screen_get_default();
-+#if GTK_MAJOR_VERSION == 2
-+ float scale = GetScaleFromGdkScreenSettings();
-+ if (scale <= 0) {
-+ scale = GetScaleFromXftDPI();
-+ if (scale <= 0)
-+ scale = 1;
-+ }
-+#else
- gint scale = gtk_widget_get_scale_factor(fake_window_);
-+#endif
- gdouble resolution = gdk_screen_get_resolution(screen);
- const float scale_factor =
- resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
diff --git a/debian/patches/system/icu.patch b/debian/patches/system/icu.patch
index f36f796..9bd7921 100644
--- a/debian/patches/system/icu.patch
+++ b/debian/patches/system/icu.patch
@@ -1,15 +1,32 @@
-description: maintain compatibility with system icu library
+description: backwards compatibility for older versions of icu
author: Michael Gilbert <mgilbert at debian.org>
---- a/BUILD.gn
-+++ b/BUILD.gn
-@@ -680,8 +680,7 @@ group("gn_all") {
- }
- }
+--- a/v8/src/runtime/runtime-intl.cc
++++ b/v8/src/runtime/runtime-intl.cc
+@@ -632,7 +632,11 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSele
+ return *isolate->factory()
+ ->NewStringFromTwoByte(Vector<const uint16_t>(
+ reinterpret_cast<const uint16_t*>(
++#if U_ICU_VERSION_MAJOR_NUM >= 59
+ icu::toUCharPtr(result.getBuffer())),
++#else
++ result.getBuffer()),
++#endif
+ result.length()))
+ .ToHandleChecked();
+ }
+--- a/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp
++++ b/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp
+@@ -527,8 +527,12 @@ String StringForUTF32LEText(const void*
+ utf16 = icu::UnicodeString::fromUTF32(reinterpret_cast<const UChar32*>(text),
+ static_cast<int32_t>(byte_length));
+ #endif
++#if U_ICU_VERSION_MAJOR_NUM >= 59
+ return String(icu::toUCharPtr(utf16.getBuffer()),
+ static_cast<unsigned>(utf16.length()));
++#else
++ return String(utf16.getBuffer(),static_cast<unsigned>(utf16.length()));
++#endif
+ }
-- if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) ||
-- (use_libfuzzer && is_mac)) {
-+ if (false) {
- deps += [
- "//testing/libfuzzer/fuzzers",
- "//testing/libfuzzer/tests:libfuzzer_tests",
+ String StringForText(const void* text,
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index 3f6d5f2..abb4373 100644
--- a/debian/patches/system/nspr.patch
+++ b/debian/patches/system/nspr.patch
@@ -25,7 +25,7 @@ author: Michael Gilbert <mgilbert at debian.org>
namespace base {
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -510,7 +510,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -525,7 +525,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/third_party/dmg_fp/dtoa_wrapper.cc',
'base/third_party/dmg_fp/g_fmt.cc',
'base/third_party/icu/icu_utf.cc',
@@ -33,7 +33,7 @@ author: Michael Gilbert <mgilbert at debian.org>
'base/threading/post_task_and_reply_impl.cc',
'base/threading/sequence_local_storage_map.cc',
'base/threading/sequenced_task_runner_handle.cc',
-@@ -660,7 +659,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -674,7 +673,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
])
@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert at debian.org>
}
config("base_implementation") {
-@@ -858,8 +861,6 @@ component("base") {
+@@ -852,8 +855,6 @@ component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
diff --git a/debian/patches/system/vpx.patch b/debian/patches/system/vpx.patch
index e3ae3dc..30732ef 100644
--- a/debian/patches/system/vpx.patch
+++ b/debian/patches/system/vpx.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ b/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
-@@ -1078,9 +1078,6 @@ int VP8DecoderImpl::Decode(const Encoded
+@@ -1171,9 +1171,6 @@ int VP8DecoderImpl::Decode(const Encoded
img = vpx_codec_get_frame(decoder_, &iter);
int qp;
@@ -13,7 +13,7 @@ author: Michael Gilbert <mgilbert at debian.org>
ret = ReturnFrame(img, input_image._timeStamp, input_image.ntp_time_ms_, qp);
if (ret != 0) {
// Reset to avoid requesting key frames too often.
-@@ -1127,8 +1124,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
+@@ -1227,8 +1224,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
VideoFrame decoded_image(buffer, timestamp, 0, kVideoRotation_0);
decoded_image.set_ntp_time_ms(ntp_time_ms);
@@ -31,8 +31,8 @@ author: Michael Gilbert <mgilbert at debian.org>
// backwards compatibility for legacy applications using the library.
#define VPX_CODEC_DISABLE_COMPAT 1
extern "C" {
--#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
--#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
+-#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" // nogncheck
+-#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" // nogncheck
+#include <vpx/vp8dx.h>
+#include <vpx/vpx_codec.h>
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list