From patchwork Tue Apr 28 09:11:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21699 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A57CB27BBE4; Tue, 28 Apr 2020 10:24:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 31C9327BBE1 for ; Tue, 28 Apr 2020 10:24:45 +0100 (BST) Received: from localhost ([::1]:48670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTMTs-0000Eg-GV for patchwork@mira.cbaines.net; Tue, 28 Apr 2020 05:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59916) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTMRE-0002AH-K3 for guix-patches@gnu.org; Tue, 28 Apr 2020 05:23:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTMHa-00056h-Lp for guix-patches@gnu.org; Tue, 28 Apr 2020 05:14:47 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTMHa-00056a-8z for guix-patches@gnu.org; Tue, 28 Apr 2020 05:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTMHa-0000YS-3v for guix-patches@gnu.org; Tue, 28 Apr 2020 05:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40753] gnu: spacefm: Add dependencies for extra functionality. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Apr 2020 09:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40753 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Jan Nieuwenhuizen Cc: 40753@debbugs.gnu.org, Efraim Flashner Received: via spool by 40753-submit@debbugs.gnu.org id=B40753.15880650952090 (code B ref 40753); Tue, 28 Apr 2020 09:12:02 +0000 Received: (at 40753) by debbugs.gnu.org; 28 Apr 2020 09:11:35 +0000 Received: from localhost ([127.0.0.1]:38907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTMH9-0000Xe-Ak for submit@debbugs.gnu.org; Tue, 28 Apr 2020 05:11:35 -0400 Received: from knopi.disroot.org ([178.21.23.139]:37580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTMH7-0000XW-KE for 40753@debbugs.gnu.org; Tue, 28 Apr 2020 05:11:34 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 554FF2807A; Tue, 28 Apr 2020 11:11:32 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ajx9rl7GCszl; Tue, 28 Apr 2020 11:11:30 +0200 (CEST) Date: Tue, 28 Apr 2020 05:11:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588065090; bh=TLTYJRkTAoTXNiItCJMBTbMYKzaG+rUkJrQpfaGE6lk=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=Dg3P4j8Cmu56mTQI1GaTPNE2s/fn7eBsayNCE5DCXHGU3FTzh49A1CwBBGPYUlT95 wc/iQakO4pLxz/ztBt3OUKY8x6kLpc0keu6qKa5zrMcO7B0vi8PoVoYTb0rLwu79tV wukABogpssmR1Twg4u5V3b+SDntqu7z20zPd/VQKDakOHHmTxOvdKMZmp1uM5VpFwZ 9CUrLJ4vSAw/p46HXUZTIC2n6P+7gxjaXUm+qcu19JlmbdL0auqn6DgDwMBmp+esrL g64YKKGLCu+8DKa/t256AZ2MjWRL/B43VJtrIQZOnsiDqqFF0n7gAVZjKRYCL0lAWe dK8PkUPfbzfmA== From: Raghav Gururajan Message-ID: <20200428051108.7dee10d7.raghavgururajan@disroot.org> In-Reply-To: <87y2qh48vu.fsf@gnu.org> References: <20200421172812.6227b2eb.raghavgururajan@disroot.org> <20200424153558.2aa79ef0.raghavgururajan@disroot.org> <87h7x8wsr8.fsf@gnu.org> <20200425221143.1a587483.raghavgururajan@disroot.org> <87lfmis5wm.fsf@gnu.org> <20200427022956.7c7d7263.raghavgururajan@disroot.org> <20200427063812.GH5243@E5400> <87y2qh48vu.fsf@gnu.org> Mime-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Jan! Sorry again for messing this up. I have attached revised patch with this email. This, along with #40922 and new patch at #40901, makes SpaceFM to work perfectly. :-) Regards, RG. From b623508a4e673e53e63336ee5d97c39e85b52b75 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 28 Apr 2020 05:02:06 -0400 Subject: [PATCH 3/3] gnu: spacefm: Fix privilege and disk management. * gnu/packages/lxde.scm (spacefm): Fix privilege and disk management. Patched references to su, ktsuss and udevil; to load them correctly. --- gnu/packages/lxde.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9de96a21cb..d152f6f79d 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -27,6 +27,7 @@ (define-module (gnu packages lxde) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages disk) @@ -279,7 +280,6 @@ with freedesktop.org standard.") `(("bash" ,bash) ("cairo" ,cairo) ("curlftpfs" ,curlftpfs) - ("dbus" ,dbus) ("eudev" ,eudev) ("fakeroot" ,fakeroot) ("ffmpegthumbnailer" ,ffmpegthumbnailer) @@ -288,6 +288,7 @@ with freedesktop.org standard.") ("gtk+" ,gtk+) ("ifuse" ,ifuse) ("jmtpfs" ,jmtpfs) + ("ktsuss" ,ktsuss) ("libx11" ,libx11) ("lsof" ,lsof) ("pango" ,pango) @@ -297,12 +298,31 @@ with freedesktop.org standard.") ("util-linux" ,util-linux) ("wget" ,wget))) (arguments - `(#:configure-flags (list (string-append "--with-bash-path=" - (assoc-ref %build-inputs "bash") - "/bin/bash") - (string-append "--sysconfdir=" - (assoc-ref %outputs "out") - "/etc")))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source-files + (lambda* (#:key inputs #:allow-other-keys) + ;; Patch config file to load programs correctly. + (substitute* "etc/spacefm.conf" + (("#terminal_su=/bin/su") + "terminal_su=/run/setuid-programs/su") + (("#graphical_su=/usr/bin/gksu") + (string-append "graphical_su=" + (string-append (assoc-ref inputs "ktsuss") + "/bin/ktsuss")))) + ;; SpaceFM expects udevil to have uid set to root. + ;; User has to manually add udevil to setuid-programs. + (substitute* "src/settings.c" + (("/usr/bin/udevil") + "/run/setuid-programs/udevil")) + #t))) + #:configure-flags (list + (string-append "--with-bash-path=" + (assoc-ref %build-inputs "bash") + "/bin/bash") + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc")))) (home-page "https://ignorantguru.github.io/spacefm/") (synopsis "Multi-panel tabbed file manager") (description "SpaceFM is a graphical, multi-panel, tabbed file manager -- 2.26.2