gentoo resync : 28.04.2021

6 files changed, 49 insertions, 121 deletions

diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 91caa5577966..90d8480c64c7 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,7 +1,6 @@
-AUX baloo-5.77.0-no-error-w-o-index.patch 2264 BLAKE2B 252ce25e00a45c431d35b082bc2e0336a7b8dd15ca3f54a14b7f192e3d439bf056c0df76eec3ee18f70e0920d3bd0bdb801b4ac68652bebb24cc1bfa4515c71b SHA512 5ca7166cbf34717f5f1d157b118574373901544c6da9386158a1fc389c81f7ca4d18c0d613442c20cba8c76dca2e5a73b97dded33cc2885e17902571647d4b41
-AUX baloo-5.77.0-strip-trailing-slash.patch 1096 BLAKE2B c3a7a30578ec903d4e83191e80927626372b6ea993e6088651cef564e1414b62e4d4d6d9e27fe27c6ec2ee72499ec7403fd64fe327efe74e8580f15e23f8eeb4 SHA512 b6b4316043ff5c4386c4c372e4b927204a6b651146b781739113b368b51e80654616efe5dd3e093269089fd0584414e82329ae55dbbaf2f03a7702c9ed1d314e
-DIST baloo-5.77.0.tar.xz 290444 BLAKE2B decc4f6fbd785ccfe8e5f4616da6ee92fee0846aa3bbb25979ecd9cd445b0d6333ef1328221e39fb976e8ebf7c53be965b5ce58c8126a1b3cd2fa64962898083 SHA512 4d56136c3d661ad7dc11bf1f6b433b5fdc48f597bfd26ae8b5529d348750b89bcaba487c5bce874d557e76f5cee0779e2ea22c2259ce33926a1b3f26fa458929
+AUX baloo-5.80.0-update-filename-terms-moving-file.patch 1187 BLAKE2B 9cd26aa380582da48d226c2d328ead1300776219868de7669d2761a94292bbe05f7fd7784f16a85520ccccd87a5f937b99ac7a59adc5042882d4b60f869232fa SHA512 0fa7ad005485a444a381742d946e72ffabb3375d41333f26389b9f70080a08594a54209562620e7530806e4687f4d4debc8e7d57ab3a2875bb93eccf3ea42e9d
 DIST baloo-5.80.0.tar.xz 288452 BLAKE2B 0de1a6d356438b18845df034f3e6a7d891b9c4ac988a7b8075702d0e669c46aad87bf094a13172e56d5e3992e06e37eb231357a64a99e7a8af0db4bf335500c9 SHA512 e7431f78609d42de61a23478067f28168cd3e2a032543fd3d4d5fc444396d73a0d9f67b39d4602d80bad814d6e1af071327261b8b22cb5d9966a375d328b3759
-EBUILD baloo-5.77.0-r1.ebuild 995 BLAKE2B c56fe2659f003a9368f355b27221d0d70e3b504e38b0379858a0c2845addc67369477a88f3ae6b82e898616859f855f5656726dc2c99aef7d6bec6b32c61114d SHA512 7e939bb0e67869105e75eae5d24cfd689dce158ec19213742d9bbd31a1ac1afafe53234e218f88bed074803d4ef757e46d80be3f5236196eaf11d78edeb4591b
-EBUILD baloo-5.80.0.ebuild 893 BLAKE2B 9ddc845ba9f79d9ead827ff7b10d4bdbc0ff851a05b02213b491b49af10b3c5f9af55b51b343436ad19ee81878b029d259760874dd46abc74535151cc44e8f30 SHA512 d9aa61fd813ae8ccea4a68aec037246dc6e309e869b79fb9feb3219911057dd1f65e51ec15ec6188cde5a081c1b173c05608f6d4265c0c5fbdcc6e43411b22d3
+DIST baloo-5.81.0.tar.xz 287360 BLAKE2B e5720f83d8f1db575c3525a63cb0c8ffa26f8450cf62c4b8f2554ce11144525b54b5cecc00a50f09ef9b2195f7aa0597cbf2708231a6e92a49df114b0cae0681 SHA512 f4736a2649c6afe6746f9e0e15e2c2adbfac7c8eb12795cb93e805a646c5c4df511dca32f78a607bdac2c123a84c095f9317d085a899d15a8392f9f863c57ae8
+EBUILD baloo-5.80.0-r1.ebuild 981 BLAKE2B 6caf21d48d47f57380e4c1da6c3a5914ee7a4c98a3802a7404a6509866ee4266ceb3fc1054dd85b47fd88af680efc16800c6dac8ebbe0d0579f98d0904a1682a SHA512 dd723c57f18201bc28b3bae3f62ddc2fd78b7631895bf2ac6e39cb54715590103804c3ff1d945e3ba7fb9a9d3d3712e3a13b6fbd71f7de677bb569b5d9913eaf
+EBUILD baloo-5.81.0.ebuild 893 BLAKE2B 9ddc845ba9f79d9ead827ff7b10d4bdbc0ff851a05b02213b491b49af10b3c5f9af55b51b343436ad19ee81878b029d259760874dd46abc74535151cc44e8f30 SHA512 d9aa61fd813ae8ccea4a68aec037246dc6e309e869b79fb9feb3219911057dd1f65e51ec15ec6188cde5a081c1b173c05608f6d4265c0c5fbdcc6e43411b22d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.77.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.80.0-r1.ebuild
index 99356c7d9759..c98a88a85959 100644
--- a/kde-frameworks/baloo/baloo-5.77.0-r1.ebuild
+++ b/kde-frameworks/baloo/baloo-5.80.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -14,6 +14,8 @@ LICENSE="LGPL-2+"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
+RESTRICT+=" test" # bug 624250
+
 DEPEND="
 	>=dev-db/lmdb-0.9.17
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -32,9 +34,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test" # bug 624250
-
 PATCHES=(
-	"${FILESDIR}/${P}-strip-trailing-slash.patch"
-	"${FILESDIR}/${P}-no-error-w-o-index.patch"
+	"${FILESDIR}/${P}-update-filename-terms-moving-file.patch" # KDE-bug #433116
 )
diff --git a/kde-frameworks/baloo/baloo-5.80.0.ebuild b/kde-frameworks/baloo/baloo-5.81.0.ebuild
index 245f2f64562f..245f2f64562f 100644
--- a/kde-frameworks/baloo/baloo-5.80.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.81.0.ebuild
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
deleted file mode 100644
index d49cc8f6d9d9..000000000000
--- a/kde-frameworks/baloo/files/baloo-5.77.0-no-error-w-o-index.patch
+++ /dev/null
@@ -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
-
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
deleted file mode 100644
index ab9c7639799f..000000000000
--- a/kde-frameworks/baloo/files/baloo-5.77.0-strip-trailing-slash.patch
+++ /dev/null
@@ -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
-
diff --git a/kde-frameworks/baloo/files/baloo-5.80.0-update-filename-terms-moving-file.patch b/kde-frameworks/baloo/files/baloo-5.80.0-update-filename-terms-moving-file.patch
new file mode 100644
index 000000000000..a5ba6232d260
--- /dev/null
+++ b/kde-frameworks/baloo/files/baloo-5.80.0-update-filename-terms-moving-file.patch
@@ -0,0 +1,41 @@
+From f6a7845b8f3cd3188053ba58f9fe7053558aec86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sat, 27 Mar 2021 13:32:55 +0100
+Subject: [PATCH] [MetadataMover] Update filename terms when moving/renaming
+ file
+
+After the removal of BasicIndexingJob::index() (bd1041ea2826e295 "Make
+renames a DB only operation") the filename terms where left empty.
+
+BUG: 433116
+---
+ src/file/metadatamover.cpp                | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/file/metadatamover.cpp b/src/file/metadatamover.cpp
+index 70ca9822..2bff5a2e 100644
+--- a/src/file/metadatamover.cpp
++++ b/src/file/metadatamover.cpp
+@@ -8,6 +8,7 @@
+ 
+ #include "metadatamover.h"
+ #include "database.h"
++#include "termgenerator.h"
+ #include "transaction.h"
+ #include "baloodebug.h"
+ 
+@@ -99,6 +100,11 @@ void MetadataMover::updateMetadata(Transaction* tr, const QString& from, const Q
+     }
+ 
+     Document doc;
++
++    const QByteArray fileName = toPath.mid(lastSlash + 1);
++    TermGenerator tg(doc);
++    tg.indexFileNameText(QFile::decodeName(fileName));
++
+     doc.setId(id);
+     doc.setParentId(parentId);
+     doc.setUrl(toPath);
+-- 
+GitLab
+