[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] gnu: Add pioneers
From: |
Leo Famulari |
Subject: |
Re: [PATCH] gnu: Add pioneers |
Date: |
Mon, 15 Feb 2016 20:21:04 -0500 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Mon, Feb 15, 2016 at 01:14:16PM -0800, address@hidden wrote:
> Hello all,
>
> I am submitting this patch that packages the game 'pioneers' into the
> games.scm file.
Thanks for the patch! Maybe I can get some of my friends to play this,
or perhaps some people on #guix ;)
>
> Let me know if I made any mistakes or can improve anything. I'm hoping to
> package several more appplications soon.
We use `git format-patch` to generate patches, since that includes the
commit message and authorship information (I had to manually name you as
the author of this commit). You can look at `git log` for examples of
the commit message format.
>
> The patch is an attachment.
Okay! Alternatively, you can use `git send-email`, which formats the
patch and sends the mail on your behalf. It provides a nice workflow but
it's not required. I understand it might require you to set up an SMTP
client, etc.
My overall recommendations for future patches are:
1) Use `git format-patch` or `git send-email`.
2) Be sure to run `guix lint`.
3) Spend a couple minutes looking at the license headers on the source
files. Sometimes there are even multiple licenses in one project.
I applied the patch with a few minor changes regarding whitespace /
formatting, and the license, described below. Some of the style changes
were not required, but since I was making other edits...
>
> - Rodger Fox
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 7eb0e7a..b32a6f4 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -14,6 +14,7 @@
> ;;; Copyright ?? 2015, 2016 Alex Kost <address@hidden>
> ;;; Copyright ?? 2015 Paul van der Walt <address@hidden>
> ;;; Copyright ?? 2015 Taylan Ulrich Bay??rl??/Kammer <address@hidden>
> +;;; Copyright ?? 2016 Rodger Fox <address@hidden>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -44,6 +45,7 @@
> #:use-module (gnu packages base)
> #:use-module (gnu packages admin)
> #:use-module (gnu packages audio)
> + #:use-module (gnu packages avahi)
> #:use-module (gnu packages boost)
> #:use-module (gnu packages fribidi)
> #:use-module (gnu packages game-development)
> @@ -89,6 +91,33 @@
> #:use-module (guix build-system cmake)
> #:use-module (guix build-system trivial))
>
I appended the package to the end of the file. This is how we usually
add packages.
> +
> +(define-public pioneers
> + (package
> + (name "pioneers")
> + (version "15.3")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://downloads.sourceforge.net/pio/pioneers-"
> + version
> + ".tar.gz"))
Reorganized and de-tabbed the uri section (the linter complains about
tabs).
> + (sha256
> + (base32
> + "128s718nnraiznbg2rajjqb7cfkdg24hy6spdd9narb4f4dsbbv9"))))
> + (build-system gnu-build-system)
> + (inputs `(("gtk+" ,gtk+)
> + ("librsvg" ,librsvg)
> + ("avahi" ,avahi)))
> + (native-inputs `(("intltool" ,intltool)
> + ("pkg-config" ,pkg-config)))
> + (synopsis "A clone of The Settlers of Catan board game")
I changed this to "Board game inspired by The Settlers of Catan". It's
not a true clone if my dinner table isn't a mess ;)
> + (description
> + "Pioneers is an emulation of the board game The Settlers of Catan. It
> can be played on a local
> +network, on the internet, and with AI players.")
Wrapped to 80 characters, since `guix lint` complained.
> + (home-page "http://pio.sourceforge.net/")
> + (license license:gpl2+)))
Since the source files include the "any later version" clause, I changed
this to GPL3+. I usually grep for 'later version' when COPYING indicates
GPL2.
Thanks again for the patch! Applied as 7e2e115501a.