From 8f760de53ce7f8b1a260ba83da1af5bc4d59db5b Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 30 Apr 2015 12:39:43 -0300
Subject: kdebase-konqueror-15.04.0-3.parabola1: fix disappearing bookmarks in
 Dolphin (FS#44186 -> https://bugs.archlinux.org/task/44186)

---
 libre/kdebase-konqueror/PKGBUILD             | 11 +++++++----
 libre/kdebase-konqueror/dolphin-places.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 libre/kdebase-konqueror/dolphin-places.patch

(limited to 'libre')

diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD
index 139cb33e8..0b8c3fb2b 100644
--- a/libre/kdebase-konqueror/PKGBUILD
+++ b/libre/kdebase-konqueror/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 237809 2015-04-20 22:20:06Z arojas $
+# $Id: PKGBUILD 238288 2015-04-30 08:34:07Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
@@ -7,7 +7,7 @@
 
 pkgname='kdebase-konqueror'
 pkgver=15.04.0
-pkgrel=2.parabola1
+pkgrel=3.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
 license=('GPL' 'LGPL' 'FDL')
@@ -16,9 +16,10 @@ conflicts=('kdebase-nsplugins' 'kdebase-konqueror-libre')
 replaces=('kdebase-nsplugins' 'kdebase-konqueror-libre')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets')
 source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
-        'konq-about-fsdg.diff')
+        'konq-about-fsdg.diff' 'dolphin-places.patch')
 sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66'
-          'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
+          'd6cbb53c04179b8180f9439eca156b7ff2e76b3a'
+          'a3c0536eece94ac288184ceaed3b6bde9241f2dc')
 pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
 optdepends=('kwebkitpart: to enable webkit engine')
@@ -30,6 +31,8 @@ prepare() {
   cd kde-baseapps-${pkgver}
   # Don't recommend nonfree software or Google.
   patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
+  # Fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174
+  patch -p1 -i "$srcdir"/dolphin-places.patch
 }
 
 build() {
diff --git a/libre/kdebase-konqueror/dolphin-places.patch b/libre/kdebase-konqueror/dolphin-places.patch
new file mode 100644
index 000000000..2a2bfcba1
--- /dev/null
+++ b/libre/kdebase-konqueror/dolphin-places.patch
@@ -0,0 +1,26 @@
+From: Emmanuel Pescosta <emmanuelpescosta099@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();
+
-- 
cgit v1.2.3-54-g00ecf