From 8fac8b3f43a1edddc9767fabf7c68d531c311106 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 11 Jul 2018 12:34:10 -0400 Subject: [PATCH] try to fix version.py for rawhide --- chromium-67.0.3396.99-py3fix.patch | 12 ++++++++++++ chromium.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 chromium-67.0.3396.99-py3fix.patch diff --git a/chromium-67.0.3396.99-py3fix.patch b/chromium-67.0.3396.99-py3fix.patch new file mode 100644 index 00000000..5dd7267a --- /dev/null +++ b/chromium-67.0.3396.99-py3fix.patch @@ -0,0 +1,12 @@ +diff -up chromium-67.0.3396.99/build/util/version.py.py3fix chromium-67.0.3396.99/build/util/version.py +--- chromium-67.0.3396.99/build/util/version.py.py3fix 2018-07-11 11:39:14.728600503 -0400 ++++ chromium-67.0.3396.99/build/util/version.py 2018-07-11 11:39:22.401406816 -0400 +@@ -68,7 +68,7 @@ def subst_template(contents, values): + try: + contents = contents.replace('@' + key + '@', val) + except TypeError: +- print repr(key), repr(val) ++ print(repr(key), repr(val)) + return contents + + diff --git a/chromium.spec b/chromium.spec index 6cceb5a4..901468e2 100644 --- a/chromium.spec +++ b/chromium.spec @@ -259,6 +259,8 @@ Patch99: chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch # Add "Fedora" to the user agent string Patch101: chromium-67.0.3396.87-fedora-user-agent.patch +# Try to fix version.py for Rawhide +Patch102: chromium-67.0.3396.99-py3fix.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: @@ -779,6 +781,7 @@ udev. %patch100 -p1 -b .oldexec %endif %patch101 -p1 -b .fedora-user-agent +%patch102 -p1 -b .py3fix # Change shebang in all relevant files in this directory and all subdirectories