2:37 p.m.
commit f845271df7cd0e1ee779802d633198d3ac2e70e1
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Thu Nov 15 00:18:29 2018 +0530
Add a patch from upstream to remove sysroot-related options from gn bootstrap
chromium-gn-r607596.patch | 41 +++++++++++++++++++++++++++++++++++++++++
chromium-vaapi.spec | 8 +++++++-
2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/chromium-gn-r607596.patch b/chromium-gn-r607596.patch
new file mode 100644
index 0000000..836e3cf
--- /dev/null
+++ b/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(a)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(a)chromium.org>
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa(a)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-vaapi.spec b/chromium-vaapi.spec
index b200cec..e53c34e 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.102
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL
and (MPLv1.1 or GPLv2 or LGPLv2)
URL: https://www.chromium.org/Home
@@ -124,6 +124,8 @@ Patch52: chromium-system-icu.patch
Patch53: chromium-harfbuzz2.patch
# Let's brand chromium!
Patch54: brand.patch
+# Disable sysroot related settings
+Patch55: chromium-gn-r607596.patch
# This build should be only available to amd64
ExclusiveArch: x86_64
########################################################################################
@@ -223,6 +225,7 @@ chromium-vaapi is an open-source web browser, powered by WebKit
(Blink)
%patch53 -p1 -b .harfbuzz2
%endif
%patch54 -p1 -b .brand
+%patch55 -p1 -b .gn
#Let's change the default shebang of python files.
find -depth -type f -name "*.py" -exec sed -iE '1s=^#!
*/usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
@@ -644,6 +647,9 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Thu Nov 15 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.102-2
+- Add a patch from upstream to remove sysroot-related options from gn bootstrap
+
* Wed Nov 14 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.102-1
- Update to 70.0.3538.102