[chromium-freeworld/el7] remove sysroot options

commit 1d18ec227197aaa04772f9f737e5121a211384f1 Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Mon Nov 26 13:43:04 2018 -0500 remove sysroot options Signed-off-by: Akarshan Biswas <akarshan.biswas(a)protonmail.com&gt; ...mium-70.0.3538.110-remove-sysroot-options.patch | 23 ++++++++++++++++++++++ chromium-freeworld.spec | 3 +++ 2 files changed, 26 insertions(+) --- diff --git a/chromium-70.0.3538.110-remove-sysroot-options.patch b/chromium-70.0.3538.110-remove-sysroot-options.patch new file mode 100644 index 0000000..9eb99d1 --- /dev/null +++ b/chromium-70.0.3538.110-remove-sysroot-options.patch @@ -0,0 +1,23 @@ +diff -up chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py.sysrootfix chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py +--- chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py.sysrootfix 2018-11-26 13:40:19.324713204 -0500 ++++ chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py 2018-11-26 13:40:43.199180888 -0500 +@@ -46,10 +46,6 @@ def main(argv): + '--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 @@ def main(argv): + '--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-freeworld.spec b/chromium-freeworld.spec index 56020fc..d696294 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -291,6 +291,8 @@ Patch117: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch Patch118: chromium-70.0.3538.77-harfbuzz2-fix.patch # Fix aarch64 build against latest linux kernel headers Patch119: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch +# https://chromium.googlesource.com/chromium/src/tools/gn/+/6630c2e334d7bc1... +Patch120: chromium-70.0.3538.110-remove-sysroot-options.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: @@ -837,6 +839,7 @@ udev. %patch118 -p1 -b .harfbuzz2 %endif %patch119 -p1 -b .aarch64-new-stat +%patch120 -p1 -b .sysrootfix # Change shebang in all relevant files in this directory and all subdirectories