Date: Thursday, June 17, 2021 @ 05:48:26 Author: foutrelis Revision: 418385
Remove setuptools build dep (FS#71276) Also replace sed to use python2 with upstream patch. Added: chromium/trunk/make-dom-distiller-protoc-plugin-call-py2.7.patch Modified: chromium/trunk/PKGBUILD ---------------------------------------------------+ PKGBUILD | 8 ++-- make-dom-distiller-protoc-plugin-call-py2.7.patch | 37 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-16 23:43:56 UTC (rev 418384) +++ PKGBUILD 2021-06-17 05:48:26 UTC (rev 418385) @@ -16,7 +16,7 @@ 'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'libva' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'nodejs' 'pipewire' - 'java-runtime-headless' 'python2' 'python2-setuptools') + 'java-runtime-headless' 'python2') optdepends=('pipewire: WebRTC desktop sharing under Wayland' 'kdialog: support for native dialogs in Plasma' 'org.freedesktop.secrets: password storage backend on GNOME / Xfce' @@ -26,6 +26,7 @@ https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz fix-crash-in-ThemeService.patch unbundle-use-char16_t-as-UCHAR_TYPE.patch + make-dom-distiller-protoc-plugin-call-py2.7.patch extend-enable-accelerated-video-decode-flag.patch sql-make-VirtualCursor-standard-layout-type.patch chromium-glibc-2.33.patch @@ -35,6 +36,7 @@ '171525009003a9ed1182cfcb6f407d7169d9a731a474304e263029376719f55a' '3cfe46e181cb9d337c454b5b5adbf5297052f29cd617cdee4380eeb1943825d8' '59a59a60a08b335fe8647fdf0f9d2288d236ebf2cc9626396d0c4d032fd2b25d' + '76ceebd14c9a6f1ea6a05b1613e64d1e2aca595e0f0b3e9497e3eeee33ed756c' '66db9132d6f5e06aa26e5de0924f814224a76a9bdf4b61afce161fb1d7643b22' 'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150' '2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b' @@ -98,6 +100,7 @@ # Upstream fixes patch -Np1 -i ../fix-crash-in-ThemeService.patch patch -Np1 -i ../unbundle-use-char16_t-as-UCHAR_TYPE.patch + patch -Np1 -i ../make-dom-distiller-protoc-plugin-call-py2.7.patch patch -Np1 -i ../extend-enable-accelerated-video-decode-flag.patch # https://chromium-review.googlesource.com/c/chromium/src/+/2862724 @@ -106,9 +109,6 @@ # Fixes for building with libstdc++ instead of libc++ patch -Np1 -i ../patches/chromium-90-ruy-include.patch - # Force script incompatible with Python 3 to use /usr/bin/python2 - sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py - # Link to system tools required by the build mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ Added: make-dom-distiller-protoc-plugin-call-py2.7.patch =================================================================== --- make-dom-distiller-protoc-plugin-call-py2.7.patch (rev 0) +++ make-dom-distiller-protoc-plugin-call-py2.7.patch 2021-06-17 05:48:26 UTC (rev 418385) @@ -0,0 +1,37 @@ +From 359b22d3f775afa33cca9e4f8fb57eadd0ec4118 Mon Sep 17 00:00:00 2001 +From: Nico Weber <tha...@chromium.org> +Date: Fri, 23 Apr 2021 16:22:19 +0000 +Subject: [PATCH] Make dom distiller protoc plugin explicitly call py2.7 + +With this, chrome builds with when `/usr/bin/env python` is py3. + +Bug: 1202134 +Change-Id: Ibbd97a1311ccb34d46f266912c871fd0522f9535 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2848445 +Commit-Queue: Nico Weber <tha...@chromium.org> +Commit-Queue: Yaron Friedman <yfried...@chromium.org> +Commit-Queue: Dirk Pranke <dpra...@google.com> +Auto-Submit: Nico Weber <tha...@chromium.org> +Reviewed-by: Yaron Friedman <yfried...@chromium.org> +Reviewed-by: Dirk Pranke <dpra...@google.com> +Cr-Commit-Position: refs/heads/master@{#875702} +--- + .../dom_distiller_js/protoc_plugins/json_values_converter.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py b/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py +index e86a88c759fcb..cae1a998c4650 100755 +--- a/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py ++++ b/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py +@@ -1,7 +1,10 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2.7 + # Copyright 2016 The Chromium Authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. ++# ++# TODO(crbug.com/1202134): Switch run line back to just "python" ++# once things are py3-compatible. + + """protoc plugin to create C++ reader/writer for JSON-encoded protobufs +