[SCM] KDE Development Platform Libraries module packaging branch, wheezy, updated. debian/4.8.4-4-5-g4145c19

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=4145c19

The following commit has been merged in the wheezy branch:
commit 4145c1930036a6e763e5b481954dfd0f3e11bf8d
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 4 15:10:44 2012 +0100

    fix supported protocols for in-memory services (related to #685980)
    
    backport upstream commit bd963e1e9abd1f82b72824fcdf7118ecffdec756
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 +
 ...es-don-t-have-details-so-assume-they-supp.patch |   32 ++++++++++++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35157bc..8bca20a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ kde4libs (4:4.8.4-5) UNRELEASED; urgency=low
   * Backport upstream commit fea636ce886844992ac8b05a9c22cd822c45e832 to fix
     the reading of the "Keywords" key in .desktop files of applications;
     patch upstream_Fix-parsing-of-the-Keywords-key-in-.desktop-files-no.patch.
+  * Backport upstream commit bd963e1e9abd1f82b72824fcdf7118ecffdec756 to fix
+    the supported protocols for in-memory services (related to #685980);
+    patch upstream_Temp-services-don-t-have-details-so-assume-they-supp.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Oct 2012 17:04:46 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 8137698..90c9679 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ glibc_filesystem.diff
 python3-support-bytecode.patch
 fix-copying-of-files-with-extended-ACLs.patch
 upstream_Fix-parsing-of-the-Keywords-key-in-.desktop-files-no.patch
+upstream_Temp-services-don-t-have-details-so-assume-they-supp.patch
diff --git a/debian/patches/upstream_Temp-services-don-t-have-details-so-assume-they-supp.patch b/debian/patches/upstream_Temp-services-don-t-have-details-so-assume-they-supp.patch
new file mode 100644
index 0000000..a8803cb
--- /dev/null
+++ b/debian/patches/upstream_Temp-services-don-t-have-details-so-assume-they-supp.patch
@@ -0,0 +1,32 @@
+From bd963e1e9abd1f82b72824fcdf7118ecffdec756 Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Wed, 18 Jul 2012 20:26:59 +0200
+Subject: [PATCH] Temp services don't have details, so assume they support KIO
+ urls.
+
+A KService created in memory from an exec line cannot possibly have
+a Category or X-KDE-Protocols key.
+
+CCBUG: 274655, 292822
+---
+ kio/kio/krun.cpp |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
+index 1c3bf2c..60a6565 100644
+--- a/kio/kio/krun.cpp
++++ b/kio/kio/krun.cpp
+@@ -373,7 +373,9 @@ static QStringList supportedProtocols(const KService& _service)
+         if (supportedProtocols.isEmpty()) {
+             // compat mode: assume KIO if not set and it's a KDE app (or a KDE service)
+             const QStringList categories = _service.property("Categories").toStringList();
+-            if (categories.contains("KDE") || !_service.isApplication()) {
++            if (categories.contains("KDE")
++                    || !_service.isApplication()
++                    || _service.entryPath().isEmpty() /*temp service*/) {
+                 supportedProtocols.append("KIO");
+             }
+             else { // if no KDE app, be a bit over-generic
+-- 
+1.7.10.4
+

-- 
KDE Development Platform Libraries module packaging