diff --git a/Fix-wrong-path-URL-conversion.patch b/Fix-wrong-path-URL-conversion.patch deleted file mode 100644 index 465712f..0000000 --- a/Fix-wrong-path-URL-conversion.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: David Faure -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); - - diff --git a/dolphin-15.12.3.tar.xz b/dolphin-15.12.3.tar.xz deleted file mode 100644 index e86a13d..0000000 --- a/dolphin-15.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26c347bbf65ec635162b86564c1f4693334d24afe16448f93fdacf6291d3bddd -size 658572 diff --git a/dolphin-16.04.1.tar.xz b/dolphin-16.04.1.tar.xz new file mode 100644 index 0000000..c53aa55 --- /dev/null +++ b/dolphin-16.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d90cdcdaecb384068bcaed870f3a1218df2dc4a010f851c15fb168fc28e0a5 +size 659948 diff --git a/dolphin.changes b/dolphin.changes index f9b9116..4f90202 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Sat May 7 10:11:20 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + +- Drop upstreamed patch specify-fallback-icon.patch + + +------------------------------------------------------------------- +Tue Apr 26 14:32:54 UTC 2016 - wbauer@tmo.at + +- Added specify-fallback-icon.patch: fixes missing icons for + certain filetypes where the specified icon doesn't exist + (kde#358958, kde#361034) + +------------------------------------------------------------------- +Sun Apr 17 05:50:36 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:31:12 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + +- Drop upstreamed patch Fix-wrong-path-URL-conversion.patch + ------------------------------------------------------------------- Fri Mar 25 16:37:37 UTC 2016 - wbauer@tmo.at diff --git a/dolphin.spec b/dolphin.spec index b70fb7f..8e1914d 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -17,7 +17,7 @@ Name: dolphin -Version: 15.12.3 +Version: 16.04.1 Release: 0 Summary: KDE File Manager License: GPL-2.0+ @@ -26,8 +26,6 @@ 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 @@ -96,7 +94,6 @@ 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