[bug#40221] Submission of GUI Package Description for 7kaa

[bug#40221] Submission of GUI Package Description for 7kaa

[Naga Malleswari]

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

Hi

I had a discussion with rekado and guix-vits on IRC regarding which GUI
can be done and upon their suggestions i have chosen 7kaa game.

guix-vits have helped a lot with most of the package description and
with the manual provided by rekado i was able to write this package
description.


I have written sepearately as 7kaa.scm and

guix environment --ad-hoc 7kaa -L ./

and later 7kaa have run the game.


Hence i added to games.scm(assuming thats the actual location. Please
correct me) and done with the patch.

Lint have given me couple of corrections. I need your suggestions before
making the commit.


-- 
Regards
NagaMalli


[-- Attachment #2: 0001-gnu-Add-7kaa.patch --]
[-- Type: text/x-patch, Size: 2146 bytes --]

From 09cb4f4acef66ee90f444655c8aca83b09a4a161 Mon Sep 17 00:00:00 2001
From: Naga Malleswari <nagamalli@riseup.net>
Date: Wed, 25 Mar 2020 18:59:34 +0530
Subject: [PATCH] gnu: Add 7kaa.

* gnu/packages/games.scm (7kaa): New variable.
---
 gnu/packages/games.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2b03a36c43..bb24a8a653 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10319,3 +10319,39 @@ range with the objective to hit as many dummy targets as possible within
 soldiers, jeeps and tanks.  The gameplay is simple but it is not that easy to
 get high scores.")
     (license license:gpl2+)))
+
+(define-public 7kaa
+  (package
+    (name "7kaa")
+    (version "2.15.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/the3dfxdude/7kaa/archive/v"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "0bf90v1bm4zazwalfl9vd5dfbdcxwhi02rmggn5xc0yq0zkxwlqv"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("automake" ,automake)
+       ("autoconf" ,autoconf)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("sdl2" ,sdl2)
+       ("enet" ,enet)
+       ("openal" ,openal)
+       ("gettext" ,gettext-minimal)
+       ("curl" ,curl)))
+    (home-page "https://7kfans.com/")
+    (synopsis "Seven Kingdoms Ancient Adversaries: real-time strategy game")
+    (description
+     "Seven Kingdoms, designed by Trevor Chan, brings a unique blend of
+Real-Time Strategy with the addition of trade, diplomacy, and espionage.
+The game enables players to compete against up to six other kingdoms
+allowing players to conquer opponents by defeating them in war (with
+troops or machines), capturing their buildings with spies, or offering
+opponents money for their kingdom.  In 2009, Enlight Software released the
+game under the GPL license.  7kfans project is updating the game and
+provides a community for fans.  A free Seven Kingdoms will help continue
+the legacy.")
+    (license license:gpl2+)))
-- 
2.25.1

[bug#40221] Submission of GUI Package Description for 7kaa

[Nicolas Goaziou]

Hello,

Naga Malleswari <nagamalli@riseup.net> writes:

> Hence i added to games.scm(assuming thats the actual location. Please
> correct me) and done with the patch.

Thank you!

> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/the3dfxdude/7kaa/archive/v"
> +                           version ".tar.gz"))

This URL is not stable. Home page provides a stable release at:

  https://github.com/the3dfxdude/7kaa/releases/download/v2.15.3/7kaa-2.15.3.tar.xz

I suggest to use this one, replacing 2.5.13 with `version', like you did. 

> +       (sha256
> +        (base32 "0bf90v1bm4zazwalfl9vd5dfbdcxwhi02rmggn5xc0yq0zkxwlqv"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("automake" ,automake)
> +       ("autoconf" ,autoconf)
> +       ("pkg-config" ,pkg-config)))

Could you re-order inputs alphabetically?

> +    (inputs
> +     `(("sdl2" ,sdl2)
> +       ("enet" ,enet)
> +       ("openal" ,openal)
> +       ("gettext" ,gettext-minimal)
> +       ("curl" ,curl)))

Ditto.

> +    (home-page "https://7kfans.com/")
> +    (synopsis "Seven Kingdoms Ancient Adversaries: real-time strategy game")
> +    (description
> +     "Seven Kingdoms, designed by Trevor Chan, brings a unique blend of
> +Real-Time Strategy with the addition of trade, diplomacy, and espionage.

We try to avoid adding "marketing" words or idioms in descriptions, like
"unique blend". I think "blend" is enough.

> +7kfans project is updating the game and
> +provides a community for fans.  A free Seven Kingdoms will help continue
> +the legacy.")

I suggest to drop this part, which is not informative in the
description. Besides, everything is Free in Guix.

Could you send an updated patch?

Regards,

-- 
Nicolas Goaziou

[bug#40221] Submission of GUI Package Description for 7kaa

[Nicolas Goaziou]

Completing myself,

>> +    (inputs
>> +     `(("sdl2" ,sdl2)
>> +       ("enet" ,enet)
>> +       ("openal" ,openal)
>> +       ("gettext" ,gettext-minimal)

gettext is a native input, you should move it in the appropriate
section.

[bug#40221] Submission of GUI Package Description for 7kaa v2

[Naga Malleswari]

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

Hi

I have made all the changes suggested by you in the trailing mail as
well. I had to change the hash. Please review the patch and suggest any
changes.

On 25/03/20 9:36 pm, Nicolas Goaziou wrote:
> Completing myself,
>
>>> +    (inputs
>>> +     `(("sdl2" ,sdl2)
>>> +       ("enet" ,enet)
>>> +       ("openal" ,openal)
>>> +       ("gettext" ,gettext-minimal)
> gettext is a native input, you should move it in the appropriate
> section.
>
-- 
Regards
NagaMalli


[-- Attachment #2: 0001-gnu-Add-7kaa.patch --]
[-- Type: text/x-patch, Size: 2384 bytes --]

From ca08e2306f39655c957b9ce5081c6ec01427d95d Mon Sep 17 00:00:00 2001
From: Naga Malleswari <nagamalli@riseup.net>
Date: Thu, 26 Mar 2020 01:30:43 +0530
Subject: [PATCH] gnu: Add 7kaa.

* gnu/packages/games.scm (7kaa): New variable.
---
 gnu/packages/games.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2b03a36c43..35b362a76f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -47,6 +47,7 @@
 ;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw>
 ;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx>
+;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -10319,3 +10320,37 @@ range with the objective to hit as many dummy targets as possible within
 soldiers, jeeps and tanks.  The gameplay is simple but it is not that easy to
 get high scores.")
     (license license:gpl2+)))
+    
+(define-public 7kaa
+  (package
+    (name "7kaa")
+    (version "2.15.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/the3dfxdude/7kaa/releases/download/v"
+                             version "/7kaa-" version ".tar.xz"))
+       (sha256
+        (base32 "0blj47mcsfw1sn3465j6iham8m6ki07iggnq4q8nnaqnryx710jc"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("curl" ,curl)
+       ("enet" ,enet)
+       ("openal" ,openal)
+       ("sdl2" ,sdl2)))
+    (home-page "https://7kfans.com/")
+    (synopsis "Seven Kingdoms Ancient Adversaries: real-time strategy game")
+    (description
+     "Seven Kingdoms, designed by Trevor Chan, brings a blend of
+Real-Time Strategy with the addition of trade, diplomacy, and espionage.
+The game enables players to compete against up to six other kingdoms
+allowing players to conquer opponents by defeating them in war (with
+troops or machines), capturing their buildings with spies, or offering
+opponents money for their kingdom.  In 2009, Enlight Software released the
+game under the GPL license.")
+    (license license:gpl2+)))
-- 
2.25.1

bug#40221: Submission of GUI Package Description for 7kaa v2

[Nicolas Goaziou]

Hello,

Naga Malleswari <nagamalli@riseup.net> writes:
>
> I have made all the changes suggested by you in the trailing mail as
> well. I had to change the hash. Please review the patch and suggest any
> changes.

Thank you.

I applied your patch (as db47adb0c767c373958d892411da2c89fe5503a3) with
the following changes:

- I removed dependency on autoconf and automake since, as a release, the
  code is already boostrapped.

- I removed the last sentence in the description.

Regards,

-- 
Nicolas Goaziou