[PATCH] gnu: Add instead.

Done

Details

2 participants

Leo Prikler
Dmitry Polyakov

Owner: unassigned

Submitted by: Dmitry Polyakov

Severity: normal

Merged with

47508

Dmitry Polyakov wrote on 8 Feb 2021 08:23

Recipients:(address . guix-patches@gnu.org)

Message-ID:87o8gv58h0.fsf@liltechdude.xyz

hope this work

From b0693f72129958c7d9e18cd5efb5d83902dee8f3 Mon Sep 17 00:00:00 2001

* gnu/local.mk (instead): New variable.

---

gnu/local.mk | 2 +

gnu/packages/game-development.scm | 45

+++++++++++++++++++

.../patches/instead-use-games-path.patch | 28 ++++++++++++

3 files changed, 75 insertions(+)

create mode 100644 gnu/packages/patches/instead-use-games-path.patch

Toggle diff (127 lines)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..a117058 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,50 @@ 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 "Simple text adventure interpreter for Unix and 
Windows")
+    (description "Simple text adventure interpreter for Unix and 
Windows.")
+    (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")))))))
+
 (define-public ioquake3
   ;; We follow master since it seems that there won't be releases 
   after 1.3.6.
   (let ((commit "95b9cab4d644fa3bf757cfff821cc4f7d76e38b0"))
diff --git a/gnu/packages/patches/instead-use-games-path.patch 
b/gnu/packages/patches/instead-use-games-path.patch
new file mode 100644
index 0000000..2e460bf
--- /dev/null
+++ b/gnu/packages/patches/instead-use-games-path.patch
@@ -0,0 +1,28 @@
+From eba79afc957b9dc89cfd5c21434bd8ad5e0363bb Mon Sep 17 00:00:00 
2001
+From: Dmitry Polyakov <liltechdude@gmail.com>
+Date: Wed, 3 Feb 2021 14:33:37 -0500
+Subject: [PATCH] add custom gamedir support
+
+---
+ src/main.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index 9e6e2c3b..860bd3aa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -366,6 +366,12 @@ int instead_main(int argc, char *argv[])
+ 	setdir(game_cwd);
+ 	profile_load(NULL);
+
++    char *gamespath_env = NULL;
++
++    if (gamespath_env = getenv("INSTEAD_GAMES_PATH"), gamespath_env 
!= NULL) {
++      games_sw = strdup(gamespath_env);
++    }
++
+ 	for (i = 1; i < argc; i++) {
+ 		if (lua_sw) /* during load profile */
+ 			break;
+--
+2.30.0

2.30.0

??????????????

Leo Prikler wrote on 8 Feb 2021 13:46

Recipients:(name . Dmitry Polyakov)(address . polyakov@liltechdude.xyz)(address . 46378@debbugs.gnu.org)

Message-ID:33da1d54a4c1060302bc06013fd784155dd55f57.camel@student.tugraz.at

Hello,

Am Montag, den 08.02.2021, 02:23 -0500 schrieb Dmitry Polyakov:

Toggle quote (1 lines)

> hope this work

Sadly it doesn't seem so, I can't seem to get the patch to apply. If

you don't have git send-email set up, you might want to simply send the

patch as an attachment instead.

Toggle quote (6 lines)> From b0693f72129958c7d9e18cd5efb5d83902dee8f3 Mon Sep 17 00:00:00
> 2001
> From: Dmitry Polyakov <liltechdude@gmail.com>
> Subject: [PATCH] gnu: Add instead.
> 
> * gnu/local.mk (instead): New variable.

That's not the list of changes that have been made.

Toggle quote (54 lines)> --- 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,50 @@ 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 "Simple text adventure interpreter for Unix and 
> Windows")

Shorten to "Text adventure interpreter".

Toggle quote (2 lines)

> + (description "Simple text adventure interpreter for Unix and

> Windows.")

The description should be at least one full sentence. Also try not to

mention proprietary software ;)

Toggle quote (5 lines)> +From eba79afc957b9dc89cfd5c21434bd8ad5e0363bb Mon Sep 17 00:00:00 
> 2001
> +From: Dmitry Polyakov <liltechdude@gmail.com>
> +Date: Wed, 3 Feb 2021 14:33:37 -0500
> +Subject: [PATCH] add custom gamedir support

Try to use a more descriptive commit message in this patch as well.

Regards,

Leo

Dmitry Polyakov wrote on 8 Feb 2021 14:04

Recipients:(name . Leo Prikler)(address . leo.prikler@student.tugraz.at)(address . 46378@debbugs.gnu.org)

Message-ID:874kimemme.fsf@liltechdude.xyz

Leo Prikler writes:

Toggle quote (10 lines)> Hello,
>
> Am Montag, den 08.02.2021, 02:23 -0500 schrieb Dmitry Polyakov:
>> hope this work
> Sadly it doesn't seem so, I can't seem to get the patch to apply. 
> If
> you don't have git send-email set up, you might want to simply send 
> the
> patch as an attachment instead.

Agghhhh, `format=flowed` broke patch body. I'll try to change other

problems soon.

??????????????

polyakov wrote on 8 Feb 2021 15:11

[PATCH] gnu: Add instead.

Recipients:(address . 46378@debbugs.gnu.org)(name . Dmitry Polyakov)(address . liltechdude@gmail.com)

Message-ID:20210208141120.9184-1-polyakov@liltechdude.xyz

* gnu/local.mk (instead): New variable.

* gnu/packages/patches/instead-use-games-path.patch:

Patch for engine that enable set game directory

location in environment.

---

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

Toggle diff (127 lines)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")))))))
+
 (define-public ioquake3
   ;; We follow master since it seems that there won't be releases after 1.3.6.
   (let ((commit "95b9cab4d644fa3bf757cfff821cc4f7d76e38b0"))
diff --git a/gnu/packages/patches/instead-use-games-path.patch b/gnu/packages/patches/instead-use-games-path.patch
new file mode 100644
index 0000000..e081506
--- /dev/null
+++ b/gnu/packages/patches/instead-use-games-path.patch
@@ -0,0 +1,28 @@
+From eba79afc957b9dc89cfd5c21434bd8ad5e0363bb Mon Sep 17 00:00:00 2001
+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
+
+---
+ src/main.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index 9e6e2c3b..860bd3aa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -366,6 +366,12 @@ int instead_main(int argc, char *argv[])
+ 	setdir(game_cwd);
+ 	profile_load(NULL);
+
++    char *gamespath_env = NULL;
++
++    if (gamespath_env = getenv("INSTEAD_GAMES_PATH"), gamespath_env != NULL) {
++      games_sw = strdup(gamespath_env);
++    }
++
+ 	for (i = 1; i < argc; i++) {
+ 		if (lua_sw) /* during load profile */
+ 			break;
+--
+2.30.0
-- 
2.30.0

Leo Prikler wrote on 8 Feb 2021 16:46

Recipients:(name . Dmitry Polyakov)(address . liltechdude@gmail.com)

Message-ID:6398b29a976e3e804e224268fd58afd26326b35b.camel@student.tugraz.at

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:

Toggle quote (1 lines)

> * 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.

Toggle quote (3 lines)

> * gnu/packages/patches/instead-use-games-path.patch:

> Patch for engine that enable set game directory

> location in environment.

"New file." is okay here.

Toggle quote (104 lines)> ---
>  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.

Toggle quote (4 lines)

> +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

Dmitry Polyakov wrote on 8 Feb 2021 18:15

Recipients:(name . Leo Prikler)(address . leo.prikler@student.tugraz.at)(address . 46378@debbugs.gnu.org)

Message-ID:87v9b2cwh4.fsf@liltechdude.xyz

Leo Prikler writes:

Toggle quote (5 lines)

> 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.

No, my goal is to send as good patch as possible without any stuff

rewriting patch by maintainer. My first patch was submitting with

copy-pasting patch from output of magit `W c c` to message-buffer, but

format=flowed (as this artcle https://useplaintext.email/urges) in

m4ue

wrap some lines and therefore inline patch is brocken.

Second sended by `git send-email --to="46378@debbugs.gnu.org" HEAD^`.

May be I should turn off format=flowed option? Or send patch as

attached

file? I dunno what way is produce minimal effort by your side, so

please

tell me.

Sorry, I literally have no expirience with email driven changes

submitting before.

??????????????

Leo Prikler wrote on 8 Feb 2021 18:43

Recipients:(name . Dmitry Polyakov)(address . polyakov@liltechdude.xyz)(address . 46378@debbugs.gnu.org)

Message-ID:a97390cbd7d137672947249ca66ee52f9585ce77.camel@student.tugraz.at

Am Montag, den 08.02.2021, 12:15 -0500 schrieb Dmitry Polyakov:

Toggle quote (15 lines)> Leo Prikler writes:
> 
> > 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.
> 
> No, my goal is to send as good patch as possible without any stuff 
> like
> rewriting patch by maintainer. My first patch was submitting with
> copy-pasting patch from output of magit `W c c` to message-buffer,
> but
> format=flowed (as this artcle https://useplaintext.email/ urges) in 
> m4ue
> wrap some lines and therefore inline patch is brocken.

That looks like a decent recommendation for normal email, but is

inadequate for patches. You might want to disable line wrapping for

patches.

Toggle quote (7 lines)> Second sended by `git send-email --to="46378@debbugs.gnu.org" HEAD^`.
> 
> May be I should turn off format=flowed option? Or send patch as 
> attached
> file? I dunno what way is produce minimal effort by your side, so 
> please
> tell me.

The output of git send-email *should* be compatible with git am.

However, the mail that you've sent seems to have some of the fields

mixed up. I'm not sure if send-email has a format=flowed option, but

if it does, you might want to uncheck it.

Don't forget to add --cc=leo.prikler@student.tugraz.at (or more

generally --cc=<reviewer>) to your invocation of `git send-email`, so

that reviewers, that are not subscribed to the ML (like myself) are

also immediately informed.

I'm personally fine with patches as attachment, but others might not

be. I'll send one of my own commits as formatted by format-patch as an

attachment to this, so that you can cross-check your own git send-email

setup. Especially make sure that the header sequence matches up.

Toggle quote (2 lines)

> Sorry, I literally have no expirience with email driven changes

> submitting before.

Don't worry too much about it, everyone's a beginner :)

Regards,

Leo

From 771e1e7521fddc1f36f966c4b418f69c13c1aeea Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Sun, 7 Feb 2021 20:25:12 +0100
Subject: [PATCH] gnu: python2-renpy: Update to 7.4.2.

* gnu/packages/game-development.scm (python2-renpy): Update to 7.4.2.
[native-inputs]: Add gcc-8.
---
 gnu/packages/game-development.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (40 lines)diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 1ddd0e531f..92c3da92ab 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -63,6 +63,7 @@
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages dbm)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
@@ -1141,13 +1142,13 @@ developed mainly for Ren'py.")
 (define-public python2-renpy
   (package
     (name "python2-renpy")
-    (version "7.4.0")
+    (version "7.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.renpy.org/dl/" version
                            "/renpy-" version "-source.tar.bz2"))
-       (sha256 (base32 "0av3mbh54xh6i3rvf60x5hbsjcfpzgia2j958mhyc5826zjxzfpg"))
+       (sha256 (base32 "1mlrq9q3r36izyskq674qhp8s32iirvvfb4r8z6hi26189aaydsw"))
        (modules '((guix build utils)))
        (patches
         (search-patches
@@ -1224,7 +1225,8 @@ developed mainly for Ren'py.")
      `(("python2-future" ,python2-future)
        ("python2-pygame" ,python2-pygame-sdl2)))
     (native-inputs
-     `(("python2-cython" ,python2-cython)
+     `(("gcc" ,gcc-8) ; for const variables as initializer elements
+       ("python2-cython" ,python2-cython)
        ("xdg-utils" ,xdg-utils)))
     (home-page "https://www.renpy.org/")
     (synopsis "Ren'py python module")
-- 
2.30.0

Leo Prikler wrote on 5 Apr 2021 18:42

Re: [PATCH] gnu: add instead

Recipients:

Message-ID:41db15be319b0111d77e0f5b9cbd6609d7d24d69.camel@student.tugraz.at

merge 46378 47508

thanks

Hi,

as you can see, there does exist prior work on the packaging of

instead. Dmitry's patch also includes a search path among other

things, but there were some setbacks, that are discussed over there.

Work on that patch seems to have come to a halt, but it would be great

if you could try to see what could be salvaged from it.

Regards,

Leo

Am Mittwoch, den 31.03.2021, 02:53 +0300 schrieb Alexander Krotov:

Toggle quote (48 lines)> * gnu/packages/games.scm (instead): New variable.
> ---
>  gnu/packages/games.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 3f909aad4b..22975cf0d6 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -12379,3 +12379,34 @@ game FPS.")
>  implemented using ncurses user interface.  An SDL graphical version
> is also
>  available.")
>      (license license:gpl3+)))
> +
> +(define-public instead
> +  (package
> +    (name "instead")
> +    (version "3.3.4")
> +    (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
> "09z22i0ny3dhjhj3g1walxg5mdnr3wsx95q1f92z32cabmqkbiyc"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:tests? #f))
> +    (inputs `(("zlib" ,zlib)
> +              ("lua" ,lua)
> +              ("sdl2" ,sdl2)
> +              ("sdl2-mixer" ,sdl2-mixer)
> +              ("sdl2-image" ,sdl2-image)
> +              ("sdl2-ttf" ,sdl2-ttf)
> +              ("gtk+" ,gtk+)))
> +    (native-inputs `(("pkg-config" ,pkg-config)))
> +    (home-page "https://instead.hugeping.ru/")
> +    (synopsis "Simple text adventures/visual novels engine")
> +    (description "INSTEAD is an INterpreter of Simple TExt
> ADventure.  Using
> +INSTEAD you can create and play games that could be classified as a
> mix of
> +visual novel and text quest.")
> +    (license license:expat)))

polyakov wrote on 4 Aug 2021 14:29

[PATCH] gnu: Add instead.

Recipients:(address . 46378@debbugs.gnu.org)

Message-ID:20210804122912.20268-1-polyakov@liltechdude.xyz

* gnu/local.mk (dist_patch_DATA):

* gnu/packages/patches/instead-use-games-path.patch:

New file.

---

gnu/local.mk | 2 +

gnu/packages/game-development.scm | 52 +++++++++++++++++++

.../patches/instead-use-games-path.patch | 32 ++++++++++++

3 files changed, 86 insertions(+)

create mode 100644 gnu/packages/patches/instead-use-games-path.patch

Toggle diff (130 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index e849480..0c45ae5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -43,6 +43,7 @@
 # Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
 # Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 # Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
+# Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
 #
 # This file is part of GNU Guix.
 #
@@ -1261,6 +1262,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.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/inkscape-1.1-fix-build-witch-gcc7.5.patch	\
   %D%/packages/patches/intel-xed-fix-nondeterminism.patch	\
   %D%/packages/patches/intltool-perl-compatibility.patch	\
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index e1593c0..4164b20 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
+;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2115,6 +2116,57 @@ upon which people base their games, ports to new platforms, and other
 projects.")
       (license license:gpl2))))
 
+(define-public instead
+  (package
+    (name "instead")
+    (version "3.3.5")
+    (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 "02j8cw623j51qmr4991i5hsbrzmnp0qfzds8m6nwwr15sjv3hv1g"))
+       (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))
+    (inputs
+     `(("sdl2-images" ,sdl2-image)
+       ("sdl2-ttf" ,sdl2-ttf)
+       ("lua" ,lua)
+       ("pkg-config" ,pkg-config)
+       ("sdl2-mixer" ,sdl2-mixer)
+       ("luajit" ,luajit)
+       ("gtk+",gtk+)))
+    (home-page "https://instead3.syscall.ru/")
+    (synopsis "Text adventure interpreter")
+    (description "The STEAD (Simple TExt ADventures) interpreter provide
+functionality to play games that combine visual novels, text adventures
+and classic quests of 1990-s.  STEAD games feature:
+@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 license:gpl2)
+    (native-search-paths
+     (list (search-path-specification
+            (variable "INSTEAD_GAMES_PATH")
+            (separator #f)                        ;single entry
+            (files '("share/instead/games")))))))
+
 (define-public openvr
   (package
     (name "openvr")
diff --git a/gnu/packages/patches/instead-use-games-path.patch b/gnu/packages/patches/instead-use-games-path.patch
new file mode 100644
index 0000000..52e96ed
--- /dev/null
+++ b/gnu/packages/patches/instead-use-games-path.patch
@@ -0,0 +1,32 @@
+From 8b350daa847dd8e131d9e6b5b4434ce68a7903d0 Mon Sep 17 00:00:00 2001
+From: Dmitry Polyakov <polyakov@liltechdude.xyz>
+Date: Wed, 4 Aug 2021 15:46:33 +0500
+Subject: [PATCH] [PATCH] Add support for INSTEAD_GAMES_PATH
+
+In certain cases, the user needs to determinate by himself where the
+games will be stored. Using an environment variable is the most common
+way to provide the user with this capability.
+---
+ src/main.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index ba0ada1d..b05497b8 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -394,6 +394,12 @@ int instead_main(int argc, char *argv[])
+ 	setdir(game_cwd);
+ 	profile_load(NULL);
+ 
++	char *gamespath_env = NULL;
++
++	if (gamespath_env = getenv("INSTEAD_GAMES_PATH"), gamespath_env != NULL) {
++	  games_sw = strdup(gamespath_env);
++	}
++
+ 	for (i = 1; i < argc; i++) {
+ 		if (lua_sw) /* during load profile */
+ 			break;
+-- 
+2.32.0
+
-- 
2.32.0

Leo Prikler wrote on 4 Aug 2021 15:50

Recipients:

Message-ID:4810a8fa8167edd84bfe860acecb1dd9cb81faf8.camel@student.tugraz.at

Hi,

I've made a lot of changes to this patch, but given that it has been

around for a while and I didn't want to stall you even further, I've

decided to push the modified version.

Am Mittwoch, den 04.08.2021, 17:29 +0500 schrieb

polyakov@liltechdude.xyz:

Toggle quote (7 lines)> From: Dmitry Polyakov <polyakov@liltechdude.xyz>
> 
> * gnu/local.mk (dist_patch_DATA):
>   Register the patch.
> 
> * gnu/packages/patches/instead-use-games-path.patch:
>   New file.

game-development.scm was not mentioned, also you should mention any

patch before the Makefile it's added to.

Toggle quote (67 lines)> ---
>  gnu/local.mk                                  |  2 +
>  gnu/packages/game-development.scm             | 52
> +++++++++++++++++++
>  .../patches/instead-use-games-path.patch      | 32 ++++++++++++
>  3 files changed, 86 insertions(+)
>  create mode 100644 gnu/packages/patches/instead-use-games-path.patch
> 
> diff --git a/gnu/local.mk b/gnu/local.mk
> index e849480..0c45ae5 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -43,6 +43,7 @@
>  # Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
>  # Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
>  # Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
> +# Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
>  #
>  # This file is part of GNU Guix.
>  #
> @@ -1261,6 +1262,7 @@ dist_patch_DATA =				
> 		\
>    %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.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/inkscape-1.1-fix-build-witch-gcc7.5.patch	
> \
>    %D%/packages/patches/intel-xed-fix-nondeterminism.patch	\
>    %D%/packages/patches/intltool-perl-compatibility.patch	\
> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-
> development.scm
> index e1593c0..4164b20 100644
> --- a/gnu/packages/game-development.scm
> +++ b/gnu/packages/game-development.scm
> @@ -21,6 +21,7 @@
>  ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
>  ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
>  ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
> +;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -2115,6 +2116,57 @@ upon which people base their games, ports to
> new platforms, and other
>  projects.")
>        (license license:gpl2))))
>  
> +(define-public instead
> +  (package
> +    (name "instead")
> +    (version "3.3.5")
> +    (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
> "02j8cw623j51qmr4991i5hsbrzmnp0qfzds8m6nwwr15sjv3hv1g"))
> +       (patches
> +        (search-patches
> +         "instead-use-games-path.patch"))))

I've added a snippet to unbundle zlib.

Toggle quote (17 lines)> +    (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))
> +    (inputs
> +     `(("sdl2-images" ,sdl2-image)
> +       ("sdl2-ttf" ,sdl2-ttf)
> +       ("lua" ,lua)
> +       ("pkg-config" ,pkg-config)
> +       ("sdl2-mixer" ,sdl2-mixer)
> +       ("luajit" ,luajit)
> +       ("gtk+",gtk+)))

I've reorganized the imports and added zlib.

Toggle quote (13 lines)> +    (home-page "https://instead3.syscall.ru/")
> +    (synopsis "Text adventure interpreter")
> +    (description "The STEAD (Simple TExt ADventures) interpreter
> provide
> +functionality to play games that combine visual novels, text
> adventures
> +and classic quests of 1990-s.  STEAD games feature:
> +@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")

I've shortened the description -- this may be somewhat subjective, but

I find the short one neater.

Toggle quote (1 lines)

> + (license license:gpl2)

License should be Expat, I believe, also I shoved it below the search

path.

Toggle quote (26 lines)> +    (native-search-paths
> +     (list (search-path-specification
> +            (variable "INSTEAD_GAMES_PATH")
> +            (separator #f)                        ;single entry
> +            (files '("share/instead/games")))))))
> +
>  (define-public openvr
>    (package
>      (name "openvr")
> diff --git a/gnu/packages/patches/instead-use-games-path.patch
> b/gnu/packages/patches/instead-use-games-path.patch
> new file mode 100644
> index 0000000..52e96ed
> --- /dev/null
> +++ b/gnu/packages/patches/instead-use-games-path.patch
> @@ -0,0 +1,32 @@
> +From 8b350daa847dd8e131d9e6b5b4434ce68a7903d0 Mon Sep 17 00:00:00
> 2001
> +From: Dmitry Polyakov <polyakov@liltechdude.xyz>
> +Date: Wed, 4 Aug 2021 15:46:33 +0500
> +Subject: [PATCH] [PATCH] Add support for INSTEAD_GAMES_PATH
> +
> +In certain cases, the user needs to determinate by himself where the
> +games will be stored. Using an environment variable is the most
> common
> +way to provide the user with this capability.

I've reworded this to use gender-neutral language. There are female

and non-binary contributors as well :)

Toggle quote (26 lines)> +---
> + src/main.c | 6 ++++++
> + 1 file changed, 6 insertions(+)
> +
> +diff --git a/src/main.c b/src/main.c
> +index ba0ada1d..b05497b8 100644
> +--- a/src/main.c
> ++++ b/src/main.c
> +@@ -394,6 +394,12 @@ int instead_main(int argc, char *argv[])
> + 	setdir(game_cwd);
> + 	profile_load(NULL);
> + 
> ++	char *gamespath_env = NULL;
> ++
> ++	if (gamespath_env = getenv("INSTEAD_GAMES_PATH"), gamespath_env
> != NULL) {
> ++	  games_sw = strdup(gamespath_env);
> ++	}
> ++
> + 	for (i = 1; i < argc; i++) {
> + 		if (lua_sw) /* during load profile */
> + 			break;
> +-- 
> +2.32.0
> +

Thanks and have a nice day :)

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 46378@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date