[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#75146] [PATCH v4 16/68] gnu: catfish: Update to 4.20.0.
From: |
iyzsong |
Subject: |
[bug#75146] [PATCH v4 16/68] gnu: catfish: Update to 4.20.0. |
Date: |
Tue, 31 Dec 2024 14:43:46 +0800 |
From: Ashvith Shetty <Ashvith@noreply.codeberg.org>
* gnu/packages/xfce.scm (catfish): Update to 4.20.0.
[source]: Switch to git-fetch.
[home-page]: Set to docs.xfce.org.
[build-system]: Switch to meson-build-system
[arguments]: Simpify phases.
[native-inputs]: Add desktop-file-utils, gettext-minimal, gtk+:bin and python.
Remove intltool and python-distutils-extra.
Change-Id: Ieca091640912cfbe50d13623bcc0866aa5e3514c
---
gnu/packages/xfce.scm | 87 +++++++++++++++++++++----------------------
1 file changed, 43 insertions(+), 44 deletions(-)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 61377e2f16..73bf34cd80 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -81,7 +81,7 @@ (define-module (gnu packages xfce)
#: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 meson)
#:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -220,50 +220,49 @@ (define-public libxfce4ui
(define-public catfish
(package
(name "catfish")
- (version "4.18.0")
- (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
- "16cbsnki7qragwhbfs3h0ja7xg8xlf59ajxhddqm0jkmrirrpbpx"))))
- (build-system python-build-system)
+ (version "4.20.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.xfce.org/apps/catfish")
+ (commit (string-append name "-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1vyf62n8j2pgxd30j8hf1x6d0yz8r86ng39p9smfpq7m3vll8i7c"))))
+ (build-system meson-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=/")))
- ;; The check failed to spawn a message bus without /etc/machine-id.
- (delete 'sanity-check)
- (add-after 'install 'wrap-program
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/catfish")
- `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
- `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))
- #:tests? #f))
- (native-inputs
- (list pkg-config python-distutils-extra intltool))
- (inputs
- (list bash-minimal which xfconf xdg-utils))
- (propagated-inputs
- (list gtk+ python-dbus python-pexpect python-pycairo
- python-pygobject))
- (home-page "https://docs.xfce.org/apps/catfish/start")
+ (list
+ #: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")))))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/catfish")
+ `("GUIX_PYTHONPATH" =
+ (,(getenv "GUIX_PYTHONPATH")))
+ `("GI_TYPELIB_PATH" =
+ (,(getenv "GI_TYPELIB_PATH"))))))))
+ #:tests? #f))
+ (native-inputs (list desktop-file-utils ;for update-desktop-database
+ gettext-minimal
+ (list gtk+ "bin") ;for gtk-update-icon-cache
+ pkg-config
+ python))
+ (inputs (list bash-minimal which xfconf xdg-utils))
+ (propagated-inputs (list gtk+ python-dbus python-pexpect python-pycairo
+ python-pygobject))
+ (home-page "https://docs.xfce.org/apps/catfish/")
(synopsis "File searching tool for Xfce")
(description
"Catfish is a file searching tool for Linux and Unix. The interface is
--
2.46.0
- [bug#75146] [PATCH v4 14/68] gnu: xfce4-pulseaudio-plugin: Switch to git source., (continued)
- [bug#75146] [PATCH v4 14/68] gnu: xfce4-pulseaudio-plugin: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 10/68] gnu: tumbler: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 04/68] gnu: libxfce4util: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 17/68] gnu: xfce4-whiskermenu-plugin: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 05/68] gnu: xfconf: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 07/68] gnu: libxfce4windowing: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 12/68] gnu: xfce4-battery-plugin: Update to 1.1.6., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 19/68] gnu: xfce4-appfinder: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 13/68] gnu: xfce4-clipman-plugin: Update to 1.6.7., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 11/68] gnu: xfce4-panel: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 16/68] gnu: catfish: Update to 4.20.0.,
iyzsong <=
- [bug#75146] [PATCH v4 09/68] gnu: garcon: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 18/68] gnu: xfce4-xkb-plugin: Update to 0.8.5., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 23/68] gnu: thunar-volman: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 21/68] gnu: xfce4-settings: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 20/68] gnu: xfce4-session: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 26/68] gnu: thunar-media-tags-plugin: Update to 0.5.0., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 22/68] gnu: thunar: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 25/68] gnu: thunar-shares-plugin: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 29/68] gnu: xfwm4: Switch to git source., iyzsong, 2024/12/31
- [bug#75146] [PATCH v4 24/68] gnu: thunar-archive-plugin: Update to 0.5.3., iyzsong, 2024/12/31