gentoo resync : 30.05.2020

3 files changed, 31 insertions, 3 deletions

diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 44a6ba944499..5fa004444e2c 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,6 @@
+AUX messagelib-20.04.0-qt-5.15.patch 1480 BLAKE2B c0c2535178fdd111ea4b2a65700f7a489b23aae47bb8eaa5dc5820a4749292a77fa9fe6ee0632d678a01fe0507637e4b514c210a6e2007c4512c76669c960129 SHA512 b077b55adfab62abf10d433b7defb0ac315226e72b8b1dc6303f901d1ecd6a4e6f32bff1268ca02a00f6657af6f9a57654cecd15c1fe5d804161bea09160732b
 DIST messagelib-19.12.3.tar.xz 10462112 BLAKE2B c40e7eff15822287035bd3ea72d3df703803b67085a76b74d4f4eebde581de03af6da23f7cbe9ded08de5f2f0a442c2721c37ff4ddf51fc8f1e2b966dec3bb4d SHA512 d0f8c018b819a678543b42149d73bacde35461bf8fd42c7e4a7d46796a158ae665cc164d65508fb7a744ba2b2035417ce1f2daa758ffa4d0b8b8b860803d8ed9
-DIST messagelib-20.04.0.tar.xz 10494552 BLAKE2B 3d0822a7407d1e7e92d7a2b18dbc6caf418f56dd3bc22c8a1d8dab4358a72c04f62a8fd648ed2d641d1f32822a47a190e048e1794e5b712a2cf1f7f9877d58bc SHA512 1487f7bd8bf61525b841471b245cda8bf4704c7206c347dc00fdd38569e1711338d3c013baafa304f74786560b496a10a1b15ed268b9263a69c06deaa9c2d7e1
+DIST messagelib-20.04.1.tar.xz 10483264 BLAKE2B e1abcf2fcd2e5b8e6d4c1f3e6c97053f686a9b23904f2e3b85f98300a35cfa9bd389c491ea159cecb284fcf8044268681510b9fdbe72da3192ac33fa6146752f SHA512 889a8862878eac134bd5588f3756207a82fb087f9087807e5152f31f78600794b93cd53a32427352a1df83f791f0413f3b89c0c548b9b24f3c423fb42ed839fc
 EBUILD messagelib-19.12.3.ebuild 2126 BLAKE2B 90cf237b87a7aa526deb19bdebe43c8329d9601f61ad79d6d98baf48beb8d8ba274a02c67959c649772352d727f1c2775dd642ed2d4936e260c88cdaf30d034a SHA512 e07bac71e92a98ea17fac4824d7fdb2fadeb52c54f3d0b045f0d0431673d432dba259dce383b66f248e75b767be9f85bee0696c303816c865e732357d5f99385
-EBUILD messagelib-20.04.0.ebuild 2137 BLAKE2B 4532c72a0caece041d0ad0b6c423075427eb5e2681876a7e767d93f0df88ce76ad1ae37ec92b46a75c19ebc42a2611f0fc2e8394d13c4261cec39ad119bc9d28 SHA512 ebba1786404848d58735322b07861285eb7cfd3d709fb3cc8e43ca1e97f241ffd40036b674b70a8d5874ae2c1d8b9c42b7bb5a2e1586026b9157ce2528882f18
+EBUILD messagelib-20.04.1.ebuild 2192 BLAKE2B 8e921ffaba17b83e26b730ea14921336ddcb0f90dc31a68274cd911b00b3ad5646ef1cfeee48c373850a7efe7c0bd05ef25aa5fcf3d325d751dcecf30a83ce0b SHA512 109e909290a678dba67e777ab084248f6b1229b243cda684fc49c3aca44cf31b2e0ccaad16a6e2d633b4b271ad0df5c36ca027e6420831f3e738c5f88ed251b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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 000000000000..93f632bdc690
--- /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.0.ebuild b/kde-apps/messagelib/messagelib-20.04.1.ebuild
index b876fc9fcfd0..fd33d8cfb00d 100644
--- a/kde-apps/messagelib/messagelib-20.04.0.ebuild
+++ b/kde-apps/messagelib/messagelib-20.04.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="forceoptional-recursive"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.69.0
+KFMIN=5.70.0
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -69,3 +69,5 @@ RDEPEND="${DEPEND}"
 
 # bug 579630
 RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-20.04.0-qt-5.15.patch" )