From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: 42354@debbugs.gnu.org
Subject: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.9.
Date: Fri, 25 Sep 2020 14:39:24 +0200 [thread overview]
Message-ID: <871riq6ner.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <20200714144424.20954-1-mail@nicolasgoaziou.fr>
[-- Attachment #1: Type: text/plain, Size: 71 bytes --]
Hello,
What about the following patch?
Regards,
--
Nicolas Goaziou
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: update open-adventure to 1.9 --]
[-- Type: text/x-diff, Size: 6357 bytes --]
From e727bcc31d26d509a18ef022a282cd4fd6a11bc0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 13 Sep 2020 15:40:38 +0200
Subject: [PATCH] gnu: open-adventure: Update to 1.9.
* gnu/packages/games.scm (open-adventure): Update to 1.9.
[arguments]: Re-activate parallel build. Remove configure phase altogether.
[native-inputs]: Remove linenoise and python. Add libedit, python-wrapper,
and pkg-config.
[description]: Slight rewording.
(open-adventure-2.5): Deprecate in favor of open-adventure.
The package is erroneously versioned as 2.5, which refers to the last release
of the original game. However, this is a forward-port with its own versioning
scheme.
---
gnu/packages/games.scm | 122 ++++++++++++++++++++---------------------
1 file changed, 59 insertions(+), 63 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index b819cd104f..cd8e3ccb1b 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6376,71 +6376,67 @@ at their peak of economic growth and military prowess.
license:mpl2.0
license:zlib))))
-;; There have been no official releases.
(define-public open-adventure
- (let* ((commit "d43854f0f6bb8e9eea7fbce80348150e7e7fc34d")
- (revision "2"))
- (package
- (name "open-adventure")
- (version (string-append "2.5-" revision "." (string-take commit 7)))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/esr/open-adventure")
- (commit commit)))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "08bwrvf4axb1rsfd6ia1fddsky9pc1p350vjskhaakg2czc6dsk0"))))
- (build-system gnu-build-system)
- (arguments
- `(#:make-flags (list "CC=gcc")
- #:parallel-build? #f ; not supported
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Linenoise is meant to be included, so we have to
- ;; copy it into the working directory.
- (let* ((linenoise (assoc-ref inputs "linenoise"))
- (noisepath (string-append linenoise "/include/linenoise"))
- (out (assoc-ref outputs "out")))
- (copy-recursively noisepath "linenoise"))
- #t))
- (add-before 'build 'use-echo
- (lambda _
- (substitute* "tests/Makefile"
- (("/bin/echo") (which "echo")))
- #t))
- (add-after 'build 'build-manpage
- (lambda _
- ;; This target is missing a dependency
- (substitute* "Makefile"
- ((".adoc.6:" line)
- (string-append line " advent.adoc")))
- (invoke "make" ".adoc.6")))
- ;; There is no install target
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (man (string-append out "/share/man/man6")))
- (install-file "advent" bin)
- (install-file "advent.6" man))
- #t)))))
- (native-inputs
- `(("asciidoc" ,asciidoc)
- ("linenoise" ,linenoise)
- ("python" ,python)
- ("python-pyyaml" ,python-pyyaml)))
- (home-page "https://gitlab.com/esr/open-adventure")
- (synopsis "Colossal Cave Adventure")
- (description "The original Colossal Cave Adventure from 1976 was the
-origin of all text adventures, dungeon-crawl (computer) games, and
-computer-hosted roleplaying games. This is the last version released by
+ (package
+ (name "open-adventure")
+ (version "1.9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/esr/open-adventure")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "123svzy7xczdklx6plbafp22yv9bcvwfibjk0jv2c9i22dfsr07f"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags (list "CC=gcc")
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (add-before 'build 'use-echo
+ (lambda _
+ (substitute* "tests/Makefile"
+ (("/bin/echo") (which "echo")))
+ #t))
+ (add-after 'build 'build-manpage
+ (lambda _
+ ;; This target is missing a dependency
+ (substitute* "Makefile"
+ ((".adoc.6:" line)
+ (string-append line " advent.adoc")))
+ (invoke "make" ".adoc.6")))
+ ;; There is no install target.
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (man (string-append out "/share/man/man6")))
+ (install-file "advent" bin)
+ (install-file "advent.6" man))
+ #t)))))
+ (native-inputs
+ `(("asciidoc" ,asciidoc)
+ ("libedit" ,libedit)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("python-pyyaml" ,python-pyyaml)))
+ (home-page "https://gitlab.com/esr/open-adventure")
+ (synopsis "Colossal Cave Adventure")
+ (description
+ "The original Colossal Cave Adventure from 1976 was the origin of all
+text adventures, dungeon-crawl (computer) games, and computer-hosted
+roleplaying games. This is a forward port of the last version released by
Crowther & Woods, its original authors, in 1995. It has been known as
-\"adventure 2.5\" and \"430-point adventure\".")
- (license license:bsd-2))))
+``adventure 2.5'' and ``430-point adventure''.")
+ (license license:bsd-2)))
+
+(define-public open-adventure-2.5
+ (package
+ (inherit open-adventure)
+ (version "2.5")
+ (properties `((superseded . ,open-adventure)))))
(define-public tome4
(package
--
2.28.0
next prev parent reply other threads:[~2020-09-25 12:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 14:44 [bug#42354] [PATCH] gnu: open-adventure: Update to 1.8 Nicolas Goaziou
2020-07-21 16:37 ` Ludovic Courtès
2020-09-07 13:59 ` Ludovic Courtès
2020-09-07 19:24 ` Nicolas Goaziou
2020-09-08 15:46 ` Ludovic Courtès
2020-09-09 19:39 ` Nicolas Goaziou
2020-09-10 7:46 ` Ludovic Courtès
2020-09-13 13:46 ` Nicolas Goaziou
2020-09-13 20:58 ` Ludovic Courtès
2020-09-25 12:39 ` Nicolas Goaziou [this message]
2020-11-26 17:38 ` bug#42354: [PATCH] gnu: open-adventure: Update to 1.9 Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871riq6ner.fsf@nicolasgoaziou.fr \
--to=mail@nicolasgoaziou.fr \
--cc=42354@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).