GNU bug report logs - #69705
[PATCH] gnu: freegish: Update to 0-3.caf58a2f9.

Previous Next

Package: guix-patches;

Reported by: iyzsong <at> envs.net

Date: Sun, 10 Mar 2024 08:31:02 UTC

Severity: normal

Tags: patch

Done: 宋文武 <iyzsong <at> envs.net>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: 宋文武 <iyzsong <at> envs.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#69705: closed ([PATCH] gnu: freegish: Update to 0-3.caf58a2f9.)
Date: Mon, 27 May 2024 01:47:01 +0000
[Message part 1 (text/plain, inline)]
Your message dated Mon, 27 May 2024 09:46:32 +0800
with message-id <87wmngvxfr.fsf <at> envs.net>
and subject line Re: [bug#69705] [PATCH] gnu: freegish: Update to 0-3.caf58a2f9.
has caused the debbugs.gnu.org bug report #69705,
regarding [PATCH] gnu: freegish: Update to 0-3.caf58a2f9.
to be marked as done.

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


-- 
69705: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=69705
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: iyzsong <at> envs.net
To: guix-patches <at> gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [PATCH] gnu: freegish: Update to 0-3.caf58a2f9.
Date: Sun, 10 Mar 2024 16:29:36 +0800
From: 宋文武 <iyzsong <at> member.fsf.org>

* gnu/packages/games.scm (freegish): Update to 0-3.caf58a2f9.
[inputs]: Replace sdl-union with sdl2.  Remove zlib.
[arguments]: Adjust configure-flags, remove unneeded phases.

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

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9ff08e5e74..0fb7f5889e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6654,8 +6654,8 @@ (define-public megaglest
     (license license:gpl2+)))
 
 (define-public freegish
-  (let ((commit "21977ee5fc2008231b35160df00efe954c508b16")
-        (revision "2"))
+  (let ((commit "caf58a2f990a939230bab82226e29cd79732f366")
+        (revision "3"))
     (package
       (name "freegish")
       (version (string-append "0-" revision "." (string-take commit 9)))
@@ -6667,7 +6667,7 @@ (define-public freegish
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1qh0gcnbyxyzmb13jifwba4xrzj94m4w9whdvl0gnds6ricmwply"))
+                  "0980ad8xg0bzm6507bq9sbgw03i7jj33g0f955g0q8jvpb22r65v"))
                 (modules '((guix build utils)))
                 ;; The audio files in the "music" directory are licensed under
                 ;; CC-BY-NC, so we delete them.
@@ -6679,25 +6679,14 @@ (define-public freegish
       (arguments
        `(#:tests? #f ; no tests included
          #:configure-flags
-         (list "-DCMAKE_INSTALL_FHS=ON")
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'set-DATAPATH
-             (lambda* (#:key outputs #:allow-other-keys)
-               (substitute* "CMakeLists.txt"
-                 (("^option\\(INSTALL_FHS" line)
-                  (string-append "add_definitions(-DDATAPATH=\""
-                                 (assoc-ref outputs "out") "/share/freegish\")\n"
-                                 line)))
-               #t)))))
+         (list "-DINSTALL_FHS=ON")))
       (inputs
-       (list (sdl-union (list sdl sdl-mixer))
+       (list sdl2
              openal
              libvorbis
              libogg
              mesa
-             libpng
-             zlib))
+             libpng))
       (home-page "https://github.com/freegish/freegish")
       (synopsis "Side-scrolling physics platformer with a ball of tar")
       (description "In FreeGish you control Gish, a ball of tar who lives

base-commit: 7758e63f7a89f53fbb7c7a265ae472af0a8dfab0
-- 
2.41.0



[Message part 3 (message/rfc822, inline)]
From: 宋文武 <iyzsong <at> envs.net>
To: 69705-done <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Adam Faiz <adam.faiz <at> disroot.org>
Subject: Re: [bug#69705] [PATCH] gnu: freegish: Update to 0-3.caf58a2f9.
Date: Mon, 27 May 2024 09:46:32 +0800
Pushed to master as commit 473cdecd89.


This bug report was last modified 362 days ago.

Previous Next


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