* [bug#40980] gnu: xfe: Fix configuration and icons.
@ 2020-04-30 11:29 Raghav Gururajan
2020-05-01 7:47 ` [bug#40980] gnu: xfe: Fix configuration and icons. (v2) Raghav Gururajan
0 siblings, 1 reply; 7+ messages in thread
From: Raghav Gururajan @ 2020-04-30 11:29 UTC (permalink / raw)
To: 40980
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-xfe-Fix-configuration-and-icons.patch --]
[-- Type: text/x-patch, Size: 2984 bytes --]
From 47a6d0cca849dbfe7e2b3fdc9479ae3307708324 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Apr 2020 07:23:41 -0400
Subject: [PATCH] gnu: xfe: Fix configuration and icons.
Patched paths to xferc and icons, to load them correctly.
Cosmetic changes to source uri.
* gnu/packages/disk.scm (xfe): Fix configuration and icons.
---
gnu/packages/disk.scm | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index b7d3b9d954..1d7f4ea1f9 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -917,9 +917,8 @@ since they are better handled by external tools.")
(origin
(method url-fetch)
(uri
- (string-append "https://sourceforge.net/projects/xfe/files/xfe/"
- version
- "/xfe-" version ".tar.gz"))
+ (string-append "https://sourceforge.net/projects/" name "/files/" name
+ "/" version "/" name "-" version ".tar.gz"))
(sha256
(base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs"))))
(build-system gnu-build-system)
@@ -937,17 +936,25 @@ since they are better handled by external tools.")
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-xferc-path
+ (add-after 'unpack 'patch-xfe-paths
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (xferc (string-append out "/share/xfe/xferc")))
+ (let*
+ ((out (assoc-ref outputs "out"))
+ (xferc (string-append out "/share/xfe/xferc"))
+ (xfe-theme (string-append out "/share/xfe/icons/xfe-theme")))
+ ;; Correct path for xfe configuration.
(substitute* "src/XFileExplorer.cpp"
- (("/usr/share/xfe/xferc") xferc))
- #t))))
- #:make-flags
- (let ((out (assoc-ref %outputs "out")))
- (list (string-append "BASH_COMPLETION_DIR=" out
- "/share/bash-completion/completions")))))
+ (("/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))))))
(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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [bug#40980] gnu: xfe: Fix configuration and icons. (v2)
2020-04-30 11:29 [bug#40980] gnu: xfe: Fix configuration and icons Raghav Gururajan
@ 2020-05-01 7:47 ` Raghav Gururajan
2020-05-01 11:55 ` Danny Milosavljevic
0 siblings, 1 reply; 7+ messages in thread
From: Raghav Gururajan @ 2020-05-01 7:47 UTC (permalink / raw)
To: 40980
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-xfe-Fix-configuration-and-icons.patch --]
[-- Type: text/x-patch, Size: 3275 bytes --]
From c29163895fd4c7aa4c2e448272e987ac6ff9ceed Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 1 May 2020 03:43:04 -0400
Subject: [PATCH] gnu: xfe: Fix configuration and icons.
Changed paths to datadir, xferc and icons, to load them correctly.
Removed bash-completions, as the directory does not exist.
Cosmetic changes to source uri.
* gnu/packages/disk.scm (xfe): Fix configuration and icons.
---
gnu/packages/disk.scm | 35 +++++++++++++++++++++++------------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index b7d3b9d954..fad07d60f6 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -917,9 +917,8 @@ since they are better handled by external tools.")
(origin
(method url-fetch)
(uri
- (string-append "https://sourceforge.net/projects/xfe/files/xfe/"
- version
- "/xfe-" version ".tar.gz"))
+ (string-append "https://sourceforge.net/projects/" name "/files/" name
+ "/" version "/" name "-" version ".tar.gz"))
(sha256
(base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs"))))
(build-system gnu-build-system)
@@ -937,17 +936,29 @@ since they are better handled by external tools.")
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-xferc-path
+ (add-after 'unpack 'patch-xfe-paths
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (xferc (string-append out "/share/xfe/xferc")))
+ (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.
+ (substitute* "src/foxhacks.cpp"
+ (("/etc:/usr/share:/usr/local/share") share))
+ ;; Correct path for xfe configuration.
(substitute* "src/XFileExplorer.cpp"
- (("/usr/share/xfe/xferc") xferc))
- #t))))
- #:make-flags
- (let ((out (assoc-ref %outputs "out")))
- (list (string-append "BASH_COMPLETION_DIR=" out
- "/share/bash-completion/completions")))))
+ (("/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))))))
(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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [bug#40980] gnu: xfe: Fix configuration and icons. (v2)
2020-05-01 7:47 ` [bug#40980] gnu: xfe: Fix configuration and icons. (v2) Raghav Gururajan
@ 2020-05-01 11:55 ` Danny Milosavljevic
2020-05-01 14:41 ` [bug#40980] gnu: xfe: Fix configuration and icons. (v3) Raghav Gururajan
0 siblings, 1 reply; 7+ messages in thread
From: Danny Milosavljevic @ 2020-05-01 11:55 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: 40980
[-- Attachment #1: Type: text/plain, Size: 1137 bytes --]
Hi Raghav,
On Fri, 1 May 2020 03:47:03 -0400
Raghav Gururajan <raghavgururajan@disroot.org> wrote:
> * gnu/packages/disk.scm (xfe): Fix configuration and icons.
Please mention the phases and arguments you changed.
> (origin
> (method url-fetch)
> (uri
> - (string-append "https://sourceforge.net/projects/xfe/files/xfe/"
> - version
> - "/xfe-" version ".tar.gz"))
> + (string-append "https://sourceforge.net/projects/" name "/files/" name
> + "/" version "/" name "-" version ".tar.gz"))
Please don't do that without a good reason because it makes us unable to rename
our package later.
> - (add-after 'unpack 'patch-xferc-path
> + (add-after 'unpack 'patch-xfe-paths
Please mention this in the commit log.
> - #:make-flags
> - (let ((out (assoc-ref %outputs "out")))
> - (list (string-append "BASH_COMPLETION_DIR=" out
> - "/share/bash-completion/completions")))))
Please mention the removal of make-flags in the commit log.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#40980] gnu: xfe: Fix configuration and icons. (v3)
2020-05-01 11:55 ` Danny Milosavljevic
@ 2020-05-01 14:41 ` Raghav Gururajan
2020-05-01 14:54 ` Danny Milosavljevic
0 siblings, 1 reply; 7+ messages in thread
From: Raghav Gururajan @ 2020-05-01 14:41 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 40980
[-- Attachment #1: Type: text/plain, Size: 1150 bytes --]
Hi Danny!
> > * gnu/packages/disk.scm (xfe): Fix configuration and icons.
>
> Please mention the phases and arguments you changed.
>
> > (origin
> > (method url-fetch)
> > (uri
> > - (string-append "https://sourceforge.net/projects/xfe/files/xfe/"
> > - version
> > - "/xfe-" version ".tar.gz"))
> > + (string-append "https://sourceforge.net/projects/" name "/files/"
> > name
> > + "/" version "/" name "-" version ".tar.gz"))
>
> Please don't do that without a good reason because it makes us unable to
> rename our package later.
>
> > - (add-after 'unpack 'patch-xferc-path
> > + (add-after 'unpack 'patch-xfe-paths
>
> Please mention this in the commit log.
>
> > - #:make-flags
> > - (let ((out (assoc-ref %outputs "out")))
> > - (list (string-append "BASH_COMPLETION_DIR=" out
> > - "/share/bash-completion/completions")))))
>
> Please mention the removal of make-flags in the commit log.
Please find the revised patch attached with this email.
Regards,
RG.
[-- Attachment #2: 0001-gnu-xfe-Fix-configuration-and-icons.patch --]
[-- Type: text/x-patch, Size: 3426 bytes --]
From 18ead96ab6498f2e197ca967e0e55a4c84cbb8f9 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 1 May 2020 10:29:06 -0400
Subject: [PATCH] gnu: xfe: Fix configuration and icons.
In patch-phase, added paths to datadir, xferc and icons;
to patch the respective and load them correctly.
Changed name of patch-phase to fit above changes.
Removed bash-completion make-flag, as the directory does not exist.
* gnu/packages/disk.scm (xfe): Fix configuration and icons.
---
gnu/packages/disk.scm | 35 +++++++++++++++++++++++------------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index b7d3b9d954..41429b73cc 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -918,8 +918,7 @@ since they are better handled by external tools.")
(method url-fetch)
(uri
(string-append "https://sourceforge.net/projects/xfe/files/xfe/"
- version
- "/xfe-" version ".tar.gz"))
+ version "/xfe-" version ".tar.gz"))
(sha256
(base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs"))))
(build-system gnu-build-system)
@@ -937,20 +936,32 @@ since they are better handled by external tools.")
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-xferc-path
+ (add-after 'unpack 'patch-xfe-paths
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (xferc (string-append out "/share/xfe/xferc")))
+ (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.
+ (substitute* "src/foxhacks.cpp"
+ (("/etc:/usr/share:/usr/local/share") share))
+ ;; Correct path for xfe configuration.
(substitute* "src/XFileExplorer.cpp"
- (("/usr/share/xfe/xferc") xferc))
- #t))))
- #:make-flags
- (let ((out (assoc-ref %outputs "out")))
- (list (string-append "BASH_COMPLETION_DIR=" out
- "/share/bash-completion/completions")))))
+ (("/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))))))
(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
of choice for all light thinking Unix addicts!")
(home-page "http://roland65.free.fr/xfe/")
- (license license:gpl2+)))
+ (license license:gpl2+)))
\ No newline at end of file
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [bug#40980] gnu: xfe: Fix configuration and icons. (v3)
2020-05-01 14:41 ` [bug#40980] gnu: xfe: Fix configuration and icons. (v3) Raghav Gururajan
@ 2020-05-01 14:54 ` Danny Milosavljevic
2020-05-01 16:45 ` [bug#40980] gnu: xfe: Fix configuration and icons. (v4) Raghav Gururajan
0 siblings, 1 reply; 7+ messages in thread
From: Danny Milosavljevic @ 2020-05-01 14:54 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: 40980
[-- Attachment #1: Type: text/plain, Size: 127 bytes --]
Hi Raghav,
please use our machine-readable metadata commit log convention instead of using
free text.
See our git log.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#40980] gnu: xfe: Fix configuration and icons. (v4)
2020-05-01 14:54 ` Danny Milosavljevic
@ 2020-05-01 16:45 ` Raghav Gururajan
2020-05-01 17:21 ` bug#40980: " Danny Milosavljevic
0 siblings, 1 reply; 7+ messages in thread
From: Raghav Gururajan @ 2020-05-01 16:45 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 40980
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
Hi Danny!
> please use our machine-readable metadata commit log convention instead of
> using free text.
>
> See our git log.
Sorry about that. I just saw your modified commit message in previous commits.
Please find the revised patch attached with this email.
Regards,
RG.
[-- Attachment #2: 0001-gnu-xfe-Fix-configuration-and-icons.patch --]
[-- Type: text/x-patch, Size: 3430 bytes --]
From 7e9c3b41d89e7ba4908cf7894b3222377e162af9 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 1 May 2020 12:31:27 -0400
Subject: [PATCH] gnu: xfe: Fix configuration and icons.
* gnu/packages/disk.scm (xfe):
[arguments]<#:make-flags>[BASH_COMPLETION_DIR]: Remove flag.
[arguments]<#:phases>[patch-xferc-path]: Remove phase.
[arguments]<#:phases>[patch-xfe-paths]: New phase.
---
gnu/packages/disk.scm | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index b7d3b9d954..e723efebbf 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -917,9 +917,8 @@ since they are better handled by external tools.")
(origin
(method url-fetch)
(uri
- (string-append "https://sourceforge.net/projects/xfe/files/xfe/"
- version
- "/xfe-" version ".tar.gz"))
+ (string-append "https://sourceforge.net/projects/xfe/files/xfe/"
+ version "/xfe-" version ".tar.gz"))
(sha256
(base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs"))))
(build-system gnu-build-system)
@@ -937,20 +936,32 @@ since they are better handled by external tools.")
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-xferc-path
+ (add-after 'unpack 'patch-xfe-paths
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (xferc (string-append out "/share/xfe/xferc")))
+ (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.
+ (substitute* "src/foxhacks.cpp"
+ (("/etc:/usr/share:/usr/local/share") share))
+ ;; Correct path for xfe configuration.
(substitute* "src/XFileExplorer.cpp"
- (("/usr/share/xfe/xferc") xferc))
- #t))))
- #:make-flags
- (let ((out (assoc-ref %outputs "out")))
- (list (string-append "BASH_COMPLETION_DIR=" out
- "/share/bash-completion/completions")))))
+ (("/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))))))
(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
of choice for all light thinking Unix addicts!")
(home-page "http://roland65.free.fr/xfe/")
- (license license:gpl2+)))
+ (license license:gpl2+)))
\ No newline at end of file
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-05-01 17:22 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-30 11:29 [bug#40980] gnu: xfe: Fix configuration and icons Raghav Gururajan
2020-05-01 7:47 ` [bug#40980] gnu: xfe: Fix configuration and icons. (v2) Raghav Gururajan
2020-05-01 11:55 ` Danny Milosavljevic
2020-05-01 14:41 ` [bug#40980] gnu: xfe: Fix configuration and icons. (v3) Raghav Gururajan
2020-05-01 14:54 ` Danny Milosavljevic
2020-05-01 16:45 ` [bug#40980] gnu: xfe: Fix configuration and icons. (v4) Raghav Gururajan
2020-05-01 17:21 ` bug#40980: " Danny Milosavljevic
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).