commit: e33ca366b83a445a3fe2cba9705a1ac306a2c3ee Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Mon Sep 14 22:09:45 2015 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Sat Sep 19 15:51:14 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e33ca366
kde-apps/kdepim: Fix blocking UI call when opening attachment Upstream fix is in >=15.08.2 See also: http://bugs.kde.org/show_bug.cgi?id=350737 Package-Manager: portage-2.2.20.1 .../files/kdepim-15.08.0-fix-blocking-UI.patch | 33 ++++++++++++++++++++++ ...pim-15.08.0.ebuild => kdepim-15.08.0-r1.ebuild} | 2 ++ kde-apps/kdepim/kdepim-15.08.1.ebuild | 2 ++ 3 files changed, 37 insertions(+) diff --git a/kde-apps/kdepim/files/kdepim-15.08.0-fix-blocking-UI.patch b/kde-apps/kdepim/files/kdepim-15.08.0-fix-blocking-UI.patch new file mode 100644 index 0000000..1e87c18 --- /dev/null +++ b/kde-apps/kdepim/files/kdepim-15.08.0-fix-blocking-UI.patch @@ -0,0 +1,33 @@ +From: Montel Laurent <[email protected]> +Date: Mon, 14 Sep 2015 11:50:12 +0000 +Subject: Fix Bug 350737 - KMail/KF5 Blocking UI Call when Opening ODF Mail Attachement +X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=ca27705bd161a64a6aa86c0c844036143eea24fb +--- +Fix Bug 350737 - KMail/KF5 Blocking UI Call when Opening ODF Mail Attachement + +FIXED-IN: 15.08.2 +BUG: 350737 +--- + + +--- a/messageviewer/viewer/viewer_p.cpp ++++ b/messageviewer/viewer/viewer_p.cpp +@@ -745,7 +745,6 @@ + QString name = mNodeHelper->writeNodeToTempFile(node); + QString linkName = createAtmFileLink(name); + QList<QUrl> lst; +- QUrl url; + bool autoDelete = true; + + if (linkName.isEmpty()) { +@@ -755,8 +754,7 @@ + + const QFileDevice::Permissions perms = QFile::permissions(linkName); + QFile::setPermissions(linkName, perms | QFileDevice::ReadUser | QFileDevice::WriteUser); +- +- url.setPath(linkName); ++ const QUrl url = QUrl::fromLocalFile(linkName); + lst.append(url); + if (offer) { + if ((!KRun::runService(*offer, lst, 0, autoDelete)) && autoDelete) { + diff --git a/kde-apps/kdepim/kdepim-15.08.0.ebuild b/kde-apps/kdepim/kdepim-15.08.0-r1.ebuild similarity index 98% rename from kde-apps/kdepim/kdepim-15.08.0.ebuild rename to kde-apps/kdepim/kdepim-15.08.0-r1.ebuild index 22bc191..a73a25e 100644 --- a/kde-apps/kdepim/kdepim-15.08.0.ebuild +++ b/kde-apps/kdepim/kdepim-15.08.0-r1.ebuild @@ -127,6 +127,8 @@ REQUIRED_USE=" kdepim_features_kalarm? ( kdepim_features_kmail ) " +PATCHES=( "${FILESDIR}/${PN}-15.08.0-fix-blocking-UI.patch" ) + src_prepare() { kde5_src_prepare diff --git a/kde-apps/kdepim/kdepim-15.08.1.ebuild b/kde-apps/kdepim/kdepim-15.08.1.ebuild index 22bc191..a73a25e 100644 --- a/kde-apps/kdepim/kdepim-15.08.1.ebuild +++ b/kde-apps/kdepim/kdepim-15.08.1.ebuild @@ -127,6 +127,8 @@ REQUIRED_USE=" kdepim_features_kalarm? ( kdepim_features_kmail ) " +PATCHES=( "${FILESDIR}/${PN}-15.08.0-fix-blocking-UI.patch" ) + src_prepare() { kde5_src_prepare
