[gentoo-commits] proj/kde:master commit in: kde-apps/messagelib/files/, kde-apps/messagelib/

[gentoo-commits] proj/kde:master commit in: kde-apps/messagelib/files/, kde-apps/messagelib/

[Andreas Sturmlechner]

commit:     1385f32f55d61d38016debbda728d51128d598fc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 11:34:56 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 14 11:34:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1385f32f

kde-apps/messagelib: Fix messageview header with Qt 5.15.0_rc

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/messagelib-20.04.0-qt-5.15.patch         | 25 ++++++++++++++++++++++
 kde-apps/messagelib/messagelib-20.04.1.ebuild      |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch b/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch
new file mode 100644
index 0000000000..93f632bdc6
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch
@@ -0,0 +1,25 @@
+From 1f2548805df60707ffba2bba27d35d441232d140 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 14 May 2020 13:27:14 +0200
+Subject: Fix load header with qt5.15
+
+---
+ messageviewer/src/viewer/webengine/mailwebenginepage.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
+index b9d7b9f..f1c3eab 100644
+--- a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
++++ b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
+@@ -40,7 +40,8 @@ void MailWebEnginePage::initialize()
+     settings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, enableElement);
+     settings()->setAttribute(QWebEngineSettings::XSSAuditingEnabled, enableElement);
+     settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, enableElement);
+-    settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, enableElement);
++    //We need to activate it in qt5.15 otherwise we can't load local css file and co
++    //settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, enableElement);
+     settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, enableElement);
+     settings()->setAttribute(QWebEngineSettings::HyperlinkAuditingEnabled, enableElement);
+     settings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, enableElement);
+-- 
+cgit v1.1

diff --git a/kde-apps/messagelib/messagelib-20.04.1.ebuild b/kde-apps/messagelib/messagelib-20.04.1.ebuild
index 89eaf31cd7..fd33d8cfb0 100644
--- a/kde-apps/messagelib/messagelib-20.04.1.ebuild
+++ b/kde-apps/messagelib/messagelib-20.04.1.ebuild
@@ -69,3 +69,5 @@ RDEPEND="${DEPEND}"
 
 # bug 579630
 RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-20.04.0-qt-5.15.patch" )