Hello community, here is the log from the commit of package messagelib for openSUSE:Factory checked in at 2020-01-14 21:04:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/messagelib (Old) and /work/SRC/openSUSE:Factory/.messagelib.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "messagelib" Tue Jan 14 21:04:52 2020 rev:54 rq:764022 version:19.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/messagelib/messagelib.changes 2020-01-11 14:43:18.661262426 +0100 +++ /work/SRC/openSUSE:Factory/.messagelib.new.6675/messagelib.changes 2020-01-14 21:08:33.962798495 +0100 @@ -1,0 +2,7 @@ +Mon Jan 13 14:33:13 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch to fix display of large messages (kde#387061) + * 0001-Fix-Bug-387061-Large-messages-don-t-display-in-the-v.patch + * 0002-Initialize-variable.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-Bug-387061-Large-messages-don-t-display-in-the-v.patch 0002-Initialize-variable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ messagelib.spec ++++++ --- /var/tmp/diff_new_pack.KJDGI0/_old 2020-01-14 21:08:37.194799991 +0100 +++ /var/tmp/diff_new_pack.KJDGI0/_new 2020-01-14 21:08:37.194799991 +0100 @@ -32,6 +32,9 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-Bug-387061-Large-messages-don-t-display-in-the-v.patch +Patch1: 0002-Initialize-variable.patch BuildRequires: extra-cmake-modules BuildRequires: kdepim-apps-libs-devel BuildRequires: kf5-filesystem @@ -118,7 +121,7 @@ %endif %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build -- -DMESSAGEVIEWER_USE_QTWEBENGINE=TRUE -DQTWEBENGINE_SUPPORT_OPTION=TRUE ++++++ 0001-Fix-Bug-387061-Large-messages-don-t-display-in-the-v.patch ++++++ >From 991eb9c20286bdce2458d7dbc17765dd7b0d7b38 Mon Sep 17 00:00:00 2001 From: Laurent Montel <[email protected]> Date: Mon, 13 Jan 2020 07:35:15 +0100 Subject: [PATCH] Fix Bug 387061 - Large messages don't display in the viewer pane (eg. New Tumbleweed snapshot 20171117 released!) FIXED-IN: 5.14.0 BUG: 387061 --- .../src/htmlwriter/webengineparthtmlwriter.cpp | 18 +++++++++++++++++- .../src/htmlwriter/webengineparthtmlwriter.h | 3 ++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp b/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp index 17abda10..f88ecee3 100644 --- a/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp +++ b/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp @@ -25,6 +25,8 @@ #include <cassert> #include <QByteArray> +#include <QTemporaryFile> +#include <QDir> using namespace MessageViewer; @@ -38,6 +40,7 @@ WebEnginePartHtmlWriter::WebEnginePartHtmlWriter(MailWebEngineView *view, QObjec WebEnginePartHtmlWriter::~WebEnginePartHtmlWriter() { + delete mTempFile; } void WebEnginePartHtmlWriter::begin() @@ -47,6 +50,8 @@ void WebEnginePartHtmlWriter::begin() reset(); } + delete mTempFile; + BufferedHtmlWriter::begin(); MessageViewer::WebEngineEmbedPart::self()->clear(); mState = Begun; @@ -63,8 +68,19 @@ void WebEnginePartHtmlWriter::end() mExtraHead.clear(); } // see QWebEnginePage::setHtml() - mHtmlView->setContent(data(), QStringLiteral("text/html;charset=UTF-8"), QUrl(QStringLiteral("file:///"))); + //mHtmlView->setContent(data(), QStringLiteral("text/html;charset=UTF-8"), QUrl(QStringLiteral("file:///"))); + + mTempFile = new QTemporaryFile(QDir::tempPath() + QLatin1String("/messageviewer_XXXXXX")+ QLatin1String(".html")); + mTempFile->open(); + QTextStream stream(mTempFile); + stream.setCodec("UTF-8"); + stream << data(); + + //Bug 387061 + mHtmlView->load(QUrl::fromLocalFile(mTempFile->fileName())); + //qDebug() << " tempFile.fileName()" << mTempFile->fileName(); mHtmlView->show(); + mTempFile->close(); clear(); mHtmlView->setUpdatesEnabled(true); diff --git a/messageviewer/src/htmlwriter/webengineparthtmlwriter.h b/messageviewer/src/htmlwriter/webengineparthtmlwriter.h index b45dd3b5..31801cdb 100644 --- a/messageviewer/src/htmlwriter/webengineparthtmlwriter.h +++ b/messageviewer/src/htmlwriter/webengineparthtmlwriter.h @@ -23,7 +23,7 @@ #include <QString> #include <QByteArray> - +class QTemporaryFile; namespace MessageViewer { class MailWebEngineView; } @@ -56,6 +56,7 @@ private: Queued, Ended } mState; + QTemporaryFile *mTempFile = nullptr; }; } #endif // WEBENGINEPARTHTMLWRITER_H -- 2.24.1 ++++++ 0002-Initialize-variable.patch ++++++ >From 1f215c310c518634dfd5c0b651ef901f38c5ada7 Mon Sep 17 00:00:00 2001 From: Laurent Montel <[email protected]> Date: Mon, 13 Jan 2020 07:55:41 +0100 Subject: [PATCH] Initialize variable --- messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp | 1 - messageviewer/src/htmlwriter/webengineparthtmlwriter.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp b/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp index f88ecee3..701cf053 100644 --- a/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp +++ b/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp @@ -33,7 +33,6 @@ using namespace MessageViewer; WebEnginePartHtmlWriter::WebEnginePartHtmlWriter(MailWebEngineView *view, QObject *parent) : QObject(parent) , mHtmlView(view) - , mState(Ended) { assert(view); } diff --git a/messageviewer/src/htmlwriter/webengineparthtmlwriter.h b/messageviewer/src/htmlwriter/webengineparthtmlwriter.h index 31801cdb..7a4e5909 100644 --- a/messageviewer/src/htmlwriter/webengineparthtmlwriter.h +++ b/messageviewer/src/htmlwriter/webengineparthtmlwriter.h @@ -55,7 +55,7 @@ private: Begun, Queued, Ended - } mState; + } mState = Ended; QTemporaryFile *mTempFile = nullptr; }; } -- 2.24.1
