pull in upstream fixes

0001-kio-fix-KFileMetaInfo-without-strigi.patch

@@ -0,0 +1,40 @@
+From e328a020645899f25d0afccc196928783d6b59d1 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Thu, 18 Aug 2016 19:08:02 +0200
+Subject: [PATCH] kio: fix KFileMetaInfo without strigi
+
+Provide also empty implementations of the two methods preferredGroups()
+and supportedGroups() of the KFileMetaInfo class, otherwise they are
+left unimplemented when building kdelibs without strigi.
+---
+ kio/kio/kfilemetainfo.cpp | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp
+index cdda72f..e66a6a8 100644
+--- a/kio/kio/kfilemetainfo.cpp
++++ b/kio/kio/kfilemetainfo.cpp
+@@ -479,6 +479,20 @@ QStringList KFileMetaInfo::supportedKeys() const
+ {
+     return QStringList();
+ }
++
++#ifndef KDE_NO_DEPRECATED
++KFileMetaInfoGroupList KFileMetaInfo::preferredGroups() const
++{
++    return KFileMetaInfoGroupList();
++}
++#endif
++
++#ifndef KDE_NO_DEPRECATED
++KFileMetaInfoGroupList KFileMetaInfo::supportedGroups() const
++{
++    return KFileMetaInfoGroupList();
++}
++#endif
+ #endif
+ 
+ KFileMetaInfoItemList KFileMetaInfoGroup::items() const
+-- 
+2.7.4
+

kdelibs.spec

@@ -198,6 +198,7 @@ Patch67: kdelibs-4.14.17-gcc6_narrowing_hack.patch
 
 ## upstream
 # 4.14 branch
+Patch101: 0001-kio-fix-KFileMetaInfo-without-strigi.patch
 
 ## security fix
 
@@ -483,6 +484,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch67 -p1 -b .gcc6_narrowing_hack
 
 # upstream patches
+%patch101 -p1 -b .0001
 
 # security fixes
 
@@ -865,6 +867,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Thu Aug 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.23-4
+- pull in upstream fixes
+
 * Tue Aug 16 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.23-3
 - respin