all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#54933] [patch] Add Liquid War 6
@ 2022-04-14 10:00 zamfofex
  2022-04-29 21:14 ` bug#54933: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: zamfofex @ 2022-04-14 10:00 UTC (permalink / raw)
  To: 54933

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: liquidwar6.diff --]
[-- Type: text/x-patch, Size: 2283 bytes --]

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index de398c297f..8765f70761 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -70,6 +70,7 @@
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
 ;;; Copyright © 2022 Yovan Naumovski <yovan@gorski.stream>
 ;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com>
+;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -140,6 +141,7 @@ (define-module (gnu packages games)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphics)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gsasl)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
@@ -12647,3 +12649,35 @@ (define-public fheroes2
 Magic II (aka HOMM2) game engine.  It requires assets and game resources to
 play; it will look for them at @file{~/.local/share/fheroes2} folder.")
     (license license:gpl2)))
+
+(define-public liquidwar6
+  (package
+    (name "liquidwar6")
+    (version "0.6.3902")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://gnu/liquidwar6/"
+                            "liquidwar6-" version ".tar.gz"))
+        (sha256
+         (base32 "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn"))))
+    (inputs
+      (list guile-2.0 zlib expat sqlite ncurses readline curl doxygen python-2
+            libxslt perl graphviz glu libcaca
+            (sdl-union (list sdl sdl-image sdl-ttf sdl-mixer))))
+    (build-system gnu-build-system)
+    (arguments
+      '(#:configure-flags
+         (list
+           "--enable-allinone"
+           "CFLAGS=-Wno-error"
+           (string-append "CPPFLAGS="
+             "-I" (search-input-directory %build-inputs "include/SDL")))))
+    (synopsis "Liquid War 6 is a unique multiplayer wargame.")
+    (description
+      (string-append
+        "Liquid War 6 is a unique multiplayer wargame. Your army is a blob of "
+        "liquid and you have to try and eat your opponents. Rules are very "
+        "simple yet original, they have been invented by Thomas Colcombet."))
+    (home-page "https://www.gnu.org/software/liquidwar6/")
+    (license license:gpl3+)))

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#54933: [patch] Add Liquid War 6
  2022-04-14 10:00 [bug#54933] [patch] Add Liquid War 6 zamfofex
@ 2022-04-29 21:14 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2022-04-29 21:14 UTC (permalink / raw)
  To: zamfofex; +Cc: 54933-done

Hi,

zamfofex <zamfofex@twdb.moe> skribis:

> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index de398c297f..8765f70761 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm

Applied with mostly cosmetic changes:

> +    (inputs
> +      (list guile-2.0 zlib expat sqlite ncurses readline curl doxygen python-2
> +            libxslt perl graphviz glu libcaca
> +            (sdl-union (list sdl sdl-image sdl-ttf sdl-mixer))))

I passed it through ‘guix style’ and moved ‘doxygen’ to ‘native-inputs’
as suggested by ‘guix lint’.

> +    (arguments
> +      '(#:configure-flags
> +         (list
> +           "--enable-allinone"
> +           "CFLAGS=-Wno-error"
> +           (string-append "CPPFLAGS="
> +             "-I" (search-input-directory %build-inputs "include/SDL")))))

I used a gexp and ‘this-package-input’here.

> +    (description
> +      (string-append
> +        "Liquid War 6 is a unique multiplayer wargame. Your army is a blob of "
> +        "liquid and you have to try and eat your opponents. Rules are very "
> +        "simple yet original, they have been invented by Thomas Colcombet."))

I changed that to a literal string:

  https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html

For future patches please take a look at:

  https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html

In particular, please use ‘git format-patch’ and possibly ‘git
send-email’ to send patches.  That ensures the commit log and authorship
are preserved and makes the reviewer’s life easier.  :-)

Thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-04-29 21:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-14 10:00 [bug#54933] [patch] Add Liquid War 6 zamfofex
2022-04-29 21:14 ` bug#54933: " Ludovic Courtès

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.