* [bug#72847] Patches
2024-08-27 21:17 [bug#72847] [PATCH 0/4] Update gpodder.scm kiasoc5 via Guix-patches via
2024-09-03 8:57 ` [bug#72847] Patches missing Andreas Enge
@ 2024-09-22 16:40 ` kiasoc5--- via Guix-patches via
2024-10-04 19:41 ` bug#72847: Patches Ludovic Courtès
1 sibling, 1 reply; 4+ messages in thread
From: kiasoc5--- via Guix-patches via @ 2024-09-22 16:40 UTC (permalink / raw)
To: 72847
[-- Attachment #1: Type: text/plain, Size: 82 bytes --]
I am traveling and unable to send emails through git. I've attached the
patches.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-gnu-libmygpo-qt-Improve-package-style.patch --]
[-- Type: text/x-diff; name=0003-gnu-libmygpo-qt-Improve-package-style.patch, Size: 1317 bytes --]
From 12ba5eab5a57f45a80813695bd070f372598e671 Mon Sep 17 00:00:00 2001
Message-Id: <12ba5eab5a57f45a80813695bd070f372598e671.1725289939.git.kiasoc5@disroot.org>
In-Reply-To: <4ee49352110cb9a0ac58e5f3ac44ea4481a7b028.1725289939.git.kiasoc5@disroot.org>
References: <4ee49352110cb9a0ac58e5f3ac44ea4481a7b028.1725289939.git.kiasoc5@disroot.org>
From: kiasoc5 <kiasoc5@disroot.org>
Date: Tue, 27 Aug 2024 17:00:32 -0400
Subject: [PATCH 3/4] gnu: libmygpo-qt: Improve package style.
* gnu/packages/gpodder.scm (libmygpo-qt)[inputs]: Remove input labels.
[arguments]: Switch from quasiquote to quote.
Change-Id: If258f1e7ef5d291e5452e3d540564c13d86801ef
---
gnu/packages/gpodder.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index e77cd39bcf..1073af0f3b 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -147,9 +147,9 @@ (define-public libmygpo-qt
(native-inputs
(list pkg-config))
(inputs
- `(("qt" ,qtbase-5)))
+ (list qtbase-5))
(arguments
- `(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON")
+ '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON")
;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446
;; is fixed.
#:tests? #f))
--
2.39.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0004-gnu-gpodder-Update-to-3.11.4.patch --]
[-- Type: text/x-diff; name=0004-gnu-gpodder-Update-to-3.11.4.patch, Size: 5357 bytes --]
From a8257413dd5c4db04c585ba5fffc5c101a60c573 Mon Sep 17 00:00:00 2001
Message-Id: <a8257413dd5c4db04c585ba5fffc5c101a60c573.1725289939.git.kiasoc5@disroot.org>
In-Reply-To: <4ee49352110cb9a0ac58e5f3ac44ea4481a7b028.1725289939.git.kiasoc5@disroot.org>
References: <4ee49352110cb9a0ac58e5f3ac44ea4481a7b028.1725289939.git.kiasoc5@disroot.org>
From: kiasoc5 <kiasoc5@disroot.org>
Date: Tue, 27 Aug 2024 16:44:45 -0400
Subject: [PATCH 4/4] gnu: gpodder: Update to 3.11.4.
* 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
---
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-module (gnu packages gpodder)
(define-public gpodder
(package
(name "gpodder")
- (version "3.11.1")
+ (version "3.11.4")
(source
(origin
(method git-fetch)
@@ -58,7 +59,7 @@ (define-public gpodder
(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 @@ (define-public gpodder
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
--
2.39.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0002-gnu-python-mygpoclient-Update-to-1.9.patch --]
[-- Type: text/x-diff; name=0002-gnu-python-mygpoclient-Update-to-1.9.patch, Size: 1717 bytes --]
From 0b2b747882807f556ee5bc7fce0a38941f89b529 Mon Sep 17 00:00:00 2001
Message-Id: <0b2b747882807f556ee5bc7fce0a38941f89b529.1725289939.git.kiasoc5@disroot.org>
In-Reply-To: <4ee49352110cb9a0ac58e5f3ac44ea4481a7b028.1725289939.git.kiasoc5@disroot.org>
References: <4ee49352110cb9a0ac58e5f3ac44ea4481a7b028.1725289939.git.kiasoc5@disroot.org>
From: kiasoc5 <kiasoc5@disroot.org>
Date: Tue, 27 Aug 2024 01:20:36 -0400
Subject: [PATCH 2/4] gnu: python-mygpoclient: Update to 1.9.
* gnu/packages/gpodder.scm (python-mygpoclient): Update to 1.9.
[native-inputs]: Add python-pytest.
[arguments]: Switch from quasiquote to quote.
Change-Id: I78c6f49d94619d63a115527a20fb6ae1c30fed4b
---
gnu/packages/gpodder.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index 52ca28a632..e77cd39bcf 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -163,19 +163,19 @@ (define-public libmygpo-qt
(define-public python-mygpoclient
(package
(name "python-mygpoclient")
- (version "1.8")
+ (version "1.9")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mygpoclient" version))
(sha256
(base32
- "1fi5x6k1mngr0iviw2s4n1f3y2x7pwqy5ivkcrjdprzvwr37f0mh"))))
+ "05hmjdb73m7vl6lzvh58bnliy4227pv8hprwfka0bg19cnvgpyf5"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-minimock python-nose))
+ (list python-coverage python-minimock python-nose python-pytest))
(arguments
- `(#:phases
+ '(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
--
2.39.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0001-gnu-python-podcastparser-Update-to-0.6.10.patch --]
[-- Type: text/x-diff; name=0001-gnu-python-podcastparser-Update-to-0.6.10.patch, Size: 1266 bytes --]
From 4ee49352110cb9a0ac58e5f3ac44ea4481a7b028 Mon Sep 17 00:00:00 2001
Message-Id: <4ee49352110cb9a0ac58e5f3ac44ea4481a7b028.1725289939.git.kiasoc5@disroot.org>
From: kiasoc5 <kiasoc5@disroot.org>
Date: Tue, 27 Aug 2024 01:20:36 -0400
Subject: [PATCH 1/4] gnu: python-podcastparser: Update to 0.6.10.
* gnu/packages/gpodder.scm (python-podcastparser): Update to 0.6.10.
Change-Id: I8378ec847d3815412918e43fe1583cb06a9658f6
---
gnu/packages/gpodder.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index f9102d3a44..52ca28a632 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -191,13 +191,13 @@ (define-public python-mygpoclient
(define-public python-podcastparser
(package
(name "python-podcastparser")
- (version "0.6.6")
+ (version "0.6.10")
(source
(origin
(method url-fetch)
(uri (pypi-uri "podcastparser" version))
(sha256
- (base32 "0m24r2qhck0win44xfhxajbppkss4ha6am0042s0xyq3408883m3"))))
+ (base32 "1mqkkxz928y430xx3mgw9dj78ilkgv9hjdha1hizbks6mmhcp6ib"))))
(native-inputs
(list python-pytest))
(arguments
base-commit: 0aa66ec0b0bef39591ddae3d8d06ac0fa71f03bb
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread