[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/baloo/, kde-frameworks/baloo/files/

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/baloo/, kde-frameworks/baloo/files/

[Michael Palimaka]

commit:     233ee641eb0819f6795c07b6a33d927dcc0c0e2e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Sep 22 19:37:53 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 16:00:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233ee641

kde-frameworks/baloo: Backport fix for baloo crash if disabled

Upstream bug: https://bugs.kde.org/show_bug.cgi?id=353049

Package-Manager: portage-2.2.20.1

 kde-frameworks/baloo/baloo-5.14.0-r1.ebuild        | 36 ++++++++++++++++++++++
 .../files/baloo-5.14.0-check-if-db-open.patch      | 28 +++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/kde-frameworks/baloo/baloo-5.14.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.14.0-r1.ebuild
new file mode 100644
index 0000000..bf7b12e
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.14.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Framework for searching and managing metadata"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep solid)
+	dev-db/lmdb
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	sys-apps/attr
+"
+RDEPEND="${DEPEND}
+	!kde-base/baloo:4[-minimal(-)]
+"
+
+PATCHES=( "${FILESDIR}/${P}-check-if-db-open.patch" )

diff --git a/kde-frameworks/baloo/files/baloo-5.14.0-check-if-db-open.patch b/kde-frameworks/baloo/files/baloo-5.14.0-check-if-db-open.patch
new file mode 100644
index 0000000..76c71fb
--- /dev/null
+++ b/kde-frameworks/baloo/files/baloo-5.14.0-check-if-db-open.patch
@@ -0,0 +1,28 @@
+From: Boudhayan Gupta <me@BaloneyGeek.com>
+Date: Tue, 22 Sep 2015 18:55:36 +0000
+Subject: Fail Baloo::File::load() if the Database is not open.
+X-Git-Url: http://quickgit.kde.org/?p=baloo.git&a=commitdiff&h=29fe68f2657df503926e629477a41f7d9435048f
+---
+Fail Baloo::File::load() if the Database is not open.
+Fixes crash if selecting multiple files in Dolphin with
+Baloo disabled.
+
+BUG: 353049
+REVIEW: 125352
+---
+
+
+--- a/src/lib/file.cpp
++++ b/src/lib/file.cpp
+@@ -98,6 +98,10 @@
+     Database *db = globalDatabaseInstance();
+     db->open(Database::OpenDatabase);
+ 
++    if (!db->isOpen()) {
++        return false;
++    }
++
+     quint64 id = filePathToId(QFile::encodeName(d->url));
+     if (!id) {
+         return false;
+

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/baloo/, kde-frameworks/baloo/files/

[Andreas Sturmlechner]

commit:     500f1b0925996f5cf7d552a48443bdb52c0ca4bd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 21:51:28 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 23:19:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=500f1b09

kde-frameworks/baloo: Sync IndexerConfig on exit

See also: https://mail.kde.org/pipermail/plasma-devel/2020-February/111114.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=417127
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/baloo/baloo-5.67.0-r1.ebuild        | 37 ++++++++++++++++++++++
 .../baloo-5.67.0-sync-IndexerConfig-on-exit.patch  | 37 ++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild
new file mode 100644
index 00000000000..c7b655229de
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-db/lmdb-0.9.17
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kfilemetadata-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kidletime-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 624250
+
+PATCHES=( "${FILESDIR}/${P}-sync-IndexerConfig-on-exit.patch" )

diff --git a/kde-frameworks/baloo/files/baloo-5.67.0-sync-IndexerConfig-on-exit.patch b/kde-frameworks/baloo/files/baloo-5.67.0-sync-IndexerConfig-on-exit.patch
new file mode 100644
index 00000000000..d18b7e2a169
--- /dev/null
+++ b/kde-frameworks/baloo/files/baloo-5.67.0-sync-IndexerConfig-on-exit.patch
@@ -0,0 +1,37 @@
+From a0f8e748159b6bc0b8e5eaa1f9eb58a18ca736fa Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 13 Feb 2020 16:52:40 +0000
+Subject: Sync IndexerConfig on exit
+
+Summary:
+KCoreConfigSkeleton, unlike KConfig does not automagically save on exit.
+
+BUG: 417127
+
+Test Plan:
+balooctl disable
+balooctl enable
+
+Subscribers: kde-frameworks-devel, #baloo
+
+Tags: #frameworks, #baloo
+
+Differential Revision: https://phabricator.kde.org/D27376
+---
+ src/lib/indexerconfig.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/indexerconfig.cpp b/src/lib/indexerconfig.cpp
+index 66786b9..19ae342 100644
+--- a/src/lib/indexerconfig.cpp
++++ b/src/lib/indexerconfig.cpp
+@@ -43,6 +43,7 @@ IndexerConfig::IndexerConfig()
+ 
+ IndexerConfig::~IndexerConfig()
+ {
++    d->m_settings.save();
+     delete d;
+ }
+ 
+-- 
+cgit v1.1

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/baloo/, kde-frameworks/baloo/files/

[Andreas Sturmlechner]

commit:     b3a2c01693cb2d53d5fd730c26ceae43f2972afb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 16:52:20 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 21:06:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a2c016

kde-frameworks/baloo: Fix index corruption, fix error w/o index

a) [BasicIndexingJob] Strip trailing slash from folders
Upstream commit 9b61371fdefbd538938f20cdc87eed03d170fa5b
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=430273
Thanks-to: josef64 (in #gentoo-kde IRC)

b) Avoid errors for application startup if no baloo index was ever created
Upstream commit d102b01ee59d93de3fe18c12364ea69a85ea723f

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/baloo/baloo-5.77.0-r1.ebuild        | 40 +++++++++++
 .../files/baloo-5.77.0-no-error-w-o-index.patch    | 77 ++++++++++++++++++++++
 .../files/baloo-5.77.0-strip-trailing-slash.patch  | 34 ++++++++++
 3 files changed, 151 insertions(+)

diff --git a/kde-frameworks/baloo/baloo-5.77.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.77.0-r1.ebuild
new file mode 100644
index 00000000000..ac7ba502832
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.77.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-db/lmdb-0.9.17
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kfilemetadata-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kidletime-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 624250
+
+PATCHES=(
+	"${FILESDIR}/${P}-strip-trailing-slash.patch"
+	"${FILESDIR}/${P}-no-error-w-o-index.patch"
+)

diff --git a/kde-frameworks/baloo/files/baloo-5.77.0-no-error-w-o-index.patch b/kde-frameworks/baloo/files/baloo-5.77.0-no-error-w-o-index.patch
new file mode 100644
index 00000000000..d49cc8f6d9d
--- /dev/null
+++ b/kde-frameworks/baloo/files/baloo-5.77.0-no-error-w-o-index.patch
@@ -0,0 +1,77 @@
+From d102b01ee59d93de3fe18c12364ea69a85ea723f Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 31 Dec 2020 15:44:40 +0000
+Subject: [PATCH] avoid errors for application startup if no baloo index was
+ ever created
+
+use case:
+
+ * a KDE application started e.g. in an non-KDE Plasma environment
+ * a KDE application started with baloo indexing disabled
+
+you normally will get:
+
+kf.kio.slaves.tags: tag fetch failed: "Failed to open the database"
+kf.kio.slaves.tags: "tags:/" list() invalid url
+
+Now this is not issued if no index database exist.
+---
+ src/engine/database.cpp | 6 ++++++
+ src/engine/database.h   | 7 +++++++
+ src/lib/taglistjob.cpp  | 7 +++++++
+ 3 files changed, 20 insertions(+)
+
+diff --git a/src/engine/database.cpp b/src/engine/database.cpp
+index 427210d0..ac93426c 100644
+--- a/src/engine/database.cpp
++++ b/src/engine/database.cpp
+@@ -247,3 +247,9 @@ QString Database::path() const
+     QMutexLocker locker(&m_mutex);
+     return m_path;
+ }
++
++bool Database::isAvailable() const
++{
++    QMutexLocker locker(&m_mutex);
++    return QFileInfo::exists(m_path + QStringLiteral("/index"));
++}
+diff --git a/src/engine/database.h b/src/engine/database.h
+index 0f43b623..26d21101 100644
+--- a/src/engine/database.h
++++ b/src/engine/database.h
+@@ -73,6 +73,13 @@ public:
+      */
+     QString path() const;
+ 
++    /**
++     * Is the database available for use?
++     * For example if indexing is disabled or the indexer did never run this is false.
++     * @return database available
++     */
++    bool isAvailable() const;
++
+ private:
+     /**
+      * serialize access, as open might be called from multiple threads
+diff --git a/src/lib/taglistjob.cpp b/src/lib/taglistjob.cpp
+index cea57889..58945cc7 100644
+--- a/src/lib/taglistjob.cpp
++++ b/src/lib/taglistjob.cpp
+@@ -33,7 +33,14 @@ TagListJob::~TagListJob()
+ void TagListJob::start()
+ {
+     Database *db = globalDatabaseInstance();
++
+     if (!db->open(Database::ReadOnlyDatabase)) {
++        // if we have no index, we have no tags
++        if (!db->isAvailable()) {
++            emitResult();
++            return;
++        }
++
+         setError(UserDefinedError);
+         setErrorText(QStringLiteral("Failed to open the database"));
+         emitResult();
+-- 
+GitLab
+

diff --git a/kde-frameworks/baloo/files/baloo-5.77.0-strip-trailing-slash.patch b/kde-frameworks/baloo/files/baloo-5.77.0-strip-trailing-slash.patch
new file mode 100644
index 00000000000..ab9c7639799
--- /dev/null
+++ b/kde-frameworks/baloo/files/baloo-5.77.0-strip-trailing-slash.patch
@@ -0,0 +1,34 @@
+From 9b61371fdefbd538938f20cdc87eed03d170fa5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sat, 12 Dec 2020 19:01:45 +0100
+Subject: [PATCH] [BasicIndexingJob] Strip trailing slash from folders
+
+If BasicIndexingJob is called with a path with a trailing slash, the
+search for the last slash (separating name from parent path) goes wrong.
+
+This was wrong already earlier, but with commit 47ebc15844f6b8a8
+("[Document] Add parent document ID and populate it") this caused
+document and parent id to be the same.
+
+CCBUG: 430273
+---
+ src/file/basicindexingjob.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/file/basicindexingjob.cpp b/src/file/basicindexingjob.cpp
+index e00c6a2b..c0f18ddd 100644
+--- a/src/file/basicindexingjob.cpp
++++ b/src/file/basicindexingjob.cpp
+@@ -23,6 +23,9 @@ BasicIndexingJob::BasicIndexingJob(const QString& filePath, const QString& mimet
+     , m_mimetype(mimetype)
+     , m_indexingLevel(level)
+ {
++    if (m_filePath.endsWith(QChar('/'))) {
++	m_filePath.chop(1);
++    }
+ }
+ 
+ namespace {
+-- 
+GitLab
+