Archived
1
0
Fork 0

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.
This commit is contained in:
Nicolas Goaziou 2020-09-13 15:40:38 +02:00
parent d94428b4f4
commit 62d2a87646
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D

View file

@ -6529,37 +6529,25 @@ at their peak of economic growth and military prowess.
license:mpl2.0 license:mpl2.0
license:zlib)))) license:zlib))))
;; There have been no official releases.
(define-public open-adventure (define-public open-adventure
(let* ((commit "d43854f0f6bb8e9eea7fbce80348150e7e7fc34d")
(revision "2"))
(package (package
(name "open-adventure") (name "open-adventure")
(version (string-append "2.5-" revision "." (string-take commit 7))) (version "1.9")
(source (origin (source
(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.com/esr/open-adventure") (url "https://gitlab.com/esr/open-adventure")
(commit commit))) (commit version)))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "123svzy7xczdklx6plbafp22yv9bcvwfibjk0jv2c9i22dfsr07f"))))
"08bwrvf4axb1rsfd6ia1fddsky9pc1p350vjskhaakg2czc6dsk0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list "CC=gcc") `(#:make-flags (list "CC=gcc")
#:parallel-build? #f ; not supported
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (delete 'configure) ;no configure script
(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 (add-before 'build 'use-echo
(lambda _ (lambda _
(substitute* "tests/Makefile" (substitute* "tests/Makefile"
@ -6572,7 +6560,7 @@ at their peak of economic growth and military prowess.
((".adoc.6:" line) ((".adoc.6:" line)
(string-append line " advent.adoc"))) (string-append line " advent.adoc")))
(invoke "make" ".adoc.6"))) (invoke "make" ".adoc.6")))
;; There is no install target ;; There is no install target.
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -6583,17 +6571,25 @@ at their peak of economic growth and military prowess.
#t))))) #t)))))
(native-inputs (native-inputs
`(("asciidoc" ,asciidoc) `(("asciidoc" ,asciidoc)
("linenoise" ,linenoise) ("libedit" ,libedit)
("python" ,python) ("pkg-config" ,pkg-config)
("python" ,python-wrapper)
("python-pyyaml" ,python-pyyaml))) ("python-pyyaml" ,python-pyyaml)))
(home-page "https://gitlab.com/esr/open-adventure") (home-page "https://gitlab.com/esr/open-adventure")
(synopsis "Colossal Cave Adventure") (synopsis "Colossal Cave Adventure")
(description "The original Colossal Cave Adventure from 1976 was the (description
origin of all text adventures, dungeon-crawl (computer) games, and "The original Colossal Cave Adventure from 1976 was the origin of all
computer-hosted roleplaying games. This is the last version released by 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 Crowther & Woods, its original authors, in 1995. It has been known as
\"adventure 2.5\" and \"430-point adventure\".") ``adventure 2.5'' and ``430-point adventure''.")
(license license:bsd-2)))) (license license:bsd-2)))
(define-public open-adventure-2.5
(package
(inherit open-adventure)
(version "2.5")
(properties `((superseded . ,open-adventure)))))
(define-public tome4 (define-public tome4
(package (package