4.14.24 (kde-apps-16.08.1)

This commit is contained in:
Rex Dieter 2016-09-06 09:36:39 -05:00
parent d822f8a9af
commit 428a617cdd
4 changed files with 8 additions and 47 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/kdelibs-4.14.23.tar.xz
/kdelibs-4.14.24.tar.xz

View File

@ -1,40 +0,0 @@
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

View File

@ -49,9 +49,9 @@
Summary: KDE Libraries
# shipped with kde applications, version...
%global apps_version 16.08.0
Version: 4.14.23
Release: 5%{?dist}
%global apps_version 16.08.1
Version: 4.14.24
Release: 1%{?dist}
Name: kdelibs
Epoch: 6
@ -202,7 +202,6 @@ Patch67: kdelibs-4.14.17-gcc6_narrowing_hack.patch
## upstream
# 4.14 branch
Patch101: 0001-kio-fix-KFileMetaInfo-without-strigi.patch
## security fix
@ -491,7 +490,6 @@ 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
@ -874,6 +872,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Tue Sep 06 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.24-1
- 4.14.24 (kde-apps-16.08.1)
* Sun Aug 28 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.23-5
- backport no_fake_mimetypes fix for f24+ (reviewboard#117135)

View File

@ -1 +1 @@
22856b0f5676df04d92e26927a323265 kdelibs-4.14.23.tar.xz
5bbe1873dd9ff892a3f1101f02e04718 kdelibs-4.14.24.tar.xz