[packages/kde4-kdelibs] - rel 2; important fixes from packagers kde list

[arekm]

commit a7568c9fd1e90da650c43203a8874591f5a22eb9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Dec 8 20:13:33 2012 +0100

    - rel 2; important fixes from packagers kde list

 ...hen-no-service-was-selected-user-clicked-.patch | 26 +++++++++++
 ...-check-parent-mimetypes-in-protocolForArc.patch | 54 ++++++++++++++++++++++
 kde4-kdelibs.spec                                  |  6 ++-
 3 files changed, 85 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kdelibs.spec b/kde4-kdelibs.spec
index 416c883..957fa1a 100644
--- a/kde4-kdelibs.spec
+++ b/kde4-kdelibs.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):	K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kdelibs
 Version:	4.9.4
-Release:	1
+Release:	2
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
@@ -29,6 +29,8 @@ Patch1:		%{name}-cacert.patch
 Patch2:		%{name}-findlzmafix.patch
 Patch3:		%{name}-aboutPLD.patch
 Patch4:		%{name}-devicemanager_remove.patch
+Patch5:		0001-Fix-crash-when-no-service-was-selected-user-clicked-.patch
+Patch6:		0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	Qt3Support-devel >= %{qtver}
@@ -240,6 +242,8 @@ KDE.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %if "%{pld_release}" == "ti"
 sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp
diff --git a/0001-Fix-crash-when-no-service-was-selected-user-clicked-.patch b/0001-Fix-crash-when-no-service-was-selected-user-clicked-.patch
new file mode 100644
index 0000000..6626b23
--- /dev/null
+++ b/0001-Fix-crash-when-no-service-was-selected-user-clicked-.patch
@@ -0,0 +1,26 @@
+From 0820b3173aff4f0f3c803a9e75e726024da38ee5 Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Thu, 6 Dec 2012 11:55:05 +0100
+Subject: [PATCH] Fix crash when no service was selected (user clicked on
+ "Open With...")
+
+---
+ kparts/browserrun.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+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());
+-- 
+1.7.7
+
diff --git a/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
new file mode 100644
index 0000000..bdbf7c5
--- /dev/null
+++ b/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
@@ -0,0 +1,54 @@
+From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Wed, 5 Dec 2012 22:42:25 +0100
+Subject: [PATCH] Revert "Also check parent mimetypes in
+ protocolForArchiveMimetype()."
+
+This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05.
+It breaks opening odt and other zip-based files in external apps.
+That's what I get for delegating the testing :-)
+BUG: 311214
+---
+ kio/kio/kprotocolmanager.cpp |   19 +------------------
+ 1 files changed, 1 insertions(+), 18 deletions(-)
+
+diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
+index 3f1cadd..502a3e6 100644
+--- a/kio/kio/kprotocolmanager.cpp
++++ b/kio/kio/kprotocolmanager.cpp
+@@ -47,7 +47,6 @@
+ #include <ksharedconfig.h>
+ #include <kstandarddirs.h>
+ #include <kurl.h>
+-#include <kmimetype.h>
+ #include <kmimetypetrader.h>
+ #include <kprotocolinfofactory.h>
+ 
+@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType )
+             }
+         }
+     }
+-    const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
+-    if (!prot.isEmpty())
+-        return prot;
+-
+-    // Check parent mimetypes
+-    KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
+-    if (mime) {
+-        const QStringList parentMimeTypes = mime->allParentMimeTypes();
+-        Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
+-            const QString res = d->protocolForArchiveMimetypes.value(parentMimeType);
+-            if (!res.isEmpty()) {
+-                return res;
+-            }
+-        }
+-    }
+-
+-    return QString();
++    return d->protocolForArchiveMimetypes.value(mimeType);
+ }
+ 
+ #undef PRIVATE_DATA
+-- 
+1.7.7
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdelibs.git/commitdiff/a7568c9fd1e90da650c43203a8874591f5a22eb9