[bug#70481] [PATCH 0/2] Update qmmp

[bug#70481] [PATCH 0/2] Update qmmp

[Timotej Lazar]

Timotej Lazar (2):
  gnu: qmmp: Update to 2.1.7.
  gnu: qmmp: Add missing inputs.

 gnu/packages/music.scm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)


base-commit: 0f68306268773f0eaa4327e1f6fdcb39442e4a34
-- 
2.41.0

[bug#70481] [PATCH 1/2] gnu: qmmp: Update to 2.1.7.

[Timotej Lazar]

* gnu/packages/music.scm (qmmp): Update to 2.1.7.
[properties]: Add release-monitoring-url.
---
 gnu/packages/music.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ceac94a592..86b46bfdfe 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -603,15 +603,15 @@ (define-public ctrlr
 (define-public qmmp
   (package
     (name "qmmp")
-    (version "2.1.6")
+    (version "2.1.7")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://qmmp.ylsoftware.com/files/"
+       (uri (string-append "https://qmmp.ylsoftware.com/files/qmmp/"
                            (version-major+minor version) "/"
                            "qmmp-" version ".tar.bz2"))
        (sha256
-        (base32 "1jpflf17198ascaqmxla6ajb69bnj8zzngk32vdyyw5443kshylj"))))
+        (base32 "0wqy4dh5cci67d822zn2535l0vsvd9c9sqsbscz4j530c6y6g9z6"))))
     (build-system qt-build-system)
     (arguments
      (list #:qtbase qtbase
@@ -650,6 +650,8 @@ (define-public qmmp
     (native-inputs
      (list pkg-config))
     (home-page "https://qmmp.ylsoftware.com")
+    (properties
+     `((release-monitoring-url . "https://qmmp.ylsoftware.com/downloads.php")))
     (synopsis "Qt-based music player")
     (description "Music player with support for most common audio formats, and
 plugins for various additional features such as visualization, effects and
-- 
2.41.0

[bug#70481] [PATCH 2/2] gnu: qmmp: Add missing inputs.

[Timotej Lazar]

* gnu/packages/music.scm (qmmp): Add inputs to support unpacking skins.
[inputs]: Add tar and unzip.
[arguments]: Add phase to set absolute paths to these programs.

Change-Id: I79a6530ad27b474ecc64e5b7de36e0370595bc69
---
 gnu/packages/music.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 86b46bfdfe..df3ff38b4a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -615,7 +615,15 @@ (define-public qmmp
     (build-system qt-build-system)
     (arguments
      (list #:qtbase qtbase
-           #:tests? #f)) ; there are no tests
+           #:tests? #f ; there are no tests
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'set-paths
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* "src/plugins/Ui/skinned/skinreader.cpp"
+                     (("\"(tar|unzip)\"" _ name)
+                      (let ((file (string-append "/bin/" name)))
+                        (string-append "\"" (search-input-file inputs file) "\"")))))))))
     (inputs
      ;; Missing optional inputs:
      ;; libsidplay2 ; input plugin
@@ -645,6 +653,8 @@ (define-public qmmp
            qttools
            soxr
            taglib
+           tar ; for loading skins
+           unzip ; for loading skins
            wavpack
            wildmidi))
     (native-inputs
-- 
2.41.0

bug#70481: [PATCH 0/2] Update qmmp

[Zheng Junjie]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

Timotej Lazar <timotej.lazar@araneo.si> writes:

> Timotej Lazar (2):
>   gnu: qmmp: Update to 2.1.7.
>   gnu: qmmp: Add missing inputs.
>
>  gnu/packages/music.scm | 20 ++++++++++++++++----
>  1 file changed, 16 insertions(+), 4 deletions(-)
>
>
> base-commit: 0f68306268773f0eaa4327e1f6fdcb39442e4a34

LGTM, push. see
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=fa67c2718a22348f49f279704e79925bc7488da5
and https://git.savannah.gnu.org/cgit/guix.git/commit/?id=53623ce862fb9cb02b1a6028d37c2e240eb05093

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]