From 98dc9a933e28e2a83990b67cacd4ce88f5f4e9b6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 15:29:47 +0200 Subject: [PATCH] package/qt5/qt5webengine-chromium-catapult: bump version to fix build issue We have the qt5webengine-chromium-catapult package to override the catapult code from qtwebengine-chromium with a newer version. It was initially introduced because the catapult code in qtwebengine-chromium was not Python 3.x compatible. Turns out that the catapult version we're using exhibits new build issues related to Python 3.12 (and perhaps others), so let's update it again to fix: FAILED: gen/content/browser/tracing/about_tracing.js gen/content/browser/tracing/about_tracing.html /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/host-bin/python ../../3rdparty/chromium/third_party/catapult/tracing/bin/generate_about_tracing_contents --outdir gen/content/browser/tracing /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py:21: SyntaxWarning: invalid escape sequence '\(' if re.search('url\(.+\)', contents): /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py:63: SyntaxWarning: invalid escape sequence '\(' return re.sub('url\((?P"|\'|)(?P[^"\'()]*)(?P=quote)\)', /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py:75: SyntaxWarning: invalid escape sequence '\(' 'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)', /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py:7: SyntaxWarning: invalid escape sequence '\/' return js.replace('', '<\/script>') /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py:302: SyntaxWarning: invalid escape sequence '\/' raise Exception('Escape script tags with <\/script>') Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_module.py", line 28, in Parse parser_results = parse_html_deps.HTMLModuleParser().Parse(self.contents) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py", line 304, in Parse return HTMLModuleParserResults(html) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py", line 170, in __init__ self._soup = bs4.BeautifulSoup(html, 'html5lib') ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/third_party/beautifulsoup4-4.9.3/py3k/bs4/__init__.py", line 243, in __init__ raise FeatureNotFound( bs4.FeatureNotFound: Couldn't find a tree builder with the features you requested: html5lib. Do you need to install a parser library? During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/third_party/catapult/tracing/bin/generate_about_tracing_contents", line 14, in sys.exit(generate_about_tracing_contents.Main(sys.argv[1:])) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/tracing/tracing_build/generate_about_tracing_contents.py", line 32, in Main load_sequence = vulcanizer.CalcLoadSequenceForModuleNames(names) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/project.py", line 146, in CalcLoadSequenceForModuleNames modules = [self.loader.LoadModule(module_name=name, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/resource_loader.py", line 149, in LoadModule m.Parse(excluded_scripts) File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_module.py", line 30, in Parse raise Exception('While parsing %s: %s' % (self.name, str(ex))) Exception: While parsing tracing.ui.extras.about_tracing.about_tracing: Couldn't find a tree builder with the features you requested: html5lib. Do you need to install a parser library? Signed-off-by: Thomas Petazzoni --- .../qt5webengine-chromium-catapult.hash | 2 +- .../qt5webengine-chromium-catapult.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash index 5a99c52e1f..18bee4f58f 100644 --- a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cb1b81c3d9612185b9e981b7329cd49ef057d1afb6de84b88a2af58154d3a0ca qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-git4.tar.gz +sha256 3dfcab349fd82c854b72fcc3f64e2e08f9a0d72c712a0d86a30d3a9994f244ba qt5webengine-chromium-catapult-7534569f99827c0ed4df818254ba7daca4606bca-git4.tar.gz sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk index 5d0db1e790..bf577873ae 100644 --- a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 7534569f99827c0ed4df818254ba7daca4606bca QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause