Accepting request 330675 from KDE:Frameworks5

Update to 5.14.0

OBS-URL: https://build.opensuse.org/request/show/330675
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=22

kio-5.13.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c31fde0c554859f9241a1dbdc854405d7cb358085ac7c703c7bb4105748bdbd4
-size 2848760

kio-5.14.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2aa35888d93e8f41d0c43c20b6566f918824905676e9d1bce708c239cacb31af
+size 2848028

kio.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Sep  8 17:13:14 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.14.0
+  * Use Q_OS_WIN instead of Q_OS_WINDOWS
+  * Make KDE_FORK_SLAVES work under Windows
+  * Disable installation of desktop file for ProxyScout kded module
+  * Provide deterministic sort order for
+    KDirSortFilterProxyModelPrivate::compare
+  * Show custom folder icons again (kde#350612)
+  * Move kpasswdserver from kded to kiod
+  * Fix porting bugs in kpasswdserver
+  * Remove legacy code for talking very very old versions
+    of kpasswdserver.
+  * KDirListerTest: use QTRY_COMPARE on both statements,
+    to fix race showed by CI
+  * KFilePlacesModel: implement old TODO about using trashrc
+    instead of a full-blown KDirLister.
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.14.0.php
+- Drop show-custom-folder-icons-sgain.patch, merged upstream
+
 -------------------------------------------------------------------
 Tue Aug 18 16:16:22 UTC 2015 - hrvoje.senjan@gmail.com
 

kio.spec

@@ -17,9 +17,9 @@
 
 
 %bcond_without lang
-%define _tar_path 5.13
+%define _tar_path 5.14
 Name:           kio
-Version:        5.13.0
+Version:        5.14.0
 Release:        0
 %define kf5_version %{version}
 BuildRequires:  cmake >= 2.8.12
@@ -75,8 +75,6 @@ Source:         http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
 Source1:        baselibs.conf
 # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
 Patch0:         kio_help-fallback-to-kde4-docs.patch
-# PATCH-FIX-UPSTREAM show-custom-folder-icons-sgain.patch
-Patch1:         show-custom-folder-icons-sgain.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -123,7 +121,6 @@ Development files.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
   %cmake_kf5 -d build
@@ -217,14 +214,12 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
 %{_kf5_plugindir}/kcm_webshortcuts.so
 %dir %{_kf5_plugindir}/kf5/kded
 %{_kf5_plugindir}/kf5/kded/kcookiejar.so
-%{_kf5_plugindir}/kf5/kded/kpasswdserver.so
 %{_kf5_plugindir}/kf5/kded/proxyscout.so
+%{_kf5_plugindir}/kf5/kiod/kpasswdserver.so
 %{_kf5_plugindir}/kf5/urifilters/
 %{_kf5_servicesdir}/cache.desktop
 %{_kf5_servicesdir}/cookies.desktop
 %{_kf5_servicesdir}/fixhosturifilter.desktop
-%dir %{_kf5_servicesdir}/kded
-%{_kf5_servicesdir}/kded/proxyscout.desktop
 %{_kf5_servicesdir}/kshorturifilter.desktop
 %{_kf5_servicesdir}/kuriikwsfilter.desktop
 %{_kf5_servicesdir}/kurisearchfilter.desktop

show-custom-folder-icons-sgain.patch

@@ -1,92 +0,0 @@
-From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
-Date: Tue, 11 Aug 2015 18:13:52 +0000
-Subject: Show custom folder icons again
----
-Show custom folder icons again
-
-Set mimetype as known when we assign the mime type for inode/directory
-
-This bug was introduced by commit 46cd152f
-
-BUG: 350612
-FIXED-IN: 5.14
-REVIEW: 124690
----
-
-
---- a/autotests/kfileitemtest.cpp
-+++ b/autotests/kfileitemtest.cpp
-@@ -25,6 +25,8 @@
- #include <qtemporarydir.h>
- #include <qtemporaryfile.h>
- #include <kuser.h>
-+#include <kdesktopfile.h>
-+#include <kconfiggroup.h>
- 
- QTEST_MAIN(KFileItemTest)
- 
-@@ -472,6 +474,25 @@
-     QCOMPARE(fileItem.currentMimeType().name(), udsMimeType);
- }
- 
-+void KFileItemTest::testIconNameForCustomFolderIcons()
-+{
-+    // Custom folder icons should be displayed (bug 350612)
-+
-+    const QString iconName = QStringLiteral("folder-music");
-+
-+    QTemporaryDir tempDir;
-+    const QUrl url = QUrl::fromLocalFile(tempDir.path());
-+    KDesktopFile cfg(tempDir.path() + QString::fromLatin1("/.directory"));
-+    cfg.desktopGroup().writeEntry("Icon", iconName);
-+    cfg.sync();
-+
-+    KIO::UDSEntry entry;
-+    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
-+    KFileItem fileItem(entry, url);
-+
-+    QCOMPARE(fileItem.iconName(), iconName);
-+}
-+
- #ifndef Q_OS_WIN // user/group/other write permissions are not handled on windows
- 
- void KFileItemTest::testIsReadable_data()
-
---- a/autotests/kfileitemtest.h
-+++ b/autotests/kfileitemtest.h
-@@ -41,6 +41,7 @@
-     void testMimetypeForRemoteFolderWithFileType();
-     void testCurrentMimetypeForRemoteFolder();
-     void testCurrentMimetypeForRemoteFolderWithFileType();
-+    void testIconNameForCustomFolderIcons();
- 
- #ifndef Q_OS_WIN
-     void testIsReadable_data();
-
---- a/src/core/kfileitem.cpp
-+++ b/src/core/kfileitem.cpp
-@@ -732,15 +732,15 @@
-         QMimeDatabase db;
-         if (isDir()) {
-             d->m_mimeType = db.mimeTypeForName("inode/directory");
--            return d->m_mimeType;
--        }
--        bool isLocalUrl;
--        const QUrl url = mostLocalUrl(&isLocalUrl);
--        d->m_mimeType = db.mimeTypeForUrl(url);
--        // was:  d->m_mimeType = KMimeType::findByUrl( url, d->m_fileMode, isLocalUrl );
--        // => we are no longer using d->m_fileMode for remote URLs.
--        Q_ASSERT(d->m_mimeType.isValid());
--        //qDebug() << d << "finding final mimetype for" << url << ":" << d->m_mimeType.name();
-+        } else {
-+            bool isLocalUrl;
-+            const QUrl url = mostLocalUrl(&isLocalUrl);
-+            d->m_mimeType = db.mimeTypeForUrl(url);
-+            // was:  d->m_mimeType = KMimeType::findByUrl( url, d->m_fileMode, isLocalUrl );
-+            // => we are no longer using d->m_fileMode for remote URLs.
-+            Q_ASSERT(d->m_mimeType.isValid());
-+            //qDebug() << d << "finding final mimetype for" << url << ":" << d->m_mimeType.name();
-+        }
-         d->m_bMimeTypeKnown = true;
-     }
-