Package: guix-patches;
Reported by: Dmitry Polyakov <polyakov <at> liltechdude.xyz>
Date: Mon, 8 Feb 2021 09:25:02 UTC
Severity: normal
Tags: patch
Merged with 47508
Done: Leo Prikler <leo.prikler <at> student.tugraz.at>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 46378 in the body.
You can then email your comments to 46378 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#46378; Package guix-patches.
(Mon, 08 Feb 2021 09:25:03 GMT) Full text and rfc822 format available.Dmitry Polyakov <polyakov <at> liltechdude.xyz>:guix-patches <at> gnu.org.
(Mon, 08 Feb 2021 09:25:03 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Dmitry Polyakov <polyakov <at> liltechdude.xyz> To: guix-patches <at> gnu.org Subject: [PATCH] gnu: Add instead. Date: Mon, 08 Feb 2021 02:23:07 -0500
[Message part 1 (text/plain, inline)]
hope this work
From b0693f72129958c7d9e18cd5efb5d83902dee8f3 Mon Sep 17 00:00:00 2001
From: Dmitry Polyakov <liltechdude <at> gmail.com>
Subject: [PATCH] gnu: Add instead.
* 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
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 <at> gmail.com>
# Copyright © 2020 Vinicius Monego <monego <at> posteo.net>
# Copyright © 2021 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
+# Copyright © 2021 Dmitry Polyakov <polyakov <at> 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 <at> nicolasgoaziou.fr>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
+;;; Copyright © 2021 Dmitry Polyakov <polyakov <at> 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 <at> 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
--
魔法少女リルテチヅデですよ。
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#46378; Package guix-patches.
(Mon, 08 Feb 2021 12:48:01 GMT) Full text and rfc822 format available.Message #8 received at 46378 <at> debbugs.gnu.org (full text, mbox):
From: Leo Prikler <leo.prikler <at> student.tugraz.at> To: Dmitry Polyakov <polyakov <at> liltechdude.xyz> Cc: 46378 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Add instead. Date: Mon, 08 Feb 2021 13:46:53 +0100
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.
> From b0693f72129958c7d9e18cd5efb5d83902dee8f3 Mon Sep 17 00:00:00
> 2001
> From: Dmitry Polyakov <liltechdude <at> gmail.com>
> Subject: [PATCH] gnu: Add instead.
>
> * gnu/local.mk (instead): New variable.
That's not the list of changes that have been made.
> --- a/gnu/packages/game-development.scm
> +++ b/gnu/packages/game-development.scm
> @@ -20,6 +20,7 @@
> ;;; Copyright © 2020 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
> ;;; Copyright © 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
> +;;; Copyright © 2021 Dmitry Polyakov <polyakov <at> 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".
> + (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 ;)
> +From eba79afc957b9dc89cfd5c21434bd8ad5e0363bb Mon Sep 17 00:00:00
> 2001
> +From: Dmitry Polyakov <liltechdude <at> 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
guix-patches <at> gnu.org:bug#46378; Package guix-patches.
(Mon, 08 Feb 2021 13:06:02 GMT) Full text and rfc822 format available.Message #11 received at 46378 <at> debbugs.gnu.org (full text, mbox):
From: Dmitry Polyakov <polyakov <at> liltechdude.xyz> To: Leo Prikler <leo.prikler <at> student.tugraz.at> Cc: 46378 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Add instead. Date: Mon, 08 Feb 2021 08:04:57 -0500
[Message part 1 (text/plain, inline)]
Leo Prikler writes: > 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. -- 魔法少女リルテチヅデですよ。
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#46378; Package guix-patches.
(Mon, 08 Feb 2021 14:12:01 GMT) Full text and rfc822 format available.Message #14 received at 46378 <at> debbugs.gnu.org (full text, mbox):
From: polyakov <at> liltechdude.xyz To: 46378 <at> debbugs.gnu.org Cc: Dmitry Polyakov <liltechdude <at> gmail.com> Subject: [PATCH] gnu: Add instead. Date: Mon, 8 Feb 2021 09:11:20 -0500
From: Dmitry Polyakov <liltechdude <at> gmail.com>
* 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
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 <at> gmail.com>
# Copyright © 2020 Vinicius Monego <monego <at> posteo.net>
# Copyright © 2021 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
+# Copyright © 2021 Dmitry Polyakov <polyakov <at> 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 <at> nicolasgoaziou.fr>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
+;;; Copyright © 2021 Dmitry Polyakov <polyakov <at> 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 <at> 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
guix-patches <at> gnu.org:bug#46378; Package guix-patches.
(Mon, 08 Feb 2021 15:48:02 GMT) Full text and rfc822 format available.Message #17 received at 46378 <at> debbugs.gnu.org (full text, mbox):
From: Leo Prikler <leo.prikler <at> student.tugraz.at> To: polyakov <at> liltechdude.xyz, 46378 <at> debbugs.gnu.org Cc: Dmitry Polyakov <liltechdude <at> gmail.com> Subject: Re: [PATCH] gnu: Add instead. Date: Mon, 08 Feb 2021 16:46:54 +0100
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 <at> 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 <at> gmail.com>
> # Copyright © 2020 Vinicius Monego <monego <at> posteo.net>
> # Copyright © 2021 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
> +# Copyright © 2021 Dmitry Polyakov <polyakov <at> 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 <at> nicolasgoaziou.fr>
> ;;; Copyright © 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
> +;;; Copyright © 2021 Dmitry Polyakov <polyakov <at> 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 <at> 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
guix-patches <at> gnu.org:bug#46378; Package guix-patches.
(Mon, 08 Feb 2021 17:16:01 GMT) Full text and rfc822 format available.Message #20 received at 46378 <at> debbugs.gnu.org (full text, mbox):
From: Dmitry Polyakov <polyakov <at> liltechdude.xyz> To: Leo Prikler <leo.prikler <at> student.tugraz.at> Cc: 46378 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Add instead. Date: Mon, 08 Feb 2021 12:15:03 -0500
[Message part 1 (text/plain, inline)]
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. Second sended by `git send-email --to="46378 <at> 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. -- 魔法少女リルテチヅデですよ。
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#46378; Package guix-patches.
(Mon, 08 Feb 2021 17:45:01 GMT) Full text and rfc822 format available.Message #23 received at 46378 <at> debbugs.gnu.org (full text, mbox):
From: Leo Prikler <leo.prikler <at> student.tugraz.at> To: Dmitry Polyakov <polyakov <at> liltechdude.xyz> Cc: 46378 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Add instead. Date: Mon, 08 Feb 2021 18:43:59 +0100
[Message part 1 (text/plain, inline)]
Am Montag, den 08.02.2021, 12:15 -0500 schrieb Dmitry Polyakov: > 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. > Second sended by `git send-email --to="46378 <at> 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 <at> 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. > 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
[0001-gnu-python2-renpy-Update-to-7.4.2.patch (text/x-patch, attachment)]
Leo Prikler <leo.prikler <at> student.tugraz.at>
to control <at> debbugs.gnu.org.
(Mon, 05 Apr 2021 16:43:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#46378; Package guix-patches.
(Wed, 04 Aug 2021 12:30:01 GMT) Full text and rfc822 format available.Message #28 received at 46378 <at> debbugs.gnu.org (full text, mbox):
From: polyakov <at> liltechdude.xyz To: 46378 <at> debbugs.gnu.org Cc: Dmitry Polyakov <polyakov <at> liltechdude.xyz>, leo.prikler <at> student.tugraz.at Subject: [PATCH] gnu: Add instead. Date: Wed, 4 Aug 2021 17:29:12 +0500
From: Dmitry Polyakov <polyakov <at> liltechdude.xyz>
* gnu/local.mk (dist_patch_DATA):
Register the patch.
* 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
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 <at> philipmcgrath.com>
# Copyright © 2021 Arun Isaac <arunisaac <at> systemreboot.net>
# Copyright © 2021 Sharlatan Hellseher <sharlatanus <at> gmail.com>
+# Copyright © 2021 Dmitry Polyakov <polyakov <at> 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 <at> araneo.si>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407 <at> posteo.ro>
+;;; Copyright © 2021 Dmitry Polyakov <polyakov <at> 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 <at> 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 <leo.prikler <at> student.tugraz.at>:Dmitry Polyakov <polyakov <at> liltechdude.xyz>:Message #33 received at 46378-done <at> debbugs.gnu.org (full text, mbox):
From: Leo Prikler <leo.prikler <at> student.tugraz.at> To: polyakov <at> liltechdude.xyz, 46378-done <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Add instead. Date: Wed, 04 Aug 2021 15:50:48 +0200
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 <at> liltechdude.xyz:
> From: Dmitry Polyakov <polyakov <at> 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.
> ---
> 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 <at> philipmcgrath.com>
> # Copyright © 2021 Arun Isaac <arunisaac <at> systemreboot.net>
> # Copyright © 2021 Sharlatan Hellseher <sharlatanus <at> gmail.com>
> +# Copyright © 2021 Dmitry Polyakov <polyakov <at> 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 <at> araneo.si>
> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
> ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407 <at> posteo.ro>
> +;;; Copyright © 2021 Dmitry Polyakov <polyakov <at> 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.
> + (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.
> + (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.
> + (license license:gpl2)
License should be Expat, I believe, also I shoved it below the search
path.
> + (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 <at> 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 :)
> +---
> + 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 :)
Leo Prikler <leo.prikler <at> student.tugraz.at>:Alexander Krotov <krotov <at> iitp.ru>:Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Thu, 02 Sep 2021 11:24:04 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.