GNU bug report logs - #71600
[PATCH 0/2] Update QuakeSpasm

Previous Next

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

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

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

From: James Smith <jsubuntuxp <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH 0/2] Update QuakeSpasm
Date: Sun, 16 Jun 2024 14:40:58 -0700

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

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

From: James Smith <jsubuntuxp <at> disroot.org>
To: 71600 <at> debbugs.gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH 1/2] gnu: quakespasm: Update to 0.96.2.
Date: Sun, 16 Jun 2024 14:43:12 -0700

* 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

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

From: James Smith <jsubuntuxp <at> disroot.org>
To: 71600 <at> debbugs.gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH 2/2] gnu: quakespasm: Update package style.
Date: Sun, 16 Jun 2024 14:43:13 -0700

* 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

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: James Smith <jsubuntuxp <at> disroot.org>, 71600-done <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> envs.net>,
 Adam Faiz <adam.faiz <at> disroot.org>
Subject: Re: [bug#71600] [PATCH 0/2] Update QuakeSpasm
Date: Sun, 23 Jun 2024 15:56:45 +0200

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

Previous Next

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