[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-crash-on-open-with.patch)

[Andrea Scarpino]

    Date: Thursday, December 6, 2012 @ 09:03:01
  Author: andrea
Revision: 172900

Fix crash on Open With

Added:
  kdelibs/trunk/fix-crash-on-open-with.patch
Modified:
  kdelibs/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   10 +++++++---
 fix-crash-on-open-with.patch |   19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-06 13:49:38 UTC (rev 172899)
+++ PKGBUILD	2012-12-06 14:03:01 UTC (rev 172900)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.4
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,11 +18,13 @@
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'archlinux-menu.patch'
-        '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch')
+        '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch'
+        'fix-crash-on-open-with.patch')
 sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'f5d203932f67ab6d87c794e9cb78a3b1a22ef747')
+          'f5d203932f67ab6d87c794e9cb78a3b1a22ef747'
+          '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -32,7 +34,9 @@
        # add Archlinux menu entry
        patch -p1 -i "${srcdir}"/archlinux-menu.patch
 
+       # Fixed upstream
        patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+       patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch
 
        cd "${srcdir}"
        mkdir build

Added: fix-crash-on-open-with.patch
===================================================================
--- fix-crash-on-open-with.patch	                        (rev 0)
+++ fix-crash-on-open-with.patch	2012-12-06 14:03:01 UTC (rev 172900)
@@ -0,0 +1,19 @@
+commit 0820b3173aff4f0f3c803a9e75e726024da38ee5
+Author: David Faure <faure at kde.org>
+Date:   Thu Dec 6 11:55:05 2012 +0100
+
+    Fix crash when no service was selected (user clicked on "Open With...")
+
+diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
+index 6d84800..6de0380 100644
+--- a/kparts/browserrun.cpp
++++ b/kparts/browserrun.cpp
+@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _
+                          this, SLOT(slotCopyToTempFileResult(KJob*)) );
+                 return Delayed; // We'll continue after the job has finished
+             }
+-            if (selectedService) {
++            if (selectedService && question.selectedService()) {
+                 *selectedService = question.selectedService();
+                 // KRun will use this when starting an app
+                 KRun::setPreferredService(question.selectedService()->desktopEntryName());