GNU bug report logs - #71810
[PATCH 1/3] gnu: smplayer: Update to 22.2.0

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Z572 <873216071 <at> qq.com>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#71810: closed ([PATCH 1/3] gnu: smplayer: Update to 22.2.0)
Date: Mon, 15 Jul 2024 13:42:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Mon, 15 Jul 2024 21:41:01 +0800
with message-id <8734oahixe.fsf <at> qq.com>
and subject line Re: [bug#71810] [PATCH v2 3/3] gnu: smplayer: Update to 23.12.0.
has caused the debbugs.gnu.org bug report #71810,
regarding [PATCH 1/3] gnu: smplayer: Update to 22.2.0
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
71810: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71810
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: attila.lendvai <at> gmail.com
To: guix-patches <at> gnu.org
Cc: Attila Lendvai <attila <at> lendvai.name>
Subject: [PATCH 1/3] gnu: smplayer: Update to 22.2.0
Date: Thu, 27 Jun 2024 23:58:19 +0200

From: Attila Lendvai <attila <at> lendvai.name>

* gnu/packages/video.scm (smplayer) [origin]: Build from the git repo.
[arguments]: Remove LRELEASE kludge.

Change-Id: Iff065784a2b2ef677807e4194ca04ce2ec501fef
---

the rationale for sending three patches is that if someone
wants to experiment with different versions, then they can
easily grab them from the git history.

and i had to go step-by-step anyway to find out what version
broke, and what was the difference, so i recorded the steps.

 gnu/packages/video.scm | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 77cdfe9078c..731403f5291 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2711,15 +2711,15 @@ (define-public mpv
 (define-public smplayer
   (package
     (name "smplayer")
-    (version "21.10.0")
+    (version "22.2.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://sourceforge/smplayer/SMPlayer/" version
-                    "/smplayer-" version ".tar.bz2"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/smplayer-dev/smplayer")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
-               (base32
-                "12nvcl0cfix1xay9hfi7856vg4lpv8y5b0a22212bsjbvl5g22rc"))))
+               (base32 "0mcvpm86n9l0nwavnaa1n2jfalgrzdfh92sdjnwx1iga89m4k55s"))))
     (build-system qt-build-system)
     (native-inputs
      (list qttools-5))
@@ -2728,23 +2728,10 @@ (define-public smplayer
     (arguments
      (list #:tests? #false              ; no tests
            #:make-flags #~(list (string-append "PREFIX=" #$output)
-                                (string-append "CC=" #+(cc-for-target))
-                                ;; A KLUDGE to turn off invoking lrelease on the
-                                ;; project for now, because it fails consistently
-                                ;; with "WARNING: Could not find qmake spec
-                                ;; 'default'". See below.
-                                "LRELEASE=true")
+                                (string-append "CC=" #+(cc-for-target)))
            #:phases
            #~(modify-phases %standard-phases
                (delete 'configure)
-               ;; Due to the above, we must run lrelease separately on each .ts file
-               ;; (as opposed to running `lrelease-pro smplayer.pro` for the entire
-               ;; project, as the Makefile does normally without the above kludge).
-               (add-after 'build 'compile-ts-files
-                 (lambda _
-                   (for-each (lambda (file)
-                               (invoke "lrelease" file))
-                             (find-files "./" "\\.ts$"))))
                (add-after 'install 'wrap-executable
                  (lambda* (#:key inputs outputs #:allow-other-keys)
                    (let* ((out (assoc-ref outputs "out"))

base-commit: 78d946b01162fbe986c6768800e8cfd6e70e67e5
-- 
2.45.1

[Message part 3 (message/rfc822, inline)]

From: Z572 <873216071 <at> qq.com>
To: attila.lendvai <at> gmail.com
Cc: 71810-done <at> debbugs.gnu.org, Attila Lendvai <attila <at> lendvai.name>
Subject: Re: [bug#71810] [PATCH v2 3/3] gnu: smplayer: Update to 23.12.0.
Date: Mon, 15 Jul 2024 21:41:01 +0800

[Message part 4 (text/plain, inline)]

attila.lendvai <at> gmail.com writes:

> From: Attila Lendvai <attila <at> lendvai.name>
>
> * gnu/packages/video.scm (smplayer) [inputs]: Add qtdeclarative-5.
>
> Change-Id: I6b727f6fe368bd70bf9fc3d61f7c0b5efe56c3a1
> ---
>  gnu/packages/video.scm | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
> index 2d1424fb8ec..1fa4ab15ff5 100644
> --- a/gnu/packages/video.scm
> +++ b/gnu/packages/video.scm
> @@ -2711,7 +2711,7 @@ (define-public mpv
>  (define-public smplayer
>    (package
>      (name "smplayer")
> -    (version "22.7.0")
> +    (version "23.12.0")
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
> @@ -2719,12 +2719,16 @@ (define-public smplayer
>                      (commit (string-append "v" version))))
>                (file-name (git-file-name name version))
>                (sha256
> -               (base32 "0qs9vz440bdvnyghi7f4frsan7n9xiy3afw9lhmf5m8xxa37325c"))))
> +               (base32 "0yrm57rib910h9m4avhg6mkmkzy9xjb3f185c5zr6jls100az8h1"))))
>      (build-system qt-build-system)
>      (native-inputs
>       (list qttools-5))
>      (inputs
> -     (list bash-minimal qtbase-5 zlib mpv))
> +     (list bash-minimal
> +           qtbase-5
> +           qtdeclarative-5
> +           zlib
> +           mpv))
>      (arguments
>       (list #:tests? #false              ; no tests
>             #:make-flags #~(list (string-append "PREFIX=" #$output)

push, see

https://git.savannah.gnu.org/cgit/guix.git/commit/?id=8c86eaeac6a20edad6c3c938df3815a6bcb86270
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=7e703ae7506251952b775e645785b095c183f8e8
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3689faac5c10249f052c979b527cba26054170d8

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.