- apply upstream patch to revert the check parent mimetypes in
protocolForArchiveMimetype() (kde#311214)
This commit is contained in:
parent
92f040cd34
commit
840ce1b474
@ -0,0 +1,53 @@
|
|||||||
|
From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Faure <faure@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
|
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.9.4
|
Version: 4.9.4
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -164,6 +164,7 @@ Patch58: kdelibs-cmake_python3.patch
|
|||||||
Patch59: kdelibs-4.9.3-kcm_ssl.patch
|
Patch59: kdelibs-4.9.3-kcm_ssl.patch
|
||||||
|
|
||||||
## upstream
|
## upstream
|
||||||
|
Patch100: 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
|
||||||
|
|
||||||
## security fix
|
## security fix
|
||||||
# Not Upstreamed? why not ? -- Rex
|
# Not Upstreamed? why not ? -- Rex
|
||||||
@ -339,6 +340,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
%patch59 -p1 -b .filter
|
%patch59 -p1 -b .filter
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
|
%patch100 -p1 -b .kio
|
||||||
|
|
||||||
# security fixes
|
# security fixes
|
||||||
%patch200 -p1 -b .CVE-2009-2702
|
%patch200 -p1 -b .CVE-2009-2702
|
||||||
@ -598,6 +600,10 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 06 2012 Than Ngo <than@redhat.com> - 6:4.9.4-3
|
||||||
|
- apply upstream patch to revert the check parent mimetypes in
|
||||||
|
protocolForArchiveMimetype() (kde#311214)
|
||||||
|
|
||||||
* Tue Dec 04 2012 Than Ngo <than@redhat.com> - 6:4.9.4-2
|
* Tue Dec 04 2012 Than Ngo <than@redhat.com> - 6:4.9.4-2
|
||||||
- disable kfileplacesdevicecache which causes bad regression
|
- disable kfileplacesdevicecache which causes bad regression
|
||||||
- add rhel condition
|
- add rhel condition
|
||||||
|
Loading…
Reference in New Issue
Block a user