git » kio.git » commit f992291

diff --git a/PKGBUILD b/PKGBUILD
index dbeb860..32421ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kio
-pkgver=5.13.0
-pkgrel=3
+pkgver=5.14.0
+pkgrel=1
 pkgdesc='Resource and network access abstraction'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/kio'
@@ -14,16 +14,13 @@ makedepends=('extra-cmake-modules' 'kdoctools')
 optdepends=('kio-extras: extra protocols support (sftp, fish and more)')
 groups=('kf5')
 install=kio.install
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" 'custom-folder-icons.patch')
-md5sums=('315c79dc4fb128343d18bfd9ef18a726'
-         '9b534ca29ef53644344541c5c770ff51')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('aad540c6a23327756c259afe72e531d1')
 
 prepare() {
   mkdir -p build
 
-# Fix custom folder icons https://bugs.kde.org/show_bug.cgi?id=350612
   cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir"/custom-folder-icons.patch
 }
 
 build() {
diff --git a/custom-folder-icons.patch b/custom-folder-icons.patch
deleted file mode 100644
index 024059d..0000000
--- a/custom-folder-icons.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
-Date: Tue, 11 Aug 2015 18:13:52 +0000
-Subject: Show custom folder icons again
-X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=d8aafbc37daab3cd62ee77430a55b3d72ccc12e0
----
-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;
-     }
- 
-