From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
Date: Fri, 15 Nov 2024 13:46:42 +0000 (UTC) [thread overview]
Message-ID: <1731678390.8c924e2dfea18dde4f21ecf59cea227c7802acf0.asturm@gentoo> (raw)
commit: 8c924e2dfea18dde4f21ecf59cea227c7802acf0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 13:28:05 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 13:46:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c924e2d
kde-frameworks/kio: KFilePlacesItem: Use Solid to find home mount point
See also:
https://invent.kde.org/frameworks/kio/-/merge_requests/1722
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...kio-5.116.0-use-solid-for-home-mountpoint.patch | 38 ++++++++
kde-frameworks/kio/kio-5.116.0-r3.ebuild | 101 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.116.0-use-solid-for-home-mountpoint.patch b/kde-frameworks/kio/files/kio-5.116.0-use-solid-for-home-mountpoint.patch
new file mode 100644
index 000000000000..9dcfc45b3aa5
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.116.0-use-solid-for-home-mountpoint.patch
@@ -0,0 +1,38 @@
+From 93f53971adfbb9269b589fcce268560b49cd1f83 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kai.uwe.broulik@basyskom.com>
+Date: Thu, 19 Sep 2024 12:10:32 +0000
+Subject: [PATCH] KFilePlacesItem: Use Solid to find home mount point
+
+KMountPoints potentially parses MTAB which can be slow.
+Instead, use Solid which already has a cache of all the devices.
+
+The impact on a typical system is negligible but real-world
+testing on a system with lots of network shares showed a
+speed-up of over 80% in this code path.
+
+Signed-off-by: Kiriakos Antoniadis <kiriakos.antoniadis@advantest.com>
+
+(cherry picked from commit b5d45a857e6fdb3fb7b08e44753eef203ea605c6)
+---
+ src/filewidgets/kfileplacesitem.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/filewidgets/kfileplacesitem.cpp b/src/filewidgets/kfileplacesitem.cpp
+index 4aa562a4f9..3af8a0f1d4 100644
+--- a/src/filewidgets/kfileplacesitem.cpp
++++ b/src/filewidgets/kfileplacesitem.cpp
+@@ -531,8 +531,9 @@ void KFilePlacesItem::onAccessibilityChanged(bool isAccessible)
+ if (m_access->filePath() == QDir::rootPath()) {
+ m_isTeardownAllowed = false;
+ } else {
+- KMountPoint::Ptr mountPoint = KMountPoint::currentMountPoints().findByPath(QDir::homePath());
+- if (mountPoint && m_access->filePath() == mountPoint->mountPoint()) {
++ const auto homeDevice = Solid::Device::storageAccessFromPath(QDir::homePath());
++ const auto *homeAccess = homeDevice.as<Solid::StorageAccess>();
++ if (homeAccess && m_access->filePath() == homeAccess->filePath()) {
+ m_isTeardownAllowed = false;
+ }
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.116.0-r3.ebuild b/kde-frameworks/kio/kio-5.116.0-r3.ebuild
new file mode 100644
index 000000000000..a3b7804f211c
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.116.0-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="acl kerberos +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/kauth-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kbookmarks-${PVCUT}*:5
+ =kde-frameworks/kcodecs-${PVCUT}*:5
+ =kde-frameworks/kcompletion-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kcrash-${PVCUT}*:5
+ =kde-frameworks/kdbusaddons-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kjobwidgets-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ =kde-frameworks/solid-${PVCUT}*:5
+ sys-power/switcheroo-control
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ =kde-frameworks/kdoctools-${PVCUT}*:5
+ )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+ X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ test? ( sys-libs/zlib )
+"
+RDEPEND="${COMMON_DEPEND}
+ || (
+ kde-apps/kio-extras:6
+ kde-frameworks/kio-trash-desktop-file:5
+ )
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+
+PATCHES=( "${FILESDIR}/${P}-use-solid-for-home-mountpoint.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DKF6_COMPAT_BUILD=ON
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ -DWITH_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
next reply other threads:[~2024-11-15 13:46 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-15 13:46 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-10 7:57 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/ Andreas Sturmlechner
2024-07-16 16:32 Andreas Sturmlechner
2024-03-24 21:03 Andreas Sturmlechner
2024-03-19 9:10 Andreas Sturmlechner
2023-06-22 21:16 Andreas Sturmlechner
2023-03-26 9:52 Andreas Sturmlechner
2023-03-23 16:47 Andreas Sturmlechner
2023-03-23 8:11 Andreas Sturmlechner
2023-01-25 10:22 Andreas Sturmlechner
2022-11-27 11:20 Andreas Sturmlechner
2022-08-08 14:40 Andreas Sturmlechner
2022-07-26 12:08 Andreas Sturmlechner
2022-07-19 13:29 Andreas Sturmlechner
2022-06-29 19:53 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-11-18 10:38 Andreas Sturmlechner
2021-08-15 18:57 Andreas Sturmlechner
2021-08-14 17:09 Andreas Sturmlechner
2021-07-16 15:21 Andreas Sturmlechner
2021-07-14 12:41 Andreas Sturmlechner
2021-05-30 15:51 Andreas Sturmlechner
2021-05-15 10:49 Andreas Sturmlechner
2021-04-11 14:23 Andreas Sturmlechner
2021-04-04 13:23 Andreas Sturmlechner
2021-03-25 23:13 Andreas Sturmlechner
2021-02-13 20:49 Andreas Sturmlechner
2021-02-12 21:48 Andreas Sturmlechner
2021-01-24 13:02 Andreas Sturmlechner
2021-01-11 12:28 Andreas Sturmlechner
2020-12-23 21:32 Andreas Sturmlechner
2020-11-16 23:41 Andreas Sturmlechner
2020-09-29 12:49 Andreas Sturmlechner
2020-05-16 22:38 Andreas Sturmlechner
2019-01-16 12:50 Andreas Sturmlechner
2018-07-21 16:51 Andreas Sturmlechner
2017-12-03 12:34 Andreas Sturmlechner
2017-09-30 20:34 Andreas Sturmlechner
2017-05-17 22:08 Andreas Sturmlechner
2017-02-28 21:02 Johannes Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1731678390.8c924e2dfea18dde4f21ecf59cea227c7802acf0.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox