From: Jesse Gibbons <jgibbons2357@gmail.com>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: 36182@debbugs.gnu.org
Subject: [bug#36182] [PATCH] add freeorion
Date: Thu, 13 Jun 2019 18:57:09 -0600 [thread overview]
Message-ID: <20190613185709.1a97b9ae@gmail.com> (raw)
In-Reply-To: <87tvctp5km.fsf@nicolasgoaziou.fr>
[-- Attachment #1: Type: text/plain, Size: 3960 bytes --]
On Thu, 13 Jun 2019 22:56:41 +0200
Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:
> Jesse Gibbons <jgibbons2357@gmail.com> writes:
>
> > On Wed, 12 Jun 2019 21:48:52 +0200
> > Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:
>
> >> If you use Emacs, there is a template to automatically fill this.
> > I did not know this. How do I use the template?
>
> See "The Perfect Setup" section of the Guix manual, in particular the
> part about Yasnippet.
I will look into this later.
>
> > I added a comment to explain why I specify the most recent commit. I
> > also added a note that it should be updated when the next stable
> > release is available (the maintainers seem to prefer announcing new
> > releases every September). I will personally update this in
> > mid-September or October if version 0.4.8.1 or 0.4.9 or 0.5 or 1.0
> > is available and no volunteer beats me to it. If you want I can also
> > request release 0.4.8.1 ASAP so we can specify a release rather
> > than a commit. I personally prefer to keep the commit and wait
> > three or four months for the release.
>
> Fair enough. Thank you for the explanation.
>
> I think we also need a
>
> (file-name (git-file-name name version))
>
> in the source.
Ok.
>
> >> > + (home-page
> >> > + "https://www.freeorion.org/index.php/Main_Page")
> >>
> >> I think "https://www.freeorion.org" is enough, since it points to
> >> the page above.
>
> You probably overlooked that remark.
No, i just forgot. It's fixed now, but 'guix lint' does not like it.
>
> > The link says that 4X refers to a genre of strategy game centered
> > around conquest. I think the current context is a sufficient
> > explanation, but I did expand the description. I think it is best to
> > keep the 4X in the description in case someone tries a search for
> > that genre.
>
> OK.
>
> > I added comments to explain these licenses.
>
> According to
> <https://www.freeorion.org/index.php/FreeOrionWiki:Copyrights>, the
> source code is released under gpl2, artwork, music and sounds, and
> in-game text are released under cc-by-sa3.0, and the game content
> scripts are released under both gpl2 and cc-by-sa3.0.
I got my information from github. I'll update.
>
> So, the comments should include the description above, for
> completeness.
>
> > Updated patch is attached. Is there anything else you want me to
> > fix?
>
> Great. I'm adding some small remarks, but overall the patch LGTM.
>
> > +;;;Most recent stable release uses boost_signals (v1)
> > +;;;which was later replaced with boost-signals2 and
> > +;;;no longer exists. This commit builds and runs.
> > +;;;TODO: Update this when the next stable release when
> > +;;;it is available.
>
> In Scheme, such comments use ";; " as a prefix.
Fixed.
>
> > + (commit "470d0711537804df3c2ca25532f674ab4bec58af")))
> > + (sha256
> > + (base32
> > + "1wsw632l1cj17px6i88nqjzs0dngp5rsr67n6qkkjlfjfxi69j0f"))))
> > + (arguments
> > + '(#:tests? #f)) ;no test
> > + (build-system cmake-build-system)
> > + (inputs `(("boost" ,boost)
> > + ("boost_signals" ,boost-signals2)
> > + ("freetype2" ,freetype)
> > + ("python2" ,python-2.7)
> > + ("openal" ,openal)
> > + ("libogg" ,libogg)
> > + ("libvorbis" ,libvorbis)
> > + ("zlib" ,zlib)
> > + ("libpng" ,libpng)
> > + ("sdl2" ,sdl2)
> > + ("glu" ,glu)
> > + ("glew" ,glew)))
>
> Could you re-order inputs alphabetically?
Done.
>
> > + (home-page
> > + "https://www.freeorion.org/index.php/Main_Page")
>
> See above.
>
> Also, don't forget to add yourself to the Hall of Fame at the top of
> the "games.scm" file.
I did that when I added gnurobots.
>
> Can you send an updated patch? Hopefully I should be able to apply it
> then.
Attached.
>
> Thank you!
[-- Attachment #2: 0001-add-freeorion.patch --]
[-- Type: text/x-patch, Size: 2693 bytes --]
From d6230c5286b95e9c8f2acc3662bddb1a20346251 Mon Sep 17 00:00:00 2001
From: Jesse Gibbons <jgibbons2357+guix@gmail.com>
Date: Thu, 13 Jun 2019 18:48:43 -0600
Subject: [PATCH] add freeorion * gnu/packages/games.scm (freeorion): New
variable.
---
gnu/packages/games.scm | 49 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 86bdf99a32..4d6b06d55c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7455,3 +7455,52 @@ steam locomotive across many levels and collect all the coaches to
win.")
;; The project is dual-licensed GPL2+ and GPL3+.
(license (list license:gpl2+ license:gpl3+))))
+
+(define-public freeorion
+ (package
+ (name "freeorion")
+ (version "0.4.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/freeorion/freeorion.git")
+ ;;Most recent stable release uses boost_signals (v1) which was later
+ ;;replaced with boost-signals2 and no longer exists. This commit builds
+ ;;and runs.
+ ;;TODO: Update this when the next stable release when it is available.
+ (commit "470d0711537804df3c2ca25532f674ab4bec58af")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1wsw632l1cj17px6i88nqjzs0dngp5rsr67n6qkkjlfjfxi69j0f"))))
+ (arguments
+ '(#:tests? #f)) ;no test
+ (build-system cmake-build-system)
+ (inputs
+ `(("boost" ,boost)
+ ("boost_signals" ,boost-signals2)
+ ("freetype2" ,freetype)
+ ("glew" ,glew)
+ ("glu" ,glu)
+ ("libogg" ,libogg)
+ ("libpng" ,libpng)
+ ("libvorbis" ,libvorbis)
+ ("openal" ,openal)
+ ("python2" ,python-2.7)
+ ("sdl2" ,sdl2)
+ ("zlib" ,zlib)))
+ (home-page
+ "https://www.freeorion.org/")
+ (synopsis
+ "Turn-based space empire and galactic conquest computer game")
+ (description
+ "FreeOrion is a free, open source, turn-based space empire and galactic
+conquest (4X) computer game being designed and built by the FreeOrion project.
+Control an empire with the goal of exploring the galaxy, expanding your
+territory, exploiting the resources, and exterminating rival alien empires.
+FreeOrion is inspired by the tradition of the Master of Orion games, but is not
+a clone or remake of that series or any other game.")
+ (license (list
+ license:gpl2 ;game code, game content, scripts
+ license:cc-by-sa3.0))));artwork, music, sound, game content, scripts
--
2.22.0
next prev parent reply other threads:[~2019-06-14 0:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 16:22 [bug#36182] [PATCH] add freeorion Jesse Gibbons
2019-06-12 19:48 ` Nicolas Goaziou
2019-06-13 18:58 ` Jesse Gibbons
2019-06-13 20:56 ` Nicolas Goaziou
2019-06-14 0:57 ` Jesse Gibbons [this message]
2019-06-16 19:46 ` bug#36182: " Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190613185709.1a97b9ae@gmail.com \
--to=jgibbons2357@gmail.com \
--cc=36182@debbugs.gnu.org \
--cc=mail@nicolasgoaziou.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).