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 C396E158F6E for ; Mon, 16 Aug 2021 20:48:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02A5EE0CDA; Sun, 15 Aug 2021 18:58:01 +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 CBB69E0CD5 for ; Sun, 15 Aug 2021 18:58:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A685A3455F5 for ; Sun, 15 Aug 2021 18:57:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CE0E8B0 for ; Sun, 15 Aug 2021 18:57:58 +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: <1629053799.30d6ef4fc1cd0fbb61f4cea6f7be0424956a0dad.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch kde-frameworks/kio/kio-5.85.0-r1.ebuild X-VCS-Directories: kde-frameworks/kio/ kde-frameworks/kio/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 30d6ef4fc1cd0fbb61f4cea6f7be0424956a0dad X-VCS-Branch: master Date: Sun, 15 Aug 2021 18:57:58 +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: 29842ef6-7bac-43fe-b1c0-bce7731d0937 X-Archives-Hash: 6f54c650cc8619598d73e554d7e94127 commit: 30d6ef4fc1cd0fbb61f4cea6f7be0424956a0dad Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 15 18:38:42 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 15 18:56:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d6ef4f kde-frameworks/kio: Allow editing icons for root-owned desktop files Upstream commit 2187b62588b060bc27143dd326b5171aec930454 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=429613 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...w-edit-icons-for-root-owned-desktop-files.patch | 32 ++++++++++++++++++++++ kde-frameworks/kio/kio-5.85.0-r1.ebuild | 1 + 2 files changed, 33 insertions(+) diff --git a/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch b/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch new file mode 100644 index 00000000000..34a70a827e0 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch @@ -0,0 +1,32 @@ +From 2187b62588b060bc27143dd326b5171aec930454 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Sat, 7 Aug 2021 19:38:43 +0000 +Subject: [PATCH] [kpropertiesdialog] Allow editing icons for root-owned + desktop files + +--- + src/widgets/kpropertiesdialog.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp +index 76155338e..2288ccc08 100644 +--- a/src/widgets/kpropertiesdialog.cpp ++++ b/src/widgets/kpropertiesdialog.cpp +@@ -1206,6 +1206,14 @@ KFilePropsPlugin::KFilePropsPlugin(KPropertiesDialog *_props) + bool KFilePropsPlugin::enableIconButton() const + { + const KFileItem item = properties->item(); ++ ++ // desktop files are special, files in /usr/share/applications can be ++ // edited by overlaying them in .local/share/applications ++ // https://bugs.kde.org/show_bug.cgi?id=429613 ++ if (item.isDesktopFile()) { ++ return true; ++ } ++ + // If the current item is a directory, check if it's writable, + // so we can create/update a .directory + // Current item is a file, same thing: check if it is writable +-- +GitLab + diff --git a/kde-frameworks/kio/kio-5.85.0-r1.ebuild b/kde-frameworks/kio/kio-5.85.0-r1.ebuild index 9522606997f..ed1bd212da3 100644 --- a/kde-frameworks/kio/kio-5.85.0-r1.ebuild +++ b/kde-frameworks/kio/kio-5.85.0-r1.ebuild @@ -73,6 +73,7 @@ PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" PATCHES=( "${FILESDIR}"/${P}-KDirOperator-exp-to-url-only-in-detail-treeview.patch # KDE-bug 440475 + "${FILESDIR}"/${P}-allow-edit-icons-for-root-owned-desktop-files.patch # KDE-bug 429613 ) src_configure() {