Hello community, here is the log from the commit of package dolphin for openSUSE:Factory checked in at 2016-04-01 13:00:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin (Old) and /work/SRC/openSUSE:Factory/.dolphin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin" Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes 2016-03-26 15:12:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dolphin.new/dolphin.changes 2016-04-01 13:00:57.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Mar 25 16:37:37 UTC 2016 - [email protected] + +- Added Fix-wrong-path-URL-conversion.patch: fixes display of + additional file metadata in dolphin's filelist for indexed files + (boo#970896) + +------------------------------------------------------------------- New: ---- Fix-wrong-path-URL-conversion.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin.spec ++++++ --- /var/tmp/diff_new_pack.PTpO5b/_old 2016-04-01 13:00:58.000000000 +0200 +++ /var/tmp/diff_new_pack.PTpO5b/_new 2016-04-01 13:00:58.000000000 +0200 @@ -26,6 +26,8 @@ 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 @@ %prep %setup -q -n dolphin-%{version} %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ Fix-wrong-path-URL-conversion.patch ++++++ From: David Faure <[email protected]> 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);
