From patchwork Tue Jun 16 13:12:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christine Lemmer-Webber X-Patchwork-Id: 22743 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 E0AAD27BBE3; Tue, 16 Jun 2020 14:13:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4EAFF27BBE1 for ; Tue, 16 Jun 2020 14:13:41 +0100 (BST) Received: from localhost ([::1]:35052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlBPI-0004RC-Nn for patchwork@mira.cbaines.net; Tue, 16 Jun 2020 09:13:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlBOg-0003gS-9i for guix-patches@gnu.org; Tue, 16 Jun 2020 09:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlBOg-0003sS-0V for guix-patches@gnu.org; Tue, 16 Jun 2020 09:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlBOf-0000DG-Qn for guix-patches@gnu.org; Tue, 16 Jun 2020 09:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41892] Update crawl to 0.25.0 Resent-From: Christopher Lemmer Webber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jun 2020 13:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41892 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41892@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1592313150777 (code B ref -1); Tue, 16 Jun 2020 13:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jun 2020 13:12:30 +0000 Received: from localhost ([127.0.0.1]:48477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlBOA-0000CT-1E for submit@debbugs.gnu.org; Tue, 16 Jun 2020 09:12:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:34760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlBO8-0000CM-I6 for submit@debbugs.gnu.org; Tue, 16 Jun 2020 09:12:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlBO8-0003Fb-CC for guix-patches@gnu.org; Tue, 16 Jun 2020 09:12:28 -0400 Received: from dustycloud.org ([2600:3c02::f03c:91ff:feae:cb51]:54510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlBO6-0003i6-Kx for guix-patches@gnu.org; Tue, 16 Jun 2020 09:12:28 -0400 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 68C9726665 for ; Tue, 16 Jun 2020 09:12:24 -0400 (EDT) User-agent: mu4e 1.4.9; emacs 26.3 From: Christopher Lemmer Webber Date: Tue, 16 Jun 2020 09:12:23 -0400 Message-ID: <87sgevcfyg.fsf@dustycloud.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2600:3c02::f03c:91ff:feae:cb51; envelope-from=cwebber@dustycloud.org; helo=dustycloud.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 14 X-Spam_score: 1.4 X-Spam_bar: + X-Spam_report: (1.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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" X-getmail-retrieved-from-mailbox: Patches Patch attached. The new version of Crawl is amazing. Completely reworked spell system and everything! However, apparently the -nodeps.tar.xz release is normally made before the Debian release... since I expressed interest in packaging 0.25.0 asap one of the devs made the tarball themselves, but apparently from an OSX machine, and it left all these ._* doodads in it, which broke compilation. I added a couple of lines to get rid of them. I'm not sure if they're going to release another tarball that removes those; I guess if they do, that'll have a different hash. In the meanwhile this does work. I'm not sure if I should push it or not given the above. Maybe we should wait to see if the dev responds to me on IRC about the ._* files. (Apparently after the tournament is done, a 0.25.1 release is likely soon anyway.) - Chris From 288f754bded0d4c306b3b29e1f8d11a90516b48f Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Tue, 16 Jun 2020 09:06:20 -0400 Subject: [PATCH] gnu: crawl: Update to 0.25.0. * gnu/packages/games.scm (crawl): Update to 0.25.0. --- gnu/packages/games.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 10ac8cb550..e95effa992 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5264,7 +5264,7 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.24.0") + (version "0.25.0") (source (origin (method url-fetch) @@ -5277,8 +5277,18 @@ fish. The whole game is accompanied by quiet, comforting music.") (string-append "http://crawl.develz.org/release/stone_soup-" version "-nodeps.tar.xz"))) (sha256 - (base32 "0kdq6s12myxfdg75ma9x3ys2nd0xwb3xm2ynlmhg4628va0pnixr")) - (patches (search-patches "crawl-upgrade-saves.patch")))) + (base32 "0rn1wjxdqw33caiwisfypm1j8cid3c9pz01ahicl17144zs29z3d")) + (patches (search-patches "crawl-upgrade-saves.patch")) + ;; The 0.25.0 -nodeps.tar.xz was built from an OSX machine; normally + ;; apparently it's built from a Debian machine before the Debian + ;; packages are made. These ._* files are binary and have the string + ;; "Mac OS X" in them... removing these seems to result in compilation + ;; again. + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file (find-files "." "^\\._")) + #t)))) (build-system gnu-build-system) (inputs `(("lua51" ,lua-5.1) -- 2.26.2