Package: guix-patches;
Reported by: Adam Faiz <adam.faiz <at> disroot.org>
Date: Thu, 21 Dec 2023 10:33:02 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
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 67950 in the body.
You can then email your comments to 67950 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#67950; Package guix-patches.
(Thu, 21 Dec 2023 10:33:02 GMT) Full text and rfc822 format available.Adam Faiz <adam.faiz <at> disroot.org>:guix-patches <at> gnu.org.
(Thu, 21 Dec 2023 10:33:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: guix-patches <at> gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH 0/3] gnu: Add devours. Date: Thu, 21 Dec 2023 18:31:16 +0800
From 4a21bc5fc4a31a9a8f5cac2ea834d86203e5115a Mon Sep 17 00:00:00 2001 Message-ID: <cover.1703154486.git.adam.faiz <at> disroot.org> From: AwesomeAdam54321 <adam.faiz <at> disroot.org> Date: Thu, 21 Dec 2023 18:28:06 +0800 Subject: [PATCH 0/3] gnu: Add devours. This patch series adds All Things Devours, a sci-fi text adventure game. AwesomeAdam54321 (3): gnu: Add inform. gnu: Add informlib. gnu: Add devours. gnu/local.mk | 1 + gnu/packages/game-development.scm | 50 ++++++++ gnu/packages/games.scm | 74 ++++++++++++ .../patches/inform-add-makefile.patch | 109 ++++++++++++++++++ 4 files changed, 234 insertions(+) create mode 100644 gnu/packages/patches/inform-add-makefile.patch base-commit: 29c94dd522833b2603a651c14a5b06120bcf1829 -- 2.41.0
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Thu, 21 Dec 2023 10:42:02 GMT) Full text and rfc822 format available.Message #8 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 67950 <at> debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH 1/3] gnu: Add inform. Date: Thu, 21 Dec 2023 18:40:45 +0800
From 7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1 Mon Sep 17 00:00:00 2001
Message-ID: <7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1.1703154486.git.adam.faiz <at> disroot.org>
In-Reply-To: <cover.1703154486.git.adam.faiz <at> disroot.org>
References: <cover.1703154486.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 21 Dec 2023 18:15:41 +0800
Subject: [PATCH 1/3] gnu: Add inform.
* gnu/packages/patches/inform-add-makefile.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/game-development.scm (inform): New variable.
---
gnu/local.mk | 1 +
gnu/packages/game-development.scm | 25 ++++
.../patches/inform-add-makefile.patch | 109 ++++++++++++++++++
3 files changed, 135 insertions(+)
create mode 100644 gnu/packages/patches/inform-add-makefile.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index f7aec83e8a..1bc955ce1f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1449,6 +1449,7 @@ dist_patch_DATA = \
%D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \
%D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \
%D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \
+ %D%/packages/patches/inform-add-makefile.patch \
%D%/packages/patches/inkscape-poppler-compat.patch \
%D%/packages/patches/instead-use-games-path.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index a2d7c5ea63..0c467de23f 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2771,6 +2771,31 @@ (define-public ioquake3
people base their games, ports to new platforms, and other projects.")
(license license:gpl2))))
+(define-public inform
+ (package
+ (name "inform")
+ (version "6.41")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://jxself.org/git/inform.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1g2misbp4lacaqa96wk0ad59ybr2dvjnhjsrz98byx4i99s2m2nr"))
+ (patches
+ (search-patches
+ "inform-add-makefile.patch"))))
+ (build-system gnu-build-system)
+ (native-inputs (list autoconf automake))
+ (synopsis "The Inform 6 compiler")
+ (description
+ "This is an Inform 6 compiler that has been modified slightly to work better
+when the Inform standard library is in a non-standard location.")
+ (home-page "https://jxself.org/git/inform.git")
+ (license license:gpl3+)))
+
(define-public instead
(package
(name "instead")
diff --git a/gnu/packages/patches/inform-add-makefile.patch b/gnu/packages/patches/inform-add-makefile.patch
new file mode 100644
index 0000000000..497d40979e
--- /dev/null
+++ b/gnu/packages/patches/inform-add-makefile.patch
@@ -0,0 +1,109 @@
+From b2332ab850dc260be8892ad5a4148b335c6b193b Mon Sep 17 00:00:00 2001
+From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
+Date: Wed, 20 Dec 2023 22:38:41 +0800
+Subject: [PATCH] Implement a Makefile for Inform.
+
+---
+ Makefile.am | 17 +++++++++++++++++
+ configure.ac | 40 ++++++++++++++++++++++++++++++++++++++++
+ src/Makefile.am | 17 +++++++++++++++++
+ 3 files changed, 74 insertions(+)
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+ create mode 100644 src/Makefile.am
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..fb99417
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,17 @@
++# This file is part of Inform.
++#
++# Inform is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by
++# theFree Software Foundation, either version 3 of the License, or
++#(at your option) any later version.
++#
++# Inform is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with Inform. If not, see https://gnu.org/licenses/
++
++AUTOMAKE_OPTIONS = foreign
++SUBDIRS = src
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..0ff8ced
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,40 @@
++# Process this file with autoconf to produce a configure script.
++#
++# This file is part of Inform.
++#
++# Inform is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by
++# theFree Software Foundation, either version 3 of the License, or
++#(at your option) any later version.
++#
++# Inform is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with Inform. If not, see https://gnu.org/licenses/
++
++AC_INIT([inform], [6.41], [j <at> jxself.org])
++AM_INIT_AUTOMAKE([foreign])
++AC_OUTPUT(Makefile src/Makefile)
++
++# Checks for programs.
++AC_PROG_CC
++
++# Checks for libraries.
++
++# Checks for header files.
++AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_CHECK_HEADER_STDBOOL
++AC_TYPE_SIZE_T
++
++# Checks for library functions.
++AC_FUNC_ERROR_AT_LINE
++AC_FUNC_MALLOC
++AC_FUNC_REALLOC
++AC_CHECK_FUNCS([memmove memset realpath strchr strtol])
++
++AC_OUTPUT
+diff --git a/src/Makefile.am b/src/Makefile.am
+new file mode 100644
+index 0000000..b548944
+--- /dev/null
++++ b/src/Makefile.am
+@@ -0,0 +1,17 @@
++# This file is part of Inform.
++#
++# Inform is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by
++# theFree Software Foundation, either version 3 of the License, or
++#(at your option) any later version.
++#
++# Inform is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with Inform. If not, see https://gnu.org/licenses/
++
++bin_PROGRAMS = inform
++inform_SOURCES = arrays.c asm.c bpatch.c chars.c directs.c errors.c expressc.c expressp.c files.c header.h inform.c lexer.c memory.c objects.c states.c symbols.c syntax.c tables.c text.c veneer.c verbs.c
+--
+2.41.0
+
--
2.41.0
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Thu, 21 Dec 2023 10:43:01 GMT) Full text and rfc822 format available.Message #11 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 67950 <at> debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH 2/3] gnu: Add informlib. Date: Thu, 21 Dec 2023 18:42:17 +0800
From 55f87c2ef4fe17845ac94e9e0ef5ccae98b1777f Mon Sep 17 00:00:00 2001
Message-ID: <55f87c2ef4fe17845ac94e9e0ef5ccae98b1777f.1703154486.git.adam.faiz <at> disroot.org>
In-Reply-To: <cover.1703154486.git.adam.faiz <at> disroot.org>
References: <cover.1703154486.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 21 Dec 2023 18:17:29 +0800
Subject: [PATCH 2/3] gnu: Add informlib.
* gnu/packages/game-development.scm (informlib): New variable.
---
gnu/packages/game-development.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 0c467de23f..6e080b3f36 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -57,6 +57,7 @@ (define-module (gnu packages game-development)
#:use-module (guix svn-download)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
@@ -2796,6 +2797,30 @@ (define-public inform
(home-page "https://jxself.org/git/inform.git")
(license license:gpl3+)))
+(define-public informlib
+ (package
+ (name "informlib")
+ (version "6.12.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://jxself.org/git/informlib.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fcnw4jjzln402qk097n2s8y24vw1p3mmlmh6k1mbr2zfajjcn5r"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan
+ #~'(("." "lib"))))
+ (synopsis "Inform 6 standard library")
+ (description
+ "This package provides the standard library for Inform 6.")
+ (home-page "https://jxself.org/git/informlib.git")
+ (license license:agpl3+)))
+
(define-public instead
(package
(name "instead")
--
2.41.0
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Thu, 21 Dec 2023 10:45:02 GMT) Full text and rfc822 format available.Message #14 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 67950 <at> debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH 3/3] gnu: Add devours. Date: Thu, 21 Dec 2023 18:43:54 +0800
From 4a21bc5fc4a31a9a8f5cac2ea834d86203e5115a Mon Sep 17 00:00:00 2001
Message-ID: <4a21bc5fc4a31a9a8f5cac2ea834d86203e5115a.1703154486.git.adam.faiz <at> disroot.org>
In-Reply-To: <cover.1703154486.git.adam.faiz <at> disroot.org>
References: <cover.1703154486.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 21 Dec 2023 18:26:27 +0800
Subject: [PATCH 3/3] gnu: Add devours.
* gnu/packages/games.scm (devours): New variable.
---
gnu/packages/games.scm | 74 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 66739d7a6b..f7ff5cadf7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11100,6 +11100,80 @@ (define-public curseofwar
available.")
(license license:gpl3+)))
+(define-public devours
+ (let ((commit "d50e745aa14aa48f7555ae12eb3d1000de1cc150")
+ (revision "0"))
+ (package
+ (name "devours")
+ (version (git-version "3" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://jxself.org/git/devours.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ksl6mh76jfx64rmasz2571f88ws45vby2977srhgkh355zp3lzn"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ; no configure
+ (replace 'build
+ (lambda _
+ (invoke "inform"
+ (string-append "+include_path="
+ #$(this-package-native-input "informlib")
+ "/lib")
+ "devours.inf")))
+ (replace 'install
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Create standalone executable.
+ (let* ((bash (search-input-file inputs "/bin/bash"))
+ (share (string-append #$output "/share"))
+ (scummvm (search-input-file inputs "/bin/scummvm"))
+ (bin (string-append #$output "/bin"))
+ (executable (string-append bin "/devours")))
+ (mkdir-p share)
+ (copy-file "devours.z5" (string-append share "/devours.z5"))
+ (mkdir-p bin)
+ (with-output-to-file executable
+ (lambda ()
+ (format #t "#!~a~%" bash)
+ (format #t
+ "exec ~a --path=~a glk:zcode~%"
+ scummvm share)))
+ (chmod executable #o755))))
+ (add-after 'install-executable 'install-desktop-file
+ (lambda _
+ (let* ((apps (string-append #$output "/share/applications"))
+ (share (string-append #$output "")))
+ (mkdir-p apps)
+ (make-desktop-entry-file
+ (string-append apps "/devours.desktop")
+ #:name "All Things Devours"
+ #:generic-name "All Things Devours"
+ #:exec (string-append #$output "/bin/devours")
+ #:categories '("AdventureGame" "Game" "RolePlaying")
+ #:keywords '("game" "adventure" "sci-fi")
+ #:comment '((#f "Sci-fi text adventure game")))))))))
+ (inputs
+ (list bash scummvm))
+ (native-inputs
+ (list inform informlib))
+ (synopsis "All Things Devours")
+ (description
+ "All Things Devours is a short piece of sci-fi interactive fiction,
+leaning strongly towards the text-adventure end of the spectrum.
+Any move you make may put things into an unwinnable state. You are therefore
+encouraged to save frequently, and also to realise that you will probably have
+to start over several times to find the most satisfactory ending.")
+ (home-page "https://jxself.org/git/devours.git")
+ (license license:agpl3+))))
+
(define-public schiffbruch
;; There haven't been any releases for several years, so I've taken the most
;; recent commit from the master branch that didn't fail to build (the last
--
2.41.0
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Fri, 22 Dec 2023 17:07:01 GMT) Full text and rfc822 format available.Message #17 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Adam Faiz <adam.faiz <at> disroot.org>, 67950 <at> debbugs.gnu.org Subject: Re: [PATCH 1/3] gnu: Add inform. Date: Fri, 22 Dec 2023 18:05:48 +0100
Am Donnerstag, dem 21.12.2023 um 18:40 +0800 schrieb Adam Faiz:
> From 7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1 Mon Sep 17 00:00:00
> 2001
> Message-ID:
> <7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1.1703154486.git.adam.faiz <at> di
> sroot.org>
> In-Reply-To: <cover.1703154486.git.adam.faiz <at> disroot.org>
> References: <cover.1703154486.git.adam.faiz <at> disroot.org>
> From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
> Date: Thu, 21 Dec 2023 18:15:41 +0800
> Subject: [PATCH 1/3] gnu: Add inform.
>
> * gnu/packages/patches/inform-add-makefile.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it here.
> * gnu/packages/game-development.scm (inform): New variable.
> ---
> gnu/local.mk | 1 +
> gnu/packages/game-development.scm | 25 ++++
> .../patches/inform-add-makefile.patch | 109
> ++++++++++++++++++
> 3 files changed, 135 insertions(+)
> create mode 100644 gnu/packages/patches/inform-add-makefile.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index f7aec83e8a..1bc955ce1f 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1449,6 +1449,7 @@ dist_patch_DATA
> = \
> %D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \
> %D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \
> %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-
> fix.patch \
> + %D%/packages/patches/inform-add-makefile.patch \
> %D%/packages/patches/inkscape-poppler-compat.patch \
> %D%/packages/patches/instead-use-games-path.patch \
> %D%/packages/patches/intltool-perl-compatibility.patch \
> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-
> development.scm
> index a2d7c5ea63..0c467de23f 100644
> --- a/gnu/packages/game-development.scm
> +++ b/gnu/packages/game-development.scm
> @@ -2771,6 +2771,31 @@ (define-public ioquake3
> people base their games, ports to new platforms, and other
> projects.")
> (license license:gpl2))))
>
> +(define-public inform
> + (package
> + (name "inform")
> + (version "6.41")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://jxself.org/git/inform.git")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> "1g2misbp4lacaqa96wk0ad59ybr2dvjnhjsrz98byx4i99s2m2nr"))
> + (patches
> + (search-patches
> + "inform-add-makefile.patch"))))
> + (build-system gnu-build-system)
> + (native-inputs (list autoconf automake))
> + (synopsis "The Inform 6 compiler")
> + (description
> + "This is an Inform 6 compiler that has been modified slightly
> to work better
> +when the Inform standard library is in a non-standard location.")
> + (home-page "https://jxself.org/git/inform.git")
> + (license license:gpl3+)))
> +
> (define-public instead
> (package
> (name "instead")
> diff --git a/gnu/packages/patches/inform-add-makefile.patch
> b/gnu/packages/patches/inform-add-makefile.patch
> new file mode 100644
> index 0000000000..497d40979e
> --- /dev/null
> +++ b/gnu/packages/patches/inform-add-makefile.patch
> @@ -0,0 +1,109 @@
> +From b2332ab850dc260be8892ad5a4148b335c6b193b Mon Sep 17 00:00:00
> 2001
> +From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
> +Date: Wed, 20 Dec 2023 22:38:41 +0800
> +Subject: [PATCH] Implement a Makefile for Inform.
> +
> +---
> + Makefile.am | 17 +++++++++++++++++
> + configure.ac | 40 ++++++++++++++++++++++++++++++++++++++++
> + src/Makefile.am | 17 +++++++++++++++++
> + 3 files changed, 74 insertions(+)
> + create mode 100644 Makefile.am
> + create mode 100644 configure.ac
> + create mode 100644 src/Makefile.am
> +
> +diff --git a/Makefile.am b/Makefile.am
> +new file mode 100644
> +index 0000000..fb99417
> +--- /dev/null
> ++++ b/Makefile.am
> +@@ -0,0 +1,17 @@
> ++# This file is part of Inform.
> ++#
> ++# Inform is free software: you can redistribute it and/or modify it
> ++# under the terms of the GNU General Public License as published by
> ++# theFree Software Foundation, either version 3 of the License, or
> ++#(at your option) any later version.
> ++#
> ++# Inform is distributed in the hope that it will be useful, but
> ++# WITHOUT ANY WARRANTY; without even the implied warranty of
> ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> ++# General Public License for more details.
> ++#
> ++# You should have received a copy of the GNU General Public License
> ++# along with Inform. If not, see https://gnu.org/licenses/
> ++
> ++AUTOMAKE_OPTIONS = foreign
> ++SUBDIRS = src
> +diff --git a/configure.ac b/configure.ac
> +new file mode 100644
> +index 0000000..0ff8ced
> +--- /dev/null
> ++++ b/configure.ac
> +@@ -0,0 +1,40 @@
> ++# Process this file with autoconf to produce a configure script.
> ++#
> ++# This file is part of Inform.
> ++#
> ++# Inform is free software: you can redistribute it and/or modify it
> ++# under the terms of the GNU General Public License as published by
> ++# theFree Software Foundation, either version 3 of the License, or
> ++#(at your option) any later version.
> ++#
> ++# Inform is distributed in the hope that it will be useful, but
> ++# WITHOUT ANY WARRANTY; without even the implied warranty of
> ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> ++# General Public License for more details.
> ++#
> ++# You should have received a copy of the GNU General Public License
> ++# along with Inform. If not, see https://gnu.org/licenses/
> ++
> ++AC_INIT([inform], [6.41], [j <at> jxself.org])
> ++AM_INIT_AUTOMAKE([foreign])
> ++AC_OUTPUT(Makefile src/Makefile)
> ++
> ++# Checks for programs.
> ++AC_PROG_CC
> ++
> ++# Checks for libraries.
> ++
> ++# Checks for header files.
> ++AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h])
> ++
> ++# Checks for typedefs, structures, and compiler characteristics.
> ++AC_CHECK_HEADER_STDBOOL
> ++AC_TYPE_SIZE_T
> ++
> ++# Checks for library functions.
> ++AC_FUNC_ERROR_AT_LINE
> ++AC_FUNC_MALLOC
> ++AC_FUNC_REALLOC
> ++AC_CHECK_FUNCS([memmove memset realpath strchr strtol])
> ++
> ++AC_OUTPUT
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +new file mode 100644
> +index 0000000..b548944
> +--- /dev/null
> ++++ b/src/Makefile.am
> +@@ -0,0 +1,17 @@
> ++# This file is part of Inform.
> ++#
> ++# Inform is free software: you can redistribute it and/or modify it
> ++# under the terms of the GNU General Public License as published by
> ++# theFree Software Foundation, either version 3 of the License, or
> ++#(at your option) any later version.
> ++#
> ++# Inform is distributed in the hope that it will be useful, but
> ++# WITHOUT ANY WARRANTY; without even the implied warranty of
> ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> ++# General Public License for more details.
> ++#
> ++# You should have received a copy of the GNU General Public License
> ++# along with Inform. If not, see https://gnu.org/licenses/
> ++
> ++bin_PROGRAMS = inform
> ++inform_SOURCES = arrays.c asm.c bpatch.c chars.c directs.c errors.c
> expressc.c expressp.c files.c header.h inform.c lexer.c memory.c
> objects.c states.c symbols.c syntax.c tables.c text.c veneer.c
> verbs.c
> +--
> +2.41.0
> +
You might want to suggest this patch to upstream. If not, you can do
something similar by using copy-build-system and a build phase that
reads something along the lines of
(apply invoke (gcc-for-target) "-o" "inform"
(find-files "src" "\\.c$"))
Cheers
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Sun, 24 Dec 2023 12:37:02 GMT) Full text and rfc822 format available.Message #20 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 67950 <at> debbugs.gnu.org Subject: Re: [PATCH 1/3] gnu: Add inform. Date: Sun, 24 Dec 2023 20:35:24 +0800
On 12/23/23 01:05, Liliana Marie Prikler wrote: > Am Donnerstag, dem 21.12.2023 um 18:40 +0800 schrieb Adam Faiz: >> From 7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1 Mon Sep 17 00:00:00 >> 2001 >> Message-ID: >> <7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1.1703154486.git.adam.faiz <at> di >> sroot.org> >> In-Reply-To: <cover.1703154486.git.adam.faiz <at> disroot.org> >> References: <cover.1703154486.git.adam.faiz <at> disroot.org> >> From: AwesomeAdam54321 <adam.faiz <at> disroot.org> >> Date: Thu, 21 Dec 2023 18:15:41 +0800 >> Subject: [PATCH 1/3] gnu: Add inform. >> >> * gnu/packages/patches/inform-add-makefile.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Register it here. >> * gnu/packages/game-development.scm (inform): New variable. >> --- >> gnu/local.mk | 1 + >> gnu/packages/game-development.scm | 25 ++++ >> .../patches/inform-add-makefile.patch | 109 >> ++++++++++++++++++ >> 3 files changed, 135 insertions(+) >> create mode 100644 gnu/packages/patches/inform-add-makefile.patch >> >> diff --git a/gnu/local.mk b/gnu/local.mk >> index f7aec83e8a..1bc955ce1f 100644 >> --- a/gnu/local.mk >> +++ b/gnu/local.mk >> @@ -1449,6 +1449,7 @@ dist_patch_DATA >> = \ >> %D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \ >> %D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \ >> %D%/packages/patches/imagemagick-WriteTHUMBNAILImage- >> fix.patch \ >> + %D%/packages/patches/inform-add-makefile.patch \ >> %D%/packages/patches/inkscape-poppler-compat.patch \ >> %D%/packages/patches/instead-use-games-path.patch \ >> %D%/packages/patches/intltool-perl-compatibility.patch \ >> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game- >> development.scm >> index a2d7c5ea63..0c467de23f 100644 >> --- a/gnu/packages/game-development.scm >> +++ b/gnu/packages/game-development.scm >> @@ -2771,6 +2771,31 @@ (define-public ioquake3 >> people base their games, ports to new platforms, and other >> projects.") >> (license license:gpl2)))) >> >> +(define-public inform >> + (package >> + (name "inform") >> + (version "6.41") >> + (source >> + (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://jxself.org/git/inform.git") >> + (commit (string-append "v" version)))) >> + (file-name (git-file-name name version)) >> + (sha256 >> + (base32 >> "1g2misbp4lacaqa96wk0ad59ybr2dvjnhjsrz98byx4i99s2m2nr")) >> + (patches >> + (search-patches >> + "inform-add-makefile.patch")))) >> + (build-system gnu-build-system) >> + (native-inputs (list autoconf automake)) >> + (synopsis "The Inform 6 compiler") >> + (description >> + "This is an Inform 6 compiler that has been modified slightly >> to work better >> +when the Inform standard library is in a non-standard location.") >> + (home-page "https://jxself.org/git/inform.git") >> + (license license:gpl3+))) >> + >> (define-public instead >> (package >> (name "instead") >> diff --git a/gnu/packages/patches/inform-add-makefile.patch >> b/gnu/packages/patches/inform-add-makefile.patch >> new file mode 100644 >> index 0000000000..497d40979e >> --- /dev/null >> +++ b/gnu/packages/patches/inform-add-makefile.patch >> @@ -0,0 +1,109 @@ >> +From b2332ab850dc260be8892ad5a4148b335c6b193b Mon Sep 17 00:00:00 >> 2001 >> +From: AwesomeAdam54321 <adam.faiz <at> disroot.org> >> +Date: Wed, 20 Dec 2023 22:38:41 +0800 >> +Subject: [PATCH] Implement a Makefile for Inform. >> + >> +--- >> + Makefile.am | 17 +++++++++++++++++ >> + configure.ac | 40 ++++++++++++++++++++++++++++++++++++++++ >> + src/Makefile.am | 17 +++++++++++++++++ >> + 3 files changed, 74 insertions(+) >> + create mode 100644 Makefile.am >> + create mode 100644 configure.ac >> + create mode 100644 src/Makefile.am >> + >> +diff --git a/Makefile.am b/Makefile.am >> +new file mode 100644 >> +index 0000000..fb99417 >> +--- /dev/null >> ++++ b/Makefile.am >> +@@ -0,0 +1,17 @@ >> ++# This file is part of Inform. >> ++# >> ++# Inform is free software: you can redistribute it and/or modify it >> ++# under the terms of the GNU General Public License as published by >> ++# theFree Software Foundation, either version 3 of the License, or >> ++#(at your option) any later version. >> ++# >> ++# Inform is distributed in the hope that it will be useful, but >> ++# WITHOUT ANY WARRANTY; without even the implied warranty of >> ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++# General Public License for more details. >> ++# >> ++# You should have received a copy of the GNU General Public License >> ++# along with Inform. If not, see https://gnu.org/licenses/ >> ++ >> ++AUTOMAKE_OPTIONS = foreign >> ++SUBDIRS = src >> +diff --git a/configure.ac b/configure.ac >> +new file mode 100644 >> +index 0000000..0ff8ced >> +--- /dev/null >> ++++ b/configure.ac >> +@@ -0,0 +1,40 @@ >> ++# Process this file with autoconf to produce a configure script. >> ++# >> ++# This file is part of Inform. >> ++# >> ++# Inform is free software: you can redistribute it and/or modify it >> ++# under the terms of the GNU General Public License as published by >> ++# theFree Software Foundation, either version 3 of the License, or >> ++#(at your option) any later version. >> ++# >> ++# Inform is distributed in the hope that it will be useful, but >> ++# WITHOUT ANY WARRANTY; without even the implied warranty of >> ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++# General Public License for more details. >> ++# >> ++# You should have received a copy of the GNU General Public License >> ++# along with Inform. If not, see https://gnu.org/licenses/ >> ++ >> ++AC_INIT([inform], [6.41], [j <at> jxself.org]) >> ++AM_INIT_AUTOMAKE([foreign]) >> ++AC_OUTPUT(Makefile src/Makefile) >> ++ >> ++# Checks for programs. >> ++AC_PROG_CC >> ++ >> ++# Checks for libraries. >> ++ >> ++# Checks for header files. >> ++AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h]) >> ++ >> ++# Checks for typedefs, structures, and compiler characteristics. >> ++AC_CHECK_HEADER_STDBOOL >> ++AC_TYPE_SIZE_T >> ++ >> ++# Checks for library functions. >> ++AC_FUNC_ERROR_AT_LINE >> ++AC_FUNC_MALLOC >> ++AC_FUNC_REALLOC >> ++AC_CHECK_FUNCS([memmove memset realpath strchr strtol]) >> ++ >> ++AC_OUTPUT >> +diff --git a/src/Makefile.am b/src/Makefile.am >> +new file mode 100644 >> +index 0000000..b548944 >> +--- /dev/null >> ++++ b/src/Makefile.am >> +@@ -0,0 +1,17 @@ >> ++# This file is part of Inform. >> ++# >> ++# Inform is free software: you can redistribute it and/or modify it >> ++# under the terms of the GNU General Public License as published by >> ++# theFree Software Foundation, either version 3 of the License, or >> ++#(at your option) any later version. >> ++# >> ++# Inform is distributed in the hope that it will be useful, but >> ++# WITHOUT ANY WARRANTY; without even the implied warranty of >> ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++# General Public License for more details. >> ++# >> ++# You should have received a copy of the GNU General Public License >> ++# along with Inform. If not, see https://gnu.org/licenses/ >> ++ >> ++bin_PROGRAMS = inform >> ++inform_SOURCES = arrays.c asm.c bpatch.c chars.c directs.c errors.c >> expressc.c expressp.c files.c header.h inform.c lexer.c memory.c >> objects.c states.c symbols.c syntax.c tables.c text.c veneer.c >> verbs.c >> +-- >> +2.41.0 >> + > You might want to suggest this patch to upstream. If not, you can do > something similar by using copy-build-system and a build phase that > reads something along the lines of > (apply invoke (gcc-for-target) "-o" "inform" > (find-files "src" "\\.c$")) > Cheers Thanks, I already sent this patch upstream, but I haven't gotten a response yet. I'll send a V2 of this patch series using your copy-build-system with a build phase idea.
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Sun, 24 Dec 2023 15:48:01 GMT) Full text and rfc822 format available.Message #23 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 67950 <at> debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH v2 1/3] gnu: Add inform. Date: Sun, 24 Dec 2023 23:46:31 +0800
From eaf206d6a1a29a2334fa31e9692bf6f584d73409 Mon Sep 17 00:00:00 2001
Message-ID: <eaf206d6a1a29a2334fa31e9692bf6f584d73409.1703432554.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 21 Dec 2023 18:15:41 +0800
Subject: [PATCH v2 1/3] gnu: Add inform.
* gnu/packages/game-development.scm (inform): New variable.
---
gnu/packages/game-development.scm | 34 +++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index a2d7c5ea63..72349a8d9b 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2771,6 +2771,40 @@ (define-public ioquake3
people base their games, ports to new platforms, and other projects.")
(license license:gpl2))))
+(define-public inform
+ (package
+ (name "inform")
+ (version "6.41")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://jxself.org/git/inform.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1g2misbp4lacaqa96wk0ad59ybr2dvjnhjsrz98byx4i99s2m2nr"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'build
+ (lambda _
+ (apply invoke #$(cc-for-target) "-o" "inform"
+ (find-files "src" "\\.c$")))))
+ #:install-plan
+ #~'(("inform" "bin/inform"))))
+ (native-inputs (list autoconf automake))
+ (synopsis "The Inform 6 compiler")
+ (description
+ "Inform 6 is a C-like programming language designed
+for interactive fiction. This version of the compiler has been modified
+slightly to work better when the Inform standard library is in a non-standard
+location.")
+ (home-page "https://jxself.org/git/inform.git")
+ (license license:gpl3+)))
+
(define-public instead
(package
(name "instead")
base-commit: 29c94dd522833b2603a651c14a5b06120bcf1829
--
2.41.0
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Sun, 24 Dec 2023 15:51:01 GMT) Full text and rfc822 format available.Message #26 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 67950 <at> debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH v2 2/3] gnu: Add informlib. Date: Sun, 24 Dec 2023 23:49:35 +0800
From c1fa9c53f3dda536d372257b876918376734b9d5 Mon Sep 17 00:00:00 2001
Message-ID: <c1fa9c53f3dda536d372257b876918376734b9d5.1703432554.git.adam.faiz <at> disroot.org>
In-Reply-To: <eaf206d6a1a29a2334fa31e9692bf6f584d73409.1703432554.git.adam.faiz <at> disroot.org>
References: <eaf206d6a1a29a2334fa31e9692bf6f584d73409.1703432554.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Sun, 24 Dec 2023 23:14:31 +0800
Subject: [PATCH v2 2/3] gnu: Add informlib.
* gnu/packages/game-development.scm (informlib): New variable.
---
gnu/packages/game-development.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 72349a8d9b..dec0209d6b 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2805,6 +2805,30 @@ (define-public inform
(home-page "https://jxself.org/git/inform.git")
(license license:gpl3+)))
+(define-public informlib
+ (package
+ (name "informlib")
+ (version "6.12.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://jxself.org/git/informlib.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fcnw4jjzln402qk097n2s8y24vw1p3mmlmh6k1mbr2zfajjcn5r"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan
+ #~'(("." "lib"))))
+ (synopsis "Inform 6 standard library")
+ (description
+ "This package provides the standard library for Inform 6.")
+ (home-page "https://jxself.org/git/informlib.git")
+ (license license:agpl3+)))
+
(define-public instead
(package
(name "instead")
--
2.41.0
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Sun, 24 Dec 2023 15:54:01 GMT) Full text and rfc822 format available.Message #29 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 67950 <at> debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH v2 3/3] gnu: Add devours. Date: Sun, 24 Dec 2023 23:52:29 +0800
From a68ffe27e91e72d85f450141afe6df020906597b Mon Sep 17 00:00:00 2001
Message-ID: <a68ffe27e91e72d85f450141afe6df020906597b.1703432554.git.adam.faiz <at> disroot.org>
In-Reply-To: <eaf206d6a1a29a2334fa31e9692bf6f584d73409.1703432554.git.adam.faiz <at> disroot.org>
References: <eaf206d6a1a29a2334fa31e9692bf6f584d73409.1703432554.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Sun, 24 Dec 2023 23:15:53 +0800
Subject: [PATCH v2 3/3] gnu: Add devours.
* gnu/packages/games.scm (devours): New variable.
---
gnu/packages/games.scm | 74 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 66739d7a6b..f7ff5cadf7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11100,6 +11100,80 @@ (define-public curseofwar
available.")
(license license:gpl3+)))
+(define-public devours
+ (let ((commit "d50e745aa14aa48f7555ae12eb3d1000de1cc150")
+ (revision "0"))
+ (package
+ (name "devours")
+ (version (git-version "3" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://jxself.org/git/devours.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ksl6mh76jfx64rmasz2571f88ws45vby2977srhgkh355zp3lzn"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ; no configure
+ (replace 'build
+ (lambda _
+ (invoke "inform"
+ (string-append "+include_path="
+ #$(this-package-native-input "informlib")
+ "/lib")
+ "devours.inf")))
+ (replace 'install
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Create standalone executable.
+ (let* ((bash (search-input-file inputs "/bin/bash"))
+ (share (string-append #$output "/share"))
+ (scummvm (search-input-file inputs "/bin/scummvm"))
+ (bin (string-append #$output "/bin"))
+ (executable (string-append bin "/devours")))
+ (mkdir-p share)
+ (copy-file "devours.z5" (string-append share "/devours.z5"))
+ (mkdir-p bin)
+ (with-output-to-file executable
+ (lambda ()
+ (format #t "#!~a~%" bash)
+ (format #t
+ "exec ~a --path=~a glk:zcode~%"
+ scummvm share)))
+ (chmod executable #o755))))
+ (add-after 'install-executable 'install-desktop-file
+ (lambda _
+ (let* ((apps (string-append #$output "/share/applications"))
+ (share (string-append #$output "")))
+ (mkdir-p apps)
+ (make-desktop-entry-file
+ (string-append apps "/devours.desktop")
+ #:name "All Things Devours"
+ #:generic-name "All Things Devours"
+ #:exec (string-append #$output "/bin/devours")
+ #:categories '("AdventureGame" "Game" "RolePlaying")
+ #:keywords '("game" "adventure" "sci-fi")
+ #:comment '((#f "Sci-fi text adventure game")))))))))
+ (inputs
+ (list bash scummvm))
+ (native-inputs
+ (list inform informlib))
+ (synopsis "All Things Devours")
+ (description
+ "All Things Devours is a short piece of sci-fi interactive fiction,
+leaning strongly towards the text-adventure end of the spectrum.
+Any move you make may put things into an unwinnable state. You are therefore
+encouraged to save frequently, and also to realise that you will probably have
+to start over several times to find the most satisfactory ending.")
+ (home-page "https://jxself.org/git/devours.git")
+ (license license:agpl3+))))
+
(define-public schiffbruch
;; There haven't been any releases for several years, so I've taken the most
;; recent commit from the master branch that didn't fail to build (the last
--
2.41.0
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Mon, 25 Dec 2023 00:17:01 GMT) Full text and rfc822 format available.Message #32 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 67950 <at> debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH v3 1/3] gnu: Add inform. Date: Mon, 25 Dec 2023 08:16:08 +0800
From eea4385fef9805fd37517b476b8d581d081cc44c Mon Sep 17 00:00:00 2001
Message-ID: <eea4385fef9805fd37517b476b8d581d081cc44c.1703463244.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 21 Dec 2023 18:15:41 +0800
Subject: [PATCH v3 1/3] gnu: Add inform.
* gnu/packages/game-development.scm (inform): New variable.
---
gnu/packages/game-development.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index a2d7c5ea63..0b2c0177ab 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2771,6 +2771,31 @@ (define-public ioquake3
people base their games, ports to new platforms, and other projects.")
(license license:gpl2))))
+(define-public inform
+ (let ((commit "20cbfff96015938809d0e3da6cd0d83b76d27f14")
+ (revision "0"))
+ (package
+ (name "inform")
+ (version (git-version "6.41" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://jxself.org/git/inform.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "19z8pgrj1s2irany5s6xxwsm3bdnri1as46fdi16zdp4aah523jy"))))
+ (build-system gnu-build-system)
+ (native-inputs (list autoconf automake))
+ (synopsis "The Inform 6 compiler")
+ (description
+ "Inform 6 is a programming language designed for interactive fiction.
+This version of the compiler has been modified slightly to work better when the
+Inform standard library is in a non-standard location.")
+ (home-page "https://jxself.org/git/inform.git")
+ (license license:gpl3+))))
+
(define-public instead
(package
(name "instead")
base-commit: 29c94dd522833b2603a651c14a5b06120bcf1829
--
2.41.0
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Mon, 25 Dec 2023 00:18:02 GMT) Full text and rfc822 format available.Message #35 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 67950 <at> debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH v3 2/3] gnu: Add informlib. Date: Mon, 25 Dec 2023 08:17:13 +0800
From 017efac401edf8b4a1c60bfac11fb6c3467ee998 Mon Sep 17 00:00:00 2001
Message-ID: <017efac401edf8b4a1c60bfac11fb6c3467ee998.1703463244.git.adam.faiz <at> disroot.org>
In-Reply-To: <eea4385fef9805fd37517b476b8d581d081cc44c.1703463244.git.adam.faiz <at> disroot.org>
References: <eea4385fef9805fd37517b476b8d581d081cc44c.1703463244.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Sun, 24 Dec 2023 23:14:31 +0800
Subject: [PATCH v3 2/3] gnu: Add informlib.
* gnu/packages/game-development.scm (informlib): New variable.
---
gnu/packages/game-development.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 0b2c0177ab..1eeaab097a 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -57,6 +57,7 @@ (define-module (gnu packages game-development)
#:use-module (guix svn-download)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
@@ -2796,6 +2797,30 @@ (define-public inform
(home-page "https://jxself.org/git/inform.git")
(license license:gpl3+))))
+(define-public informlib
+ (package
+ (name "informlib")
+ (version "6.12.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://jxself.org/git/informlib.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fcnw4jjzln402qk097n2s8y24vw1p3mmlmh6k1mbr2zfajjcn5r"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan
+ #~'(("." "lib"))))
+ (synopsis "Inform 6 standard library")
+ (description
+ "This package provides the standard library for Inform 6.")
+ (home-page "https://jxself.org/git/informlib.git")
+ (license license:agpl3+)))
+
(define-public instead
(package
(name "instead")
--
2.41.0
guix-patches <at> gnu.org:bug#67950; Package guix-patches.
(Mon, 25 Dec 2023 00:20:01 GMT) Full text and rfc822 format available.Message #38 received at 67950 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 67950 <at> debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH v3 3/3] gnu: Add devours. Date: Mon, 25 Dec 2023 08:18:35 +0800
From b21aaee0b84af2a916a0855740ba25b61a0d594f Mon Sep 17 00:00:00 2001
Message-ID: <b21aaee0b84af2a916a0855740ba25b61a0d594f.1703463244.git.adam.faiz <at> disroot.org>
In-Reply-To: <eea4385fef9805fd37517b476b8d581d081cc44c.1703463244.git.adam.faiz <at> disroot.org>
References: <eea4385fef9805fd37517b476b8d581d081cc44c.1703463244.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Sun, 24 Dec 2023 23:15:53 +0800
Subject: [PATCH v3 3/3] gnu: Add devours.
* gnu/packages/games.scm (devours): New variable.
---
gnu/packages/games.scm | 74 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 66739d7a6b..f7ff5cadf7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11100,6 +11100,80 @@ (define-public curseofwar
available.")
(license license:gpl3+)))
+(define-public devours
+ (let ((commit "d50e745aa14aa48f7555ae12eb3d1000de1cc150")
+ (revision "0"))
+ (package
+ (name "devours")
+ (version (git-version "3" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://jxself.org/git/devours.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ksl6mh76jfx64rmasz2571f88ws45vby2977srhgkh355zp3lzn"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ; no configure
+ (replace 'build
+ (lambda _
+ (invoke "inform"
+ (string-append "+include_path="
+ #$(this-package-native-input "informlib")
+ "/lib")
+ "devours.inf")))
+ (replace 'install
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Create standalone executable.
+ (let* ((bash (search-input-file inputs "/bin/bash"))
+ (share (string-append #$output "/share"))
+ (scummvm (search-input-file inputs "/bin/scummvm"))
+ (bin (string-append #$output "/bin"))
+ (executable (string-append bin "/devours")))
+ (mkdir-p share)
+ (copy-file "devours.z5" (string-append share "/devours.z5"))
+ (mkdir-p bin)
+ (with-output-to-file executable
+ (lambda ()
+ (format #t "#!~a~%" bash)
+ (format #t
+ "exec ~a --path=~a glk:zcode~%"
+ scummvm share)))
+ (chmod executable #o755))))
+ (add-after 'install-executable 'install-desktop-file
+ (lambda _
+ (let* ((apps (string-append #$output "/share/applications"))
+ (share (string-append #$output "")))
+ (mkdir-p apps)
+ (make-desktop-entry-file
+ (string-append apps "/devours.desktop")
+ #:name "All Things Devours"
+ #:generic-name "All Things Devours"
+ #:exec (string-append #$output "/bin/devours")
+ #:categories '("AdventureGame" "Game" "RolePlaying")
+ #:keywords '("game" "adventure" "sci-fi")
+ #:comment '((#f "Sci-fi text adventure game")))))))))
+ (inputs
+ (list bash scummvm))
+ (native-inputs
+ (list inform informlib))
+ (synopsis "All Things Devours")
+ (description
+ "All Things Devours is a short piece of sci-fi interactive fiction,
+leaning strongly towards the text-adventure end of the spectrum.
+Any move you make may put things into an unwinnable state. You are therefore
+encouraged to save frequently, and also to realise that you will probably have
+to start over several times to find the most satisfactory ending.")
+ (home-page "https://jxself.org/git/devours.git")
+ (license license:agpl3+))))
+
(define-public schiffbruch
;; There haven't been any releases for several years, so I've taken the most
;; recent commit from the master branch that didn't fail to build (the last
--
2.41.0
Liliana Marie Prikler <liliana.prikler <at> gmail.com>:Adam Faiz <adam.faiz <at> disroot.org>:Message #43 received at 67950-done <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Adam Faiz <adam.faiz <at> disroot.org>, 67950-done <at> debbugs.gnu.org Subject: Re: [PATCH v3 3/3] gnu: Add devours. Date: Sun, 31 Dec 2023 12:35:14 +0100
Am Montag, dem 25.12.2023 um 08:18 +0800 schrieb Adam Faiz: > From b21aaee0b84af2a916a0855740ba25b61a0d594f Mon Sep 17 00:00:00 > 2001 > Message-ID: > <b21aaee0b84af2a916a0855740ba25b61a0d594f.1703463244.git.adam.faiz <at> di > sroot.org> > In-Reply-To: > <eea4385fef9805fd37517b476b8d581d081cc44c.1703463244.git.adam.faiz <at> di > sroot.org> > References: > <eea4385fef9805fd37517b476b8d581d081cc44c.1703463244.git.adam.faiz <at> di > sroot.org> > From: AwesomeAdam54321 <adam.faiz <at> disroot.org> > Date: Sun, 24 Dec 2023 23:15:53 +0800 > Subject: [PATCH v3 3/3] gnu: Add devours. > > * gnu/packages/games.scm (devours): New variable. > --- Pushed. Happy new years!
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Sun, 28 Jan 2024 12:24:08 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.