From 85acb836bc12e5fc2d8b1826efae61bbab5dca53 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Thu, 12 Aug 2021 09:43:31 -0700
Subject: [PATCH] Fix use-python2.patch

---
 qt5-qtwebengine.spec                          |  7 +++---
 ...engine-everywhere-5.15.5-use-python2.patch | 23 ++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index cf98cd0..337cec3 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -53,7 +53,7 @@
 Summary: Qt5 - QtWebEngine components
 Name:    qt5-qtwebengine
 Version: 5.15.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -213,8 +213,6 @@ BuildRequires: %{__python2}
 BuildRequires: python2
 BuildRequires: python2-rpm-macros
 %endif
-## HACK, seems patch26 is not 100% complete
-BuildRequires: %{_bindir}/python
 %if 0%{?use_system_libvpx}
 BuildRequires: pkgconfig(vpx) >= 1.8.0
 %endif
@@ -634,6 +632,9 @@ done
 
 
 %changelog
+* Thu Aug 12 2021 Troy Dawson <tdawson@redhat.com> - 5.15.5-3
+- Fix use-python2.patch
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/qtwebengine-everywhere-5.15.5-use-python2.patch b/qtwebengine-everywhere-5.15.5-use-python2.patch
index 12c53ea..9626d27 100644
--- a/qtwebengine-everywhere-5.15.5-use-python2.patch
+++ b/qtwebengine-everywhere-5.15.5-use-python2.patch
@@ -1,6 +1,7 @@
-diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.use-python2 qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
---- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.use-python2	2021-05-28 07:05:45.000000000 -0500
-+++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py	2021-06-23 15:27:45.771765298 -0500
+diff --git a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
+index 8af373102..b551c0fe2 100644
+--- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
++++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
 @@ -83,7 +83,7 @@ def _MinifyJS(input_js):
  
    with tempfile.NamedTemporaryFile() as _:
@@ -10,9 +11,19 @@ diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/cat
          rjsmin_path
      ]
      p = subprocess.Popen(args,
-diff -up qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro.use-python2 qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro
---- qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro.use-python2	2021-06-11 00:31:04.000000000 -0500
-+++ qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro	2021-06-23 15:26:48.897435095 -0500
+@@ -203,7 +203,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 --git a/src/webengine/module.pro b/src/webengine/module.pro
+index 49a1086b2..afc89d49e 100644
+--- a/src/webengine/module.pro
++++ b/src/webengine/module.pro
 @@ -76,7 +76,7 @@ qtConfig(webengine-testsupport) {
      python = $$pythonPathForShell()
      chromium_attributions.commands = \