| author | Antonio Rojas
<arojas@archlinux.org> 2024-05-10 17:22:05 UTC |
| committer | Antonio Rojas
<arojas@archlinux.org> 2024-05-10 17:22:05 UTC |
| parent | 6b0c0e76e0934db2f84be40cb5978cee47266e78 |
| .SRCINFO | +10 | -1 |
| PKGBUILD | +9 | -5 |
| python3.12-imp.patch | +29 | -29 |
| qt5-webengine-icu-75.patch | +25 | -0 |
| qt5-webengine-ninja-1.12.patch | +12 | -0 |
diff --git a/.SRCINFO b/.SRCINFO index b05ecd4..0144c4a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -35,6 +35,7 @@ pkgbase = qt5-webengine depends = libxtst depends = ttf-font optdepends = pipewire: WebRTC desktop sharing under Wayland + options = !lto source = kde-qtwebengine::git+https://code.qt.io/qt/qtwebengine.git#tag=v5.15.16-lts source = git+https://code.qt.io/qt/qtwebengine-chromium.git source = qt5-webengine-python3.patch @@ -43,7 +44,11 @@ pkgbase = qt5-webengine source = qt5-webengine-pipewire-0.3.patch source = qt5-webengine-libxml-2.12.patch source = qt5-webengine-icu-74.patch - sha256sums = SKIP + source = qt5-webengine-icu-75.patch + source = python3.12-imp.patch + source = python3.12-six.patch + source = qt5-webengine-ninja-1.12.patch + sha256sums = a47f420bd0549b11faf70c86e97c6b696f56fd586a545b6bab8f596121c4ba17 sha256sums = SKIP sha256sums = 0ad5d1660886f7bbf5108b071bf5d7bbbabf1cd1258ce9d4587a01dec4a1aa89 sha256sums = d8beb3d65a1aaf927285e6f055a9d1facd0f9c3fd851f91ba568389fb3137399 @@ -51,5 +56,9 @@ pkgbase = qt5-webengine sha256sums = 5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f sha256sums = bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e sha256sums = 547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845 + sha256sums = 7cac28ba784d24b4abf6414079548ada165343af507ecd8e23cbe7e4f63ae52f + sha256sums = 61a7a775ff5a118d1a5cc2298db19fb8412be5d7d38dcad1ca199ef87685adf8 + sha256sums = ac87ec55ee5cbcf2d520e1ea433d041c0bf754271a17f859edbb9976f192ce3f + sha256sums = 6672741b64d896dc555c8ee42ca2329c4f20d5f406095a69fe72da44b3a142f4 pkgname = qt5-webengine diff --git a/PKGBUILD b/PKGBUILD index dd6b7f0..ed2f48e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -25,7 +25,8 @@ source=(kde-$_pkgfqn::git+https://code.qt.io/qt/qtwebengine.git#tag=v${pkgver}-l qt5-webengine-icu-74.patch qt5-webengine-icu-75.patch python3.12-imp.patch - python3.12-six.patch) + python3.12-six.patch + qt5-webengine-ninja-1.12.patch) sha256sums=('a47f420bd0549b11faf70c86e97c6b696f56fd586a545b6bab8f596121c4ba17' 'SKIP' '0ad5d1660886f7bbf5108b071bf5d7bbbabf1cd1258ce9d4587a01dec4a1aa89' @@ -34,9 +35,11 @@ sha256sums=('a47f420bd0549b11faf70c86e97c6b696f56fd586a545b6bab8f596121c4ba17' '5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f' 'bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e' '547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845' - '10e5cf4317af304ed67e231cdb8b3dfdc36cd9f241ea58edfdfad5e2ea039b08' - '01e8ba57b46881d58bdea36d8b475ed0eed1ac88bdef4b54b45aefad22f7c3b2' - 'ac87ec55ee5cbcf2d520e1ea433d041c0bf754271a17f859edbb9976f192ce3f') + '7cac28ba784d24b4abf6414079548ada165343af507ecd8e23cbe7e4f63ae52f' + '61a7a775ff5a118d1a5cc2298db19fb8412be5d7d38dcad1ca199ef87685adf8' + 'ac87ec55ee5cbcf2d520e1ea433d041c0bf754271a17f859edbb9976f192ce3f' + '6672741b64d896dc555c8ee42ca2329c4f20d5f406095a69fe72da44b3a142f4') +options=(!lto) prepare() { mkdir -p build @@ -57,6 +60,7 @@ prepare() { patch -p2 -d src/3rdparty/chromium -i "$srcdir"/qt5-webengine-icu-75.patch # Fix build with ICU 75 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 } build() { @@ -69,8 +73,8 @@ build() { -proprietary-codecs \ -system-ffmpeg \ -webp \ - -spellchecker \ -webengine-icu \ + -spellchecker \ -webengine-kerberos \ -webengine-webrtc-pipewire make diff --git a/python3.12-imp.patch b/python3.12-imp.patch index 644cae5..f359966 100644 --- a/python3.12-imp.patch +++ b/python3.12-imp.patch @@ -1,28 +1,33 @@ -From 3664134f749f4851a14ab1953a9ee460a1fe0b68 Mon Sep 17 00:00:00 2001 -From: Bruno Pitrus <brunopitrus@hotmail.com> -Date: Tue, 25 Jul 2023 18:34:09 +0000 -Subject: [PATCH] Remove unused python import +Description: stop using imp module which was removed in Python 3.12 +Origin: upstream, commits + https://chromium.googlesource.com/chromium/src/+/9e0c89a3b5638ba2 + https://chromium.googlesource.com/chromium/src/+/f5f6e361d037c316 +Last-Update: 2024-03-17 -The `imp` module has been removed in Python 3.12 causing these scripts to error out. - -Task-number: QTBUG-121555 -Change-Id: Ic7c038d21b86052bdda13015f80934db52a2143e -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4714859 -Auto-Submit: Bruno Pitrus <brunopitrus@hotmail.com> -Reviewed-by: Ken Rockot <rockot@google.com> -Commit-Queue: Ken Rockot <rockot@google.com> -Cr-Commit-Position: refs/heads/main@{#1174966} -NOKEYCHECK=True -GitOrigin-RevId: f5f6e361d037c31630661186e7bd7b31d2784cb8 -Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/534568 -Reviewed-by: Michal Klocek <michal.klocek@qt.io> ---- - chromium/mojo/public/tools/mojom/mojom/fileutil.py | 1 - - chromium/mojo/public/tools/mojom/mojom/parse/lexer.py | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/chromium/mojo/public/tools/mojom/mojom/fileutil.py -index 29daec367c5..124f12c134b 100644 +--- 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 @@ @@ -33,8 +38,6 @@ index 29daec367c5..124f12c134b 100644 import os.path import sys -diff --git a/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py -index 73ca15df94c..1083a1af7bb 100644 --- a/mojo/public/tools/mojom/mojom/parse/lexer.py +++ b/mojo/public/tools/mojom/mojom/parse/lexer.py @@ -2,7 +2,6 @@ @@ -45,6 +48,3 @@ index 73ca15df94c..1083a1af7bb 100644 import os.path import sys --- -2.32.0 - diff --git a/qt5-webengine-icu-75.patch b/qt5-webengine-icu-75.patch index e71f0a6..6178a2c 100644 --- a/qt5-webengine-icu-75.patch +++ b/qt5-webengine-icu-75.patch @@ -72,3 +72,28 @@ index 345e45ce127..e686e5d691a 100644 #include "absl/types/optional.h" +diff --git a/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc b/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc +index 8fcc799b795..bc69ddcf18c 100644 +--- a/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc ++++ b/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc +@@ -15,6 +15,7 @@ + #include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics.h" + #include "third_party/blink/renderer/core/page/scrolling/text_fragment_finder.h" + #include "third_party/blink/renderer/platform/text/text_boundaries.h" ++#include "absl/base/attributes.h" + + namespace blink { + +diff --git a/chromium/third_party/abseil-cpp/absl/base/options.h b/chromium/third_party/abseil-cpp/absl/base/options.h +index df506f0fae6..1de105fed4a 100644 +--- a/chromium/third_party/abseil-cpp/absl/base/options.h ++++ b/chromium/third_party/abseil-cpp/absl/base/options.h +@@ -180,7 +180,7 @@ + // absl::variant is a typedef of std::variant, use the feature macro + // ABSL_USES_STD_VARIANT. + +-#define ABSL_OPTION_USE_STD_VARIANT 2 ++#define ABSL_OPTION_USE_STD_VARIANT 0 + + + // ABSL_OPTION_USE_INLINE_NAMESPACE diff --git a/qt5-webengine-ninja-1.12.patch b/qt5-webengine-ninja-1.12.patch new file mode 100644 index 0000000..9bddb53 --- /dev/null +++ b/qt5-webengine-ninja-1.12.patch @@ -0,0 +1,12 @@ +diff --git a/chromium/content/public/browser/BUILD.gn b/chromium/content/public/browser/BUILD.gn +index 7cf82a4aacf..0e0dda2c3ca 100644 +--- a/chromium/content/public/browser/BUILD.gn ++++ b/chromium/content/public/browser/BUILD.gn +@@ -469,6 +469,7 @@ jumbo_source_set("browser_sources") { + "//build:chromeos_buildflags", + "//cc", + "//components/viz/host", ++ "//components/spellcheck:buildflags", + "//content/browser", # Must not be public_deps! + "//device/fido", + "//gpu",