mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
kde-frameworks/baloo: drop 5.77.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -1,3 +1,2 @@
|
||||
DIST baloo-5.77.0.tar.xz 290444 BLAKE2B decc4f6fbd785ccfe8e5f4616da6ee92fee0846aa3bbb25979ecd9cd445b0d6333ef1328221e39fb976e8ebf7c53be965b5ce58c8126a1b3cd2fa64962898083 SHA512 4d56136c3d661ad7dc11bf1f6b433b5fdc48f597bfd26ae8b5529d348750b89bcaba487c5bce874d557e76f5cee0779e2ea22c2259ce33926a1b3f26fa458929
|
||||
DIST baloo-5.80.0.tar.xz 288452 BLAKE2B 0de1a6d356438b18845df034f3e6a7d891b9c4ac988a7b8075702d0e669c46aad87bf094a13172e56d5e3992e06e37eb231357a64a99e7a8af0db4bf335500c9 SHA512 e7431f78609d42de61a23478067f28168cd3e2a032543fd3d4d5fc444396d73a0d9f67b39d4602d80bad814d6e1af071327261b8b22cb5d9966a375d328b3759
|
||||
DIST baloo-5.81.0.tar.xz 287360 BLAKE2B e5720f83d8f1db575c3525a63cb0c8ffa26f8450cf62c4b8f2554ce11144525b54b5cecc00a50f09ef9b2195f7aa0597cbf2708231a6e92a49df114b0cae0681 SHA512 f4736a2649c6afe6746f9e0e15e2c2adbfac7c8eb12795cb93e805a646c5c4df511dca32f78a607bdac2c123a84c095f9317d085a899d15a8392f9f863c57ae8
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
# 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"
|
||||
)
|
||||
@@ -1,77 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user