[bug#71600] [PATCH 0/2] Update QuakeSpasm

[bug#71600] [PATCH 0/2] Update QuakeSpasm

[James Smith via Guix-patches via]

This patch series updates QuakeSpasm as well as update the package style.

James Smith (2):
  gnu: quakespasm: Update to 0.96.2.
  gnu: quakespasm: Update package style.

 gnu/packages/games.scm | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)


base-commit: 2195f70936b7aeec123d4e95345f1007d3a7bb06
-- 
2.45.1

[bug#71600] [PATCH 1/2] gnu: quakespasm: Update to 0.96.2.

[James Smith via Guix-patches via]

* gnu/packages/games.scm (quakespasm): Update to 0.96.2.
[source]: Update source code download link.

Change-Id: I30559b53021249db57f078ae51fd9b24d2b580f3
---
 gnu/packages/games.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 59b169171c..8d1450db01 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7667,14 +7667,14 @@ (define-public tome4
 (define-public quakespasm
   (package
     (name "quakespasm")
-    (version "0.93.2")
+    (version "0.96.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/quakespasm/Source/quakespasm-"
-                           version ".tgz"))
+                           version ".tar.gz"))
        (sha256
-        (base32 "0qm0j5drybvvq8xadfyppkpk3rxqsxbywzm6iwsjwdf0iia3gss5"))))
+        (base32 "0hr58w1d2yw82vm9lkln05z6d4sjlcr6grxhf6sqdqwyfy9nv1mw"))))
     (arguments
      `(#:tests? #f
        #:make-flags '("CC=gcc"
-- 
2.45.1

[bug#71600] [PATCH 2/2] gnu: quakespasm: Update package style.

[James Smith via Guix-patches via]

* gnu/packages/games.scm (quakespasm)[arguments]: Use gexps.
<#:make-flags>: Set compiler to (cc-for-target) instead of hardcoding to gcc.
<#:phases>: Simplify fix-makefile-paths and remove trailing #t.

Change-Id: I250a842c78f2f49b451e5df76509fbe6fa1b4576
---
 gnu/packages/games.scm | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8d1450db01..5fe402d2eb 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7676,23 +7676,21 @@ (define-public quakespasm
        (sha256
         (base32 "0hr58w1d2yw82vm9lkln05z6d4sjlcr6grxhf6sqdqwyfy9nv1mw"))))
     (arguments
-     `(#:tests? #f
-       #:make-flags '("CC=gcc"
-                      "MP3LIB=mpg123"
-                      "USE_CODEC_FLAC=1"
-                      "USE_CODEC_MIKMOD=1"
-                      "USE_SDL2=1"
-                      "-CQuake")
-       #:phases (modify-phases %standard-phases
-                  (delete 'configure)
-                  (add-after 'unpack 'fix-makefile-paths
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        (mkdir-p (string-append out "/bin"))
-                        (substitute* "Quake/Makefile"
-                          (("/usr/local/games")
-                           (string-append out "/bin")))
-                        #t))))))
+     (list #:tests? #f
+           #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+                                "MP3LIB=mpg123"
+                                "USE_CODEC_FLAC=1"
+                                "USE_CODEC_MIKMOD=1"
+                                "USE_SDL2=1"
+                                "-CQuake")
+           #:phases #~(modify-phases %standard-phases
+                        (delete 'configure)
+                        (add-after 'unpack 'fix-makefile-paths
+                          (lambda _
+                            (mkdir-p (string-append #$output "/bin"))
+                            (substitute* "Quake/Makefile"
+                              (("/usr/local/games")
+                               (string-append #$output "/bin"))))))))
     (build-system gnu-build-system)
     (inputs (list libmikmod
                   libvorbis
-- 
2.45.1

bug#71600: [PATCH 0/2] Update QuakeSpasm

[Liliana Marie Prikler]

Hi James,

Am Sonntag, dem 16.06.2024 um 14:40 -0700 schrieb James Smith:
> This patch series updates QuakeSpasm as well as update the package
> style.
I've pushed your series with some edits to the commit messages.

Cheers