From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#40753] gnu: spacefm: Add dependencies for extra functionality. Resent-Message-ID: Date: Tue, 28 Apr 2020 05:11:08 -0400 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 Content-Type: multipart/mixed; boundary="MP_/7PzNt4OOqRT0YxgM5j.mq7u" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Jan Nieuwenhuizen Cc: 40753@debbugs.gnu.org, Efraim Flashner --MP_/7PzNt4OOqRT0YxgM5j.mq7u Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline 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. --MP_/7PzNt4OOqRT0YxgM5j.mq7u Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-gnu-spacefm-Fix-privilege-and-disk-management.patch >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 --MP_/7PzNt4OOqRT0YxgM5j.mq7u--