Hello community, here is the log from the commit of package messagelib for openSUSE:Factory checked in at 2018-10-29 14:20:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/messagelib (Old) and /work/SRC/openSUSE:Factory/.messagelib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "messagelib" Mon Oct 29 14:20:09 2018 rev:37 rq:644436 version:18.08.2 Changes: -------- --- /work/SRC/openSUSE:Factory/messagelib/messagelib.changes 2018-10-15 09:36:15.335769874 +0200 +++ /work/SRC/openSUSE:Factory/.messagelib.new/messagelib.changes 2018-10-29 14:57:58.633919637 +0100 @@ -1,0 +2,8 @@ +Wed Oct 24 10:20:18 UTC 2018 - wba...@tmo.at + +- Add 0001-Check-QtWebEngine-version-instead-of-Qt-s.patch to fix + behavior of the PgUp/PgDown and Space keys in the messageviewer + when QtWebEngine 5.10+ is used in combination with Qt 5.9 as in + Leap 15 (boo#1105461, kde#397349) + +------------------------------------------------------------------- New: ---- 0001-Check-QtWebEngine-version-instead-of-Qt-s.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ messagelib.spec ++++++ --- /var/tmp/diff_new_pack.x2Aj0r/_old 2018-10-29 14:57:59.145920824 +0100 +++ /var/tmp/diff_new_pack.x2Aj0r/_new 2018-10-29 14:57:59.145920824 +0100 @@ -29,6 +29,8 @@ Group: System/Libraries Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: 0001-Check-QtWebEngine-version-instead-of-Qt-s.patch BuildRequires: akonadi-contact-devel BuildRequires: akonadi-mime-devel BuildRequires: akonadi-search-devel @@ -116,6 +118,7 @@ %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build -- -DMESSAGEVIEWER_USE_QTWEBENGINE=TRUE -DQTWEBENGINE_SUPPORT_OPTION=TRUE ++++++ 0001-Check-QtWebEngine-version-instead-of-Qt-s.patch ++++++ >From 569c3780a8f18830d7be24b7a7d40b755a2dbc60 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <wba...@tmo.at> Date: Thu, 25 Oct 2018 00:03:38 +0200 Subject: [PATCH] Check QtWebEngine version instead of Qt's This code depends on the QtWebEngine (not Qt) version, so it should actually check for that. Otherwise it breaks if a distribution ships Qt 5.9 LTS together with a newer QtWebEngine, like e.g. openSUSE Leap 15.0 does, or QtWebEngine 5.9 together with a newer Qt as is the case in FreeBSD. BUG: 397349 CCBUG: 388440 FIXED-IN: 18.08.3 Differential Revision: https://phabricator.kde.org/D16398 --- webengineviewer/src/webenginescript.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webengineviewer/src/webenginescript.cpp b/webengineviewer/src/webenginescript.cpp index 2e9fcd44..ca668ff2 100644 --- a/webengineviewer/src/webenginescript.cpp +++ b/webengineviewer/src/webenginescript.cpp @@ -18,6 +18,7 @@ */ #include "webenginescript.h" #include <QDebug> +#include <QtWebEngine/QtWebEngineVersion> using namespace WebEngineViewer; QString WebEngineScript::findAllImages() @@ -126,7 +127,7 @@ QString WebEngineScript::searchElementPosition(const QString &elementStr) static QString scrollTop() { -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +#if QTWEBENGINE_VERSION >= QT_VERSION_CHECK(5, 10, 0) return QStringLiteral("document.documentElement.scrollTop"); #else return QStringLiteral("document.body.scrollTop"); -- 2.16.4
