[chromium-freeworld: 4/11] fix more python hardcoding

commit cb0be2c990fc724e1bb330d1ea043e9eda1714d8 Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Wed Jul 25 14:16:12 2018 -0400 fix more python hardcoding chromium-67.0.3396.99-py2-bootstrap.patch | 21 +++++++++++++++++++++ chromium.spec | 1 - 2 files changed, 21 insertions(+), 1 deletion(-) --- diff --git a/chromium-67.0.3396.99-py2-bootstrap.patch b/chromium-67.0.3396.99-py2-bootstrap.patch index a6c2435..b59c84b 100644 --- a/chromium-67.0.3396.99-py2-bootstrap.patch +++ b/chromium-67.0.3396.99-py2-bootstrap.patch @@ -1,3 +1,24 @@ +diff -up chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py +--- chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 2018-07-25 14:14:02.004886479 -0400 ++++ chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2018-07-25 14:15:30.167896461 -0400 +@@ -58,7 +58,7 @@ def _MinifyJS(input_js): + + with tempfile.NamedTemporaryFile() as _: + args = [ +- 'python', ++ 'python2', + rjsmin_path + ] + p = subprocess.Popen(args, +@@ -177,7 +177,7 @@ def _MinifyCSS(css_text): + os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py')) + + with tempfile.NamedTemporaryFile() as _: +- rcssmin_args = ['python', rcssmin_path] ++ rcssmin_args = ['python2', rcssmin_path] + p = subprocess.Popen(rcssmin_args, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, diff -up chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py.py2 chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py --- chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py.py2 2018-07-24 16:58:53.372022183 -0400 +++ chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py 2018-07-24 17:00:03.200279816 -0400 diff --git a/chromium.spec b/chromium.spec index a8d735c..6fe07a6 100644 --- a/chromium.spec +++ b/chromium.spec @@ -1119,7 +1119,6 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/protobuf/third_party/six' \ 'third_party/qcms' \ 'third_party/qunit' \ - 'third_party/rcssmin' \ %if 0%{?bundlere2} 'third_party/re2' \ %endif