[bug#46378] [PATCH] gnu: Add instead.

[Leo Prikler]

Hello Dmitry,

the patch now applies with "git apply", but not "git am", which makes
it difficult to sign off.  I can however rewrite the commit on your
behalf if that is what you want.

Am Montag, den 08.02.2021, 09:11 -0500 schrieb
polyakov@liltechdude.xyz:
> * gnu/local.mk (instead): New variable.
This is not what happens in local.mk.  In local.mk you register your
patch in dist_patch_DATA.  The new variable goes to game-
development.scm.

> * gnu/packages/patches/instead-use-games-path.patch:
>   Patch for engine that enable set game directory
>   location in environment.
"New file." is okay here.

> ---
>  gnu/local.mk                                  |  2 +
>  gnu/packages/game-development.scm             | 53
> +++++++++++++++++++
>  .../patches/instead-use-games-path.patch      | 28 ++++++++++
>  3 files changed, 83 insertions(+)
>  create mode 100644 gnu/packages/patches/instead-use-games-path.patch
> 
> diff --git a/gnu/local.mk b/gnu/local.mk
> index b9b4b66..923231f 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -40,6 +40,7 @@
>  # Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
>  # Copyright © 2020 Vinicius Monego <monego@posteo.net>
>  # Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
> +# Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
>  #
>  # This file is part of GNU Guix.
>  #
> @@ -1187,6 +1188,7 @@ dist_patch_DATA =                               
>               \
>    %D%/packages/patches/ilmbase-fix-tests.patch                       
> \
>    %D%/packages/patches/inetutils-hurd.patch                  \
>    %D%/packages/patches/inkscape-poppler-0.76.patch           \
> +  %D%/packages/patches/instead-use-games-path.patch          \
>    %D%/packages/patches/intel-xed-fix-nondeterminism.patch    \
>    %D%/packages/patches/intltool-perl-compatibility.patch     \
>    %D%/packages/patches/iputils-libcap-compat.patch           \
> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-
> development.scm
> index 92c3da9..018d946 100644
> --- a/gnu/packages/game-development.scm
> +++ b/gnu/packages/game-development.scm
> @@ -20,6 +20,7 @@
>  ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
>  ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
>  ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
> +;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -1961,6 +1962,58 @@ all modern computing platforms.  Each library
> component is fairly independent
>  of the others")
>      (license license:lgpl2.0+)))
>  
> +(define-public instead
> +  (package
> +    (name "instead")
> +    (version "3.3.2")
> +    (build-system cmake-build-system)
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/instead-hub/instead";)
> +             (commit version)))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32
> "014wfz5z5x72rhnakczpgfyw8s6bq510bxfmn4gv66jahkh4b65f"))
> +       (patches
> +        (search-patches
> +         "instead-use-games-path.patch"))))
> +    (arguments
> +     '(#:configure-flags
> +       (list (string-append
> +              "-DLUA_INCLUDE_DIR="
> +              (assoc-ref %build-inputs "luajit") "/include/luajit-
> 2.1/")
> +             "-DWITH_LUAJIT=1"
> +             "-DWITH_GTK3=1")
> +       #:tests? #f))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (inputs
> +     `(("sdl2-images" ,sdl2-image)
> +       ("sdl2-ttf" ,sdl2-ttf)
> +       ("lua" ,lua)
> +       ("sdl2-mixer" ,sdl2-mixer)
> +       ("luajit" ,luajit)
> +       ("gtk+",gtk+)))
> +    (home-page "https://instead3.syscall.ru/";)
> +    (synopsis "Text adventure interpreter")
> +    (description "The interpreter of STEAD (Simple Text Adventures)
> allows one
> +to play games that combine visual novels, text adventures and
> classic quests
> +of 1990-s.  The STEAD games features are:
> +@enumerate
> +@item Very simple source code of the stories. (based on LUA);
> +@item Graphical game interface;
> +@item Supports music and images;
> +@item Theme support - a game may change the interface look;
> +@end enumerate")
> +    (license (list license:gpl2 license:zlib))
> +    (native-search-paths
> +     (list (search-path-specification
> +            (variable "INSTEAD_GAMES_PATH")
> +            (separator #f)              ;single entry
> +            (files '("share/instead/games")))))))
> +
LGTM, but the description could do with a few improvements.  
"This package allows to" is somewhat of an anti-pattern.
On a related note "The interpreter of STEAD" is probably better worded
as "The STEAD interpreter" and "The STEAD games features" could be
"STEAD games feature" or something along those lines.
Items should probably not end in semicolons.

> +From: Dmitry Polyakov <liltechdude@gmail.com>
> +Date: Wed, 3 Feb 2021 14:33:37 -0500
> +Subject: [PATCH] add support to get game directory location from
> environent
Should be "Add support for INSTEAD_GAMES_PATH" followed by two newlines
followed by a rationale as for why this patch is required.

Regards, 
Leo