From 8d7dd4892e8aa73ce7c3ea73f48a5274e48f5428 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 22 Dec 2014 15:09:16 +0100
Subject: KDE 4.9.5 for Slackware 14.0 (02jan2013)

---
 kde/patch/kdelibs/kdelibs.fstab.patch              | 47 ---------------------
 .../kdelibs/kdelibs.mimetypecheck.BUG311214.patch  | 48 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 47 deletions(-)
 delete mode 100644 kde/patch/kdelibs/kdelibs.fstab.patch
 create mode 100644 kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch

(limited to 'kde/patch/kdelibs')

diff --git a/kde/patch/kdelibs/kdelibs.fstab.patch b/kde/patch/kdelibs/kdelibs.fstab.patch
deleted file mode 100644
index a57662b..0000000
--- a/kde/patch/kdelibs/kdelibs.fstab.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Alex Fiestas <afiestas@kde.org>
-Date: Tue, 05 Jun 2012 16:12:28 +0000
-Subject: Emit deviceRemoved/Added with the right deviceList set
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=19213a6c34e1b47a100815ccbfee8b5c70c3c12a
----
-Emit deviceRemoved/Added with the right deviceList set
-
-The problem is quite straightforward, deviceAdded is being emitted when
-the m_deviceList has the OLD list, so the new device is still NOT in it.
-If the user of the library instances a device Solid::Device(UDI) in the
-slot after that signal, the device will be null because it will not be
-found in m_deviceList.
-
-REVIEW: 105132
----
-
-
---- a/solid/solid/backends/fstab/fstabmanager.cpp
-+++ b/solid/solid/backends/fstab/fstabmanager.cpp
-@@ -116,17 +116,19 @@ void FstabManager::_k_updateDeviceList()
-     QSet<QString> newlist = deviceList.toSet();
-     QSet<QString> oldlist = m_deviceList.toSet();
- 
--    foreach(const QString &device, newlist) {
--        if ( !oldlist.contains(device) )
--            emit deviceAdded(udiPrefix() + "/" + device);
--    }
--
-     foreach(const QString &device, oldlist) {
--        if ( !newlist.contains(device) )
-+        if ( !newlist.contains(device) ) {
-             emit deviceRemoved(udiPrefix() + "/" + device);
-+        }
-     }
- 
-     m_deviceList = deviceList;
-+
-+    foreach(const QString &device, newlist) {
-+        if ( !oldlist.contains(device) ) {
-+            emit deviceAdded(udiPrefix() + "/" + device);
-+        }
-+    }
- }
- 
- void FstabManager::onMtabChanged()
-
-
diff --git a/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch b/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch
new file mode 100644
index 0000000..048f2d0
--- /dev/null
+++ b/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch
@@ -0,0 +1,48 @@
+commit 73283f1332e90fbb6fe0caa39a038cb16b83a54c
+Author: David Faure <faure@kde.org>
+Date:   Wed Dec 5 22:42:25 2012 +0100
+
+    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
+
+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
-- 
cgit v1.2.3