From: Christopher Rodriguez <yewscion@gmail.com>
To: 52684@debbugs.gnu.org
Cc: Christopher Rodriguez <yewscion@gmail.com>
Subject: bug#52684: [PATCH v1] Updated and fixed frotz package.
Date: Wed, 22 Jun 2022 20:58:03 -0400 [thread overview]
Message-ID: <20220623005803.2569142-1-yewscion@gmail.com> (raw)
In-Reply-To: <7ee7ed76-4676-6c86-87f0-8d7ab886fc50@gmail.com>
---
Hello!
Was going through my open issues, saw this one was still open. Took a crack at
fixing frotz; It builds and works as expected now. Wanted to share.
Thanks for Your time!
gnu/packages/games.scm | 66 +++++++++++++++++++++++++++---------------
1 file changed, 43 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8e6ab03530..512871d780 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7988,7 +7988,7 @@ (define (install src dst)
(define-public frotz
(package
(name "frotz")
- (version "2.44")
+ (version "2.54")
(source (origin
(method url-fetch)
(uri (list (string-append
@@ -7999,30 +7999,50 @@ (define-public frotz
"frotz/frotz-" version ".tar.gz")))
(sha256
(base32
- "1v735xr3blznac8fnwa27s1vhllx4jpz7kw7qdw1bsfj6kq21v3k"))))
+ "1vsfq9ryyb4nvzxpnnn40k423k9pdy8k67i8390qz5h0vmxw0fds"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; there are no tests
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'curses
- (lambda _
- (substitute* "Makefile"
- (("lcurses") "lncurses"))
- #t))
- (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 "frotz" bin)
- (mkdir-p man)
- (install-file "doc/frotz.6" man)
- #t))))))
- (inputs (list libmodplug libsamplerate libsndfile libvorbis ncurses))
- (synopsis "Portable Z-machine interpreter (ncurses version) for text adventure games")
- (description "Frotz is an interpreter for Infocom games and other Z-machine
+ `(#:tests? #f ;there are no tests
+ #:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'build
+ (lambda* _
+ ;; Compile.
+ (invoke "make" "frotz")))
+ (add-before 'build 'patch-makefile
+ (lambda* _
+ (let ((makefiles (list "Makefile"
+ "src/common/Makefile"
+ "src/curses/Makefile"
+ "src/x11/Makefile"
+ "src/sdl/Makefile"
+ "src/dumb/Makefile"
+ "src/blorb/Makefile")))
+ (map (lambda (x)
+ (substitute* x
+ (("\\$\\(CC\\)") "gcc"))) makefiles))))
+ (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 "frotz" bin)
+ (mkdir-p man)
+ (install-file "doc/frotz.6" man)))))))
+ (native-inputs (list pkg-config))
+ (inputs (list ao
+ libmodplug
+ libsamplerate
+ libsndfile
+ libvorbis
+ ncurses
+ which
+ perl
+ pkg-config))
+ (synopsis
+ "Portable Z-machine interpreter (ncurses version) for text adventure games")
+ (description
+ "Frotz is an interpreter for Infocom games and other Z-machine
games in the text adventure/interactive fiction genre. This version of Frotz
complies with standard 1.0 of Graham Nelson's specification. It plays all
Z-code games V1-V8, including V6, with sound support through libao, and uses
base-commit: 2873433c72ad6302a275579a646ba9635f036927
--
2.36.1
prev parent reply other threads:[~2022-06-23 0:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-20 19:17 bug#52684: [BUG] Multiple Packages Failing to Build Christopher Rodriguez
2021-12-21 0:36 ` zimoun
2021-12-21 17:52 ` Christopher Rodriguez
2021-12-21 18:02 ` Maxime Devos
2021-12-21 18:08 ` Christopher Rodriguez
2021-12-21 19:47 ` Christopher Rodriguez
2021-12-21 20:44 ` Maxime Devos
2021-12-21 21:38 ` Christopher Rodriguez
2021-12-21 22:38 ` Maxime Devos
2021-12-22 17:07 ` Christopher Rodriguez
2021-12-22 17:36 ` Maxime Devos
2021-12-22 19:59 ` Christopher Rodriguez
2021-12-22 20:50 ` Maxime Devos
2021-12-22 20:54 ` Maxime Devos
2021-12-22 21:57 ` Christopher Rodriguez
2021-12-23 9:27 ` Maxime Devos
2021-12-22 20:53 ` Maxime Devos
2021-12-27 18:18 ` Christopher Rodriguez
2021-12-27 20:06 ` Maxime Devos
2021-12-30 10:20 ` Maxime Devos
2021-12-30 10:29 ` Maxime Devos
2021-12-27 20:36 ` Christopher Rodriguez
2022-01-02 13:53 ` Christopher Rodriguez
2022-06-23 0:58 ` Christopher Rodriguez [this message]
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=20220623005803.2569142-1-yewscion@gmail.com \
--to=yewscion@gmail.com \
--cc=52684@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).