From: Raghav Gururajan <raghavgururajan@disroot.org>
To: 41083@debbugs.gnu.org
Subject: [bug#41083] gnu: xfe: Fix hard-coded fhs directories.
Date: Mon, 4 May 2020 13:16:24 -0400 [thread overview]
Message-ID: <20200504131624.04c6d30e.raghavgururajan@disroot.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-xfe-Fix-hard-coded-fhs-directories.patch --]
[-- Type: text/x-patch, Size: 6332 bytes --]
From 660f134e15438e7ee7aec1c076dca93c68e4edc6 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 4 May 2020 13:07:02 -0400
Subject: [PATCH] gnu: xfe: Fix hard-coded fhs directories.
* gnu/packages/disk.scm (xfe): Fix hard-coded fhs directories.
[arguments]<#:phases>['patch-xfe-paths]: Delete phase.
[arguments]<#:phases>['patch-bin-dirs]: New phase.
[arguments]<#:phases>['patch-share-dirs]: New phase.
[inputs]<bash,coreutils,file,findutils>: New inputs.
---
gnu/packages/disk.scm | 109 ++++++++++++++++++++++++++++++++----------
1 file changed, 83 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 484126a3ea..69f0a131bc 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -48,6 +48,7 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages elf)
#:use-module (gnu packages file-systems)
+ #:use-module (gnu packages file)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
@@ -940,43 +941,99 @@ since they are better handled by external tools.")
(sha256
(base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs"))))
(build-system gnu-build-system)
- (native-inputs
- `(("intltool" ,intltool)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("fox" ,fox)
- ("freetype" ,freetype)
- ("x11" ,libx11)
- ("xcb" ,libxcb)
- ("xcb-util" ,xcb-util)
- ("xft" ,libxft)
- ("xrandr" ,libxrandr)))
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-xfe-paths
+ (add-after 'unpack 'patch-bin-dirs
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let*
+ ((sh
+ (string-append
+ (assoc-ref inputs "bash") "/bin/sh"))
+ (du
+ (string-append
+ (assoc-ref inputs "coreutils") "/bin/du"))
+ (sort
+ (string-append
+ (assoc-ref inputs "coreutils") "/bin/sort"))
+ (cut
+ (string-append
+ (assoc-ref inputs "coreutils") "/bin/cut"))
+ (ls
+ (string-append
+ (assoc-ref inputs "coreutils") "/bin/ls"))
+ (xargs
+ (string-append
+ (assoc-ref inputs "findutils") "/bin/xargs"))
+ (file
+ (string-append
+ (assoc-ref inputs "file") "/bin/file")))
+ (substitute* "src/FilePanel.cpp"
+ (("/bin/sh") sh)
+ (("/usr/bin/du") du)
+ (("/usr/bin/sort") sort)
+ (("/usr/bin/cut") cut)
+ (("/usr/bin/xargs") xargs))
+ (substitute* "src/help.h"
+ (("/bin/sh") sh)
+ (("/bin/ls") ls))
+ (substitute* "src/SearchPanel.cpp"
+ (("/usr/bin/du") du)
+ (("/usr/bin/sort") sort)
+ (("/usr/bin/cut") cut)
+ (("/usr/bin/xargs") xargs))
+ (substitute* "src/startupnotification.cpp"
+ (("/bin/sh") sh))
+ (substitute* "src/xfeutils.cpp"
+ (("/usr/bin/file") file))
+ #t)))
+ (add-after 'unpack 'patch-share-dirs
(lambda* (#:key outputs #:allow-other-keys)
(let*
- ((out (assoc-ref outputs "out"))
- (share (string-append out "/share"))
- (xferc (string-append out "/share/xfe/xferc"))
- (xfe-theme (string-append out "/share/xfe/icons/xfe-theme")))
- ;; Correct path for xfe registry.
+ ((out
+ (assoc-ref outputs "out"))
+ (share
+ (string-append out "/share"))
+ (xfe
+ (string-append out "/share/xfe"))
+ (xferc
+ (string-append out "/share/xfe/xferc"))
+ (icons
+ (string-append out "/share/xfe/icons"))
+ (xfe-theme
+ (string-append out "/share/xfe/icons/xfe-theme")))
(substitute* "src/foxhacks.cpp"
- (("/etc:/usr/share:/usr/local/share") share))
- ;; Correct path for xfe configuration.
+ (("/usr/share") share)
+ (("/usr/local/share") share))
+ (substitute* "src/help.h"
+ (("/usr/share/xfe") xfe)
+ (("/usr/local/share/xfe") xfe)
+ (("/opt/local/share/xfe") xfe)
+ (("/usr/share/xfe/icons/xfe-theme") xfe-theme)
+ (("/usr/local/share/xfe/icons/xfe-theme") xfe-theme))
+ (substitute* "src/xfedefs.h"
+ (("/usr/share/xfe/icons") icons)
+ (("/usr/local/share/xfe/icons") icons))
(substitute* "src/XFileExplorer.cpp"
(("/usr/share/xfe/xferc") xferc)
(("/usr/local/share/xfe/xferc") xferc)
(("/opt/local/share/xfe/xferc") xferc))
- ;; Correct path for xfe icons.
- (substitute* "src/xfedefs.h"
- (((string-append
- "~/.config/xfe/icons/xfe-theme:"
- "/usr/local/share/xfe/icons/xfe-theme:"
- "/usr/share/xfe/icons/xfe-theme"))
- xfe-theme))
#t))))))
+ (native-inputs
+ `(("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("bash" ,bash)
+ ("coreutils" ,coreutils)
+ ("file" ,file)
+ ("findutils" ,findutils)
+ ("fox" ,fox)
+ ("freetype" ,freetype)
+ ("x11" ,libx11)
+ ("xcb" ,libxcb)
+ ("xcb-util" ,xcb-util)
+ ("xft" ,libxft)
+ ("xrandr" ,libxrandr)))
(synopsis "File Manager for X-Based Graphical Systems")
(description"XFE (X File Explorer) is a file manager for X. It is based on
the popular but discontinued, X Win Commander. It aims to be the file manager
--
2.26.2
next reply other threads:[~2020-05-04 17:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 17:16 Raghav Gururajan [this message]
2020-05-04 21:04 ` [bug#41083] gnu: xfe: Fix hard-coded fhs directories Ludovic Courtès
2020-05-05 15:44 ` Raghav Gururajan
2020-05-06 15:39 ` bug#41083: " Nicolas Goaziou
2020-05-06 15:52 ` [bug#41083] " Ludovic Courtès
2020-05-04 21:18 ` Nicolas Goaziou
2020-05-05 15:36 ` Raghav Gururajan
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=20200504131624.04c6d30e.raghavgururajan@disroot.org \
--to=raghavgururajan@disroot.org \
--cc=41083@debbugs.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.