diff options
| -rw-r--r-- | chromium/chromium/chromium-gn-r607596.patch | 41 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 8 |
2 files changed, 48 insertions, 1 deletions
diff --git a/chromium/chromium/chromium-gn-r607596.patch b/chromium/chromium/chromium-gn-r607596.patch new file mode 100644 index 0000000..836e3cf --- /dev/null +++ b/chromium/chromium/chromium-gn-r607596.patch @@ -0,0 +1,41 @@ +From 4849d9a19f700961e2c25b642bdaaa6514040e60 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Date: Tue, 13 Nov 2018 15:41:11 +0000 +Subject: [PATCH] gn bootstrap: Remove sysroot-related options + +https://gn-review.googlesource.com/c/gn/+/3200 removed the --no-sysroot +option from gen.py and moved to only use a sysroot in the GN bots, so the +options here no longer have any effect. + +Bug: 904350 +Change-Id: Ieddc71a4f8f802c2d050de1c69ca3a9ec788ee88 +Reviewed-on: https://chromium-review.googlesource.com/c/1333391 +Reviewed-by: Nico Weber <thakis@chromium.org> +Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Cr-Commit-Position: refs/heads/master@{#607596} +--- + tools/gn/bootstrap/bootstrap.py | 6 ------ + 1 file changed, 6 deletions(-) + +--- chromium-70.0.3538.102/tools/gn/bootstrap/bootstrap.py.orig 2018-11-14 06:52:07.000000000 +0800 ++++ chromium-70.0.3538.102/tools/gn/bootstrap/bootstrap.py 2018-11-15 00:22:05.719552038 +0800 +@@ -46,10 +46,6 @@ + '--build-path', + help='The directory in which to build gn, ' + 'relative to the src directory. (eg. out/Release)') +- parser.add_option( +- '--with-sysroot', +- action='store_true', +- help='Download and build with the Debian sysroot.') + parser.add_option('-v', '--verbose', help='ignored') + options, args = parser.parse_args(argv) + if args: +@@ -71,8 +67,6 @@ + '--no-last-commit-position', + '--out-path=' + gn_build_dir, + ] +- if not options.with_sysroot: +- cmd.append('--no-sysroot') + if options.debug: + cmd.append('--debug') + subprocess.check_call(cmd) diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index 16733b6..69bcc12 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -44,7 +44,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 70.0.3538.77 +Version: 70.0.3538.102 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -96,6 +96,9 @@ Patch70: chromium-gcc8-r588316.patch Patch71: chromium-gcc8-r588547.patch Patch72: chromium-gcc8-r589614.patch +# Add patches from upstream to fix GN bootstrap +Patch80: chromium-gn-r607596.patch + # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -610,6 +613,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Nov 14 2018 - Ting-Wei Lan <lantw44@gmail.com> - 70.0.3538.102-100 +- Update to 70.0.3538.102 + * Thu Oct 25 2018 - Ting-Wei Lan <lantw44@gmail.com> - 70.0.3538.77-100 - Update to 70.0.3538.77 |