[arch-commits] Commit in kdelibs/trunk (2 files)

[Andrea Scarpino]

    Date: Wednesday, December 5, 2012 @ 18:07:31
  Author: andrea
Revision: 172780

upgpkg: kdelibs 4.9.4-2

Fix regression when opening odt files

Added:
  kdelibs/trunk/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
Modified:
  kdelibs/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch |   53 ++++++++++
 PKGBUILD                                                        |   10 +
 2 files changed, 60 insertions(+), 3 deletions(-)

Added: 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
===================================================================
--- 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch	                        (rev 0)
+++ 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch	2012-12-05 23:07:31 UTC (rev 172780)
@@ -0,0 +1,53 @@
+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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-05 19:01:30 UTC (rev 172779)
+++ PKGBUILD	2012-12-05 23:07:31 UTC (rev 172780)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -17,10 +17,12 @@
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch')
 sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          'f5d203932f67ab6d87c794e9cb78a3b1a22ef747')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -30,6 +32,8 @@
        # add Archlinux menu entry
        patch -p1 -i "${srcdir}"/archlinux-menu.patch
 
+       patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+
        cd "${srcdir}"
        mkdir build
        cd build