Date: Sunday, February 25, 2018 @ 09:59:28 Author: arojas Revision: 297946
Fix tab loading animation with Qt 5.10.1 Added: qupzilla/trunk/64c8e9bc.patch Modified: qupzilla/trunk/PKGBUILD ----------------+ 64c8e9bc.patch | 25 +++++++++++++++++++++++++ PKGBUILD | 9 ++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) Added: 64c8e9bc.patch =================================================================== --- 64c8e9bc.patch (rev 0) +++ 64c8e9bc.patch 2018-02-25 09:59:28 UTC (rev 297946) @@ -0,0 +1,25 @@ +From 64c8e9bcdffd98ced3fcf4f0077dc286b472d8b0 Mon Sep 17 00:00:00 2001 +From: David Rosca <[email protected]> +Date: Thu, 15 Feb 2018 08:35:34 +0100 +Subject: [PATCH] WebPage: Make the loadFinished workaround for all Qt 5.10 + versions + +See #2479 +--- + src/lib/webengine/webpage.cpp | 2 +- + tests/autotests/webviewtest.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/lib/webengine/webpage.cpp b/src/lib/webengine/webpage.cpp +index 965cac205..5adb6f22a 100644 +--- a/src/lib/webengine/webpage.cpp ++++ b/src/lib/webengine/webpage.cpp +@@ -100,7 +100,7 @@ WebPage::WebPage(QObject* parent) + }); + + // Workaround for broken load started/finished signals in QtWebEngine 5.10 +- if (qstrcmp(qVersion(), "5.10.0") == 0) { ++ if (qstrncmp(qVersion(), "5.10.", 5) == 0) { + connect(this, &QWebEnginePage::loadProgress, this, [this](int progress) { + if (progress == 100) { + emit loadFinished(true); Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-25 08:46:25 UTC (rev 297945) +++ PKGBUILD 2018-02-25 09:59:28 UTC (rev 297946) @@ -4,7 +4,7 @@ pkgname=qupzilla pkgver=2.2.5 -pkgrel=2 +pkgrel=3 pkgdesc="Cross-platform QtWebEngine browser" arch=(x86_64) url="https://www.qupzilla.com/"; @@ -13,13 +13,16 @@ makedepends=(qt5-tools kwallet libgnome-keyring) optdepends=('kwallet: kf5 kwallet integration' 'libgnome-keyring: gnome keyring integration') source=(https://github.com/QupZilla/qupzilla/releases/download/v$pkgver/QupZilla-$pkgver.tar.xz - https://github.com/QupZilla/qupzilla/commit/f3b770d2.patch) + https://github.com/QupZilla/qupzilla/commit/f3b770d2.patch + 64c8e9bc.patch) sha256sums=('b1b5bf6b3061a76d1add3c072753cc088140eb0fafcf24b9a0c4951b4d8948f6' - '497268175711ff833451943a40803892c18388ca7ab8fb86c8277c26961c678b') + '497268175711ff833451943a40803892c18388ca7ab8fb86c8277c26961c678b' + 'f5e41609be94bd671044c692e48b815edf3467ab51f931f8d9c364d76bac2e31') prepare() { cd QupZilla-$pkgver patch -p1 -i ../f3b770d2.patch # https://github.com/QupZilla/qupzilla/issues/2578 + patch -p1 -i ../64c8e9bc.patch # Fix tab loading animation with Qt 5.10.1 } build() {
