Re: [PATCH] add kobodeluxe

2016-10-18 Thread Christopher Allan Webber
Stephen Webber writes:

> Thank you both for the warm welcome and feedback :)
>
> I've attached a patch that builds upon Chris's changes.
>
> Changed:
> spelling patch - removed
> description - "game" now included in description
> patch names - use dashes consistently (thank you Chris)
>
> Unchanged:
> whitespace warnings - these are due to an intersection of the git patch
> format and the tabular convention within Kobodeluxe's code
> user profile - postponed until someone with security expertise can modify
>
> Patches originate from:
> https://packages.debian.org/sid/games/kobodeluxe (parent page)
> http://http.debian.net/debian/pool/main/k/kobodeluxe/kobodeluxe_0.5.1-8.debian.tar.xz
> (direct link)
>
> If any future changes are necessary, please let me know :)

Great!  I pushed it, and indicated that origin in the one .patch file
that didn't mention anything about its provenance in a separate commit.

Thanks for your contribution, Stephen!



Re: [PATCH] add kobodeluxe

2016-10-17 Thread Stephen Webber
Thank you both for the warm welcome and feedback :)

I've attached a patch that builds upon Chris's changes.

Changed:
spelling patch - removed
description - "game" now included in description
patch names - use dashes consistently (thank you Chris)

Unchanged:
whitespace warnings - these are due to an intersection of the git patch
format and the tabular convention within Kobodeluxe's code
user profile - postponed until someone with security expertise can modify

Patches originate from:
https://packages.debian.org/sid/games/kobodeluxe (parent page)
http://http.debian.net/debian/pool/main/k/kobodeluxe/kobodeluxe_0.5.1-8.debian.tar.xz
(direct link)

If any future changes are necessary, please let me know :)

On Mon, Oct 17, 2016 at 11:41 AM, Kei Kebreau  wrote:

> Christopher Allan Webber  writes:
>
> >> On Sun, Oct 16, 2016 at 9:06 PM, Kei Kebreau 
> wrote:
> >>> When I applied the patch, git complained about trailing whitespace; a
> >>> trivial fix.
> >
> > Those whitespace "errors" were in the original patches we borrowed from
> > Debian, and weren't on any of the lines that patch in new code.
> > Nonetheless the patches seem to apply fine without them, so here's an
> > adjusted patch that fixes that.  (It also fixes the commit line, since I
> > forgot to change the underscores to hyphens there in my last patch!)
> >
> >  - Chris
> >
> > From 62bf271a6907bd5b0ec73662bc3f92c64aafa229 Mon Sep 17 00:00:00 2001
> > From: Stephen Webber 
> > Date: Sun, 16 Oct 2016 15:04:35 -0500
> > Subject: [PATCH] gnu: Add kobodeluxe.
> >
> > * gnu/packages/games.scm (kobodeluxe): New variable.
> > * gnu/packages/patches/kobodeluxe-paths.patch: New file.
> > * gnu/packages/patches/kobodeluxe-spelling.patch: New file.
> > * gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch: New file.
> > * gnu/packages/patches/kobodeluxe-const-charp-conversion.patch: New
> file.
> > * gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch: New
> file.
> > * gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch: New
> file.
> > * gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch:
> New file.
> > * gnu/local.mk (dist_patch_DATA): Register it.
> > ---
> >  gnu/local.mk   |  7 +++
> >  gnu/packages/games.scm | 34 +++
> >  .../kobodeluxe-const-charp-conversion.patch| 17 ++
> >  .../patches/kobodeluxe-enemies-pipe-decl.patch | 67
> ++
> >  .../kobodeluxe-graphics-window-signed-char.patch   | 38 
> >  .../kobodeluxe-manpage-minus-not-hyphen.patch  | 15 +
> >  .../kobodeluxe-midicon-segmentation-fault.patch| 24 
> >  gnu/packages/patches/kobodeluxe-paths.patch| 40 +
> >  gnu/packages/patches/kobodeluxe-spelling.patch | 25 
> >  9 files changed, 267 insertions(+)
> >  create mode 100644 gnu/packages/patches/kobodeluxe-const-charp-
> conversion.patch
> >  create mode 100644 gnu/packages/patches/kobodeluxe-enemies-pipe-decl.
> patch
> >  create mode 100644 gnu/packages/patches/kobodeluxe-graphics-window-
> signed-char.patch
> >  create mode 100644 gnu/packages/patches/kobodeluxe-manpage-minus-not-
> hyphen.patch
> >  create mode 100644 gnu/packages/patches/kobodeluxe-midicon-
> segmentation-fault.patch
> >  create mode 100644 gnu/packages/patches/kobodeluxe-paths.patch
> >  create mode 100644 gnu/packages/patches/kobodeluxe-spelling.patch
> >
> > diff --git a/gnu/local.mk b/gnu/local.mk
> > index 19dd9ae..a358939 100644
> > --- a/gnu/local.mk
> > +++ b/gnu/local.mk
> > @@ -621,6 +621,13 @@ dist_patch_DATA =
>   \
> >%D%/packages/patches/jq-CVE-2015-8863.patch\
> >%D%/packages/patches/khmer-use-libraries.patch\
> >%D%/packages/patches/kmod-module-directory.patch   \
> > +  %D%/packages/patches/kobodeluxe-paths.patch\
> > +  %D%/packages/patches/kobodeluxe-spelling.patch \
> > +  %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch\
> > +  %D%/packages/patches/kobodeluxe-const-charp-conversion.patch   \
> > +  %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch \
> > +  %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch   \
> > +  %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch  \
> >%D%/packages/patches/laby-make-install.patch   \
> >%D%/packages/patches/ldc-disable-tests.patch   \
> >%D%/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
> > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> > index 2bb53e0..7c43f84 100644
> > --- a/gnu/packages/games.scm
> > +++ b/gnu/packages/games.scm
> > @@ -23,6 +23,7 @@
> >  ;;; Copyright © 2016 Alex Griffin 
> >  ;;; Copyright © 2016 Efraim Flashner 
> >  ;;; Copyright © 2016 Jan Nieuwenhuizen 
> > +;;; Copyright © 2016 Steve Webber 
> >  ;;;
> >  ;;; This file is p

Re: [PATCH] add kobodeluxe

2016-10-17 Thread Kei Kebreau
Christopher Allan Webber  writes:

>> On Sun, Oct 16, 2016 at 9:06 PM, Kei Kebreau  wrote:
>>> When I applied the patch, git complained about trailing whitespace; a
>>> trivial fix.
>
> Those whitespace "errors" were in the original patches we borrowed from
> Debian, and weren't on any of the lines that patch in new code.
> Nonetheless the patches seem to apply fine without them, so here's an
> adjusted patch that fixes that.  (It also fixes the commit line, since I
> forgot to change the underscores to hyphens there in my last patch!)
>
>  - Chris
>
> From 62bf271a6907bd5b0ec73662bc3f92c64aafa229 Mon Sep 17 00:00:00 2001
> From: Stephen Webber 
> Date: Sun, 16 Oct 2016 15:04:35 -0500
> Subject: [PATCH] gnu: Add kobodeluxe.
>
> * gnu/packages/games.scm (kobodeluxe): New variable.
> * gnu/packages/patches/kobodeluxe-paths.patch: New file.
> * gnu/packages/patches/kobodeluxe-spelling.patch: New file.
> * gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch: New file.
> * gnu/packages/patches/kobodeluxe-const-charp-conversion.patch: New file.
> * gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch: New file.
> * gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch: New file.
> * gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.
> ---
>  gnu/local.mk   |  7 +++
>  gnu/packages/games.scm | 34 +++
>  .../kobodeluxe-const-charp-conversion.patch| 17 ++
>  .../patches/kobodeluxe-enemies-pipe-decl.patch | 67 
> ++
>  .../kobodeluxe-graphics-window-signed-char.patch   | 38 
>  .../kobodeluxe-manpage-minus-not-hyphen.patch  | 15 +
>  .../kobodeluxe-midicon-segmentation-fault.patch| 24 
>  gnu/packages/patches/kobodeluxe-paths.patch| 40 +
>  gnu/packages/patches/kobodeluxe-spelling.patch | 25 
>  9 files changed, 267 insertions(+)
>  create mode 100644 
> gnu/packages/patches/kobodeluxe-const-charp-conversion.patch
>  create mode 100644 gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch
>  create mode 100644 
> gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch
>  create mode 100644 
> gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch
>  create mode 100644 
> gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch
>  create mode 100644 gnu/packages/patches/kobodeluxe-paths.patch
>  create mode 100644 gnu/packages/patches/kobodeluxe-spelling.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 19dd9ae..a358939 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -621,6 +621,13 @@ dist_patch_DATA =
> \
>%D%/packages/patches/jq-CVE-2015-8863.patch\
>%D%/packages/patches/khmer-use-libraries.patch\
>%D%/packages/patches/kmod-module-directory.patch   \
> +  %D%/packages/patches/kobodeluxe-paths.patch\
> +  %D%/packages/patches/kobodeluxe-spelling.patch \
> +  %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch\
> +  %D%/packages/patches/kobodeluxe-const-charp-conversion.patch   \
> +  %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch \
> +  %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch   \
> +  %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch  \
>%D%/packages/patches/laby-make-install.patch   \
>%D%/packages/patches/ldc-disable-tests.patch   \
>%D%/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 2bb53e0..7c43f84 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -23,6 +23,7 @@
>  ;;; Copyright © 2016 Alex Griffin 
>  ;;; Copyright © 2016 Efraim Flashner 
>  ;;; Copyright © 2016 Jan Nieuwenhuizen 
> +;;; Copyright © 2016 Steve Webber 
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -2994,3 +2995,36 @@ symbols, the game needs graphics to render the 
> non-euclidean world.")
> license:public-domain ; src/direntx.*
> license:zlib  ; src/savepng.*
> license:gpl2+ ; remaining files
> +
> +(define-public kobodeluxe
> +  (package
> +(name "kobodeluxe")
> +(version "0.5.1")
> +(source (origin
> +  (method url-fetch)
> +  (uri (string-append 
> "http://olofson.net/kobodl/download/KoboDeluxe-";
> +  version ".tar.bz2"))
> +  (sha256
> +   (base32
> +"0b2wvdpnmaibsy419c16dfwj5kvd3pccby2aaqvm964x74592yqg"))
> +  (patches (search-patches
> +"kobodeluxe-const-charp-conversion.patch"
> +"kobodeluxe-enemies-pipe

Re: [PATCH] add kobodeluxe

2016-10-17 Thread Ludovic Courtès
Hello!

Welcome, Stephen!

Christopher Allan Webber  skribis:

> From c8b122d8c7cf7a574bbbac66963ac355c64effc5 Mon Sep 17 00:00:00 2001
> From: Stephen Webber 
> Date: Sun, 16 Oct 2016 15:04:35 -0500
> Subject: [PATCH] gnu: Add kobodeluxe.
>
> * gnu/packages/games.scm (kobodeluxe): New variable.
> * gnu/packages/patches/kobodeluxe_paths.patch: New file.
> * gnu/packages/patches/kobodeluxe-spelling.patch: New file.
> * gnu/packages/patches/kobodeluxe_enemies-pipe-decl.patch: New file.
> * gnu/packages/patches/kobodeluxe_const_charp_conversion.patch: New file.
> * gnu/packages/patches/kobodeluxe_manpage-minus-not-hyphen.patch: New file.
> * gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch: New file.
> * gnu/packages/patches/kobodeluxe_graphics_window-signed-char.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.

Overall looks good to me!  I have minor/cosmetic suggestions, but
otherwise this is ready for commit IMO.

> +  %D%/packages/patches/kobodeluxe_paths.patch
> +  %D%/packages/patches/kobodeluxe-spelling.patch
> +  %D%/packages/patches/kobodeluxe_enemies-pipe-decl.patch
> +  %D%/packages/patches/kobodeluxe_const_charp_conversion.patch
> +  %D%/packages/patches/kobodeluxe_manpage-minus-not-hyphen.patch
> +  %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch
> +  %D%/packages/patches/kobodeluxe_graphics_window-signed-char.patch

Maybe use only hyphens in file names for consistency.

> +(synopsis "Shooter with space station destruction")
> +(description
> + "Kobo Deluxe is an enhanced version of Akira Higuchi's XKobo for Un*x
> +systems with X11.")

Maybe s/XKobo.*/XKobo graphical game/.

That way ‘guix package -s game’ will return it.  :-)

> --- /dev/null
> +++ b/gnu/packages/patches/kobodeluxe-spelling.patch
> @@ -0,0 +1,25 @@
> +Description: two spelling fixes
> +Author: Damyan Ivanov 

Maybe this patch can be omitted; hopefully it’ll be fixed in the next
release.

> +++ b/gnu/packages/patches/kobodeluxe_paths.patch
> @@ -0,0 +1,40 @@
> +# Disable reading of configs, graphics, and data from the current directory.
> +# So it's safe to run kobodeluxe from anywhere w/o worry about an attacker
> +# feeding it bad data.

Could you indicate the origin or status of this patch?

Chris: feel free to push an updated version!

Stephen, you picked a tricky package as your first patch but it’s
perfect!  I’m sure you had a good mentor too.  ;-)

Ludo’.



Re: [PATCH] add kobodeluxe

2016-10-17 Thread Christopher Allan Webber
Stephen Webber writes:

> As for the permanent user profile, one of the debian patches I applied
> changed the functionality for security reason. I'm not certain I have the
> expertise to make a correcting decision at this time, especially that is in
> line with guix conventions about state.

I also don't feel qualified to interpret the potential security issue in
the patch, not to build an alternative path based patch that's not at
supposed risk.  My suggestion is: let's accept the patch now, and if
someone can come up with a reason why the Debian-applied patch wasn't
needed, we can remove it, or if they can come up with a patch that
switches it to paths in the user's home directory, we can do that.

WDYT?

> On Sun, Oct 16, 2016 at 9:06 PM, Kei Kebreau  wrote:
>> When I applied the patch, git complained about trailing whitespace; a
>> trivial fix.

Those whitespace "errors" were in the original patches we borrowed from
Debian, and weren't on any of the lines that patch in new code.
Nonetheless the patches seem to apply fine without them, so here's an
adjusted patch that fixes that.  (It also fixes the commit line, since I
forgot to change the underscores to hyphens there in my last patch!)

 - Chris

>From 62bf271a6907bd5b0ec73662bc3f92c64aafa229 Mon Sep 17 00:00:00 2001
From: Stephen Webber 
Date: Sun, 16 Oct 2016 15:04:35 -0500
Subject: [PATCH] gnu: Add kobodeluxe.

* gnu/packages/games.scm (kobodeluxe): New variable.
* gnu/packages/patches/kobodeluxe-paths.patch: New file.
* gnu/packages/patches/kobodeluxe-spelling.patch: New file.
* gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch: New file.
* gnu/packages/patches/kobodeluxe-const-charp-conversion.patch: New file.
* gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch: New file.
* gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch: New file.
* gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk   |  7 +++
 gnu/packages/games.scm | 34 +++
 .../kobodeluxe-const-charp-conversion.patch| 17 ++
 .../patches/kobodeluxe-enemies-pipe-decl.patch | 67 ++
 .../kobodeluxe-graphics-window-signed-char.patch   | 38 
 .../kobodeluxe-manpage-minus-not-hyphen.patch  | 15 +
 .../kobodeluxe-midicon-segmentation-fault.patch| 24 
 gnu/packages/patches/kobodeluxe-paths.patch| 40 +
 gnu/packages/patches/kobodeluxe-spelling.patch | 25 
 9 files changed, 267 insertions(+)
 create mode 100644 gnu/packages/patches/kobodeluxe-const-charp-conversion.patch
 create mode 100644 gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch
 create mode 100644 gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch
 create mode 100644 gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch
 create mode 100644 gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch
 create mode 100644 gnu/packages/patches/kobodeluxe-paths.patch
 create mode 100644 gnu/packages/patches/kobodeluxe-spelling.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 19dd9ae..a358939 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -621,6 +621,13 @@ dist_patch_DATA =		\
   %D%/packages/patches/jq-CVE-2015-8863.patch			\
   %D%/packages/patches/khmer-use-libraries.patch\
   %D%/packages/patches/kmod-module-directory.patch		\
+  %D%/packages/patches/kobodeluxe-paths.patch			\
+  %D%/packages/patches/kobodeluxe-spelling.patch		\
+  %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch	\
+  %D%/packages/patches/kobodeluxe-const-charp-conversion.patch	\
+  %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch	\
+  %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch	\
+  %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch	\
   %D%/packages/patches/laby-make-install.patch			\
   %D%/packages/patches/ldc-disable-tests.patch			\
   %D%/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2bb53e0..7c43f84 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -23,6 +23,7 @@
 ;;; Copyright © 2016 Alex Griffin 
 ;;; Copyright © 2016 Efraim Flashner 
 ;;; Copyright © 2016 Jan Nieuwenhuizen 
+;;; Copyright © 2016 Steve Webber 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2994,3 +2995,36 @@ symbols, the game needs graphics to render the non-euclidean world.")
license:public-domain ; src/direntx.*
license:zlib  ; src/savepng.*
license:gpl2+ ; remaining files
+
+(define-public kobodeluxe
+  (package
+(name "kobodeluxe")
+(version "0.5.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "http://olofson.net/kobodl/download/KoboDeluxe-";
+

Re: [PATCH] add kobodeluxe

2016-10-16 Thread Stephen Webber
As for the permanent user profile, one of the debian patches I applied
changed the functionality for security reason. I'm not certain I have the
expertise to make a correcting decision at this time, especially that is in
line with guix conventions about state.

I'll remember the feedback on patch name convention in the future. Thank
you for your review!


On Sun, Oct 16, 2016 at 9:06 PM, Kei Kebreau  wrote:

> Christopher Allan Webber  writes:
>
> > I know Stephen, so I helped him put together this package, which is his
> > first.  It's a long time favorite free software game.
> >
> > There were a lot of patches to Kobo Deluxe in Debian; we kept finding
> > that it wouldn't build without one or another of them, and we read the
> > summary of all of them and decided they were all probably worth
> > including.
> >
> > I think the package looks fine, but probably someone else should look it
> > over.  If someone can give it an ACK, I'd love to merge it (or you can)!
> >
> >  - Chris
>
> I love this game! It's a solid patch except for two things:
>
> I can't make a permanent user profile. This is a somewhat popular
> problem for games to have.
>
> When I applied the patch, git complained about trailing whitespace; a
> trivial fix.
>


Re: [PATCH] add kobodeluxe

2016-10-16 Thread Kei Kebreau
Christopher Allan Webber  writes:

> I know Stephen, so I helped him put together this package, which is his
> first.  It's a long time favorite free software game.
>
> There were a lot of patches to Kobo Deluxe in Debian; we kept finding
> that it wouldn't build without one or another of them, and we read the
> summary of all of them and decided they were all probably worth
> including.
>
> I think the package looks fine, but probably someone else should look it
> over.  If someone can give it an ACK, I'd love to merge it (or you can)!
>
>  - Chris

I love this game! It's a solid patch except for two things:

I can't make a permanent user profile. This is a somewhat popular
problem for games to have.

When I applied the patch, git complained about trailing whitespace; a
trivial fix.


signature.asc
Description: PGP signature


Re: [PATCH] add kobodeluxe

2016-10-16 Thread Christopher Allan Webber
Christopher Allan Webber writes:

> I know Stephen, so I helped him put together this package, which is his
> first.  It's a long time favorite free software game.
>
> There were a lot of patches to Kobo Deluxe in Debian; we kept finding
> that it wouldn't build without one or another of them, and we read the
> summary of all of them and decided they were all probably worth
> including.
>
> I think the package looks fine, but probably someone else should look it
> over.  If someone can give it an ACK, I'd love to merge it (or you can)!
>
>  - Chris

There was something I overlooked, mainly because we corrected it late
in the patch... the automake file is missing some backslashes.  I also
changed some underscores to dashes in the patch filenames.

New patch attached!

>From c8b122d8c7cf7a574bbbac66963ac355c64effc5 Mon Sep 17 00:00:00 2001
From: Stephen Webber 
Date: Sun, 16 Oct 2016 15:04:35 -0500
Subject: [PATCH] gnu: Add kobodeluxe.

* gnu/packages/games.scm (kobodeluxe): New variable.
* gnu/packages/patches/kobodeluxe_paths.patch: New file.
* gnu/packages/patches/kobodeluxe-spelling.patch: New file.
* gnu/packages/patches/kobodeluxe_enemies-pipe-decl.patch: New file.
* gnu/packages/patches/kobodeluxe_const_charp_conversion.patch: New file.
* gnu/packages/patches/kobodeluxe_manpage-minus-not-hyphen.patch: New file.
* gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch: New file.
* gnu/packages/patches/kobodeluxe_graphics_window-signed-char.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk   |  7 +++
 gnu/packages/games.scm | 34 +++
 .../kobodeluxe-midicon-segmentation-fault.patch| 24 
 gnu/packages/patches/kobodeluxe-spelling.patch | 25 
 .../kobodeluxe_const_charp_conversion.patch| 17 ++
 .../patches/kobodeluxe_enemies-pipe-decl.patch | 67 ++
 .../kobodeluxe_graphics_window-signed-char.patch   | 38 
 .../kobodeluxe_manpage-minus-not-hyphen.patch  | 15 +
 gnu/packages/patches/kobodeluxe_paths.patch| 40 +
 9 files changed, 267 insertions(+)
 create mode 100644 gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch
 create mode 100644 gnu/packages/patches/kobodeluxe-spelling.patch
 create mode 100644 gnu/packages/patches/kobodeluxe_const_charp_conversion.patch
 create mode 100644 gnu/packages/patches/kobodeluxe_enemies-pipe-decl.patch
 create mode 100644 gnu/packages/patches/kobodeluxe_graphics_window-signed-char.patch
 create mode 100644 gnu/packages/patches/kobodeluxe_manpage-minus-not-hyphen.patch
 create mode 100644 gnu/packages/patches/kobodeluxe_paths.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 19dd9ae..ccdca77 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -621,6 +621,13 @@ dist_patch_DATA =		\
   %D%/packages/patches/jq-CVE-2015-8863.patch			\
   %D%/packages/patches/khmer-use-libraries.patch\
   %D%/packages/patches/kmod-module-directory.patch		\
+  %D%/packages/patches/kobodeluxe_paths.patch
+  %D%/packages/patches/kobodeluxe-spelling.patch
+  %D%/packages/patches/kobodeluxe_enemies-pipe-decl.patch
+  %D%/packages/patches/kobodeluxe_const_charp_conversion.patch
+  %D%/packages/patches/kobodeluxe_manpage-minus-not-hyphen.patch
+  %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch
+  %D%/packages/patches/kobodeluxe_graphics_window-signed-char.patch
   %D%/packages/patches/laby-make-install.patch			\
   %D%/packages/patches/ldc-disable-tests.patch			\
   %D%/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2bb53e0..3fed38c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -23,6 +23,7 @@
 ;;; Copyright © 2016 Alex Griffin 
 ;;; Copyright © 2016 Efraim Flashner 
 ;;; Copyright © 2016 Jan Nieuwenhuizen 
+;;; Copyright © 2016 Steve Webber 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2994,3 +2995,36 @@ symbols, the game needs graphics to render the non-euclidean world.")
license:public-domain ; src/direntx.*
license:zlib  ; src/savepng.*
license:gpl2+ ; remaining files
+
+(define-public kobodeluxe
+  (package
+(name "kobodeluxe")
+(version "0.5.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "http://olofson.net/kobodl/download/KoboDeluxe-";
+  version ".tar.bz2"))
+  (sha256
+   (base32
+"0b2wvdpnmaibsy419c16dfwj5kvd3pccby2aaqvm964x74592yqg"))
+  (patches (search-patches
+"kobodeluxe_const_charp_conversion.patch"
+"kobodeluxe_enemies-pipe-decl.patch"
+"kobodeluxe_graphics_window-signed-char.patch"
+"kobodeluxe_manpage-minus-not-h

Re: [PATCH] add kobodeluxe

2016-10-16 Thread Christopher Allan Webber
I know Stephen, so I helped him put together this package, which is his
first.  It's a long time favorite free software game.

There were a lot of patches to Kobo Deluxe in Debian; we kept finding
that it wouldn't build without one or another of them, and we read the
summary of all of them and decided they were all probably worth
including.

I think the package looks fine, but probably someone else should look it
over.  If someone can give it an ACK, I'd love to merge it (or you can)!

 - Chris