Date: Thursday, April 30, 2015 @ 10:34:07 Author: arojas Revision: 238288
Fix disappearing bookmarks in Dolphin (FS#44186) Added: kdebase/trunk/dolphin-places.patch Modified: kdebase/trunk/PKGBUILD ----------------------+ PKGBUILD | 11 ++++++++--- dolphin-places.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-04-30 08:33:12 UTC (rev 238287) +++ PKGBUILD 2015-04-30 08:34:07 UTC (rev 238288) @@ -14,17 +14,22 @@ 'kdebase-lib' 'kdebase-plasma') pkgver=15.04.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde-applications' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets') -source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66') +source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'dolphin-places.patch') +sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66' + 'a3c0536eece94ac288184ceaed3b6bde9241f2dc') prepare() { mkdir build + +# Fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174 + cd kde-baseapps-$pkgver + patch -p1 -i "$srcdir"/dolphin-places.patch } build() { Added: dolphin-places.patch =================================================================== --- dolphin-places.patch (rev 0) +++ dolphin-places.patch 2015-04-30 08:34:07 UTC (rev 238288) @@ -0,0 +1,26 @@ +From: Emmanuel Pescosta <emmanuelpescosta...@gmail.com> +Date: Thu, 30 Apr 2015 08:12:24 +0000 +Subject: Use user-places.xbel instead of bookmarks.xml in places model. +X-Git-Url: http://quickgit.kde.org/?p=kde-baseapps.git&a=commitdiff&h=270d2affaafcc9e87ba14f82bfe579e22607e2d2 +--- +Use user-places.xbel instead of bookmarks.xml in places model. + +FIXED-IN: 15.04.1 +CCBUG: 345174 +--- + + +--- a/dolphin/src/panels/places/placesitemmodel.cpp ++++ b/dolphin/src/panels/places/placesitemmodel.cpp +@@ -85,8 +85,8 @@ + Baloo::IndexerConfig config; + m_fileIndexingEnabled = config.fileIndexingEnabled(); + #endif +- const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"); +- m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); ++ const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel"; ++ m_bookmarkManager = KBookmarkManager::managerForExternalFile(file); + + createSystemBookmarks(); + initializeAvailableDevices(); +