all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: attila.lendvai@gmail.com
To: 71810@debbugs.gnu.org
Cc: Attila Lendvai <attila@lendvai.name>
Subject: [bug#71810] [PATCH 1/3] gnu: smplayer: Update to 22.2.0
Date: Thu, 27 Jun 2024 23:58:19 +0200	[thread overview]
Message-ID: <5708714cc9e486ffdadcb2408cf6479ecbecd220.1719525499.git.attila@lendvai.name> (raw)

From: Attila Lendvai <attila@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





             reply	other threads:[~2024-06-27 22:01 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-27 21:58 attila.lendvai [this message]
2024-06-27 21:58 ` [bug#71811] [PATCH 2/3] gnu: smplayer: Update to 22.7.0 attila.lendvai
2024-06-27 22:25   ` bug#71811: " Attila Lendvai
2024-07-13 15:59 ` [bug#71810] [PATCH v2 1/3] gnu: smplayer: Update to 22.2.0 attila.lendvai
2024-07-13 15:59   ` [bug#71810] [PATCH v2 2/3] gnu: smplayer: Update to 22.7.0 attila.lendvai
2024-07-13 15:59   ` [bug#71810] [PATCH v2 3/3] gnu: smplayer: Update to 23.12.0 attila.lendvai
2024-07-15 13:41     ` bug#71810: " Z572 via Guix-patches via
2024-07-15 13:41       ` Z572 via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5708714cc9e486ffdadcb2408cf6479ecbecd220.1719525499.git.attila@lendvai.name \
    --to=attila.lendvai@gmail.com \
    --cc=71810@debbugs.gnu.org \
    --cc=attila@lendvai.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.