Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/messagelib/files/, kde-apps/messagelib/
Date: Thu, 14 May 2020 17:25:27
Message-Id: 1589456096.1385f32f55d61d38016debbda728d51128d598fc.asturm@gentoo
1 commit: 1385f32f55d61d38016debbda728d51128d598fc
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 14 11:34:56 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu May 14 11:34:56 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1385f32f
7
8 kde-apps/messagelib: Fix messageview header with Qt 5.15.0_rc
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../files/messagelib-20.04.0-qt-5.15.patch | 25 ++++++++++++++++++++++
14 kde-apps/messagelib/messagelib-20.04.1.ebuild | 2 ++
15 2 files changed, 27 insertions(+)
16
17 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
18 new file mode 100644
19 index 0000000000..93f632bdc6
20 --- /dev/null
21 +++ b/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch
22 @@ -0,0 +1,25 @@
23 +From 1f2548805df60707ffba2bba27d35d441232d140 Mon Sep 17 00:00:00 2001
24 +From: Laurent Montel <montel@×××.org>
25 +Date: Thu, 14 May 2020 13:27:14 +0200
26 +Subject: Fix load header with qt5.15
27 +
28 +---
29 + messageviewer/src/viewer/webengine/mailwebenginepage.cpp | 3 ++-
30 + 1 file changed, 2 insertions(+), 1 deletion(-)
31 +
32 +diff --git a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
33 +index b9d7b9f..f1c3eab 100644
34 +--- a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
35 ++++ b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
36 +@@ -40,7 +40,8 @@ void MailWebEnginePage::initialize()
37 + settings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, enableElement);
38 + settings()->setAttribute(QWebEngineSettings::XSSAuditingEnabled, enableElement);
39 + settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, enableElement);
40 +- settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, enableElement);
41 ++ //We need to activate it in qt5.15 otherwise we can't load local css file and co
42 ++ //settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, enableElement);
43 + settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, enableElement);
44 + settings()->setAttribute(QWebEngineSettings::HyperlinkAuditingEnabled, enableElement);
45 + settings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, enableElement);
46 +--
47 +cgit v1.1
48
49 diff --git a/kde-apps/messagelib/messagelib-20.04.1.ebuild b/kde-apps/messagelib/messagelib-20.04.1.ebuild
50 index 89eaf31cd7..fd33d8cfb0 100644
51 --- a/kde-apps/messagelib/messagelib-20.04.1.ebuild
52 +++ b/kde-apps/messagelib/messagelib-20.04.1.ebuild
53 @@ -69,3 +69,5 @@ RDEPEND="${DEPEND}"
54
55 # bug 579630
56 RESTRICT+=" test"
57 +
58 +PATCHES=( "${FILESDIR}/${PN}-20.04.0-qt-5.15.patch" )