From 73ec844389e91cb0f5a2647070516fc8d19d8730 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Tue, 27 Aug 2024 16:44:45 -0400 Subject: gnu: gpodder: Update to 3.11.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gpodder.scm (gpodder): Update to 3.11.4. [inputs]: Replace youtube-dl with yt-dlp. [arguments]: Use G-expressions. Use #$output and search-input-file instead of assoc-ref. Remove trailing #t from phases. Change-Id: Ic5c07f63e1e5e419857ead2d58cd273660e0cad5 Signed-off-by: Ludovic Courtès --- gnu/packages/gpodder.scm | 74 +++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 1073af0f3b..c3e1c9b496 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -22,6 +22,7 @@ (define-module (gnu packages gpodder) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) @@ -50,7 +51,7 @@ (define-public gpodder (package (name "gpodder") - (version "3.11.1") + (version "3.11.4") (source (origin (method git-fetch) @@ -58,7 +59,7 @@ (url "https://github.com/gpodder/gpodder") (commit version))) (sha256 - (base32 "121cb8qz4rp6602lpbi6m2vqx3ar1cw2s4z4r7nr5qaxb0q3gk9n")) + (base32 "1zmp7kkldb59fx1y6k4mkff8ngmyb9pflcd3yqb28m9wb9bp4j4h")) (file-name (git-file-name name version)) (patches (search-patches "gpodder-disable-updater.patch")))) (build-system python-build-system) @@ -81,47 +82,42 @@ python-mutagen python-mygpoclient python-podcastparser - youtube-dl + yt-dlp xdg-utils)) (arguments - '(#:phases - (modify-phases %standard-phases - ;; Avoid needing xdg-utils as a propagated input. - (add-after 'unpack 'patch-xdg-open - (lambda* (#:key inputs #:allow-other-keys) - (let ((xdg-utils (assoc-ref inputs "xdg-utils"))) - (substitute* "src/gpodder/util.py" - (("xdg-open") (string-append xdg-utils "/bin/xdg-open"))) - #t))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "make" "unittest")))) - ;; 'msgmerge' introduces non-determinism by resetting the - ;; POT-Creation-Date in .po files. - (add-before 'install 'do-not-run-msgmerge - (lambda _ - (substitute* "makefile" - (("msgmerge") "true")) - #t)) - (add-before 'install 'make-po-files-writable - (lambda _ - (for-each + (list + #:phases + #~(modify-phases %standard-phases + ;; Avoid needing xdg-utils as a propagated input. + (add-after 'unpack 'patch-xdg-open + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/gpodder/util.py" + (("xdg-open") (search-input-file inputs "bin/xdg-open"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "unittest")))) + ;; 'msgmerge' introduces non-determinism by resetting the + ;; POT-Creation-Date in .po files. + (add-before 'install 'do-not-run-msgmerge + (lambda _ + (substitute* "makefile" + (("msgmerge") "true")))) + (add-before 'install 'make-po-files-writable + (lambda _ + (for-each (lambda (f) (chmod f #o664)) - (find-files "po")) - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (setenv "PREFIX" (assoc-ref outputs "out")) - (invoke "make" "install"))) - (add-after 'install 'wrap-gpodder - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program (string-append out "/bin/gpodder") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) - #t)))))) + (find-files "po")))) + (replace 'install + (lambda _ + (setenv "PREFIX" #$output) + (invoke "make" "install"))) + (add-after 'install 'wrap-gpodder + (lambda _ + (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append #$output "/bin/gpodder") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) (home-page "https://gpodder.github.io") (synopsis "Simple podcast client") (description "gPodder is a podcatcher, i.e. an application that allows -- cgit v1.2.3