Commit 9c4a57d3 authored by Michael Gilbert's avatar Michael Gilbert

refresh patches for chromium 66

parent d39bd4bd
This diff is collapsed.
description: content_shell_fonts depends on prebuilt ttf files
author: Michael Gilbert <mgilbert@debian.org>
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -589,7 +589,7 @@ if (is_android) {
[ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
}
- if (is_linux) {
+ if (false) {
data_deps += [ "//third_party/content_shell_fonts" ]
}
--- a/content/shell/test_runner/BUILD.gn
+++ b/content/shell/test_runner/BUILD.gn
@@ -204,7 +204,7 @@ group("resources") {
deps += [ ":copy_android_fonts_config" ]
data_deps += [ ":copy_android_fonts_config" ]
}
- if (is_android || is_linux || is_fuchsia) {
+ if (false) {
deps += [ "//third_party/content_shell_fonts" ]
data_deps += [ "//third_party/content_shell_fonts" ]
}
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -697,8 +697,7 @@ group("gn_all") {
@@ -702,8 +702,7 @@ group("gn_all") {
}
}
......
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -797,8 +797,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -838,8 +838,6 @@ void StartupBrowserCreatorImpl::AddInfoB
chrome::ShowBadFlagsPrompt(browser);
InfoBarService* infobar_service = InfoBarService::FromWebContents(
browser->tab_strip_model()->GetActiveWebContents());
......
......@@ -3,7 +3,7 @@ author: Chad Miller <chad.miller@canonical.com>
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -88,7 +88,7 @@ void CookieSettings::GetCookieSettings(
@@ -100,7 +100,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
......
description: gcc6 constexpr error
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/WebKit/Source/core/loader/IdlenessDetector.cpp
+++ b/third_party/WebKit/Source/core/loader/IdlenessDetector.cpp
@@ -15,8 +15,8 @@
namespace blink {
-const TimeDelta IdlenessDetector::kNetworkQuietWindow;
-const TimeDelta IdlenessDetector::kNetworkQuietWatchdog;
+constexpr TimeDelta IdlenessDetector::kNetworkQuietWindow;
+constexpr TimeDelta IdlenessDetector::kNetworkQuietWatchdog;
void IdlenessDetector::Shutdown() {
Stop();
......@@ -43,7 +43,7 @@ author: Michael Gilbert <mgilbert@debian.org>
case IDBKey::kBinaryType:
// https://w3c.github.io/IndexedDB/#convert-a-value-to-a-key
return ToV8(DOMArrayBuffer::Create(key->Binary()), creation_context,
@@ -379,7 +379,7 @@ static std::unique_ptr<IDBKey> CreateIDB
@@ -375,7 +375,7 @@ static std::unique_ptr<IDBKey> CreateIDB
}
DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType);
......@@ -52,7 +52,7 @@ author: Michael Gilbert <mgilbert@debian.org>
exception_state);
}
@@ -483,7 +483,7 @@ bool InjectV8KeyIntoV8Value(v8::Isolate*
@@ -479,7 +479,7 @@ bool InjectV8KeyIntoV8Value(v8::Isolate*
DCHECK(isolate->InContext());
DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType);
......@@ -61,7 +61,7 @@ author: Michael Gilbert <mgilbert@debian.org>
// The conbination of a key generator and an empty key path is forbidden by
// spec.
@@ -569,7 +569,7 @@ bool CanInjectIDBKeyIntoScriptValue(v8::
@@ -565,7 +565,7 @@ bool CanInjectIDBKeyIntoScriptValue(v8::
const IDBKeyPath& key_path) {
IDB_TRACE("canInjectIDBKeyIntoScriptValue");
DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType);
......
description: include statements needed to be able to build with gcc
author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/vr/sample_queue.cc
+++ b/chrome/browser/vr/sample_queue.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
+
#include "chrome/browser/vr/sample_queue.h"
namespace vr {
--- a/components/assist_ranker/ranker_example_util.cc
+++ b/components/assist_ranker/ranker_example_util.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <cmath>
+
#include "components/assist_ranker/ranker_example_util.h"
#include "base/bit_cast.h"
#include "base/format_macros.h"
description: gcc requires complete definition when types are used in unique_ptr
author: Michael Gilbert <mgilbert@debian.org>
--- a/services/preferences/tracked/pref_hash_filter.h
+++ b/services/preferences/tracked/pref_hash_filter.h
@@ -22,8 +22,8 @@
#include "services/preferences/tracked/hash_store_contents.h"
#include "services/preferences/tracked/interceptable_pref_filter.h"
#include "services/preferences/tracked/tracked_preference.h"
+#include "services/preferences/tracked/pref_hash_store.h"
-class PrefHashStore;
class PrefService;
namespace base {
--- a/components/policy/core/browser/browser_policy_connector_base.h
+++ b/components/policy/core/browser/browser_policy_connector_base.h
@@ -14,10 +14,10 @@
#include "components/policy/core/common/schema.h"
#include "components/policy/core/common/schema_registry.h"
#include "components/policy/policy_export.h"
+#include "components/policy/core/common/configuration_policy_provider.h"
namespace policy {
-class ConfigurationPolicyProvider;
class PolicyService;
class PolicyServiceImpl;
description: gcc6 needs explicit 'this->' for functions used in a lamba capturing 'this'
bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67274
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/accessibility/ax_event_generator.cc
+++ b/ui/accessibility/ax_event_generator.cc
@@ -411,7 +411,7 @@ void AXEventGenerator::FireRelationSourc
return;
source_nodes.insert(source_node);
- AddEvent(source_node, Event::RELATED_NODE_CHANGED);
+ this->AddEvent(source_node, Event::RELATED_NODE_CHANGED);
});
};
description: use inspector_protocol from top level third_party dir
author: Michael Gilbert <mgilbert@debian.org>
--- a/v8/src/inspector/BUILD.gn
+++ b/v8/src/inspector/BUILD.gn
@@ -4,7 +4,7 @@
import("../../gni/v8.gni")
-_inspector_protocol = v8_path_prefix + "/third_party/inspector_protocol"
+_inspector_protocol = "../../../third_party/inspector_protocol"
import("$_inspector_protocol/inspector_protocol.gni")
_protocol_generated = [
......@@ -3,8 +3,8 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -93,8 +93,6 @@ static_library("content_shell_lib") {
"browser/layout_test/layout_test_resource_dispatcher_host_delegate.h",
@@ -92,8 +92,6 @@ static_library("content_shell_lib") {
"browser/layout_test/layout_test_push_messaging_service.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",
......@@ -24,15 +24,15 @@ author: Michael Gilbert <mgilbert@debian.org>
"//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 @@
@@ -18,7 +18,6 @@
#include "content/shell/browser/layout_test/layout_test_browser_main_parts.h"
#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 {
@@ -31,11 +30,6 @@ namespace {
LayoutTestContentBrowserClient* g_layout_test_browser_client;
......@@ -52,11 +52,11 @@ author: Michael Gilbert <mgilbert@debian.org>
}
void LayoutTestContentBrowserClient::OverrideWebkitPrefs(
@@ -193,7 +186,6 @@ bool LayoutTestContentBrowserClient::Can
@@ -186,7 +179,6 @@ bool LayoutTestContentBrowserClient::Can
void LayoutTestContentBrowserClient::ExposeInterfacesToFrame(
service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>*
registry) {
- registry->AddInterface(base::Bind(&BindLayoutTestHelper));
}
} // namespace content
ResourceDispatcherHostLoginDelegate*
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -71,6 +71,8 @@ declare_args() {
@@ -74,6 +74,8 @@ declare_args() {
msvs_xtree_patched = false
}
......
This diff is collapsed.
--- a/chrome/browser/supervised_user/supervised_user_url_filter.cc
+++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc
@@ -368,7 +368,7 @@ SupervisedUserURLFilter::GetFilteringBeh
// Allow navigations to whitelisted origins (currently families.google.com).
static const base::NoDestructor<base::flat_set<GURL>> kWhitelistedOrigins(
- {GURL(kFamiliesUrl).GetOrigin()});
+ std::vector<GURL>({GURL(kFamiliesUrl).GetOrigin()}));
if (base::ContainsKey(*kWhitelistedOrigins, effective_url.GetOrigin()))
return ALLOW;
Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
===================================================================
--- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp
+++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
}
SI F from_half(U16 h) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
return vcvt_f32_f16(h);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
}
SI U16 to_half(F f) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
return vcvt_f16_f32(f);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
From b84682f31dc99b9c90f5a04947075815697c68d9 Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <jose.dapena@lge.com>
Date: Wed, 7 Mar 2018 20:07:48 +0000
Subject: [PATCH] GCC: do not initialize NEON int32x4_t with braces initializer
GCC does not support int32x4_t loading using braces wrapping 4 ints.
Instead we should use the NEON intrinsic to load from an array of
ints.
Bug: 819294
Change-Id: I13b877405273e4ebcc944d50c155ee29ff31cc99
Reviewed-on: https://chromium-review.googlesource.com/951773
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541544}
---
skia/ext/convolver_neon.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc
index 26b91b9c88c4..cae6bc2f833f 100644
--- a/skia/ext/convolver_neon.cc
+++ b/skia/ext/convolver_neon.cc
@@ -23,7 +23,7 @@ AccumRemainder(const unsigned char* pixels_left,
remainder[2] += coeff * pixels_left[i * 4 + 2];
remainder[3] += coeff * pixels_left[i * 4 + 3];
}
- return {remainder[0], remainder[1], remainder[2], remainder[3]};
+ return vld1q_s32(remainder);
}
// Convolves horizontally along a single row. The row data is given in
@@ -336,4 +336,4 @@ void ConvolveVertically_Neon(const ConvolutionFilter1D::Fixed* filter_values,
}
}
-} // namespace skia
\ No newline at end of file
+} // namespace skia
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 79aafb2b535f..a8daf9b77911 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -282,10 +282,12 @@ component("skia") {
"ext/convolver_mips_dspr2.h",
]
} else if (current_cpu == "arm" || current_cpu == "arm64") {
- sources += [
- "ext/convolver_neon.cc",
- "ext/convolver_neon.h",
- ]
+ if (arm_use_neon) {
+ sources += [
+ "ext/convolver_neon.cc",
+ "ext/convolver_neon.h",
+ ]
+ }
}
# The imported Skia gni source paths are made absolute by gn.
description: gcc before 7.3.0-10 handles Optional<WTF::Vector<T>> incorrectly
origin: derived from fix for std::vector in base/template_util.h
--- a/third_party/WebKit/Source/platform/wtf/Vector.h
+++ b/third_party/WebKit/Source/platform/wtf/Vector.h
@@ -1995,6 +1995,13 @@ Vector<T, inlineCapacity, Allocator>::Tr
} // namespace WTF
+#include "base/template_util.h"
+
+namespace base {
+template <typename T>
+struct is_trivially_copy_constructible<WTF::Vector<T>> : std::false_type {};
+}
+
using WTF::Vector;
#endif // WTF_Vector_h
description: avoid chromium's embedded C++ library when bootstrapping gn
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -663,6 +663,8 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux or is_aix:
+ ldflags.extend(['-pthread'])
+
static_libraries['xdg_user_dirs'] = {
'sources': [
'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
@@ -688,85 +690,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_linux.cc',
])
if is_linux:
- libcxx_root = SRC_ROOT + '/buildtools/third_party/libc++/trunk'
- libcxxabi_root = SRC_ROOT + '/buildtools/third_party/libc++abi/trunk'
- cflags_cc.extend([
- '-nostdinc++',
- '-isystem' + libcxx_root + '/include',
- '-isystem' + libcxxabi_root + '/include',
- ])
- ldflags.extend(['-nodefaultlibs'])
- libs.extend([
- '-lc',
- '-lgcc_s',
- '-lm',
- '-lpthread',
- ])
- static_libraries['libc++'] = {
- 'sources': [
- libcxx_root + '/src/algorithm.cpp',
- libcxx_root + '/src/any.cpp',
- libcxx_root + '/src/bind.cpp',
- libcxx_root + '/src/chrono.cpp',
- libcxx_root + '/src/condition_variable.cpp',
- libcxx_root + '/src/debug.cpp',
- libcxx_root + '/src/exception.cpp',
- libcxx_root + '/src/functional.cpp',
- libcxx_root + '/src/future.cpp',
- libcxx_root + '/src/hash.cpp',
- libcxx_root + '/src/ios.cpp',
- libcxx_root + '/src/iostream.cpp',
- libcxx_root + '/src/locale.cpp',
- libcxx_root + '/src/memory.cpp',
- libcxx_root + '/src/mutex.cpp',
- libcxx_root + '/src/new.cpp',
- libcxx_root + '/src/optional.cpp',
- libcxx_root + '/src/random.cpp',
- libcxx_root + '/src/regex.cpp',
- libcxx_root + '/src/shared_mutex.cpp',
- libcxx_root + '/src/stdexcept.cpp',
- libcxx_root + '/src/string.cpp',
- libcxx_root + '/src/strstream.cpp',
- libcxx_root + '/src/system_error.cpp',
- libcxx_root + '/src/thread.cpp',
- libcxx_root + '/src/typeinfo.cpp',
- libcxx_root + '/src/utility.cpp',
- libcxx_root + '/src/valarray.cpp',
- libcxx_root + '/src/variant.cpp',
- libcxx_root + '/src/vector.cpp',
- ],
- 'tool': 'cxx',
- 'cflags': cflags + [
- '-D_LIBCPP_NO_EXCEPTIONS',
- '-D_LIBCPP_BUILDING_LIBRARY',
- '-DLIBCXX_BUILDING_LIBCXXABI',
- ]
- }
- static_libraries['libc++abi'] = {
- 'sources': [
- libcxxabi_root + '/src/abort_message.cpp',
- libcxxabi_root + '/src/cxa_aux_runtime.cpp',
- libcxxabi_root + '/src/cxa_default_handlers.cpp',
- libcxxabi_root + '/src/cxa_demangle.cpp',
- libcxxabi_root + '/src/cxa_exception_storage.cpp',
- libcxxabi_root + '/src/cxa_guard.cpp',
- libcxxabi_root + '/src/cxa_handlers.cpp',
- libcxxabi_root + '/src/cxa_noexception.cpp',
- libcxxabi_root + '/src/cxa_unexpected.cpp',
- libcxxabi_root + '/src/cxa_vector.cpp',
- libcxxabi_root + '/src/cxa_virtual.cpp',
- libcxxabi_root + '/src/fallback_malloc.cpp',
- libcxxabi_root + '/src/private_typeinfo.cpp',
- libcxxabi_root + '/src/stdlib_exception.cpp',
- libcxxabi_root + '/src/stdlib_stdexcept.cpp',
- libcxxabi_root + '/src/stdlib_typeinfo.cpp',
- ],
- 'tool': 'cxx',
- 'cflags': cflags + [
- '-DLIBCXXABI_SILENT_TERMINATE',
- '-D_LIBCXXABI_NO_EXCEPTIONS',
- ]
- }
static_libraries['base']['sources'].extend([
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
......@@ -11,7 +11,7 @@ author: Michael Gilbert <mgilbert@debian.org>
options, args = parser.parse_args(argv)
if args:
@@ -234,6 +235,8 @@ def build_gn_with_ninja_manually(tempdir
@@ -236,6 +237,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
if options.verbose:
cmd.append('-v')
......
manpage.patch
master-preferences.patch
gn/libcxx.patch
gn/parallel.patch
gn/buildflags.patch
......@@ -10,18 +11,27 @@ disable/google-api-warning.patch
disable/third-party-cookies.patch
fixes/mojo.patch
fixes/includes.patch
fixes/optional.patch
fixes/optimize.patch
fixes/ps-print.patch
fixes/constexpr.patch
fixes/inspector.patch
fixes/wtf-vector.patch
fixes/gpu-timeout.patch
fixes/duplicate-name.patch
fixes/overloaded-call.patch
fixes/incomplete-types.patch
fixes/inconsistent-this.patch
fixes/widevine-revision.patch
fixes/chromedriver-revision.patch
fixes/skia_buildfix.patch
fixes/skia_neon.patch
system/icu.patch
system/vpx.patch
system/gtk2.patch
system/nspr.patch
system/event.patch
system/ffmpeg.patch
system/libdrm.patch
add-missing-blink-tools.patch
......@@ -3,18 +3,18 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/rtc_base/task_queue_libevent.cc
+++ b/third_party/webrtc/rtc_base/task_queue_libevent.cc
@@ -15,7 +15,7 @@
#include <string.h>
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <list>
-#include "base/third_party/libevent/event.h"
+#include <event.h>
#include "rtc_base/checks.h"
#include "rtc_base/criticalsection.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -640,26 +640,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -643,26 +643,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_conversion_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc',
])
......@@ -41,7 +41,7 @@ author: Michael Gilbert <mgilbert@debian.org>
if is_linux or is_aix:
ldflags.extend(['-pthread'])
@@ -693,13 +673,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -696,13 +676,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,9 +54,9 @@ author: Michael Gilbert <mgilbert@debian.org>
- ])
+ libs.extend(['-lrt', '-latomic', '-lnspr4', '-levent'])
else:
ldflags.extend(['-pthread'])
libs.extend(['-lrt'])
static_libraries['base']['sources'].extend([
@@ -738,12 +712,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -742,12 +716,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_mac.cc',
'base/threading/platform_thread_mac.mm',
])
......
......@@ -21,3 +21,28 @@ author: Michael Gilbert <mgilbert@debian.org>
default:
DVLOG(1) << "Unknown VideoCodec: " << video_codec;
}
description: system ffmpeg build still relies on old ffmpeg_features label
author: chromium 65 authors
--- a/build/linux/unbundle/ffmpeg.gn
+++ b/build/linux/unbundle/ffmpeg.gn
@@ -14,8 +14,8 @@ pkg_config("system_ffmpeg") {
]
}
-buildflag_header("ffmpeg_buildflags") {
- header = "ffmpeg_buildflags.h"
+buildflag_header("ffmpeg_features") {
+ header = "ffmpeg_features.h"
flags = [ "USE_SYSTEM_FFMPEG=true" ]
}
@@ -30,7 +30,7 @@ shim_headers("ffmpeg_shim") {
source_set("ffmpeg") {
deps = [
- ":ffmpeg_buildflags",
+ ":ffmpeg_features",
":ffmpeg_shim",
]
public_configs = [ ":system_ffmpeg" ]
description: add missing include needed to build with gtk2
author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/libgtkui/gtk_ui.cc
+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
@@ -66,6 +66,7 @@
#if GTK_MAJOR_VERSION == 2
#include "chrome/browser/ui/libgtkui/native_theme_gtk2.h" // nogncheck
+#include "chrome/browser/ui/libgtkui/nav_button_layout_manager.h"
#elif GTK_MAJOR_VERSION == 3
#include "chrome/browser/ui/libgtkui/native_theme_gtk3.h" // nogncheck
#include "chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h" // nogncheck
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/v8/src/runtime/runtime-intl.cc
+++ b/v8/src/runtime/runtime-intl.cc
@@ -627,7 +627,11 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSele
@@ -628,7 +628,11 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSele
return *isolate->factory()
->NewStringFromTwoByte(Vector<const uint16_t>(
reinterpret_cast<const uint16_t*>(
......@@ -17,7 +17,7 @@ author: Michael Gilbert <mgilbert@debian.org>
}
--- a/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp
+++ b/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp
@@ -528,8 +528,12 @@ String StringForUTF32LEText(const void*
@@ -531,8 +531,12 @@ String StringForUTF32LEText(const void*
utf16 = icu::UnicodeString::fromUTF32(reinterpret_cast<const UChar32*>(text),
static_cast<int32_t>(byte_length));
#endif
......
description: libdrm in stretch doesn't explicitly define DRM_FORMAT_MOD_INVALID
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/gfx/native_pixmap_handle.cc
+++ b/ui/gfx/native_pixmap_handle.cc
@@ -11,7 +11,7 @@
namespace gfx {
-#if defined(OS_LINUX)
+#if 0
static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID,
"gfx::NativePixmapPlane::kNoModifier should be an alias for"
"DRM_FORMAT_MOD_INVALID");
......@@ -15,17 +15,17 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/base/time/time.cc
+++ b/base/time/time.cc
@@ -14,7 +14,7 @@
#include "base/logging.h"
#include "base/macros.h"
#include "base/no_destructor.h"
#include "base/strings/stringprintf.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
#include "base/time/time_override.h"
#include "build/build_config.h"
namespace base {
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -551,7 +551,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -555,7 +555,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@debian.org>
'base/threading/post_task_and_reply_impl.cc',
'base/threading/scoped_blocking_call.cc',
'base/threading/sequence_local_storage_map.cc',
@@ -694,7 +693,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -697,7 +696,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
])
......@@ -44,8 +44,8 @@ author: Michael Gilbert <mgilbert@debian.org>
])
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -69,6 +69,9 @@ config("base_flags") {
"-Wno-char-subscripts",
@@ -76,6 +76,9 @@ config("base_flags") {
"-Wexit-time-destructors",
]
}
+ ldflags = [
......@@ -54,12 +54,12 @@ author: Michael Gilbert <mgilbert@debian.org>
}
config("base_implementation") {
@@ -874,8 +877,6 @@ jumbo_component("base") {
@@ -883,8 +886,6 @@ jumbo_component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
- "third_party/nspr/prtime.cc",
- "third_party/nspr/prtime.h",
"third_party/superfasthash/superfasthash.c",
"thread_annotations.h",
"threading/platform_thread.h",
"threading/platform_thread_android.cc",
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment