[bug#41169] gnu: xfe: Fix few more FHS directories.

[bug#41169] gnu: xfe: Fix few more FHS directories.

[Raghav Gururajan]

[-- Attachment #1.1.1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #1.1.2: 0001-gnu-xfe-Fix-few-more-FHS-directories.patch --]
[-- Type: text/x-patch, Size: 2107 bytes --]

From 585adef1a8f0fdf510bf0597b943eb8b610a0f76 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 10 May 2020 04:49:25 -0400
Subject: [PATCH] gnu: xfe: Fix few more FHS directories.

* gnu/packages/disk.scm (xfe): Fix /bin and /share paths in
st/config.h and src/xfedefs.h, respectively.
---
 gnu/packages/disk.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 0e35ef7de1..15f08773f8 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -990,7 +990,8 @@ since they are better handled by external tools.")
                     (file-prog (assoc-ref inputs "file")))
                (with-directory-excursion "src"
                  (substitute* '("FilePanel.cpp" "help.h" "SearchPanel.cpp"
-                                "startupnotification.cpp" "xfeutils.cpp")
+                                "startupnotification.cpp" "xfeutils.cpp"
+                                "../st/config.h")
                    (("/bin/sh" file) (string-append bash file))
                    (("/bin/ls" file) (string-append coreutils file))
                    (("/usr(/bin/du)" _ file) (string-append coreutils file))
@@ -1002,11 +1003,13 @@ since they are better handled by external tools.")
          (add-after 'unpack 'patch-share-dirs
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
-                    (share (string-append out "/share")))
+                    (share (string-append out "/share"))
+                    (xfe (string-append share "/xfe")))
                (with-directory-excursion "src"
                  (substitute* '("foxhacks.cpp" "help.h" "xfedefs.h"
                                 "XFileExplorer.cpp")
-                   (("/(usr|opt)(/local)?/share") share)))
+                   (("/(usr|opt)(/local)?/share") share)
+                   (("~/.config/xfe") xfe)))
                #t))))))
     (native-inputs
      `(("intltool" ,intltool)
-- 
2.26.2


[-- Attachment #1.1.3: 0xAE6EF3046D6F7B57.asc --]
[-- Type: application/pgp-keys, Size: 2877 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#41169] Acknowledgement (gnu: xfe: Fix few more FHS directories.)

[Raghav Gururajan]

[-- Attachment #1.1.1: Type: text/plain, Size: 216 bytes --]

Hi Nicolas!

Regarding the previous xfe patch, it looks like there are couple more
things to be patched. I have generated this patch for that. Would you be
able to push it please?

Thank you!

Regards,
RG.

[-- Attachment #1.1.2: 0xAE6EF3046D6F7B57.asc --]
[-- Type: application/pgp-keys, Size: 2877 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

bug#41169: gnu: xfe: Fix few more FHS directories.

[Nicolas Goaziou]

Hello,

Raghav Gururajan <raghavgururajan@disroot.org> writes:

> From 585adef1a8f0fdf510bf0597b943eb8b610a0f76 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Sun, 10 May 2020 04:49:25 -0400
> Subject: [PATCH] gnu: xfe: Fix few more FHS directories.

Applied. Thank you.

Regards,

-- 
Nicolas Goaziou

[bug#41169] gnu: xfe: Fix few more FHS directories.

[Raghav Gururajan]

[-- Attachment #1.1.1: Type: text/plain, Size: 76 bytes --]

Hi Nicolas!

> Applied. Thank you.

Thanks so much.

Regards,
RG.


[-- Attachment #1.1.2: 0xAE6EF3046D6F7B57.asc --]
[-- Type: application/pgp-keys, Size: 2877 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]