mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
extra/qt5-webengine to 5.15.4-3
This commit is contained in:
Kevin Mihelich
parent
471bf801d0
commit
ade5b992ef
3 changed files with 38 additions and 104 deletions
|
|
@ -10,11 +10,9 @@ buildarch=12
|
|||
highmem=1
|
||||
|
||||
pkgname=qt5-webengine
|
||||
_qtver=5.15.3
|
||||
_qtver=5.15.4
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=5
|
||||
_commit=a059e7404a6db799f4da0ad696e65ae9c854b4b0
|
||||
# Upstream won't tag releases, because potatoes https://lists.qt-project.org/pipermail/interest/2021-March/036386.html
|
||||
pkgrel=3
|
||||
arch=('x86_64')
|
||||
url='https://www.qt.io'
|
||||
license=('LGPL3' 'LGPL2.1' 'BSD')
|
||||
|
|
@ -25,11 +23,11 @@ makedepends=('git' 'python2' 'python' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'pop
|
|||
optdepends=('libpipewire02: WebRTC desktop sharing under Wayland')
|
||||
groups=('qt' 'qt5')
|
||||
_pkgfqn=qtwebengine
|
||||
source=(git+https://code.qt.io/qt/qtwebengine.git#commit=$_commit
|
||||
source=(git+https://code.qt.io/qt/qtwebengine.git#tag=v${pkgver}-lts
|
||||
git+https://code.qt.io/qt/qtwebengine-chromium.git
|
||||
v8-call-new-ListFormatter-createInstance.patch
|
||||
qt5-webengine-glibc-2.33.patch
|
||||
qtbug-91773.patch
|
||||
qtbug-93802.patch
|
||||
0001-ARM-toolchain-fixes.patch
|
||||
0002-Fix-ARM-skia-ICE.patch
|
||||
0003-bind-gen-Support-single_process-flag-in-generate_bin.patch
|
||||
|
|
@ -37,9 +35,9 @@ source=(git+https://code.qt.io/qt/qtwebengine.git#commit=$_commit
|
|||
0005-Fix-sandbox-Aw-snap-for-sycalls-403-and-407.patch)
|
||||
sha256sums=('SKIP'
|
||||
'SKIP'
|
||||
'44ebcff050a1c849819d66399c14bd711801d0eb64f518d292d3d6efedce3b3a'
|
||||
'2294e5390c869963fc58f7bf1ee0a254a3f7fce3ed00c04e34a5f03e2b31b624'
|
||||
'02009c7f87a216131ab96418c9ddb21e697e61668a970b972242f0015b36ba4c'
|
||||
'38a99bb2839e93f17826af53b8a4dc5e845b5d09cbfdf92a4a5d55bb939f01dc'
|
||||
'10b3fed2d67b3a1f487d2d95c9a603fcbc23f08d4528d1986a6d0010c9e466bc'
|
||||
'48f37525c7066b0119b10981ae59139189ca3423db6bd14da6e064065d5d3016'
|
||||
'e77263fd4c7d40972ce61ce353438ee1e0a4d0771c9014aeded001c6a2301d17'
|
||||
|
|
@ -55,11 +53,15 @@ prepare() {
|
|||
git submodule set-branch --branch 87-based src/3rdparty
|
||||
git submodule update
|
||||
|
||||
git cherry-pick -n 199ea00a9eea13315a652c62778738629185b059 # Fix crashes with some locales
|
||||
patch -p1 < "$srcdir"/qtbug-93802.patch # Fix scrolling with touchpad
|
||||
patch -p1 < "$srcdir"/qtbug-91773.patch # Fix load signals 4d4fc9cd120376f30ce0630b1e8c7bf174d44fae
|
||||
patch -p1 -d src/3rdparty/chromium/v8 -i "$srcdir"/v8-call-new-ListFormatter-createInstance.patch # Fix build with ICU 69
|
||||
patch -p1 -i "$srcdir"/qt5-webengine-glibc-2.33.patch # Fix text rendering when building with glibc 2.33
|
||||
|
||||
cd src/3rdparty
|
||||
git cherry-pick -n b498f4ce3f542882767238ea9f01eb85de6c6fda # Fix build with GCC 11
|
||||
git cherry-pick -n 12ecfd11e326219ef185e7fdd6d967985fc57599 # Fix crashes due to old cached data
|
||||
git cherry-pick -n e67c7b49247c8b9646790c718b85d8ba75b68945 # Fix build with ICU 69
|
||||
|
||||
cd "$srcdir/$_pkgfqn/src/3rdparty"
|
||||
patch -p1 -i ${srcdir}/0001-ARM-toolchain-fixes.patch
|
||||
patch -p1 -i ${srcdir}/0002-Fix-ARM-skia-ICE.patch
|
||||
|
|
|
|||
27
extra/qt5-webengine/qtbug-93802.patch
Normal file
27
extra/qt5-webengine/qtbug-93802.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
From f9881e0556368da36b36687183e4be351bfbd81b Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Wed, 2 Jun 2021 15:54:43 +0200
|
||||
Subject: [PATCH] Always send phased wheel events beginning with Began
|
||||
|
||||
The input event router does not like MayBegin.
|
||||
|
||||
Fixes: QTBUG-93082
|
||||
Change-Id: I4ac9677d7f69da3d36fc33c17541026f011feb42
|
||||
---
|
||||
src/core/web_event_factory.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
|
||||
index 593acb5e5c..aa5ea40365 100644
|
||||
--- a/src/core/web_event_factory.cpp
|
||||
+++ b/src/core/web_event_factory.cpp
|
||||
@@ -1585,7 +1585,7 @@ blink::WebMouseWheelEvent::Phase toBlinkPhase(QWheelEvent *ev)
|
||||
#endif
|
||||
return blink::WebMouseWheelEvent::kPhaseNone;
|
||||
case Qt::ScrollBegin:
|
||||
- return ev->angleDelta().isNull() ? blink::WebMouseWheelEvent::kPhaseMayBegin : blink::WebMouseWheelEvent::kPhaseBegan;
|
||||
+ return blink::WebMouseWheelEvent::kPhaseBegan;
|
||||
case Qt::ScrollUpdate:
|
||||
return blink::WebMouseWheelEvent::kPhaseChanged;
|
||||
case Qt::ScrollEnd:
|
||||
--
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001
|
||||
From: Frank Tang <ftang@chromium.org>
|
||||
Date: Thu, 15 Oct 2020 22:44:27 -0700
|
||||
Subject: [PATCH] [Intl] call new ListFormatter::createInstance
|
||||
|
||||
The one we currently using is now marked as internal and to be removed
|
||||
for 68. Migrating to the style which already avaiable in ICU 67-1.
|
||||
|
||||
Bug: v8:11031
|
||||
Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751
|
||||
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
|
||||
Commit-Queue: Frank Tang <ftang@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#70638}
|
||||
---
|
||||
src/objects/js-list-format.cc | 55 ++++++++++++-----------------------
|
||||
1 file changed, 18 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/src/objects/js-list-format.cc b/src/objects/js-list-format.cc
|
||||
index b17d38c43ff5..e48a387be50f 100644
|
||||
--- a/src/objects/js-list-format.cc
|
||||
+++ b/src/objects/js-list-format.cc
|
||||
@@ -29,46 +29,27 @@ namespace v8 {
|
||||
namespace internal {
|
||||
|
||||
namespace {
|
||||
-const char* kStandard = "standard";
|
||||
-const char* kOr = "or";
|
||||
-const char* kUnit = "unit";
|
||||
-const char* kStandardShort = "standard-short";
|
||||
-const char* kOrShort = "or-short";
|
||||
-const char* kUnitShort = "unit-short";
|
||||
-const char* kStandardNarrow = "standard-narrow";
|
||||
-const char* kOrNarrow = "or-narrow";
|
||||
-const char* kUnitNarrow = "unit-narrow";
|
||||
-
|
||||
-const char* GetIcuStyleString(JSListFormat::Style style,
|
||||
- JSListFormat::Type type) {
|
||||
+
|
||||
+UListFormatterWidth GetIcuWidth(JSListFormat::Style style) {
|
||||
+ switch (style) {
|
||||
+ case JSListFormat::Style::LONG:
|
||||
+ return ULISTFMT_WIDTH_WIDE;
|
||||
+ case JSListFormat::Style::SHORT:
|
||||
+ return ULISTFMT_WIDTH_SHORT;
|
||||
+ case JSListFormat::Style::NARROW:
|
||||
+ return ULISTFMT_WIDTH_NARROW;
|
||||
+ }
|
||||
+ UNREACHABLE();
|
||||
+}
|
||||
+
|
||||
+UListFormatterType GetIcuType(JSListFormat::Type type) {
|
||||
switch (type) {
|
||||
case JSListFormat::Type::CONJUNCTION:
|
||||
- switch (style) {
|
||||
- case JSListFormat::Style::LONG:
|
||||
- return kStandard;
|
||||
- case JSListFormat::Style::SHORT:
|
||||
- return kStandardShort;
|
||||
- case JSListFormat::Style::NARROW:
|
||||
- return kStandardNarrow;
|
||||
- }
|
||||
+ return ULISTFMT_TYPE_AND;
|
||||
case JSListFormat::Type::DISJUNCTION:
|
||||
- switch (style) {
|
||||
- case JSListFormat::Style::LONG:
|
||||
- return kOr;
|
||||
- case JSListFormat::Style::SHORT:
|
||||
- return kOrShort;
|
||||
- case JSListFormat::Style::NARROW:
|
||||
- return kOrNarrow;
|
||||
- }
|
||||
+ return ULISTFMT_TYPE_OR;
|
||||
case JSListFormat::Type::UNIT:
|
||||
- switch (style) {
|
||||
- case JSListFormat::Style::LONG:
|
||||
- return kUnit;
|
||||
- case JSListFormat::Style::SHORT:
|
||||
- return kUnitShort;
|
||||
- case JSListFormat::Style::NARROW:
|
||||
- return kUnitNarrow;
|
||||
- }
|
||||
+ return ULISTFMT_TYPE_UNITS;
|
||||
}
|
||||
UNREACHABLE();
|
||||
}
|
||||
@@ -143,7 +124,7 @@ MaybeHandle<JSListFormat> JSListFormat::New(Isolate* isolate, Handle<Map> map,
|
||||
icu::Locale icu_locale = r.icu_locale;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
icu::ListFormatter* formatter = icu::ListFormatter::createInstance(
|
||||
- icu_locale, GetIcuStyleString(style_enum, type_enum), status);
|
||||
+ icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status);
|
||||
if (U_FAILURE(status) || formatter == nullptr) {
|
||||
delete formatter;
|
||||
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError),
|
||||
Loading…
Reference in a new issue