From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2B771382C5 for ; Sun, 4 Apr 2021 13:23:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2924DE088C; Sun, 4 Apr 2021 13:23:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2B89E088C for ; Sun, 4 Apr 2021 13:23:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2969A3402FE for ; Sun, 4 Apr 2021 13:23:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A94263F for ; Sun, 4 Apr 2021 13:23:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1617542377.1864f401c9efcea3a6a6fef344826f14718526e7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/baloo/files/, kde-frameworks/baloo/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/baloo/baloo-5.80.0-r1.ebuild kde-frameworks/baloo/files/baloo-5.80.0-update-filename-terms-moving-file.patch X-VCS-Directories: kde-frameworks/baloo/files/ kde-frameworks/baloo/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1864f401c9efcea3a6a6fef344826f14718526e7 X-VCS-Branch: master Date: Sun, 4 Apr 2021 13:23:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 890384aa-ebb8-4ffc-aec8-d93a99d6c500 X-Archives-Hash: 235cfcc0ad4ac076e1a5ad11bdb3734c commit: 1864f401c9efcea3a6a6fef344826f14718526e7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 4 11:57:11 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 4 13:19:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1864f401 kde-frameworks/baloo: Fix baloo losing filename after rename Upstream commit 24da759545088060b863fef13496a5b22a5534d6 See also: https://invent.kde.org/frameworks/baloo/-/merge_requests/44 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=433116 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/baloo/baloo-5.80.0-r1.ebuild | 39 ++++++++++++++++++++ ...-5.80.0-update-filename-terms-moving-file.patch | 41 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/kde-frameworks/baloo/baloo-5.80.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.80.0-r1.ebuild new file mode 100644 index 00000000000..a38d095d548 --- /dev/null +++ b/kde-frameworks/baloo/baloo-5.80.0-r1.ebuild @@ -0,0 +1,39 @@ +# 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.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Framework for searching and managing metadata" +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 + >=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}" + +PATCHES=( + "${FILESDIR}/${P}-update-filename-terms-moving-file.patch" # KDE-bug #433116 +) 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 00000000000..a5ba6232d26 --- /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?= +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 +