GNU bug report logs - #65747
[PATCH] gnu: tennix: Update to 1.3.4.

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 65747 in the body.
You can then email your comments to 65747 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: Hendursaga <hendursaga <at> aol.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: tennix: Update to 1.3.4.
Date: Mon,  4 Sep 2023 19:09:12 -0400

* gnu/packages/games.scm (tennix): Update to 1.3.4.
[arguments]<#:phases>: Remove fix-include phase.
[inputs]: Remove labels, update to SDL2, add SDL2_gfx dependency.
[license]: Remove LGPL license, as SDL_rotozoom is no longer included.
---
 gnu/packages/games.scm | 95 +++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 760234b031..64fa9684ff 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5571,65 +5571,56 @@ (define-public lierolibre
 (define-public tennix
   (package
     (name "tennix")
-    (version "1.3.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://repo.or.cz/tennix.git")
-             (commit (string-append "tennix-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "02cj4lrdrisal5s9pnbf2smx7qz9czczjzndfkhfx0qy67b957sk"))
-       ;; Remove non-free images.
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (for-each delete-file
-                     '("data/loc_training_camp.png"
-                       "data/loc_austrian_open.png"
-                       "data/loc_olympic_green_tennis.png"))
-           #t))))
+    (version "1.3.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://repo.or.cz/tennix.git")
+                    (commit (string-append "tennix-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1fmg0vw8c2spyxy4k64nwky80jsw9mc3vnlch49q6cagjsg9y8dj"))
+              ;; Remove non-free images.
+              (modules '((guix build utils)))
+              (snippet '(begin
+                          (for-each delete-file
+                                    '("data/loc_training_camp.png"
+                                      "data/loc_austrian_open.png"
+                                      "data/loc_olympic_green_tennis.png")) #t))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ;no test
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-include
-           (lambda _
-             (substitute* '("src/graphics.h" "src/sound.h")
-               (("#include \"(SDL_(image|ttf|mixer)\\.h)\"" _ header)
-                (string-append "#include \"SDL/" header "\"")))
-             (substitute* '("src/tennix.h" "src/network.h" "src/SDL_rotozoom.h")
-               (("#include <SDL.h>") "#include <SDL/SDL.h>")
-               (("#include <SDL_net.h>") "#include <SDL/SDL_net.h>"))
-             #t))
-         (add-after 'unpack 'locate-install
-           ;; Build process cannot expand "$(INSTALL)" in Makefile.
-           (lambda _
-             (substitute* "makefile"
-               (("^CONFIGURE_OUTPUT :=.*" all)
-                (string-append "INSTALL := install -c\n" all)))
-             #t))
-         (replace 'configure
-           ;; The "configure" script is picky about the arguments it
-           ;; gets.  Call it ourselves.
-           (lambda _
-             (invoke "./configure" "--prefix" (assoc-ref %outputs "out")))))))
-    (native-inputs
-     (list which))
-    (inputs
-     `(("python" ,python-wrapper)
-       ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf sdl-net)))))
+     `(#:tests? #f ;no tests
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'locate-install
+                    ;; Build process cannot expand "$(INSTALL)" in Makefile.
+                    (lambda _
+                      (substitute* "makefile"
+                        (("^CONFIGURE_OUTPUT :=.*" all)
+                         (string-append "INSTALL := install -c\n" all))) #t))
+                  (replace 'configure
+                    ;; The "configure" script is picky about the arguments it
+                    ;; gets.  Call it ourselves.
+                    (lambda _
+                      (invoke "./configure" "--prefix"
+                              (assoc-ref %outputs "out")))))))
+    (native-inputs (list which))
+    (inputs (list python
+                  (sdl-union (list sdl2
+                                   sdl2-image
+                                   sdl2-mixer
+                                   sdl2-ttf
+                                   sdl2-net
+                                   sdl2-gfx))))
     (home-page "https://icculus.org/tennix/")
     (synopsis "Play tennis against the computer or a friend")
-    (description "Tennix is a 2D tennis game.  You can play against the
+    (description
+     "Tennix is a 2D tennis game.  You can play against the
 computer or against another player using the keyboard.  The game runs
 in-window at 640x480 resolution or fullscreen.")
     ;; Project is licensed under GPL2+ terms.  It includes images
-    ;; released under Public Domain terms, and SDL_rotozoom, released
-    ;; under LGPL2.1 terms.
-    (license (list license:gpl2+ license:public-domain license:lgpl2.1))))
+    ;; released under Public Domain terms.
+    (license (list license:gpl2+ license:public-domain))))
 
 (define-public warzone2100
   (package

base-commit: 31baada26332b5b72a8fa75e02c75e5f06274f89
-- 
2.40.1

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

From: Christopher Baines <mail <at> cbaines.net>
To: Hendursaga <hendursaga <at> aol.com>
Cc: guix-patches <at> gnu.org, 65747-done <at> debbugs.gnu.org
Subject: Re: [bug#65747] [PATCH] gnu: tennix: Update to 1.3.4.
Date: Wed, 13 Sep 2023 09:48:09 +0100

[Message part 1 (text/plain, inline)]

Hendursaga via Guix-patches via <guix-patches <at> gnu.org> writes:

> * gnu/packages/games.scm (tennix): Update to 1.3.4.
> [arguments]<#:phases>: Remove fix-include phase.
> [inputs]: Remove labels, update to SDL2, add SDL2_gfx dependency.
> [license]: Remove LGPL license, as SDL_rotozoom is no longer included.
> ---
>  gnu/packages/games.scm | 95 +++++++++++++++++++-----------------------
>  1 file changed, 43 insertions(+), 52 deletions(-)

Thanks for the patch, I've tweaked the arguments style to the new one
and pushed this to master as 901eaca92becd99d297a09a4480f7095278b22b5.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

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