GNU bug report logs - #41892
Update crawl to 0.25.0

Previous Next

Package: guix-patches;

Reported by: Christopher Lemmer Webber <cwebber <at> dustycloud.org>

Date: Tue, 16 Jun 2020 13:13:01 UTC

Severity: normal

Done: Christopher Lemmer Webber <cwebber <at> dustycloud.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 41892 in the body.
You can then email your comments to 41892 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#41892; Package guix-patches. (Tue, 16 Jun 2020 13:13:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Christopher Lemmer Webber <cwebber <at> dustycloud.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Tue, 16 Jun 2020 13:13:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Lemmer Webber <cwebber <at> dustycloud.org>
To: guix-patches <at> gnu.org
Subject: Update crawl to 0.25.0
Date: Tue, 16 Jun 2020 09:12:23 -0400
[Message part 1 (text/plain, inline)]
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

[0001-gnu-crawl-Update-to-0.25.0.patch (text/x-patch, inline)]
From 288f754bded0d4c306b3b29e1f8d11a90516b48f Mon Sep 17 00:00:00 2001
From: Christopher Lemmer Webber <cwebber <at> dustycloud.org>
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

[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#41892; Package guix-patches. (Tue, 16 Jun 2020 15:32:01 GMT) Full text and rfc822 format available.

Message #8 received at 41892 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Christopher Lemmer Webber <cwebber <at> dustycloud.org>
Cc: 41892 <at> debbugs.gnu.org
Subject: Re: [bug#41892] Update crawl to 0.25.0
Date: Tue, 16 Jun 2020 17:31:39 +0200
Christopher Lemmer Webber <cwebber <at> dustycloud.org> writes:

> Patch attached.  The new version of Crawl is amazing.  Completely
> reworked spell system and everything!

This looks good to me.

> 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.

I think it’s fine.  That’s one of the use cases for snippets.

-- 
Ricardo




Reply sent to Christopher Lemmer Webber <cwebber <at> dustycloud.org>:
You have taken responsibility. (Tue, 16 Jun 2020 19:08:02 GMT) Full text and rfc822 format available.

Notification sent to Christopher Lemmer Webber <cwebber <at> dustycloud.org>:
bug acknowledged by developer. (Tue, 16 Jun 2020 19:08:02 GMT) Full text and rfc822 format available.

Message #13 received at 41892-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Lemmer Webber <cwebber <at> dustycloud.org>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 41892-done <at> debbugs.gnu.org
Subject: Re: [bug#41892] Update crawl to 0.25.0
Date: Tue, 16 Jun 2020 15:07:51 -0400
Ricardo Wurmus writes:

> Christopher Lemmer Webber <cwebber <at> dustycloud.org> writes:
>
>> Patch attached.  The new version of Crawl is amazing.  Completely
>> reworked spell system and everything!
>
> This looks good to me.
>
>> 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.
>
> I think it’s fine.  That’s one of the use cases for snippets.

Ok!  It's pushed then.

(If someone notices that the hash becomes mismatched, it's probably
because the source did a re-upload removing those files... I don't know
if they will; haven't heard as such.)




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 15 Jul 2020 11:24:08 GMT) Full text and rfc822 format available.

This bug report was last modified 3 years and 285 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.