extra/qt5-webengine to 5.15.17-1

extra/qt5-webengine/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = qt5-webengine
 	pkgdesc = Provides support for web applications using the Chromium browser project
-	pkgver = 5.15.16
+	pkgver = 5.15.17
-	pkgrel = 8
+	pkgrel = 1
 	url = https://www.qt.io
 	arch = x86_64
 	groups = qt5
@@ -17,6 +17,7 @@ pkgbase = qt5-webengine
 	makedepends = poppler
 	makedepends = pipewire
 	makedepends = nodejs
+	makedepends = python-html5lib
 	depends = qt5-webchannel
 	depends = qt5-location
 	depends = libxcomposite
@@ -35,29 +36,21 @@ pkgbase = qt5-webengine
 	depends = libxtst
 	depends = ttf-font
 	optdepends = pipewire: WebRTC desktop sharing under Wayland
-	source = kde-qtwebengine::git+https://code.qt.io/qt/qtwebengine.git#tag=v5.15.16-lts
+	source = kde-qtwebengine::git+https://code.qt.io/qt/qtwebengine.git#tag=v5.15.17-lts
 	source = git+https://code.qt.io/qt/qtwebengine-chromium.git
-	source = qt5-webengine-python3.patch
-	source = qt5-webengine-chromium-python3.patch
 	source = qt5-webengine-ffmpeg5.patch
 	source = qt5-webengine-pipewire-0.3.patch
-	source = qt5-webengine-libxml-2.12.patch
-	source = qt5-webengine-icu-74.patch
 	source = qt5-webengine-icu-75.patch
+	source = qt5-webengine-ninja-1.12.patch
 	source = python3.12-imp.patch
 	source = python3.12-six.patch
-	source = qt5-webengine-ninja-1.12.patch
+	sha256sums = c2488e6d6778cf9954fcc45e94acb762376581a99df7f889f13a93cefd356940
-	sha256sums = a47f420bd0549b11faf70c86e97c6b696f56fd586a545b6bab8f596121c4ba17
 	sha256sums = SKIP
-	sha256sums = 0ad5d1660886f7bbf5108b071bf5d7bbbabf1cd1258ce9d4587a01dec4a1aa89
-	sha256sums = d8beb3d65a1aaf927285e6f055a9d1facd0f9c3fd851f91ba568389fb3137399
 	sha256sums = c50d3019626183e753c53a997dc8a55938847543aa3178d4c51f377be741c693
 	sha256sums = 5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f
-	sha256sums = bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e
-	sha256sums = 547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845
 	sha256sums = 7cac28ba784d24b4abf6414079548ada165343af507ecd8e23cbe7e4f63ae52f
-	sha256sums = 61a7a775ff5a118d1a5cc2298db19fb8412be5d7d38dcad1ca199ef87685adf8
-	sha256sums = ac87ec55ee5cbcf2d520e1ea433d041c0bf754271a17f859edbb9976f192ce3f
 	sha256sums = 6672741b64d896dc555c8ee42ca2329c4f20d5f406095a69fe72da44b3a142f4
+	sha256sums = 1f4357708e985bb5aca61a7e5dc4c0c1285d2af00994bb49ff89ede78198e0d2
+	sha256sums = ac87ec55ee5cbcf2d520e1ea433d041c0bf754271a17f859edbb9976f192ce3f
 
 pkgname = qt5-webengine

extra/qt5-webengine/PKGBUILD

@@ -11,46 +11,38 @@ highmem=1
 
 pkgname=qt5-webengine
 _basever=5.15.13
-pkgver=5.15.16
+pkgver=5.15.17
-pkgrel=8
+pkgrel=1
 arch=('x86_64')
 url='https://www.qt.io'
 license=('LGPL3' 'LGPL2.1' 'BSD')
 pkgdesc='Provides support for web applications using the Chromium browser project'
 depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss' 'libxkbfile' 'libxdamage'
          'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 'libvpx' 'libxtst' 'ttf-font')
-makedepends=('git' 'python' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler' 'pipewire' 'nodejs')
+makedepends=('git' 'python' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler' 'pipewire' 'nodejs' 'python-html5lib')
 optdepends=('pipewire: WebRTC desktop sharing under Wayland')
 groups=('qt5')
 _pkgfqn=${pkgname/5-/}
 source=(kde-$_pkgfqn::git+https://code.qt.io/qt/qtwebengine.git#tag=v${pkgver}-lts
         git+https://code.qt.io/qt/qtwebengine-chromium.git
-        qt5-webengine-python3.patch
-        qt5-webengine-chromium-python3.patch
         qt5-webengine-ffmpeg5.patch
         qt5-webengine-pipewire-0.3.patch
-        qt5-webengine-libxml-2.12.patch
-        qt5-webengine-icu-74.patch
         qt5-webengine-icu-75.patch
+        qt5-webengine-ninja-1.12.patch
         python3.12-imp.patch
         python3.12-six.patch
-        qt5-webengine-ninja-1.12.patch
         0001-ARM-toolchain-fixes.patch
         0002-Fix-ARM-skia-ICE.patch
         0003-bind-gen-Support-single_process-flag-in-generate_bin.patch
         0004-Run-blink-bindings-generation-single-threaded.patch)
-sha256sums=('SKIP'
+sha256sums=('c2488e6d6778cf9954fcc45e94acb762376581a99df7f889f13a93cefd356940'
             'SKIP'
-            '0ad5d1660886f7bbf5108b071bf5d7bbbabf1cd1258ce9d4587a01dec4a1aa89'
-            'd8beb3d65a1aaf927285e6f055a9d1facd0f9c3fd851f91ba568389fb3137399'
             'c50d3019626183e753c53a997dc8a55938847543aa3178d4c51f377be741c693'
             '5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f'
-            'bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e'
-            '547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845'
             '7cac28ba784d24b4abf6414079548ada165343af507ecd8e23cbe7e4f63ae52f'
-            '61a7a775ff5a118d1a5cc2298db19fb8412be5d7d38dcad1ca199ef87685adf8'
-            'ac87ec55ee5cbcf2d520e1ea433d041c0bf754271a17f859edbb9976f192ce3f'
             '6672741b64d896dc555c8ee42ca2329c4f20d5f406095a69fe72da44b3a142f4'
+            '1f4357708e985bb5aca61a7e5dc4c0c1285d2af00994bb49ff89ede78198e0d2'
+            'ac87ec55ee5cbcf2d520e1ea433d041c0bf754271a17f859edbb9976f192ce3f'
             'abccb5349ec341fd912be93d055f0cdf6becfdb5fa3312769777f750cfd4351a'
             'cad41451dffb5cc67c57882526c6c19795e6e49e7b704f92ec76dd3499486654'
             '4e58aca7f71037f154bbdfd03deb671462da433c241fd6429ca6adf2c7738f75'
@@ -65,17 +57,12 @@ prepare() {
   git submodule set-branch --branch 87-based src/3rdparty
   git -c protocol.file.allow=always submodule update
 
-  patch -p1 -i "$srcdir"/qt5-webengine-python3.patch # Fix build with Python 3
-  patch -p1 -d src/3rdparty -i "$srcdir"/qt5-webengine-chromium-python3.patch
-
   patch -p1 -d src/3rdparty -i "$srcdir"/qt5-webengine-ffmpeg5.patch # Fix build with ffmpeg 5
   patch -p1 -d src/3rdparty -i "$srcdir"/qt5-webengine-pipewire-0.3.patch # Port to pipewire 0.3
-  patch -p1 -d src/3rdparty/chromium -i "$srcdir"/qt5-webengine-libxml-2.12.patch # Fix build with libxml 2.12
-  patch -p1 -d src/3rdparty/chromium -i "$srcdir"/qt5-webengine-icu-74.patch # Fix build with ICU 74 - patch from Alpine
   patch -p2 -d src/3rdparty/chromium -i "$srcdir"/qt5-webengine-icu-75.patch # Fix build with ICU 75
+  patch -p2 -d src/3rdparty/chromium -i "$srcdir"/qt5-webengine-ninja-1.12.patch # Fix build with ninja 1.12
   patch -p1 -d src/3rdparty/chromium -i "$srcdir"/python3.12-imp.patch # Fix build with python 3.12 - patch from Debian
   patch -p1 -d src/3rdparty/chromium -i "$srcdir"/python3.12-six.patch # Fix build with python 3.12 - patch from Debian
-  patch -p2 -d src/3rdparty/chromium -i "$srcdir"/qt5-webengine-ninja-1.12.patch # Fix build with ninja 1.12
 
   [[ $CARCH == "armv7h" ]] && export NINJAJOBS="-j1"
   cd "$srcdir/kde-$_pkgfqn/src/3rdparty"
@@ -91,14 +78,15 @@ build() {
   export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
 
   cd build
-  qmake ../kde-$_pkgfqn QMAKE_CXXFLAGS="$CXXFLAGS -std=gnu++17" -- \
+  qmake ../kde-$_pkgfqn -- \
     -proprietary-codecs \
     -system-ffmpeg \
     -webp \
     -webengine-icu \
     -spellchecker \
     -webengine-kerberos \
-    -webengine-webrtc-pipewire
+    -webengine-webrtc-pipewire \
+    -webengine-python-version python3
   make
 }
 

extra/qt5-webengine/python3.12-imp.patch

@@ -4,30 +4,6 @@ Origin: upstream, commits
  https://chromium.googlesource.com/chromium/src/+/f5f6e361d037c316
 Last-Update: 2024-03-17
 
---- a/components/resources/protobufs/binary_proto_generator.py
-+++ b/components/resources/protobufs/binary_proto_generator.py
-@@ -9,7 +9,7 @@
- """
- from __future__ import print_function
- import abc
--import imp
-+from importlib import util as imp_util
- import optparse
- import os
- import re
-@@ -68,7 +68,11 @@ class GoogleProtobufModuleImporter:
-       raise ImportError(fullname)
- 
-     filepath = self._fullname_to_filepath(fullname)
--    return imp.load_source(fullname, filepath)
-+    spec = imp_util.spec_from_file_location(fullname, filepath)
-+    loaded = imp_util.module_from_spec(spec)
-+    spec.loader.exec_module(loaded)
-+
-+    return loaded
- 
- class BinaryProtoGenerator:
- 
 --- a/mojo/public/tools/mojom/mojom/fileutil.py
 +++ b/mojo/public/tools/mojom/mojom/fileutil.py
 @@ -3,7 +3,6 @@

extra/qt5-webengine/qt5-webengine-icu-74.patch

@@ -1,20 +0,0 @@
-See ICU change https://github.com/unicode-org/icu/commit/2e45e6ec0e84a1c01812015a254ea31b286316fb
-
-Similar has happened in the past. See:
-https://chromium.googlesource.com/chromium/src/+/e60b571faa3f14dd9119a6792dccf12f8bf80192
-
-diff --git a/third_party/blink/renderer/platform/text/text_break_iterator.cc b/third_party/blink/renderer/platform/text/text_break_iterator.cc
-index ddfbd51..247da06 100644
---- a/third_party/blink/renderer/platform/text/text_break_iterator.cc
-+++ b/third_party/blink/renderer/platform/text/text_break_iterator.cc
-@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar
- };
- // clang-format on
- 
--#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#if U_ICU_VERSION_MAJOR_NUM >= 74
-+#define BA_LB_COUNT (U_LB_COUNT - 8)
-+#elif U_ICU_VERSION_MAJOR_NUM >= 58
- #define BA_LB_COUNT (U_LB_COUNT - 3)
- #else
- #define BA_LB_COUNT U_LB_COUNT

extra/qt5-webengine/qt5-webengine-libxml-2.12.patch

@@ -1,26 +0,0 @@
-diff --git a/third_party/blink/renderer/core/xml/xslt_processor.h b/third_party/blink/renderer/core/xml/xslt_processor.h
-index d53835e9675793..2eaea31ed29b90 100644
---- a/third_party/blink/renderer/core/xml/xslt_processor.h
-+++ b/third_party/blink/renderer/core/xml/xslt_processor.h
-@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable {
- 
-   void reset();
- 
--  static void ParseErrorFunc(void* user_data, xmlError*);
-+  static void ParseErrorFunc(void* user_data, const xmlError*);
-   static void GenericErrorFunc(void* user_data, const char* msg, ...);
- 
-   // Only for libXSLT callbacks
-diff --git a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-index 133e0b3355d2f0..f424077089da87 100644
---- a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-+++ b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) {
-   // It would be nice to do something with this error message.
- }
- 
--void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
-+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
-   FrameConsole* console = static_cast<FrameConsole*>(user_data);
-   if (!console)
-     return;

extra/qt5-webengine/qt5-webengine-python3.patch

@@ -1,193 +0,0 @@
-diff --git a/configure.pri b/configure.pri
-index 8705ad93..6723bffe 100644
---- a/configure.pri
-+++ b/configure.pri
-@@ -7,20 +7,7 @@ QTWEBENGINE_SOURCE_TREE = $$PWD
- equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe
- 
- defineTest(isPythonVersionSupported) {
--    python = $$system_quote($$system_path($$1))
--    python_version = $$system('$$python -c "import sys; print(sys.version_info[0:3])"')
--    python_version ~= s/[()]//g
--    python_version = $$split(python_version, ',')
--    python_major_version = $$first(python_version)
--    greaterThan(python_major_version, 2) {
--        qtLog("Python version 3 is not supported by Chromium.")
--        return(false)
--    }
--    python_minor_version = $$member(python_version, 1)
--    python_patch_version = $$member(python_version, 2)
--    greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 4): return(true)
--    qtLog("Unsupported python version: $${python_major_version}.$${python_minor_version}.$${python_patch_version}.")
--    return(false)
-+    return(true)
- }
- 
- defineTest(qtConfTest_detectJumboBuild) {
-@@ -52,10 +48,10 @@ defineTest(qtConfReport_jumboBuild) {
-     qtConfReportPadded($${1}, $$mergeLimit)
- }
- 
--defineTest(qtConfTest_detectPython2) {
--    python = $$qtConfFindInPath("python2$$EXE_SUFFIX")
-+defineTest(qtConfTest_detectPython) {
-+    python = $$qtConfFindInPath("python$$EXE_SUFFIX")
-     isEmpty(python) {
--        qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.")
-+        qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.")
-         python = $$qtConfFindInPath("python$$EXE_SUFFIX")
-     }
-     isEmpty(python) {
-@@ -63,11 +59,11 @@ defineTest(qtConfTest_detectPython2) {
-         return(false)
-     }
-     !isPythonVersionSupported($$python) {
--        qtLog("A suitable Python 2 executable could not be located.")
-+        qtLog("A suitable Python executable could not be located.")
-         return(false)
-     }
- 
--    # Make tests.python2.location available in configure.json.
-+    # Make tests.python.location available in configure.json.
-     $${1}.location = $$clean_path($$python)
-     export($${1}.location)
-     $${1}.cache += location
-diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index 2750d707..9fda13d0 100644
---- a/mkspecs/features/functions.prf
-+++ b/mkspecs/features/functions.prf
-@@ -39,11 +39,11 @@ defineReplace(which) {
- 
- # Returns the unquoted path to the python executable.
- defineReplace(pythonPath) {
--    isEmpty(QMAKE_PYTHON2) {
-+    isEmpty(QMAKE_PYTHON) {
-         # Fallback for building QtWebEngine with Qt < 5.8
--        QMAKE_PYTHON2 = python
-+        QMAKE_PYTHON = python
-     }
--    return($$QMAKE_PYTHON2)
-+    return($$QMAKE_PYTHON)
- }
- 
- # Returns the python executable for use with shell / make targets.
-diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
-index e7f869a1..1bf2c5d7 100644
---- a/src/buildtools/config/support.pri
-+++ b/src/buildtools/config/support.pri
-@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) {
-     !qtwebengine_checkForGperf(QtWebEngine):return(false)
-     !qtwebengine_checkForBison(QtWebEngine):return(false)
-     !qtwebengine_checkForFlex(QtWebEngine):return(false)
--    !qtwebengine_checkForPython2(QtWebEngine):return(false)
-+    !qtwebengine_checkForPython(QtWebEngine):return(false)
-     !qtwebengine_checkForNodejs(QtWebEngine):return(false)
-     !qtwebengine_checkForSanitizer(QtWebEngine):return(false)
-     linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false)
-@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) {
-     !qtwebengine_checkForGperf(QtPdf):return(false)
-     !qtwebengine_checkForBison(QtPdf):return(false)
-     !qtwebengine_checkForFlex(QtPdf):return(false)
--    !qtwebengine_checkForPython2(QtPdf):return(false)
-+    !qtwebengine_checkForPython(QtPdf):return(false)
-     !qtwebengine_checkForSanitizer(QtPdf):return(false)
-     linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false)
-     linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false)
-@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) {
-     return(true)
- }
- 
--defineTest(qtwebengine_checkForPython2) {
-+defineTest(qtwebengine_checkForPython) {
-     module = $$1
--    !qtConfig(webengine-python2) {
--        qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.")
-+    !qtConfig(webengine-python) {
-+        qtwebengine_skipBuild("Python is required to build $${module}.")
-         return(false)
-     }
-     return(true)
-diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
-index 88d1790c..032aa665 100644
---- a/src/buildtools/configure.json
-+++ b/src/buildtools/configure.json
-@@ -295,9 +295,9 @@
-             "label": "system ninja",
-             "type": "detectNinja"
-         },
--        "webengine-python2": {
--            "label": "python2",
--            "type": "detectPython2",
-+        "webengine-python": {
-+            "label": "python",
-+            "type": "detectPython",
-             "log": "location"
-         },
-         "webengine-winversion": {
-@@ -374,7 +374,7 @@
-                          && features.webengine-gperf
-                          && features.webengine-bison
-                          && features.webengine-flex
--                         && features.webengine-python2
-+                         && features.webengine-python
-                          && features.webengine-nodejs
-                          && (!config.sanitizer || features.webengine-sanitizer)
-                          && (!config.linux || features.pkg-config)
-@@ -400,7 +400,7 @@
-                          && features.webengine-gperf
-                          && features.webengine-bison
-                          && features.webengine-flex
--                         && features.webengine-python2
-+                         && features.webengine-python
-                          && (!config.sanitizer || features.webengine-sanitizer)
-                          && (!config.linux || features.pkg-config)
-                          && (!config.linux || features.webengine-host-pkg-config)
-@@ -423,12 +423,12 @@
-             "autoDetect": "features.private_tests",
-             "output": [ "privateFeature" ]
-         },
--        "webengine-python2": {
--            "label": "python2",
--            "condition": "tests.webengine-python2",
-+        "webengine-python": {
-+            "label": "python",
-+            "condition": "tests.webengine-python",
-             "output": [
-                 "privateFeature",
--                { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" }
-+                { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" }
-             ]
-         },
-         "webengine-gperf": {
-From b60fc250d65144532cd47eac72279e93baaec2b8 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Wed, 6 Apr 2022 14:35:14 +0300
-Subject: [PATCH] Remove dependency on catapult
-
----
- src/core/qtwebengine_resources.gni | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/core/qtwebengine_resources.gni b/src/core/qtwebengine_resources.gni
-index 3bf1a5d57..29fd2603c 100644
---- a/src/core/qtwebengine_resources.gni
-+++ b/src/core/qtwebengine_resources.gni
-@@ -27,7 +27,6 @@ repack("qtwebengine_repack_resources") {
-     "$root_gen_dir/components/components_resources.pak",
-     "$root_gen_dir/components/dev_ui_components_resources.pak",
-     "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
--    "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
-     "$root_gen_dir/content/content_resources.pak",
-     "$root_gen_dir/content/dev_ui_content_resources.pak",
-     "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
-@@ -44,7 +43,6 @@ repack("qtwebengine_repack_resources") {
-      "//components/resources:components_resources_grit",
-      "//components/resources:dev_ui_components_resources_grit",
-      "//content/browser/resources/media:media_internals_resources",
--     "//content/browser/tracing:resources",
-      "//content:content_resources_grit",
-      "//content:dev_ui_content_resources_grit",
-      "//mojo/public/js:resources",
--- 
-2.35.1
-