From 2f8b14311e305e0836390237445118c36d8e1c153e39c77a9a1780f417fc4417 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Tue, 9 Sep 2014 10:14:49 +0000
Subject: [PATCH] 5.2.0

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=35
---
 0001-Fix-thumbnails-for-mimetype-groups.patch | 52 +++++++++++++++++++
 kio-5.1.0.tar.xz                              |  3 --
 kio-5.2.0.tar.xz                              |  3 ++
 kio.changes                                   |  9 ++++
 kio.spec                                      |  7 ++-
 5 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 0001-Fix-thumbnails-for-mimetype-groups.patch
 delete mode 100644 kio-5.1.0.tar.xz
 create mode 100644 kio-5.2.0.tar.xz

diff --git a/0001-Fix-thumbnails-for-mimetype-groups.patch b/0001-Fix-thumbnails-for-mimetype-groups.patch
new file mode 100644
index 0000000..db30eea
--- /dev/null
+++ b/0001-Fix-thumbnails-for-mimetype-groups.patch
@@ -0,0 +1,52 @@
+From c372f9d634fa61aff5d4df6700ed294433df913b Mon Sep 17 00:00:00 2001
+From: Maarten De Meyer <de.meyer.maarten@gmail.com>
+Date: Mon, 8 Sep 2014 23:58:55 +0200
+Subject: [PATCH] Fix thumbnails for mimetype groups.
+
+KService::mimeTypes cannot handle mimetype groups. ex: text/*
+Go back to KService::serviceTypes and remove 'ThumbCreator' entries.
+
+REVIEW: 119958
+---
+ src/widgets/previewjob.cpp | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
+index 55a3fb7..c8ea2b7 100644
+--- a/src/widgets/previewjob.cpp
++++ b/src/widgets/previewjob.cpp
+@@ -268,20 +268,25 @@ void PreviewJobPrivate::startPreview()
+             protocols.append(p);
+         }
+         foreach (const QString &protocol, protocols) {
+-            const QStringList mtypes = (*it)->mimeTypes();
++            // We cannot use mimeTypes() here, it doesn't support groups. text/*
++            const QStringList mtypes = (*it)->serviceTypes();
+             // Add supported mimetype for this protocol
+             QStringList &_ms = m_remoteProtocolPlugins[protocol];
+             foreach (const QString &_m, mtypes) {
+-                protocolMap[protocol].insert(_m, *it);
+-                if (!_ms.contains(_m)) {
+-                    _ms.append(_m);
++                if (_m != QLatin1String("ThumbCreator")) {
++                    protocolMap[protocol].insert(_m, *it);
++                    if (!_ms.contains(_m)) {
++                        _ms.append(_m);
++                    }
+                 }
+             }
+         }
+         if (enabledPlugins.contains((*it)->desktopEntryName())) {
+-            const QStringList mimeTypes = (*it)->mimeTypes();
++            const QStringList mimeTypes = (*it)->serviceTypes();
+             for (QStringList::ConstIterator mt = mimeTypes.constBegin(); mt != mimeTypes.constEnd(); ++mt) {
+-                mimeMap.insert(*mt, *it);
++                if (*mt != QLatin1String("ThumbCreator")) {
++                    mimeMap.insert(*mt, *it);
++                }
+             }
+         }
+     }
+-- 
+2.1.0
+
diff --git a/kio-5.1.0.tar.xz b/kio-5.1.0.tar.xz
deleted file mode 100644
index 615e6ad..0000000
--- a/kio-5.1.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73ceb6be282b9ceb0bc8ca12ddbc2c10cf215ec8807455136cdcb91fbf5c3dab
-size 2251736
diff --git a/kio-5.2.0.tar.xz b/kio-5.2.0.tar.xz
new file mode 100644
index 0000000..8447ec0
--- /dev/null
+++ b/kio-5.2.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7be3026dbf32efb6245ca4443cec2c0be52e0b303e396cbb70c2e09834046db
+size 2253536
diff --git a/kio.changes b/kio.changes
index d8743ad..e2620da 100644
--- a/kio.changes
+++ b/kio.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep  9 09:49:34 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.2.0
+  * For more details please see:
+    http://kde.org/announcements/kde-frameworks-5.2.php
+- Added 0001-Fix-thumbnails-for-mimetype-groups.patch, fixes thumbnail
+  generation for mimetypes with wildcard usage
+
 -------------------------------------------------------------------
 Sat Aug  2 10:20:18 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/kio.spec b/kio.spec
index 7595f66..7016542 100644
--- a/kio.spec
+++ b/kio.spec
@@ -17,11 +17,11 @@
 
 
 Name:           kio
-Version:        5.1.0
+Version:        5.2.0
 Release:        0
 %define kf5_version %{version}
 BuildRequires:  cmake >= 2.8.12
-BuildRequires:  extra-cmake-modules >= 1.1.0
+BuildRequires:  extra-cmake-modules >= 1.2.0
 BuildRequires:  fdupes
 BuildRequires:  karchive-devel >= %{kf5_version}
 BuildRequires:  kbookmarks-devel >= %{kf5_version}
@@ -66,6 +66,8 @@ Group:          System/GUI/KDE
 Url:            http://www.kde.org
 Source:         http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
+# PATCH-FIX-UPSTREAM  0001-Fix-thumbnails-for-mimetype-groups.patch -- https://git.reviewboard.kde.org/r/119958/
+Patch0:         0001-Fix-thumbnails-for-mimetype-groups.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -95,6 +97,7 @@ Development files.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %build
   %cmake_kf5 -d build