[Pkg-chromium-commit] [pkg-chromium] 02/03: refresh patches for chromium 64
Michael Gilbert
mgilbert at moszumanska.debian.org
Wed Jan 31 02:15:42 UTC 2018
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit 234763837d5bc2bd5e349d8e57eae10308f8ed49
Author: Michael Gilbert <mgilbert at debian.org>
Date: Wed Jan 31 02:16:58 2018 +0000
refresh patches for chromium 64
---
debian/patches/disable/external-components.patch | 28 ------------------
debian/patches/disable/fonts.patch | 14 +++++++++
debian/patches/disable/google-api-warning.patch | 2 +-
debian/patches/disable/promo.patch | 15 ----------
debian/patches/disable/signin.patch | 6 ++--
debian/patches/disable/third-party-cookies.patch | 2 +-
debian/patches/disable/welcome-page.patch | 2 +-
debian/patches/fixes/angle.patch | 14 +++++++++
debian/patches/fixes/chromecast.patch | 2 +-
debian/patches/fixes/includes.patch | 27 +++++++++++++++++
debian/patches/fixes/mojo.patch | 22 +++++++-------
debian/patches/fixes/optimize.patch | 2 +-
debian/patches/fixes/webrtc.patch | 13 ---------
debian/patches/gn/narrowing.patch | 2 +-
debian/patches/gn/parallel.patch | 6 ++--
debian/patches/manpage-build.patch | 37 ------------------------
debian/patches/series | 7 ++---
debian/patches/system/event.patch | 8 ++---
debian/patches/system/gtk2.patch | 2 +-
debian/patches/system/harfbuzz.patch | 14 +++++++++
debian/patches/system/icu.patch | 2 +-
debian/patches/system/lcms2.patch | 8 ++---
debian/patches/system/nspr.patch | 8 ++---
debian/patches/system/vpx.patch | 11 ++++---
debian/patches/warnings/comment.patch | 28 ++++++++++++++++--
debian/patches/warnings/enum-boolean.patch | 4 +--
debian/patches/warnings/unused-typedefs.patch | 2 +-
27 files changed, 142 insertions(+), 146 deletions(-)
diff --git a/debian/patches/disable/external-components.patch b/debian/patches/disable/external-components.patch
deleted file mode 100644
index 3863623..0000000
--- a/debian/patches/disable/external-components.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-author: Michael Gilbert <mgilbert at debian.org>
-description: disable loading external components
-
---- a/chrome/browser/extensions/external_component_loader.cc
-+++ b/chrome/browser/extensions/external_component_loader.cc
-@@ -34,22 +34,6 @@ ExternalComponentLoader::~ExternalCompon
-
- void ExternalComponentLoader::StartLoading() {
- auto prefs = std::make_unique<base::DictionaryValue>();
--#if defined(GOOGLE_CHROME_BUILD)
-- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get());
--#endif // defined(GOOGLE_CHROME_BUILD)
--
-- if (HotwordServiceFactory::IsHotwordAllowed(profile_))
-- AddExternalExtension(extension_misc::kHotwordSharedModuleId, prefs.get());
--
--#if defined(OS_CHROMEOS)
-- {
-- base::CommandLine* const command_line =
-- base::CommandLine::ForCurrentProcess();
-- if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker))
-- AddExternalExtension(extension_misc::kZIPUnpackerExtensionId,
-- prefs.get());
-- }
--#endif
-
- if (media_router::MediaRouterEnabled(profile_) &&
- FeatureSwitch::load_media_router_component_extension()->IsEnabled()) {
diff --git a/debian/patches/disable/fonts.patch b/debian/patches/disable/fonts.patch
new file mode 100644
index 0000000..763cd03
--- /dev/null
+++ b/debian/patches/disable/fonts.patch
@@ -0,0 +1,14 @@
+description: content_shell_fonts depends on prebuilt ttf files
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/content/shell/BUILD.gn
++++ b/content/shell/BUILD.gn
+@@ -590,7 +590,7 @@ if (is_android) {
+ [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
+ }
+
+- if (is_linux) {
++ if (false) {
+ data_deps += [ "//third_party/content_shell_fonts" ]
+ }
+
diff --git a/debian/patches/disable/google-api-warning.patch b/debian/patches/disable/google-api-warning.patch
index 3cb5e5e..649008c 100644
--- a/debian/patches/disable/google-api-warning.patch
+++ b/debian/patches/disable/google-api-warning.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -778,8 +778,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -791,8 +791,6 @@ void StartupBrowserCreatorImpl::AddInfoB
!command_line_.HasSwitch(switches::kTestType) &&
!command_line_.HasSwitch(switches::kEnableAutomation)) {
chrome::ShowBadFlagsPrompt(browser);
diff --git a/debian/patches/disable/promo.patch b/debian/patches/disable/promo.patch
deleted file mode 100644
index ee5f017..0000000
--- a/debian/patches/disable/promo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-description: disable the ad promo system by default
-author: Michael Gilbert <mgilbert at debian.org>
-bug-debian: http://bugs.debian.org/634101
-
---- a/chrome/browser/ui/app_list/app_list_service.cc
-+++ b/chrome/browser/ui/app_list/app_list_service.cc
-@@ -145,7 +145,7 @@ void AppListService::RegisterPrefs(PrefR
-
- // Identifies whether we should show the app launcher promo or not. This
- // becomes false when the user dismisses the promo.
-- registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
-+ registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
- }
-
- // static
diff --git a/debian/patches/disable/signin.patch b/debian/patches/disable/signin.patch
index cfbf8f9..c78ee20 100644
--- a/debian/patches/disable/signin.patch
+++ b/debian/patches/disable/signin.patch
@@ -3,7 +3,7 @@ origin: https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/reso
--- a/components/signin/core/browser/signin_manager_base.cc
+++ b/components/signin/core/browser/signin_manager_base.cc
-@@ -159,7 +159,7 @@ void SigninManagerBase::Initialize(PrefS
+@@ -162,7 +162,7 @@ void SigninManagerBase::Initialize(PrefS
bool SigninManagerBase::IsInitialized() const { return initialized_; }
bool SigninManagerBase::IsSigninAllowed() const {
@@ -27,7 +27,7 @@ origin: https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/reso
// Shows either the help app or the appropriate help page for |source|. If
// |browser| is NULL and the help page is used (vs the app), the help page is
// shown in the last active browser. If there is no such browser, a new browser
-@@ -361,6 +355,7 @@ void ShowSearchEngineSettings(Browser* b
+@@ -384,6 +378,7 @@ void ShowSearchEngineSettings(Browser* b
#if !defined(OS_ANDROID)
void ShowBrowserSignin(Browser* browser,
signin_metrics::AccessPoint access_point) {
@@ -35,7 +35,7 @@ origin: https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/reso
Profile* original_profile = browser->profile()->GetOriginalProfile();
SigninManagerBase* manager =
SigninManagerFactory::GetForProfile(original_profile);
-@@ -400,6 +395,7 @@ void ShowBrowserSignin(Browser* browser,
+@@ -424,6 +419,7 @@ void ShowBrowserSignin(Browser* browser,
false));
DCHECK_GT(browser->tab_strip_model()->count(), 0);
}
diff --git a/debian/patches/disable/third-party-cookies.patch b/debian/patches/disable/third-party-cookies.patch
index f34bdb9..a8989a8 100644
--- a/debian/patches/disable/third-party-cookies.patch
+++ b/debian/patches/disable/third-party-cookies.patch
@@ -3,7 +3,7 @@ author: Chad Miller <chad.miller at canonical.com>
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -80,7 +80,7 @@ void CookieSettings::GetCookieSettings(
+@@ -88,7 +88,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
diff --git a/debian/patches/disable/welcome-page.patch b/debian/patches/disable/welcome-page.patch
index d0aa1eb..26418ff 100644
--- a/debian/patches/disable/welcome-page.patch
+++ b/debian/patches/disable/welcome-page.patch
@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1012,7 +1012,7 @@ void ProfileManager::InitProfileUserPref
+@@ -1023,7 +1023,7 @@ void ProfileManager::InitProfileUserPref
profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
supervised_user_id);
}
diff --git a/debian/patches/fixes/angle.patch b/debian/patches/fixes/angle.patch
new file mode 100644
index 0000000..b4a28d9
--- /dev/null
+++ b/debian/patches/fixes/angle.patch
@@ -0,0 +1,14 @@
+description: add constexpr annotation to routine used in constexpr methods
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/third_party/angle/src/compiler/translator/Types.h
++++ b/third_party/angle/src/compiler/translator/Types.h
+@@ -236,7 +236,7 @@ class TType
+ {
+ }
+
+- TBasicType getBasicType() const { return type; }
++ constexpr TBasicType getBasicType() const { return type; }
+ void setBasicType(TBasicType t);
+
+ TPrecision getPrecision() const { return precision; }
diff --git a/debian/patches/fixes/chromecast.patch b/debian/patches/fixes/chromecast.patch
index a73debd..fb00ae3 100644
--- a/debian/patches/fixes/chromecast.patch
+++ b/debian/patches/fixes/chromecast.patch
@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/878244
--- a/extensions/common/feature_switch.cc
+++ b/extensions/common/feature_switch.cc
-@@ -52,7 +52,7 @@ class CommonSwitches {
+@@ -50,7 +50,7 @@ class CommonSwitches {
FeatureSwitch::DEFAULT_ENABLED),
load_media_router_component_extension(
kLoadMediaRouterComponentExtensionFlag,
diff --git a/debian/patches/fixes/includes.patch b/debian/patches/fixes/includes.patch
new file mode 100644
index 0000000..0bc5920
--- /dev/null
+++ b/debian/patches/fixes/includes.patch
@@ -0,0 +1,27 @@
+description: include statements needed to be able to build with gcc
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/cc/paint/raw_memory_transfer_cache_entry.cc
++++ b/cc/paint/raw_memory_transfer_cache_entry.cc
+@@ -4,6 +4,8 @@
+
+ #include "cc/paint/raw_memory_transfer_cache_entry.h"
+
++#include <string.h>
++
+ namespace cc {
+
+ ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(
+description: add missing include needed for call to round
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/third_party/webrtc/p2p/base/port.cc
++++ b/third_party/webrtc/p2p/base/port.cc
+@@ -12,6 +12,7 @@
+
+ #include <math.h>
+
++#include <cmath>
+ #include <algorithm>
+ #include <vector>
+
diff --git a/debian/patches/fixes/mojo.patch b/debian/patches/fixes/mojo.patch
index 6157103..97d1714 100644
--- a/debian/patches/fixes/mojo.patch
+++ b/debian/patches/fixes/mojo.patch
@@ -3,7 +3,16 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
-@@ -237,9 +237,7 @@ static_library("content_shell_lib") {
+@@ -93,8 +93,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",
+@@ -244,9 +242,7 @@ static_library("content_shell_lib") {
"//content/public/common",
"//content/public/common:service_names",
"//content/shell/test_runner:test_runner",
@@ -51,14 +60,3 @@ author: Michael Gilbert <mgilbert at debian.org>
}
} // 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/fixes/optimize.patch b/debian/patches/fixes/optimize.patch
index 6c8b81c..4166961 100644
--- a/debian/patches/fixes/optimize.patch
+++ b/debian/patches/fixes/optimize.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -70,6 +70,8 @@ declare_args() {
+@@ -71,6 +71,8 @@ declare_args() {
msvs_xtree_patched = false
}
diff --git a/debian/patches/fixes/webrtc.patch b/debian/patches/fixes/webrtc.patch
deleted file mode 100644
index 26364aa..0000000
--- a/debian/patches/fixes/webrtc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-description: add missing include needed for call to round
-author: Michael Gilbert <mgilbert at debian.org>
-
---- a/third_party/webrtc/p2p/base/port.cc
-+++ b/third_party/webrtc/p2p/base/port.cc
-@@ -10,6 +10,7 @@
-
- #include "p2p/base/port.h"
-
-+#include <cmath>
- #include <algorithm>
- #include <vector>
-
diff --git a/debian/patches/gn/narrowing.patch b/debian/patches/gn/narrowing.patch
index 3d961f5..744a91f 100644
--- a/debian/patches/gn/narrowing.patch
+++ b/debian/patches/gn/narrowing.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -352,7 +352,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -365,7 +365,7 @@ def write_gn_ninja(path, root_gen_dir, o
'-pipe',
'-fno-exceptions'
])
diff --git a/debian/patches/gn/parallel.patch b/debian/patches/gn/parallel.patch
index 4111c6d..5c4ff57 100644
--- a/debian/patches/gn/parallel.patch
+++ b/debian/patches/gn/parallel.patch
@@ -3,15 +3,15 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -111,6 +111,7 @@ def main(argv):
- parser.add_option('--gn-gen-args', help='Args to pass to gn gen --args')
+@@ -115,6 +115,7 @@ def main(argv):
+ 'relative to the src directory. (eg. out/Release)')
parser.add_option('-v', '--verbose', action='store_true',
help='Log more details')
+ parser.add_option('-j', '--jobs', help='Number of jobs')
options, args = parser.parse_args(argv)
if args:
-@@ -208,6 +209,8 @@ def build_gn_with_ninja_manually(tempdir
+@@ -221,6 +222,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
if options.verbose:
cmd.append('-v')
diff --git a/debian/patches/manpage-build.patch b/debian/patches/manpage-build.patch
deleted file mode 100644
index 1f4e85e..0000000
--- a/debian/patches/manpage-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-description: restore manpage build process
-origin: upstream chromium before version 63
-
---- a/chrome/BUILD.gn
-+++ b/chrome/BUILD.gn
-@@ -1762,6 +1762,31 @@ if (enable_resource_whitelist_generation
- }
-
- if (is_linux) {
-+ action("manpage") {
-+ name = "Chromium"
-+ filename = "chromium-browser"
-+ confdir = "chromium"
-+
-+ script = "//chrome/tools/build/linux/sed.py"
-+ infile = "app/resources/manpage.1.in"
-+ inputs = [
-+ infile,
-+ ]
-+
-+ outfile = "$root_out_dir/chromium.1"
-+ outputs = [
-+ outfile,
-+ ]
-+
-+ args = [
-+ rebase_path(infile, root_build_dir),
-+ rebase_path(outfile, root_build_dir),
-+ "-e s/@@NAME@@/$name/",
-+ "-e s/@@FILENAME@@/$filename/",
-+ "-e s/@@CONFDIR@@/$confdir/",
-+ ]
-+ }
-+
- if (is_official_build) {
- action("linux_symbols") {
- script = "//build/linux/dump_app_syms.py"
diff --git a/debian/patches/series b/debian/patches/series
index 43f7816..79332e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,23 +1,22 @@
manpage.patch
-manpage-build.patch
master-preferences.patch
gn/parallel.patch
gn/narrowing.patch
gn/buildflags.patch
-disable/promo.patch
+disable/fonts.patch
disable/signin.patch
disable/fuzzers.patch
disable/avatar-menu.patch
disable/welcome-page.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
-disable/external-components.patch
disable/device-notifications.patch
fixes/mojo.patch
-fixes/webrtc.patch
+fixes/angle.patch
+fixes/includes.patch
fixes/optimize.patch
fixes/chromecast.patch
fixes/ps-print.patch
diff --git a/debian/patches/system/event.patch b/debian/patches/system/event.patch
index 3e71ca1..2158dd7 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 "rtc_base/checks.h"
#include "rtc_base/logging.h"
- #include "rtc_base/platform_thread.h"
+ #include "rtc_base/numerics/safe_conversions.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -614,26 +614,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -628,26 +628,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 at debian.org>
if is_linux or is_aix:
ldflags.extend(['-pthread'])
-@@ -667,13 +647,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -681,13 +661,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([
-@@ -711,12 +685,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -725,12 +699,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
index ce5bda7..a758283 100644
--- a/debian/patches/system/gtk2.patch
+++ b/debian/patches/system/gtk2.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/chrome/browser/ui/libgtkui/gtk_ui.cc
+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
-@@ -66,6 +66,7 @@
+@@ -67,6 +67,7 @@
#if GTK_MAJOR_VERSION == 2
#include "chrome/browser/ui/libgtkui/native_theme_gtk2.h" // nogncheck
diff --git a/debian/patches/system/harfbuzz.patch b/debian/patches/system/harfbuzz.patch
index d753b1b..3c0fbc1 100644
--- a/debian/patches/system/harfbuzz.patch
+++ b/debian/patches/system/harfbuzz.patch
@@ -1,3 +1,6 @@
+description: changes required to build using system harfbuzz library
+author: Michael Gilbert <mgilbert at debian.org>
+
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -69,7 +69,7 @@ component("freetype_harfbuzz") {
@@ -9,3 +12,14 @@
} else {
public_deps += [ "//third_party/harfbuzz-ng:harfbuzz_source" ]
}
+--- a/third_party/WebKit/Source/platform/text/Character.cpp
++++ b/third_party/WebKit/Source/platform/text/Character.cpp
+@@ -227,8 +227,6 @@ bool Character::CanTextDecorationSkipInk
+ case UBLOCK_HANGUL_JAMO_EXTENDED_A:
+ case UBLOCK_HANGUL_JAMO_EXTENDED_B:
+ case UBLOCK_LINEAR_B_IDEOGRAMS:
+- case UBLOCK_TANGUT:
+- case UBLOCK_TANGUT_COMPONENTS:
+ return false;
+ default:
+ return true;
diff --git a/debian/patches/system/icu.patch b/debian/patches/system/icu.patch
index f90d29c..b47441a 100644
--- a/debian/patches/system/icu.patch
+++ b/debian/patches/system/icu.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/v8/src/runtime/runtime-intl.cc
+++ b/v8/src/runtime/runtime-intl.cc
-@@ -714,7 +714,11 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSele
+@@ -627,7 +627,11 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSele
return *isolate->factory()
->NewStringFromTwoByte(Vector<const uint16_t>(
reinterpret_cast<const uint16_t*>(
diff --git a/debian/patches/system/lcms2.patch b/debian/patches/system/lcms2.patch
index 655fe8e..f53790e 100644
--- a/debian/patches/system/lcms2.patch
+++ b/debian/patches/system/lcms2.patch
@@ -4,15 +4,15 @@ bug-debian: http://bugs.debian.org/879153
--- a/third_party/pdfium/BUILD.gn
+++ b/third_party/pdfium/BUILD.gn
-@@ -191,6 +191,7 @@ static_library("pdfium") {
+@@ -193,6 +193,7 @@ static_library("pdfium") {
":fxge",
- ":javascript",
+ ":fxjs",
":pwl",
+ "third_party:lcms2",
"third_party:bigint",
"third_party:pdfium_base",
]
-@@ -685,6 +686,7 @@ static_library("fpdftext") {
+@@ -686,6 +687,7 @@ static_library("fpdftext") {
configs += [ ":pdfium_core_config" ]
deps = [
":fxcrt",
@@ -20,7 +20,7 @@ bug-debian: http://bugs.debian.org/879153
]
}
-@@ -1079,6 +1081,7 @@ static_library("fxge") {
+@@ -1082,6 +1084,7 @@ static_library("fxge") {
deps = [
":fxcrt",
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index 2f386fd..57b79e9 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
-@@ -525,7 +525,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -539,7 +539,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/scoped_blocking_call.cc',
'base/threading/sequence_local_storage_map.cc',
-@@ -668,7 +667,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -682,7 +681,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,7 +44,7 @@ author: Michael Gilbert <mgilbert at debian.org>
])
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
-@@ -58,6 +58,9 @@ config("base_flags") {
+@@ -67,6 +67,9 @@ config("base_flags") {
"-Wno-char-subscripts",
]
}
@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert at debian.org>
}
config("base_implementation") {
-@@ -851,8 +854,6 @@ component("base") {
+@@ -868,8 +871,6 @@ jumbo_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 414a2ab..bba2b43 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
-@@ -1188,9 +1188,6 @@ int VP8DecoderImpl::Decode(const Encoded
+@@ -1178,9 +1178,6 @@ int VP8DecoderImpl::Decode(const Encoded
img = vpx_codec_get_frame(decoder_, &iter);
int qp;
@@ -13,12 +13,11 @@ 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.
-@@ -1244,8 +1241,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
+@@ -1234,7 +1231,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
VideoFrame decoded_image(buffer, timestamp, 0, kVideoRotation_0);
decoded_image.set_ntp_time_ms(ntp_time_ms);
-- decode_complete_callback_->Decoded(decoded_image, rtc::Optional<int32_t>(),
-- rtc::Optional<uint8_t>(qp));
+- decode_complete_callback_->Decoded(decoded_image, rtc::nullopt, qp);
+ int ret = decode_complete_callback_->Decoded(decoded_image);
+ if (ret != 0)
+ return ret;
@@ -27,7 +26,7 @@ author: Michael Gilbert <mgilbert at debian.org>
}
--- a/media/base/decode_capabilities.cc
+++ b/media/base/decode_capabilities.cc
-@@ -14,8 +14,8 @@
+@@ -15,8 +15,8 @@
// backwards compatibility for legacy applications using the library.
#define VPX_CODEC_DISABLE_COMPAT 1
extern "C" {
@@ -38,7 +37,7 @@ author: Michael Gilbert <mgilbert at debian.org>
}
#endif
-@@ -113,7 +113,7 @@ bool IsColorSpaceSupported(const media::
+@@ -105,7 +105,7 @@ bool IsColorSpaceSupported(const media::
}
bool IsVp9ProfileSupported(VideoCodecProfile profile) {
diff --git a/debian/patches/warnings/comment.patch b/debian/patches/warnings/comment.patch
index 1d4949d..a0b2296 100644
--- a/debian/patches/warnings/comment.patch
+++ b/debian/patches/warnings/comment.patch
@@ -1,9 +1,9 @@
-description: fix gcc warning about a multi-line comment
+description: fix gcc warnings about multi-line comments
author: Michael Gilbert <mgilbert at debian.org>
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
-@@ -997,11 +997,13 @@ class CONTENT_EXPORT RenderFrameHostImpl
+@@ -1046,11 +1046,13 @@ class CONTENT_EXPORT RenderFrameHostImpl
// local roots which are under this frame and their first ancestor which is a
// local root is either this frame or this frame's local root. For instance,
// in a frame tree such as:
@@ -17,3 +17,27 @@ author: Michael Gilbert <mgilbert at debian.org>
// RFHs at nodes B, E, D, C, and F are all local roots in the given frame tree
// under the root at A0, but only B, C, and E are considered immediate local
// roots of A0. Note that this will exclude any speculative or pending RFHs.
+--- a/media/video/video_encode_accelerator.h
++++ b/media/video/video_encode_accelerator.h
+@@ -161,7 +161,7 @@ class MEDIA_EXPORT VideoEncodeAccelerato
+ // handed back to the client, and afterwards the |flush_callback| will be
+ // called. The FlushCallback takes a boolean argument: |true| indicates the
+ // flush is complete; |false| indicates the flush is cancelled due to errors
+- // or destruction. The client should not invoke Flush() or Encode() while the\
++ // or destruction. The client should not invoke Flush() or Encode() while the
+ // previous Flush() is not finished yet.
+ virtual void Flush(FlushCallback flush_callback);
+
+--- a/content/browser/webauth/register_response_data.h
++++ b/content/browser/webauth/register_response_data.h
+@@ -19,8 +19,8 @@
+ namespace content {
+
+ // See figure 2:
+-// https://fidoalliance.org/specs/fido-v2.0-rd-20170927/ \
+-// fido-client-to-authenticator-protocol-v2.0-rd-20170927.html#using-the- \
++// https://fidoalliance.org/specs/fido-v2.0-rd-20170927/
++// fido-client-to-authenticator-protocol-v2.0-rd-20170927.html#using-the-
+ // ctap2-authenticatormakecredential-command-with-ctap1-u2f-authenticators
+ class CONTENT_EXPORT RegisterResponseData {
+ public:
diff --git a/debian/patches/warnings/enum-boolean.patch b/debian/patches/warnings/enum-boolean.patch
index 17c9d7a..a24e7c3 100644
--- a/debian/patches/warnings/enum-boolean.patch
+++ b/debian/patches/warnings/enum-boolean.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/third_party/WebKit/Source/platform/wtf/text/TextCodec.h
+++ b/third_party/WebKit/Source/platform/wtf/text/TextCodec.h
-@@ -71,9 +71,9 @@ enum FlushBehavior {
+@@ -68,9 +68,9 @@ enum FlushBehavior {
kDataEOF
};
@@ -15,4 +15,4 @@ author: Michael Gilbert <mgilbert at debian.org>
+static_assert(kDataEOF != 0, "DataEOF should be truthy");
class WTF_EXPORT TextCodec {
- WTF_MAKE_NONCOPYABLE(TextCodec);
+ USING_FAST_MALLOC(TextCodec);
diff --git a/debian/patches/warnings/unused-typedefs.patch b/debian/patches/warnings/unused-typedefs.patch
index 7fff0c8..edad2b7 100644
--- a/debian/patches/warnings/unused-typedefs.patch
+++ b/debian/patches/warnings/unused-typedefs.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/build/config/linux/atk/BUILD.gn
+++ b/build/config/linux/atk/BUILD.gn
-@@ -37,7 +37,7 @@ config("atk") {
+@@ -42,7 +42,7 @@ config("atk") {
cflags = [
# glib uses the pre-c++11 typedef-as-static_assert hack.
--
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