diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-09-15 00:09:45 +0200 |
|---|---|---|
| committer | Manuel Rüger <mrueg@gentoo.org> | 2015-09-19 17:51:14 +0200 |
| commit | e33ca366b83a445a3fe2cba9705a1ac306a2c3ee (patch) | |
| tree | 9df9cfd340bab0defce7bf8af29d0bff91bbadfd | |
| parent | 0205b185eda1a60e00cf1e232cbc01f6e0f53de6 (diff) | |
| download | kde-e33ca366b83a445a3fe2cba9705a1ac306a2c3ee.tar.gz kde-e33ca366b83a445a3fe2cba9705a1ac306a2c3ee.tar.bz2 kde-e33ca366b83a445a3fe2cba9705a1ac306a2c3ee.zip | |
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
| -rw-r--r-- | kde-apps/kdepim/files/kdepim-15.08.0-fix-blocking-UI.patch | 33 | ||||
| -rw-r--r-- | kde-apps/kdepim/kdepim-15.08.0-r1.ebuild (renamed from kde-apps/kdepim/kdepim-15.08.0.ebuild) | 2 | ||||
| -rw-r--r-- | kde-apps/kdepim/kdepim-15.08.1.ebuild | 2 |
3 files changed, 37 insertions, 0 deletions
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 00000000000..1e87c18ba1b --- /dev/null +++ b/kde-apps/kdepim/files/kdepim-15.08.0-fix-blocking-UI.patch @@ -0,0 +1,33 @@ +From: Montel Laurent <montel@kde.org> +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 index 22bc1915fa8..a73a25ebaa5 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 22bc1915fa8..a73a25ebaa5 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 |