[PATCH] gnu: Add pioneers

[PATCH] gnu: Add pioneers

[thylakoid]

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

Hello all,

I am submitting this patch that packages the game 'pioneers' into the 
games.scm file.

Let me know if I made any mistakes or can improve anything. I'm hoping 
to package several more appplications soon.

The patch is an attachment.

- Rodger Fox

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff; name=patch.diff, Size: 1879 bytes --]

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 <alezost@gmail.com>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;; Copyright © 2016 Rodger Fox <thylakoid@openmailbox.org>
 ;;;
 ;;; 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))
 
+
+(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"))
+              (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")
+    (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.")
+    (home-page "http://pio.sourceforge.net/")
+    (license license:gpl2+)))
+
 (define-public gnubg
   (package
     (name "gnubg")

Re: [PATCH] gnu: Add pioneers

[Leo Famulari]

On Mon, Feb 15, 2016 at 01:14:16PM -0800, thylakoid@openmailbox.org 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 <alezost@gmail.com>
>  ;;; Copyright ?? 2015 Paul van der Walt <paul@denknerd.org>
>  ;;; Copyright ?? 2015 Taylan Ulrich Bay??rl??/Kammer <taylanbayirli@gmail.com>
> +;;; Copyright ?? 2016 Rodger Fox <thylakoid@openmailbox.org>
>  ;;;
>  ;;; 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.

Re: [PATCH] gnu: Add pioneers

[Jookia]

On Mon, Feb 15, 2016 at 08:21:04PM -0500, Leo Famulari wrote:
> > +    (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.

I don't like this and I think this is a bad idea. The project isn't licensed
under the GPLv3+, it's licensed under the GPLv2+. When people search for
packages and read licenses they're not going to be misinformed. I feel this is a
disservice to the users of Guix, and misleading at best or dishonest at worst.

You mentioned in IRC that this is supposed to be for the package that Guix
builds and distributes. Indeed, the Guix documentation says the license field is
for "The license of the package", not the license of the software in the
package. Yet the home-page field is "The URL to the home-page of the package",
and the synopsis field is "A one-line description of the package." 'package'
here means the upstream, not the Guix package. Logic says that the license is
for the software, and yet it's being misrepresented.

I'd much rather like a package manager that reliably tells me the license for
upstream software, but I have a feeling this is a sore political spot. I don't
even get why you'd distribute the package under a newer GPL- this makes packages
that were previously compatible incompatible!

I don't care for the politics, but I think at the very least the 'license' field
needs to be explicitly documented as not the license for the upstream software.

Jookia.

Re: [PATCH] gnu: Add pioneers

[Leo Famulari]

On Tue, Feb 16, 2016 at 01:03:34PM +1100, Jookia wrote:
> On Mon, Feb 15, 2016 at 08:21:04PM -0500, Leo Famulari wrote:
> > > +    (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.
> 
> I don't like this and I think this is a bad idea. The project isn't licensed
> under the GPLv3+, it's licensed under the GPLv2+. When people search for
> packages and read licenses they're not going to be misinformed. I feel this is a
> disservice to the users of Guix, and misleading at best or dishonest at worst.
> 
> You mentioned in IRC that this is supposed to be for the package that Guix
> builds and distributes. Indeed, the Guix documentation says the license field is
> for "The license of the package", not the license of the software in the
> package. Yet the home-page field is "The URL to the home-page of the package",
> and the synopsis field is "A one-line description of the package." 'package'
> here means the upstream, not the Guix package. Logic says that the license is
> for the software, and yet it's being misrepresented.
> 
> I'd much rather like a package manager that reliably tells me the license for
> upstream software, but I have a feeling this is a sore political spot. I don't
> even get why you'd distribute the package under a newer GPL- this makes packages
> that were previously compatible incompatible!
> 
> I don't care for the politics, but I think at the very least the 'license' field
> needs to be explicitly documented as not the license for the upstream software.
> 
> Jookia.

You're right, I was wrong. I'm correcting this mistake and looking
through my history to see if I've made it elsewhere.

Re: [PATCH] gnu: Add pioneers

[Mark H Weaver]

Jookia <166291@gmail.com> writes:

> On Mon, Feb 15, 2016 at 08:21:04PM -0500, Leo Famulari wrote:
>> > +    (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.
>
> I don't like this and I think this is a bad idea. The project isn't licensed
> under the GPLv3+, it's licensed under the GPLv2+. When people search for
> packages and read licenses they're not going to be misinformed. I feel this is a
> disservice to the users of Guix, and misleading at best or dishonest at worst.

You're right, Jookia.  Leo was mistaken about our policy.

If upstream allows distribution under "GPLv2 or any later version", then
our license field should be gpl2+.

     Thanks,
       Mark