diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-05-14 04:44:50 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-05-14 04:44:50 -0300 |
| commit | 38136f61464f0d1a198f690a248d3ba8f863d810 (patch) | |
| tree | ca8e36721b689516908ee419ab005633b972f74d | |
| parent | aa3be8bdfd896e69b3b33c3dfa8ed3e9450452e4 (diff) | |
kdebase-konqueror-15.04.1-1.parabola1: updating version
| -rw-r--r-- | libre/kdebase-konqueror/PKGBUILD | 15 | ||||
| -rw-r--r-- | libre/kdebase-konqueror/dolphin-places.patch | 26 |
2 files changed, 6 insertions, 35 deletions
diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD index 0b8c3fb2b..617b33bf4 100644 --- a/libre/kdebase-konqueror/PKGBUILD +++ b/libre/kdebase-konqueror/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 238288 2015-04-30 08:34:07Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> @@ -6,8 +6,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname='kdebase-konqueror' -pkgver=15.04.0 -pkgrel=3.parabola1 +pkgver=15.04.1 +pkgrel=1.parabola1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') @@ -16,10 +16,9 @@ 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' 'dolphin-places.patch') -sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66' - 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a' - 'a3c0536eece94ac288184ceaed3b6bde9241f2dc') + 'konq-about-fsdg.diff') +sha1sums=('099c2d63bd3482936966445950fa290a6dc43550' + 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') optdepends=('kwebkitpart: to enable webkit engine') @@ -31,8 +30,6 @@ 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 deleted file mode 100644 index 2a2bfcba1..000000000 --- a/libre/kdebase-konqueror/dolphin-places.patch +++ /dev/null @@ -1,26 +0,0 @@ -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(); - |