unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#44951] [PATCH] gnu: Add catfish.
@ 2020-11-29 18:54 Kei Kebreau
  2020-12-02 13:02 ` Mathieu Othacehe
  0 siblings, 1 reply; 3+ messages in thread
From: Kei Kebreau @ 2020-11-29 18:54 UTC (permalink / raw)
  To: 44951; +Cc: Kei Kebreau

* gnu/packages/xfce.scm (catfish): New variable.
---
 gnu/packages/xfce.scm | 61 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index fbe06a1c76..9d05da5853 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -53,7 +53,9 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages polkit)
   #:use-module (gnu packages popt)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages search)
   #:use-module (gnu packages web)
   #:use-module (gnu packages wm)
   #:use-module (gnu packages xml)
@@ -62,6 +64,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -203,6 +206,64 @@ storage system.")
 to share commonly used Xfce widgets among the Xfce applications.")
     (license lgpl2.0+)))
 
+(define-public catfish
+  (package
+    (name "catfish")
+    (version "1.4.13")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://archive.xfce.org/src/apps/"
+                                  "catfish/" (version-major+minor version)
+                                  "/catfish-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0fg89946z6n8njxn4mv29jksw8yavg8vypsljn9031pjwl3fmh2q"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-command-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "catfish/CatfishSearchEngine.py"
+               (("'which'") (string-append "'" (which "which") "'")))
+             (substitute* "catfish/CatfishWindow.py"
+               (("xdg-mime") (which "xdg-mime"))
+               (("xdg-open") (which "xdg-open")))))
+         ;; setup.py script does not support one of the Python build
+         ;; system's default flags, "--single-version-externally-managed".
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "python" "setup.py" "install"
+                     (string-append "--prefix=" (assoc-ref outputs "out"))
+                     "--root=/")))
+         (add-after 'install 'wrap-program
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/catfish")
+                 `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
+                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))
+       #:tests? #f))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("python-distutils-extra" ,python-distutils-extra)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("which" ,which)
+       ("xdg-utils" ,xdg-utils)))
+    (propagated-inputs
+     `(("gtk+" ,gtk+)
+       ("python-dbus" ,python-dbus)
+       ("python-pexpect" ,python-pexpect)
+       ("python-pycairo" ,python-pycairo)
+       ("python-pygobject" ,python-pygobject)))
+    (home-page "https://docs.xfce.org/apps/catfish/start")
+    (synopsis "File searching tool for Xfce")
+    (description
+     "Catfish is a handy file searching tool for Linux and Unix.  The interface
+is intentionally lightweight and simple, using only GTK+ 3.  You can configure
+it to your needs by using several command line options.")
+    (license gpl2+)))
+
 (define-public elementary-xfce-icon-theme
   (package
     (name "elementary-xfce-icon-theme")
-- 
2.29.2





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#44951] [PATCH] gnu: Add catfish.
  2020-11-29 18:54 [bug#44951] [PATCH] gnu: Add catfish Kei Kebreau
@ 2020-12-02 13:02 ` Mathieu Othacehe
  2020-12-02 14:22   ` bug#44951: " Kei
  0 siblings, 1 reply; 3+ messages in thread
From: Mathieu Othacehe @ 2020-12-02 13:02 UTC (permalink / raw)
  To: Kei Kebreau; +Cc: 44951


Hello,

> +     "Catfish is a handy file searching tool for Linux and Unix.  The interface
> +is intentionally lightweight and simple, using only GTK+ 3.  You can configure
> +it to your needs by using several command line options.")

I would remove "handy" to stay neutral. Otherwise, it looks nice!

Thanks,

Mathieu




^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#44951: [PATCH] gnu: Add catfish.
  2020-12-02 13:02 ` Mathieu Othacehe
@ 2020-12-02 14:22   ` Kei
  0 siblings, 0 replies; 3+ messages in thread
From: Kei @ 2020-12-02 14:22 UTC (permalink / raw)
  To: Mathieu Othacehe; +Cc: 44951-done

Thanks for reviewing this!  It has been pushed to master with the suggested
change as commit 3c2cf75fb3.

Kei





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-12-02 14:24 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-29 18:54 [bug#44951] [PATCH] gnu: Add catfish Kei Kebreau
2020-12-02 13:02 ` Mathieu Othacehe
2020-12-02 14:22   ` bug#44951: " Kei

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).