Package: guix-patches;
Reported by: Ashvith Shetty <ashvithshetty10 <at> gmail.com>
Date: Fri, 27 Dec 2024 19:49:01 UTC
Severity: normal
Tags: patch
Done: 宋文武 <iyzsong <at> envs.net>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Ashvith Shetty <ashvithshetty10 <at> gmail.com> To: 75146 <at> debbugs.gnu.org Cc: Ashvith Shetty <Ashvith <at> noreply.codeberg.org> Subject: [bug#75146] [PATCH v0 07/15] gnu: catfish: Update to 4.20.0. Date: Sat, 28 Dec 2024 01:23:18 +0530
From: Ashvith Shetty <Ashvith <at> noreply.codeberg.org>
* gnu/packages/xfce.scm (catfish): Update to 4.20.0.
[source]: Update to XFCE's GitLab URL.
[home-page]: Set to docs.xfce.org.
[build-system]: Switch to meson-build-system
[arguments]: Enable tests
Do not replace phase 'install.
Do not delete 'sanity-check.
[native-inputs]: Add cmake, desktop-file-utils, (list gtk+ "bin")
and python.
Remove python-distutils-extra.
Change-Id: Ifc922b45308718b1a5586c15a0025f3e6d20ea4b
---
gnu/packages/xfce.scm | 88 +++++++++++++++++++++----------------------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 152da5c12d..22557bd241 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -43,6 +43,7 @@ (define-module (gnu packages xfce)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages calendar)
#:use-module (gnu packages cdrom)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages docbook)
#:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils)
@@ -82,7 +83,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)
@@ -223,50 +224,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"))))))))))
+ (native-inputs (list cmake
+ desktop-file-utils
+ (list gtk+ "bin")
+ pkg-config
+ python
+ 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/")
(synopsis "File searching tool for Xfce")
(description
"Catfish is a file searching tool for Linux and Unix. The interface is
--
2.46.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.