From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gFAyDJrlbV8PNgAA0tVLHw (envelope-from ) for ; Fri, 25 Sep 2020 12:42:02 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WIMSCJrlbV8wGQAA1q6Kng (envelope-from ) for ; Fri, 25 Sep 2020 12:42:02 +0000 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 6CAE2940430 for ; Fri, 25 Sep 2020 12:42:01 +0000 (UTC) Received: from localhost ([::1]:38470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLn32-0005he-Do for larch@yhetil.org; Fri, 25 Sep 2020 08:42:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLn18-0003lf-OJ for guix-patches@gnu.org; Fri, 25 Sep 2020 08:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLn18-000824-AZ for guix-patches@gnu.org; Fri, 25 Sep 2020 08:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLn18-0007fZ-7G for guix-patches@gnu.org; Fri, 25 Sep 2020 08:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.9. References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> In-Reply-To: <20200714144424.20954-1-mail@nicolasgoaziou.fr> Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Sep 2020 12:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42354 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42354@debbugs.gnu.org Received: via spool by 42354-submit@debbugs.gnu.org id=B42354.160103758229451 (code B ref 42354); Fri, 25 Sep 2020 12:40:02 +0000 Received: (at 42354) by debbugs.gnu.org; 25 Sep 2020 12:39:42 +0000 Received: from localhost ([127.0.0.1]:43000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLn0n-0007ex-Nr for submit@debbugs.gnu.org; Fri, 25 Sep 2020 08:39:42 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:51479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLn0l-0007ej-Gb for 42354@debbugs.gnu.org; Fri, 25 Sep 2020 08:39:40 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id AAFC22000E for <42354@debbugs.gnu.org>; Fri, 25 Sep 2020 12:39:32 +0000 (UTC) From: Nicolas Goaziou Date: Fri, 25 Sep 2020 14:39:24 +0200 Message-ID: <871riq6ner.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: ovNuvUppkigP --=-=-= Content-Type: text/plain Hello, What about the following patch? Regards, -- Nicolas Goaziou --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-open-adventure-Update-to-1.9.patch Content-Description: update open-adventure to 1.9 >From e727bcc31d26d509a18ef022a282cd4fd6a11bc0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou 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 --=-=-=--