From 428a617cddc2aa3e8d2b2cfe12086b572e7f6dfc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 6 Sep 2016 09:36:39 -0500 Subject: [PATCH] 4.14.24 (kde-apps-16.08.1) --- .gitignore | 2 +- ...kio-fix-KFileMetaInfo-without-strigi.patch | 40 ------------------- kdelibs.spec | 11 ++--- sources | 2 +- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 0001-kio-fix-KFileMetaInfo-without-strigi.patch diff --git a/.gitignore b/.gitignore index b9b61df..ca35773 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kdelibs-4.14.23.tar.xz +/kdelibs-4.14.24.tar.xz diff --git a/0001-kio-fix-KFileMetaInfo-without-strigi.patch b/0001-kio-fix-KFileMetaInfo-without-strigi.patch deleted file mode 100644 index c2258e7..0000000 --- a/0001-kio-fix-KFileMetaInfo-without-strigi.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e328a020645899f25d0afccc196928783d6b59d1 Mon Sep 17 00:00:00 2001 -From: Pino Toscano -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 - diff --git a/kdelibs.spec b/kdelibs.spec index b410ba9..141ef75 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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 - 6:4.14.24-1 +- 4.14.24 (kde-apps-16.08.1) + * Sun Aug 28 2016 Rex Dieter - 6:4.14.23-5 - backport no_fake_mimetypes fix for f24+ (reviewboard#117135) diff --git a/sources b/sources index c01603b..1270edb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22856b0f5676df04d92e26927a323265 kdelibs-4.14.23.tar.xz +5bbe1873dd9ff892a3f1101f02e04718 kdelibs-4.14.24.tar.xz