all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Brendan Tildesley <mail@brendan.scot>
To: "46695@debbugs.gnu.org" <46695@debbugs.gnu.org>
Subject: [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha
Date: Tue, 29 Jun 2021 05:12:02 +0200 (CEST)	[thread overview]
Message-ID: <830239188.255753.1624936322642@office.mailbox.org> (raw)
In-Reply-To: <871rd9f6g0.fsf@cbaines.net>

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

This change to the patch above fixes the game. I was able to play many games and it runs better than the 23 alpha. However the tests segfault so I disabled them. Christopher said he doesn't have time for this at the moment, could a reviewer rebase this change on and test it? thanks.

[-- Attachment #2: 0001-0ad-fix.patch --]
[-- Type: text/x-patch, Size: 1344 bytes --]

From 850a8511c2e65d558fd88f31251e06c5a347fa9f Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 29 Jun 2021 13:04:44 +1000
Subject: [PATCH] 0ad fix

---
 gnu/packages/games.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2eb240138b..0e60536217 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6708,7 +6708,7 @@ fight against their plot and save his fellow rabbits from slavery.")
                (xz-path (string-append (assoc-ref %build-inputs "xz") "/bin")))
            (setenv "PATH" xz-path)
            (mkdir out)
-           (invoke tar "xvf" source "-C" out "--strip=3")))))
+           (invoke tar "xvf" source "-C" out "--strip=2")))))
     (synopsis "Data files for 0ad")
     (description "0ad-data provides the data files required by the game 0ad.")
     (home-page "https://play0ad.com")
@@ -6767,6 +6767,7 @@ fight against their plot and save his fellow rabbits from slavery.")
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags '("config=release" "verbose=1" "-C" "build/workspaces/gcc")
+       #:tests? #f                      ;; Tests segfault
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-/Users/wfg-references
-- 
2.32.0


  parent reply	other threads:[~2021-06-29  3:13 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-21 21:37 [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha Christopher Baines
2021-02-21 21:41 ` [bug#46695] [PATCH 1/2] gnu: mozjs-78: Update to 78.6.1 Christopher Baines
2021-02-21 21:41   ` [bug#46695] [PATCH 2/2] gnu: 0ad-data: Update to 0.0.24-alpha Christopher Baines
2021-06-29  3:12 ` Brendan Tildesley [this message]
2021-09-03 20:14 ` [bug#46695] [PATCH 0/2] Update 0ad " Ludovic Courtès
2021-09-04  1:43   ` Brendan Tildesley
2021-11-07 22:06     ` bug#46695: " Nicolas Goaziou
     [not found]       ` <8b5e70a8-da98-e690-017b-398bc4f6a5e9@brendan.scot>
2021-11-09 11:46         ` [bug#46695] " Nicolas Goaziou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=830239188.255753.1624936322642@office.mailbox.org \
    --to=mail@brendan.scot \
    --cc=46695@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.