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

Previous Next

Package: guix-patches;

Reported by: attila.lendvai <at> gmail.com

Date: Thu, 27 Jun 2024 22:01:02 UTC

Severity: normal

Tags: patch

Done: Z572 <873216071 <at> qq.com>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71810 in the body.
You can then email your comments to 71810 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#71810; Package guix-patches. (Thu, 27 Jun 2024 22:01:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to attila.lendvai <at> gmail.com:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 27 Jun 2024 22:01:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

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
Information forwarded to guix-patches <at> gnu.org:
bug#71810; Package guix-patches. (Fri, 28 Jun 2024 06:03:02 GMT) Full text and rfc822 format available.

Message #8 received at 71810 <at> debbugs.gnu.org (full text, mbox):

From: attila.lendvai <at> gmail.com
To: 71810 <at> debbugs.gnu.org
Cc: Attila Lendvai <attila <at> lendvai.name>
Subject: [PATCH 3/3] gnu: smplayer: Update to 23.12.0
Date: Fri, 28 Jun 2024 00:27:03 +0200

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 1f29731ee06..fdfad4cea2a 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)
-- 
2.45.1
Information forwarded to guix-patches <at> gnu.org:
bug#71810; Package guix-patches. (Fri, 28 Jun 2024 06:57:01 GMT) Full text and rfc822 format available.

Message #11 received at 71810 <at> debbugs.gnu.org (full text, mbox):

From: attila.lendvai <at> gmail.com
To: 71810 <at> debbugs.gnu.org
Cc: Attila Lendvai <attila <at> lendvai.name>
Subject: [PATCH 2/3] gnu: smplayer: Update to 22.7.0
Date: Fri, 28 Jun 2024 00:27:02 +0200

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

Change-Id: Iec24da98806b87f482b280036e61e40e9d66cb5e
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 731403f5291..1f29731ee06 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.2.0")
+    (version "22.7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2719,7 +2719,7 @@ (define-public smplayer
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "0mcvpm86n9l0nwavnaa1n2jfalgrzdfh92sdjnwx1iga89m4k55s"))))
+               (base32 "0qs9vz440bdvnyghi7f4frsan7n9xiy3afw9lhmf5m8xxa37325c"))))
     (build-system qt-build-system)
     (native-inputs
      (list qttools-5))
-- 
2.45.1
Information forwarded to guix-patches <at> gnu.org:
bug#71810; Package guix-patches. (Sat, 13 Jul 2024 16:02:02 GMT) Full text and rfc822 format available.

Message #14 received at 71810 <at> debbugs.gnu.org (full text, mbox):

From: attila.lendvai <at> gmail.com
To: 71810 <at> debbugs.gnu.org
Cc: Attila Lendvai <attila <at> lendvai.name>
Subject: [PATCH v2 3/3] gnu: smplayer: Update to 23.12.0.
Date: Sat, 13 Jul 2024 17:59:36 +0200

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)
-- 
2.45.1
Information forwarded to guix-patches <at> gnu.org:
bug#71810; Package guix-patches. (Sat, 13 Jul 2024 16:02:02 GMT) Full text and rfc822 format available.

Message #17 received at 71810 <at> debbugs.gnu.org (full text, mbox):

From: attila.lendvai <at> gmail.com
To: 71810 <at> debbugs.gnu.org
Cc: Attila Lendvai <attila <at> lendvai.name>
Subject: [PATCH v2 1/3] gnu: smplayer: Update to 22.2.0.
Date: Sat, 13 Jul 2024 17:59:34 +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
---

v2 adds missing dots at the end of the 3 commit headers.

 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 382ad0ba59d..c9c3f1b1d30 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: 71694363f6cc79e44955acbd9f7ca108e658caca
-- 
2.45.1
Information forwarded to guix-patches <at> gnu.org:
bug#71810; Package guix-patches. (Sat, 13 Jul 2024 16:02:02 GMT) Full text and rfc822 format available.

Message #20 received at 71810 <at> debbugs.gnu.org (full text, mbox):

From: attila.lendvai <at> gmail.com
To: 71810 <at> debbugs.gnu.org
Cc: Attila Lendvai <attila <at> lendvai.name>
Subject: [PATCH v2 2/3] gnu: smplayer: Update to 22.7.0.
Date: Sat, 13 Jul 2024 17:59:35 +0200

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

Change-Id: Iec24da98806b87f482b280036e61e40e9d66cb5e
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c9c3f1b1d30..2d1424fb8ec 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.2.0")
+    (version "22.7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2719,7 +2719,7 @@ (define-public smplayer
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "0mcvpm86n9l0nwavnaa1n2jfalgrzdfh92sdjnwx1iga89m4k55s"))))
+               (base32 "0qs9vz440bdvnyghi7f4frsan7n9xiy3afw9lhmf5m8xxa37325c"))))
     (build-system qt-build-system)
     (native-inputs
      (list qttools-5))
-- 
2.45.1
Reply sent to Z572 <873216071 <at> qq.com>:
You have taken responsibility. (Mon, 15 Jul 2024 13:42:02 GMT) Full text and rfc822 format available.
Notification sent to attila.lendvai <at> gmail.com:
bug acknowledged by developer. (Mon, 15 Jul 2024 13:42:02 GMT) Full text and rfc822 format available.

Message #25 received at 71810-done <at> debbugs.gnu.org (full text, mbox):

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 1 (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)]
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 13 Aug 2024 11:24:05 GMT) Full text and rfc822 format available.
This bug report was last modified 83 days ago.

Previous Next

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