[arch-commits] Commit in kio/repos (8 files)

Antonio Rojas arojas at archlinux.org
Fri Aug 14 22:57:43 UTC 2015


    Date: Saturday, August 15, 2015 @ 00:57:42
  Author: arojas
Revision: 243719

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kio/repos/testing-i686/PKGBUILD
    (from rev 243718, kio/trunk/PKGBUILD)
  kio/repos/testing-i686/custom-folder-icons.patch
    (from rev 243718, kio/trunk/custom-folder-icons.patch)
  kio/repos/testing-i686/kio.install
    (from rev 243718, kio/trunk/kio.install)
  kio/repos/testing-x86_64/custom-folder-icons.patch
    (from rev 243718, kio/trunk/custom-folder-icons.patch)
Deleted:
  kio/repos/testing-i686/PKGBUILD
  kio/repos/testing-i686/kio.install
  kio/repos/testing-x86_64/PKGBUILD
  kio/repos/testing-x86_64/kio.install

------------------------------------------+
 /PKGBUILD                                |   45 +++++++++++++
 /kio.install                             |   11 +++
 testing-i686/PKGBUILD                    |   45 -------------
 testing-i686/custom-folder-icons.patch   |   94 +++++++++++++++++++++++++++++
 testing-i686/kio.install                 |   11 ---
 testing-x86_64/PKGBUILD                  |   45 -------------
 testing-x86_64/custom-folder-icons.patch |   94 +++++++++++++++++++++++++++++
 testing-x86_64/kio.install               |   11 ---
 8 files changed, 244 insertions(+), 112 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2015-08-14 22:55:58 UTC (rev 243718)
+++ testing-i686/PKGBUILD	2015-08-14 22:57:42 UTC (rev 243719)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kio
-pkgver=5.13.0
-pkgrel=2
-pkgdesc='Resource and network access abstraction'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kio'
-license=('LGPL')
-depends=('solid' 'karchive' 'kjobwidgets' 'kbookmarks' 'libxslt' 'kwallet'
-        'desktop-file-utils')
-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')
-
-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() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
-    -DLIBEXEC_INSTALL_DIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: kio/repos/testing-i686/PKGBUILD (from rev 243718, kio/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-08-14 22:57:42 UTC (rev 243719)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kio
+pkgver=5.13.0
+pkgrel=2
+pkgdesc='Resource and network access abstraction'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kio'
+license=('LGPL')
+depends=('solid' 'karchive' 'kjobwidgets' 'kbookmarks' 'libxslt' 'kwallet'
+        'desktop-file-utils')
+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')
+
+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() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_INSTALL_DIR=lib \
+    -DLIBEXEC_INSTALL_DIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Copied: kio/repos/testing-i686/custom-folder-icons.patch (from rev 243718, kio/trunk/custom-folder-icons.patch)
===================================================================
--- testing-i686/custom-folder-icons.patch	                        (rev 0)
+++ testing-i686/custom-folder-icons.patch	2015-08-14 22:57:42 UTC (rev 243719)
@@ -0,0 +1,94 @@
+From: Emmanuel Pescosta <emmanuelpescosta099 at 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;
+     }
+ 
+

Deleted: testing-i686/kio.install
===================================================================
--- testing-i686/kio.install	2015-08-14 22:55:58 UTC (rev 243718)
+++ testing-i686/kio.install	2015-08-14 22:57:42 UTC (rev 243719)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: kio/repos/testing-i686/kio.install (from rev 243718, kio/trunk/kio.install)
===================================================================
--- testing-i686/kio.install	                        (rev 0)
+++ testing-i686/kio.install	2015-08-14 22:57:42 UTC (rev 243719)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2015-08-14 22:55:58 UTC (rev 243718)
+++ testing-x86_64/PKGBUILD	2015-08-14 22:57:42 UTC (rev 243719)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kio
-pkgver=5.13.0
-pkgrel=2
-pkgdesc='Resource and network access abstraction'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kio'
-license=('LGPL')
-depends=('solid' 'karchive' 'kjobwidgets' 'kbookmarks' 'libxslt' 'kwallet'
-        'desktop-file-utils')
-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')
-
-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() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
-    -DLIBEXEC_INSTALL_DIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: kio/repos/testing-x86_64/custom-folder-icons.patch (from rev 243718, kio/trunk/custom-folder-icons.patch)
===================================================================
--- testing-x86_64/custom-folder-icons.patch	                        (rev 0)
+++ testing-x86_64/custom-folder-icons.patch	2015-08-14 22:57:42 UTC (rev 243719)
@@ -0,0 +1,94 @@
+From: Emmanuel Pescosta <emmanuelpescosta099 at 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;
+     }
+ 
+

Deleted: testing-x86_64/kio.install
===================================================================
--- testing-x86_64/kio.install	2015-08-14 22:55:58 UTC (rev 243718)
+++ testing-x86_64/kio.install	2015-08-14 22:57:42 UTC (rev 243719)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}



More information about the arch-commits mailing list