Accepting request 380448 from KDE:Applications

1

OBS-URL: https://build.opensuse.org/request/show/380448
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dolphin?expand=0&rev=12

Fix-wrong-path-URL-conversion.patch

@@ -0,0 +1,48 @@
+From: David Faure <faure@kde.org>
+Date: Sat, 28 Nov 2015 22:44:47 +0000
+Subject: Fix wrong path->URL conversion.
+X-Git-Tag: v16.03.80
+X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=35b35d0c5f62641a685282d25ea204e7004e09c0
+---
+Fix wrong path->URL conversion.
+---
+
+
+--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
++++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
+@@ -717,7 +717,13 @@
+         // the corresponding file has been deleted in the meantime.
+         return;
+     }
+-
++    applyChangedBalooRolesForItem(item);
++#endif
++}
++
++void KFileItemModelRolesUpdater::applyChangedBalooRolesForItem(const KFileItem &item)
++{
++#ifdef HAVE_BALOO
+     Baloo::File file(item.localPath());
+     file.load();
+ 
+@@ -1089,7 +1095,7 @@
+ #ifdef HAVE_BALOO
+     if (m_balooFileMonitor) {
+         m_balooFileMonitor->addFile(item.localPath());
+-        applyChangedBalooRoles(item.localPath());
++        applyChangedBalooRolesForItem(item);
+     }
+ #endif
+     return data;
+
+--- a/src/kitemviews/kfileitemmodelrolesupdater.h
++++ b/src/kitemviews/kfileitemmodelrolesupdater.h
+@@ -211,6 +211,7 @@
+     void resolveRecentlyChangedItems();
+ 
+     void applyChangedBalooRoles(const QString& file);
++    void applyChangedBalooRolesForItem(const KFileItem& file);
+ 
+     void slotDirectoryContentsCountReceived(const QString& path, int count);
+ 
+

dolphin.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 25 16:37:37 UTC 2016 - wbauer@tmo.at
+
+- Added Fix-wrong-path-URL-conversion.patch: fixes display of
+  additional file metadata in dolphin's filelist for indexed files
+  (boo#970896)
+
 -------------------------------------------------------------------
 Sun Mar 13 15:34:13 UTC 2016 - tittiatcoke@gmail.com
 

dolphin.spec

@@ -26,6 +26,8 @@ Url:            http://www.kde.org/
 Source:         dolphin-%{version}.tar.xz
 Source1:        dolphinsu.desktop
 Patch0:         dolphin-go_up.diff
+# PATCH-FIX-UPSTREAM Fix-wrong-path-URL-conversion.patch boo#970896 -- fixes display of additional file metadata in dolphin's filelist
+Patch1:         Fix-wrong-path-URL-conversion.patch
 BuildRequires:  baloo5-devel
 BuildRequires:  baloo5-widgets-devel
 BuildRequires:  extra-cmake-modules >= 1.6.0
@@ -94,6 +96,7 @@ This package contains the libraries used by Dolphin and Konqueror.
 %prep
 %setup -q -n dolphin-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
   %cmake_kf5 -d build