[arch-commits] Commit in kio/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Thu Apr 30 08:33:12 UTC 2015
Date: Thursday, April 30, 2015 @ 10:33:12
Author: arojas
Revision: 238287
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kio/repos/extra-i686/PKGBUILD
(from rev 238286, kio/trunk/PKGBUILD)
kio/repos/extra-i686/dolphin-places.patch
(from rev 238286, kio/trunk/dolphin-places.patch)
kio/repos/extra-i686/kio.install
(from rev 238286, kio/trunk/kio.install)
kio/repos/extra-x86_64/PKGBUILD
(from rev 238286, kio/trunk/PKGBUILD)
kio/repos/extra-x86_64/dolphin-places.patch
(from rev 238286, kio/trunk/dolphin-places.patch)
kio/repos/extra-x86_64/kio.install
(from rev 238286, kio/trunk/kio.install)
Deleted:
kio/repos/extra-i686/PKGBUILD
kio/repos/extra-i686/kio.install
kio/repos/extra-x86_64/PKGBUILD
kio/repos/extra-x86_64/kio.install
-----------------------------------+
/PKGBUILD | 88 +++++++++++++++++++++++++
/kio.install | 22 ++++++
extra-i686/PKGBUILD | 39 -----------
extra-i686/dolphin-places.patch | 122 ++++++++++++++++++++++++++++++++++++
extra-i686/kio.install | 11 ---
extra-x86_64/PKGBUILD | 39 -----------
extra-x86_64/dolphin-places.patch | 122 ++++++++++++++++++++++++++++++++++++
extra-x86_64/kio.install | 11 ---
8 files changed, 354 insertions(+), 100 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-04-30 08:31:51 UTC (rev 238286)
+++ extra-i686/PKGBUILD 2015-04-30 08:33:12 UTC (rev 238287)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kio
-pkgver=5.9.0
-pkgrel=1
-pkgdesc='Resource and network access abstraction'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kio'
-license=('LGPL')
-depends=('solid' 'karchive' 'kjobwidgets' 'kbookmarks' 'libxslt' 'kwallet'
- 'desktop-file-utils')
-makedepends=('extra-cmake-modules' 'kdoctools')
-groups=('kf5')
-install=kio.install
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('2fe89d374583bf38a091edc74b9bc1d3')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DLIBEXEC_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kio/repos/extra-i686/PKGBUILD (from rev 238286, kio/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-04-30 08:33:12 UTC (rev 238287)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kio
+pkgver=5.9.0
+pkgrel=2
+pkgdesc='Resource and network access abstraction'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kio'
+license=('LGPL')
+depends=('solid' 'karchive' 'kjobwidgets' 'kbookmarks' 'libxslt' 'kwallet'
+ 'desktop-file-utils')
+makedepends=('extra-cmake-modules' 'kdoctools')
+groups=('kf5')
+install=kio.install
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" 'dolphin-places.patch')
+md5sums=('2fe89d374583bf38a091edc74b9bc1d3'
+ '9700937823277d19f6f7d440f63f0954')
+
+prepare() {
+ mkdir -p build
+
+# Fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/dolphin-places.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DLIBEXEC_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kio/repos/extra-i686/dolphin-places.patch (from rev 238286, kio/trunk/dolphin-places.patch)
===================================================================
--- extra-i686/dolphin-places.patch (rev 0)
+++ extra-i686/dolphin-places.patch 2015-04-30 08:33:12 UTC (rev 238287)
@@ -0,0 +1,122 @@
+From: Emmanuel Pescosta <emmanuelpescosta099 at gmail.com>
+Date: Mon, 27 Apr 2015 12:15:49 +0000
+Subject: Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only.
+X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=e919daeb5b144b146dbf459fadb116729b866d21
+---
+Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only.
+
+REVIEW: 123525
+BUG: 345174
+FIXED-IN: 5.10
+
+CHANGELOG: Store bookmarks only in user-places.xbel.
+---
+
+
+--- a/src/filewidgets/CMakeLists.txt
++++ b/src/filewidgets/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ kfilewidget.cpp
+ kfileplacesitem.cpp
+ kfileplacesmodel.cpp
+- kfileplacessharedbookmarks.cpp
+ kfileplacesview.cpp
+ kfileplaceeditdialog.cpp
+ kfilepreviewgenerator.cpp
+
+--- a/src/filewidgets/kfileplacesmodel.cpp
++++ b/src/filewidgets/kfileplacesmodel.cpp
+@@ -19,7 +19,6 @@
+ */
+ #include "kfileplacesmodel.h"
+ #include "kfileplacesitem_p.h"
+-#include "kfileplacessharedbookmarks_p.h"
+
+ #ifdef _WIN32_WCE
+ #include "Windows.h"
+@@ -60,10 +59,9 @@
+ class KFilePlacesModel::Private
+ {
+ public:
+- Private(KFilePlacesModel *self) : q(self), bookmarkManager(0), sharedBookmarks(0) {}
++ Private(KFilePlacesModel *self) : q(self), bookmarkManager(0) {}
+ ~Private()
+ {
+- delete sharedBookmarks;
+ qDeleteAll(items);
+ }
+
+@@ -75,7 +73,6 @@
+
+ Solid::Predicate predicate;
+ KBookmarkManager *bookmarkManager;
+- KFilePlacesSharedBookmarks *sharedBookmarks;
+
+ void reloadAndSignal();
+ QList<KFilePlacesItem *> loadBookmarkList();
+@@ -92,8 +89,8 @@
+ KFilePlacesModel::KFilePlacesModel(QObject *parent)
+ : QAbstractItemModel(parent), d(new Private(this))
+ {
+- const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kfileplaces/bookmarks.xml";
+- d->bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
++ const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/user-places.xbel";
++ d->bookmarkManager = KBookmarkManager::managerForExternalFile(file);
+
+ // Let's put some places in there if it's empty. We have a corner case here:
+ // Given you have bookmarked some folders (which have been saved on
+@@ -144,9 +141,6 @@
+ // user-places.xbel will be filled later). (ereslibre)
+ d->bookmarkManager->saveAs(file);
+ }
+-
+- // create after, so if we have own places, they are added afterwards, in case of equal priorities
+- d->sharedBookmarks = new KFilePlacesSharedBookmarks(d->bookmarkManager);
+
+ QString predicate("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]"
+ " OR "
+@@ -656,8 +650,6 @@
+ return false;
+ }
+
+- d->sharedBookmarks->updateSharedBookmarks();
+-
+ d->reloadAndSignal();
+
+ return true;
+@@ -684,8 +676,6 @@
+ KFilePlacesItem *item = static_cast<KFilePlacesItem *>(after.internalPointer());
+ d->bookmarkManager->root().moveBookmark(bookmark, item->bookmark());
+ }
+-
+- d->sharedBookmarks->updateSharedBookmarks();
+
+ d->reloadAndSignal();
+ }
+@@ -714,8 +704,6 @@
+ bookmark.setIcon(iconName);
+ bookmark.setMetaDataItem("OnlyInApp", appName);
+
+- d->sharedBookmarks->updateSharedBookmarks();
+-
+ d->reloadAndSignal();
+ emit dataChanged(index, index);
+ }
+@@ -739,7 +727,6 @@
+ }
+
+ d->bookmarkManager->root().deleteBookmark(bookmark);
+- d->sharedBookmarks->updateSharedBookmarks();
+ d->reloadAndSignal();
+ }
+
+@@ -758,8 +745,6 @@
+ }
+
+ bookmark.setMetaDataItem("IsHidden", (hidden ? "true" : "false"));
+-
+- d->sharedBookmarks->updateSharedBookmarks();
+
+ d->reloadAndSignal();
+ emit dataChanged(index, index);
+
Deleted: extra-i686/kio.install
===================================================================
--- extra-i686/kio.install 2015-04-30 08:31:51 UTC (rev 238286)
+++ extra-i686/kio.install 2015-04-30 08:33:12 UTC (rev 238287)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kio/repos/extra-i686/kio.install (from rev 238286, kio/trunk/kio.install)
===================================================================
--- extra-i686/kio.install (rev 0)
+++ extra-i686/kio.install 2015-04-30 08:33:12 UTC (rev 238287)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-04-30 08:31:51 UTC (rev 238286)
+++ extra-x86_64/PKGBUILD 2015-04-30 08:33:12 UTC (rev 238287)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kio
-pkgver=5.9.0
-pkgrel=1
-pkgdesc='Resource and network access abstraction'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kio'
-license=('LGPL')
-depends=('solid' 'karchive' 'kjobwidgets' 'kbookmarks' 'libxslt' 'kwallet'
- 'desktop-file-utils')
-makedepends=('extra-cmake-modules' 'kdoctools')
-groups=('kf5')
-install=kio.install
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('2fe89d374583bf38a091edc74b9bc1d3')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DLIBEXEC_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kio/repos/extra-x86_64/PKGBUILD (from rev 238286, kio/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-04-30 08:33:12 UTC (rev 238287)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kio
+pkgver=5.9.0
+pkgrel=2
+pkgdesc='Resource and network access abstraction'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kio'
+license=('LGPL')
+depends=('solid' 'karchive' 'kjobwidgets' 'kbookmarks' 'libxslt' 'kwallet'
+ 'desktop-file-utils')
+makedepends=('extra-cmake-modules' 'kdoctools')
+groups=('kf5')
+install=kio.install
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" 'dolphin-places.patch')
+md5sums=('2fe89d374583bf38a091edc74b9bc1d3'
+ '9700937823277d19f6f7d440f63f0954')
+
+prepare() {
+ mkdir -p build
+
+# Fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/dolphin-places.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DLIBEXEC_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kio/repos/extra-x86_64/dolphin-places.patch (from rev 238286, kio/trunk/dolphin-places.patch)
===================================================================
--- extra-x86_64/dolphin-places.patch (rev 0)
+++ extra-x86_64/dolphin-places.patch 2015-04-30 08:33:12 UTC (rev 238287)
@@ -0,0 +1,122 @@
+From: Emmanuel Pescosta <emmanuelpescosta099 at gmail.com>
+Date: Mon, 27 Apr 2015 12:15:49 +0000
+Subject: Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only.
+X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=e919daeb5b144b146dbf459fadb116729b866d21
+---
+Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only.
+
+REVIEW: 123525
+BUG: 345174
+FIXED-IN: 5.10
+
+CHANGELOG: Store bookmarks only in user-places.xbel.
+---
+
+
+--- a/src/filewidgets/CMakeLists.txt
++++ b/src/filewidgets/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ kfilewidget.cpp
+ kfileplacesitem.cpp
+ kfileplacesmodel.cpp
+- kfileplacessharedbookmarks.cpp
+ kfileplacesview.cpp
+ kfileplaceeditdialog.cpp
+ kfilepreviewgenerator.cpp
+
+--- a/src/filewidgets/kfileplacesmodel.cpp
++++ b/src/filewidgets/kfileplacesmodel.cpp
+@@ -19,7 +19,6 @@
+ */
+ #include "kfileplacesmodel.h"
+ #include "kfileplacesitem_p.h"
+-#include "kfileplacessharedbookmarks_p.h"
+
+ #ifdef _WIN32_WCE
+ #include "Windows.h"
+@@ -60,10 +59,9 @@
+ class KFilePlacesModel::Private
+ {
+ public:
+- Private(KFilePlacesModel *self) : q(self), bookmarkManager(0), sharedBookmarks(0) {}
++ Private(KFilePlacesModel *self) : q(self), bookmarkManager(0) {}
+ ~Private()
+ {
+- delete sharedBookmarks;
+ qDeleteAll(items);
+ }
+
+@@ -75,7 +73,6 @@
+
+ Solid::Predicate predicate;
+ KBookmarkManager *bookmarkManager;
+- KFilePlacesSharedBookmarks *sharedBookmarks;
+
+ void reloadAndSignal();
+ QList<KFilePlacesItem *> loadBookmarkList();
+@@ -92,8 +89,8 @@
+ KFilePlacesModel::KFilePlacesModel(QObject *parent)
+ : QAbstractItemModel(parent), d(new Private(this))
+ {
+- const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kfileplaces/bookmarks.xml";
+- d->bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
++ const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/user-places.xbel";
++ d->bookmarkManager = KBookmarkManager::managerForExternalFile(file);
+
+ // Let's put some places in there if it's empty. We have a corner case here:
+ // Given you have bookmarked some folders (which have been saved on
+@@ -144,9 +141,6 @@
+ // user-places.xbel will be filled later). (ereslibre)
+ d->bookmarkManager->saveAs(file);
+ }
+-
+- // create after, so if we have own places, they are added afterwards, in case of equal priorities
+- d->sharedBookmarks = new KFilePlacesSharedBookmarks(d->bookmarkManager);
+
+ QString predicate("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]"
+ " OR "
+@@ -656,8 +650,6 @@
+ return false;
+ }
+
+- d->sharedBookmarks->updateSharedBookmarks();
+-
+ d->reloadAndSignal();
+
+ return true;
+@@ -684,8 +676,6 @@
+ KFilePlacesItem *item = static_cast<KFilePlacesItem *>(after.internalPointer());
+ d->bookmarkManager->root().moveBookmark(bookmark, item->bookmark());
+ }
+-
+- d->sharedBookmarks->updateSharedBookmarks();
+
+ d->reloadAndSignal();
+ }
+@@ -714,8 +704,6 @@
+ bookmark.setIcon(iconName);
+ bookmark.setMetaDataItem("OnlyInApp", appName);
+
+- d->sharedBookmarks->updateSharedBookmarks();
+-
+ d->reloadAndSignal();
+ emit dataChanged(index, index);
+ }
+@@ -739,7 +727,6 @@
+ }
+
+ d->bookmarkManager->root().deleteBookmark(bookmark);
+- d->sharedBookmarks->updateSharedBookmarks();
+ d->reloadAndSignal();
+ }
+
+@@ -758,8 +745,6 @@
+ }
+
+ bookmark.setMetaDataItem("IsHidden", (hidden ? "true" : "false"));
+-
+- d->sharedBookmarks->updateSharedBookmarks();
+
+ d->reloadAndSignal();
+ emit dataChanged(index, index);
+
Deleted: extra-x86_64/kio.install
===================================================================
--- extra-x86_64/kio.install 2015-04-30 08:31:51 UTC (rev 238286)
+++ extra-x86_64/kio.install 2015-04-30 08:33:12 UTC (rev 238287)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kio/repos/extra-x86_64/kio.install (from rev 238286, kio/trunk/kio.install)
===================================================================
--- extra-x86_64/kio.install (rev 0)
+++ extra-x86_64/kio.install 2015-04-30 08:33:12 UTC (rev 238287)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list