unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Raghav Gururajan <raghavgururajan@disroot.org>
To: Jan Nieuwenhuizen <janneke@gnu.org>
Cc: 40753@debbugs.gnu.org, Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#40753] gnu: spacefm: Add dependencies for extra functionality.
Date: Tue, 28 Apr 2020 05:11:08 -0400	[thread overview]
Message-ID: <20200428051108.7dee10d7.raghavgururajan@disroot.org> (raw)
In-Reply-To: <87y2qh48vu.fsf@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

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.

[-- Attachment #2: 0003-gnu-spacefm-Fix-privilege-and-disk-management.patch --]
[-- Type: text/x-patch, Size: 3394 bytes --]

From b623508a4e673e53e63336ee5d97c39e85b52b75 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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


  reply	other threads:[~2020-04-28  9:23 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-21 21:28 [bug#40753] gnu: spacefm: Add missing dependencies Raghav Gururajan
2020-04-22  0:15 ` [bug#40753] gnu: spacefm: Add and configure missing dependencies. (v2) Raghav Gururajan
2020-04-22  6:46 ` [bug#40753] gnu: spacefm: Add missing dependencies Jan Nieuwenhuizen
2020-04-22 16:28   ` Raghav Gururajan
2020-04-22 17:59     ` Jan Nieuwenhuizen
2020-04-22 20:22       ` [bug#40753] gnu: spacefm: Add missing dependencies. (v3) Raghav Gururajan
2020-04-24 19:35 ` [bug#40753] gnu: spacefm: Add dependencies for extra functionality. (v3) Raghav Gururajan
2020-04-24 20:09   ` Jan Nieuwenhuizen
2020-04-26  2:11     ` [bug#40753] gnu: spacefm: Add dependencies for extra functionality Raghav Gururajan
2020-04-26 14:00       ` Jan Nieuwenhuizen
2020-04-27  6:29         ` Raghav Gururajan
2020-04-27  6:38           ` Efraim Flashner
2020-04-27  8:42             ` Jan Nieuwenhuizen
2020-04-28  9:11               ` Raghav Gururajan [this message]
2020-04-30 13:57                 ` Raghav Gururajan
2020-05-30  5:08                   ` bug#40753: " Maxim Cournoyer
2020-04-27  8:37           ` [bug#40753] " Jan Nieuwenhuizen

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200428051108.7dee10d7.raghavgururajan@disroot.org \
    --to=raghavgururajan@disroot.org \
    --cc=40753@debbugs.gnu.org \
    --cc=efraim@flashner.co.il \
    --cc=janneke@gnu.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.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).