From patchwork Thu Mar 9 12:30:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 47815 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A955616E43; Thu, 9 Mar 2023 12:32:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DCA0416CDE for ; Thu, 9 Mar 2023 12:32:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paFRE-0001ax-VL; Thu, 09 Mar 2023 07:32:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paFRD-0001a9-Gy for guix-patches@gnu.org; Thu, 09 Mar 2023 07:32:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paFRD-0007ks-6Z for guix-patches@gnu.org; Thu, 09 Mar 2023 07:32:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1paFRD-00069Q-2Q for guix-patches@gnu.org; Thu, 09 Mar 2023 07:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62075] [PATCH 1/2] gnu: cataclysm-dda: Improve package style. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Mar 2023 12:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62075 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62075@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167836506323561 (code B ref -1); Thu, 09 Mar 2023 12:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Mar 2023 12:31:03 +0000 Received: from localhost ([127.0.0.1]:51110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paFQE-00067s-IO for submit@debbugs.gnu.org; Thu, 09 Mar 2023 07:31:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:53392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paFQC-00067M-If for submit@debbugs.gnu.org; Thu, 09 Mar 2023 07:31:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paFQC-0000xU-BQ for guix-patches@gnu.org; Thu, 09 Mar 2023 07:31:00 -0500 Received: from relay3-d.mail.gandi.net ([2001:4b98:dc4:8::223]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paFQA-0007cT-Kc for guix-patches@gnu.org; Thu, 09 Mar 2023 07:31:00 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 88E0F60006 for ; Thu, 9 Mar 2023 12:30:54 +0000 (UTC) From: Nicolas Goaziou Date: Thu, 9 Mar 2023 13:30:46 +0100 Message-Id: <20230309123047.70497-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4b98:dc4:8::223; envelope-from=mail@nicolasgoaziou.fr; helo=relay3-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (cataclysm-dda)[arguments]: Use G-expressions. [native-inputs]: Remove labels. Re-order alphabetically. --- gnu/packages/games.scm | 65 ++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 34 deletions(-) base-commit: 5befcff66edb4d72ab8e713c81836fb8519ce3e6 diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2946c787af..d057823832 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -954,43 +954,40 @@ (define-public cataclysm-dda (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1" - "LOCALIZE=1" "LANGUAGES=all") - #:phases - (modify-phases %standard-phases - (delete 'configure) - ;; Apparently we can't do make on both tiles and a console version at - ;; the same time anymore, so we have to either "make clean" between - ;; builds or do some other hackery. See: - ;; https://github.com/CleverRaven/Cataclysm-DDA/issues/42598#issuecomment-667702746 - (add-after 'install 'make-clean-pre-tiles - (lambda* (#:key make-flags outputs #:allow-other-keys) - ;; Change prefix directory and enable tile graphics and sound. - (invoke "make" "clean"))) - (add-after 'make-clean-pre-tiles 'build-tiles - (lambda* (#:key make-flags outputs #:allow-other-keys) - ;; Change prefix directory and enable tile graphics and sound. - (apply invoke "make" "TILES=1" "SOUND=1" - (string-append "PREFIX=" - (assoc-ref outputs "tiles")) - (cdr make-flags)))) - (add-after 'build-tiles 'install-tiles - (lambda* (#:key make-flags outputs #:allow-other-keys) - (apply invoke "make" "install" "TILES=1" "SOUND=1" - (string-append "PREFIX=" - (assoc-ref outputs "tiles")) - (cdr make-flags))))) - ;; TODO: Add libtap++ from https://github.com/cbab/libtappp as a native - ;; input in order to support tests. - #:tests? #f)) + (list + #:make-flags + #~(list (string-append "PREFIX=" #$output) + "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1" + "LOCALIZE=1" "LANGUAGES=all") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + ;; Apparently we can't do make on both tiles and a console version at + ;; the same time anymore, so we have to either "make clean" between + ;; builds or do some other hackery. See: + ;; https://github.com/CleverRaven/Cataclysm-DDA/issues/42598#issuecomment-667702746 + (add-after 'install 'make-clean-pre-tiles + (lambda* (#:key make-flags outputs #:allow-other-keys) + ;; Change prefix directory and enable tile graphics and sound. + (invoke "make" "clean"))) + (add-after 'make-clean-pre-tiles 'build-tiles + (lambda* (#:key make-flags outputs #:allow-other-keys) + ;; Change prefix directory and enable tile graphics and sound. + (apply invoke "make" "TILES=1" "SOUND=1" + (string-append "PREFIX=" #$output:tiles) + (cdr make-flags)))) + (add-after 'build-tiles 'install-tiles + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install" "TILES=1" "SOUND=1" + (string-append "PREFIX=" #$output:tiles) + (cdr make-flags))))) + ;; TODO: Add libtap++ from https://github.com/cbab/libtappp as a native + ;; input in order to support tests. + #:tests? #f)) (outputs '("out" "tiles")) ;for tile graphics and sound support (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("astyle" ,astyle))) + (list astyle gettext-minimal pkg-config)) (inputs (list freetype libogg From patchwork Thu Mar 9 12:30:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 47814 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 592D316E41; Thu, 9 Mar 2023 12:32:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A177A16CDE for ; Thu, 9 Mar 2023 12:32:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paFRE-0001af-B5; Thu, 09 Mar 2023 07:32:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paFRD-0001ZV-EE for guix-patches@gnu.org; Thu, 09 Mar 2023 07:32:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paFRC-0007kl-Tp for guix-patches@gnu.org; Thu, 09 Mar 2023 07:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1paFRC-00069C-DK for guix-patches@gnu.org; Thu, 09 Mar 2023 07:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62074] [PATCH 2/2] gnu: cataclysm-dda: Update to 0.G. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Mar 2023 12:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62074@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167836506223555 (code B ref -1); Thu, 09 Mar 2023 12:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Mar 2023 12:31:02 +0000 Received: from localhost ([127.0.0.1]:51108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paFQE-00067p-6w for submit@debbugs.gnu.org; Thu, 09 Mar 2023 07:31:02 -0500 Received: from lists.gnu.org ([209.51.188.17]:53382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paFQC-00067L-CC for submit@debbugs.gnu.org; Thu, 09 Mar 2023 07:31:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paFQC-0000xN-5F for guix-patches@gnu.org; Thu, 09 Mar 2023 07:31:00 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paFQA-0007cY-Jk for guix-patches@gnu.org; Thu, 09 Mar 2023 07:30:59 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 045E26000C for ; Thu, 9 Mar 2023 12:30:54 +0000 (UTC) From: Nicolas Goaziou Date: Thu, 9 Mar 2023 13:30:47 +0100 Message-Id: <20230309123047.70497-2-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309123047.70497-1-mail@nicolasgoaziou.fr> References: <20230309123047.70497-1-mail@nicolasgoaziou.fr> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.195; envelope-from=mail@nicolasgoaziou.fr; helo=relay3-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (cataclysm-dda): Update to 0.G. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d057823832..a0d7d68c2f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -942,7 +942,7 @@ (define-public bzflag (define-public cataclysm-dda (package (name "cataclysm-dda") - (version "0.F-3") + (version "0.G") (source (origin (method git-fetch) @@ -950,7 +950,7 @@ (define-public cataclysm-dda (url "https://github.com/CleverRaven/Cataclysm-DDA") (commit version))) (sha256 - (base32 "1qnsz6az9qp4sbr3y4rcqhlmadrrdzafvd2xwf3db5wn0swvbjys")) + (base32 "0y8513yflxfqblk42h5ad0dq5lx5s8k6hhjy65yfcda7amsv9mhx")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments