[bug#40487] gnu: Add xfe.

[bug#40487] gnu: Add xfe.

[Raghav Gururajan]

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

Hello Guix!

Please find the attached patch to add 'xfe' package to guix.

BLOCKER: #40484

Regards,
RG.

[-- Attachment #2: xfe.patch --]
[-- Type: application/octet-stream, Size: 2853 bytes --]

From d979830d81238cffbc12d79782eb48b4b6cd4ece Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 7 Apr 2020 11:28:40 -0400
Subject: [PATCH 3/3] gnu: Add xfe.

* gnu/packages/disk.scm (xfe): New variable.
---
 gnu/packages/disk.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index e54d6911ce..988237dd2d 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2020 Pkill -9 <pkill9@runbox.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,10 +47,12 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages graphics)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages linux)
@@ -70,6 +73,7 @@
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system python)
@@ -856,3 +860,36 @@ written in Go.  It is heavily inspired by ranger with some missing and
 extra features.  Some of the missing features are deliberately omitted
 since they are better handled by external tools.")
     (license license:expat)))
+
+(define-public xfe
+  (package
+    (name "xfe")
+    (version "1.43.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://sourceforge.net/projects/" name "/files/" name "/"
+         version "/" name "-" version ".tar.gz"))
+       (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)))
+    (synopsis "X File Explorer")
+    (description"XFE 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+)))
-- 
2.26.0

[bug#40487] bug#34276: gnu: Add xfe.

[Brice Waegeneire]

The patch look fine, however `xfe` segfault on me repeatedly after
canceling the pop window about xferc location on the first run. Raghav
wasn't able to reproduce it on it's end when we talked on IRC[0]. We 
need
someone else trying to reproducing this to know if the issue come solely
from my side. Furthermore icons are missing but I'm not sure if it's
mandatory in Guix.

[0]: http://logs.guix.gnu.org/guix/2020-04-08.log#100540

- Brice

[bug#40487] gnu: Add xfe. (v2)

[Raghav Gururajan]

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



[-- Attachment #2: 0004-gnu-Add-xfe.patch --]
[-- Type: application/octet-stream, Size: 3495 bytes --]

From 0bef9e29ecbef265efce7dc4e4c5fb51fd6203e2 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 8 Apr 2020 23:21:47 -0400
Subject: [PATCH 4/4] gnu: Add xfe.

* gnu/packages/disk.scm (xfe): New variable.
---
 gnu/packages/disk.scm | 51 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index e54d6911ce..ea2935a50a 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2020 Pkill -9 <pkill9@runbox.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,10 +47,12 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages graphics)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages linux)
@@ -70,6 +73,7 @@
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system python)
@@ -856,3 +860,50 @@ written in Go.  It is heavily inspired by ranger with some missing and
 extra features.  Some of the missing features are deliberately omitted
 since they are better handled by external tools.")
     (license license:expat)))
+
+(define-public xfe
+  (package
+    (name "xfe")
+    (version "1.43.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://sourceforge.net/projects/" name "/files/" name "/"
+         version "/" name "-" version ".tar.gz"))
+       (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-xferc-path
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out     (assoc-ref outputs "out"))
+                    (xferc   (string-append out "/share/xfe/xferc")))
+                (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")))))
+    (synopsis "X File Explorer")
+    (description"XFE 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+)))
-- 
2.26.0

[bug#40487] bug#34276: gnu: Add xfe.

[Brice Waegeneire]

Nice, v2 doesn't crash.

LGTM.

[bug#40487] gnu: Add xfe. (v3)

[Raghav Gururajan]

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



[-- Attachment #2: 0003-gnu-Add-xfe.patch --]
[-- Type: application/octet-stream, Size: 3522 bytes --]

From b2e0572d39fb52b8f15e23eb2b9d38404574d0e2 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 9 Apr 2020 11:20:12 -0400
Subject: [PATCH 3/3] gnu: Add xfe.

* gnu/packages/disk.scm (xfe): New variable.
---
 gnu/packages/disk.scm | 51 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index e54d6911ce..3d0ad30544 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2020 Pkill -9 <pkill9@runbox.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,10 +47,12 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages graphics)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages linux)
@@ -70,6 +73,7 @@
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system python)
@@ -856,3 +860,50 @@ written in Go.  It is heavily inspired by ranger with some missing and
 extra features.  Some of the missing features are deliberately omitted
 since they are better handled by external tools.")
     (license license:expat)))
+
+(define-public xfe
+  (package
+    (name "xfe")
+    (version "1.43.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://sourceforge.net/projects/xfe/files/xfe/"
+         version "/xfe-" version ".tar.gz"))
+       (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-xferc-path
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out     (assoc-ref outputs "out"))
+                    (xferc   (string-append out "/share/xfe/xferc")))
+               (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")))))
+    (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+)))
-- 
2.26.0

bug#40487: gnu: Add xfe. (v3)

[Nicolas Goaziou]

Hello,

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> Subject: [PATCH 3/3] gnu: Add xfe.

Applied. Thank you!

Regards,

-- 
Nicolas Goaziou