From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id cHC9IOO6s2KFXgEAbAwnHQ (envelope-from ) for ; Thu, 23 Jun 2022 02:59:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QBqpH+O6s2JfgAAAG6o9tA (envelope-from ) for ; Thu, 23 Jun 2022 02:59:15 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0AD9FF989 for ; Thu, 23 Jun 2022 02:59:15 +0200 (CEST) Received: from localhost ([::1]:50032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4BBh-0004DH-LS for larch@yhetil.org; Wed, 22 Jun 2022 20:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4BBW-0004Cu-LW for bug-guix@gnu.org; Wed, 22 Jun 2022 20:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4BBW-0006iv-Bx for bug-guix@gnu.org; Wed, 22 Jun 2022 20:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o4BBW-0008Mu-8h for bug-guix@gnu.org; Wed, 22 Jun 2022 20:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#52684: [PATCH v1] Updated and fixed frotz package. References: <7ee7ed76-4676-6c86-87f0-8d7ab886fc50@gmail.com> In-Reply-To: <7ee7ed76-4676-6c86-87f0-8d7ab886fc50@gmail.com> Resent-From: Christopher Rodriguez Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 23 Jun 2022 00:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52684 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 52684@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 52684-submit@debbugs.gnu.org id=B52684.165594590632124 (code B ref 52684); Thu, 23 Jun 2022 00:59:02 +0000 Received: (at 52684) by debbugs.gnu.org; 23 Jun 2022 00:58:26 +0000 Received: from localhost ([127.0.0.1]:36911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4BAw-0008M4-Ag for submit@debbugs.gnu.org; Wed, 22 Jun 2022 20:58:26 -0400 Received: from mail-qv1-f50.google.com ([209.85.219.50]:34478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4BAr-0008Ln-5h for 52684@debbugs.gnu.org; Wed, 22 Jun 2022 20:58:25 -0400 Received: by mail-qv1-f50.google.com with SMTP id t16so22784705qvh.1 for <52684@debbugs.gnu.org>; Wed, 22 Jun 2022 17:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cE1wA2XyNVV6/QnoagpIlYE3hRfHvElSFSncRlqxdrY=; b=PFR/hm742lZZpkjWGwYtNj/sMldVtMyUq+hv1z7t07kbXOtvZGs2O2psuuWBEQZwAS Ah1V9tc8sgAtkG7vJEyJ5ynP9ghA9teHuTKLgWFS2a36hzM3DX/iaMQcctWv/UdTu9Ge Qfe6MuSkWYW3Fl78GU0SJf4Qbkk5QD+pub7yn4djDQobY/eQE+qI1mBcCdkzVEa4pTZ+ v0JwUjyykl8kXMyHN4f31OvH428ly5bXQwMbPLnyxpkcPAbq4IJpjxZfDyecawBtS/J9 F7VzbNcOALhvvTIcghCe7YM4Zng2Cjwk7TclIjn01VNUxRR0ugo+AgwmxRsQJs98HKrG dMVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cE1wA2XyNVV6/QnoagpIlYE3hRfHvElSFSncRlqxdrY=; b=UlbOFCTeWo6O/WSEz+StEzm7IPRWyyTyLf7LT67tIbvLvd79NLgre2u9vHCB9fVNRv VHvn7v9TP7Atyb/KoADrcERjvF9cmM9bQhX1F18wANHyDxJUGQC9xky3fZ232dEp0ndz dAFHTpybCogTqpZvxJ+boTchp2UjP7NGWi/9ULmyxquLWRxUsufoDYHkSa0oDf8AdI9u Yfv1miMDA/c9R6nAKshHb6gudCfxAGWitnEuJaXr8IssK9lhcHoE8PyxWAIBdUeFF7L5 wPnrA94BM2BwYy8nba1x51MVhVAn3V1zI+qIqiNJV9B44YpW/wXhC6Noanm+FOYR4IGf efUw== X-Gm-Message-State: AJIora92sMt2OwTbGRKtpQah6xI6IxZc4bMOSSlqIa2INABn8njV1XW1 Ib4VmmR6q++ZyIkfkXG/LkL4P1JiauU= X-Google-Smtp-Source: AGRyM1tc5RxR9mOvAbGZLODJheBKCyruJxCxF14JSDLTuAKkIu+vyx/TxzaEYzAVJyTNLyPFnoEOnQ== X-Received: by 2002:a05:622a:1213:b0:305:1f3c:549a with SMTP id y19-20020a05622a121300b003051f3c549amr5863455qtx.386.1655945895291; Wed, 22 Jun 2022 17:58:15 -0700 (PDT) Received: from gmail.com (72-21-196-64.amazon.com. [72.21.196.64]) by smtp.gmail.com with ESMTPSA id c135-20020a379a8d000000b006a6c552736asm18323273qke.119.2022.06.22.17.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jun 2022 17:58:14 -0700 (PDT) From: Christopher Rodriguez Date: Wed, 22 Jun 2022 20:58:03 -0400 Message-Id: <20220623005803.2569142-1-yewscion@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655945955; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=cE1wA2XyNVV6/QnoagpIlYE3hRfHvElSFSncRlqxdrY=; b=TJbNSI9Q3JHw9F4Y3SUihc0cwrd8V0xBOQZnA8LWV2dslJ4DY2XqRfM/HSIx2V6elgEQU/ Ki7Miwt9mgECb1XHJ3wcaB9vsY4j5hDUwDRNqW1R+ozGgHwl1a2inUZCTk24dcRSNOVKwJ 3uOSrfE5N27v7uX8ZDWvz2uEJDYjRzMujm1xEggy9wm6mo95G7eYXy8X72XAaT/URsIKVS CyOJpjtKRIciSFXKBHG5YMW7A+Hn6BWoB5jHHGdswLZRVDlnTFTtRwMRZ+6YWsnWmAhDtb /3c4fqd9SdbzJqfoCIKgxzoNqnlBiy34+OLO16vUp5AIUZbGr9bLJZ87uPHFBw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655945955; a=rsa-sha256; cv=none; b=XQ3bL3c2h4Oh/PZli5zpTivAIYUDLO4BfmEvbSZFBWZyBjkhNpX2lIEdng1weLvJGqhiE3 Axy7olB4xPzFNfpEnyK9PPnDReAEmMiHp6wQuoah/P7Gwa+0CthX0jvQkn4MyReR9/H4LI sU7z596ChXHMT4PvIhxfV1zlindtPuTbZSOfCUyP3EMdAl43sUcrmvGlik4ysHK/Wisele ql2+wlQGG4DfEq0lDKzW8aL0W4DvgnrbLAwQws5UkJFoINWHuAWxhxkrozHgqWsRmdTs/b KSVod2EY8IQceoBW2BW0h+brxUdl1biRkINQ4NP/w0uV58XjtI1rP/ERmSzltQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="PFR/hm74"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.74 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="PFR/hm74"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 0AD9FF989 X-Spam-Score: 6.74 X-Migadu-Scanner: scn0.migadu.com X-TUID: s9i7l/hLHfnD --- 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