GNU bug report logs - #46695
[PATCH 0/2] Update 0ad to 0.0.24-alpha

Previous Next

Package: guix-patches;

Reported by: Christopher Baines <mail <at> cbaines.net>

Date: Sun, 21 Feb 2021 21:38:01 UTC

Severity: normal

Tags: patch

Done: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>

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 46695 in the body.
You can then email your comments to 46695 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#46695; Package guix-patches. (Sun, 21 Feb 2021 21:38:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Christopher Baines <mail <at> cbaines.net>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sun, 21 Feb 2021 21:38:01 GMT) Full text and rfc822 format available.

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

From: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Update 0ad to 0.0.24-alpha
Date: Sun, 21 Feb 2021 21:37:35 +0000
[Message part 1 (text/plain, inline)]
Work in progress patches to update 0ad, was more complicated than I'd
imagined. There are issues with running the tests, and the program also
doesn't start properly.

Christopher Baines (2):
  gnu: mozjs-78: Update to 78.6.1.
  gnu: 0ad-data: Update to 0.0.24-alpha.

 gnu/packages/games.scm    | 56 ++++++++++++++++++++++++---------------
 gnu/packages/gnuzilla.scm | 10 +++++--
 2 files changed, 43 insertions(+), 23 deletions(-)
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#46695; Package guix-patches. (Sun, 21 Feb 2021 21:42:01 GMT) Full text and rfc822 format available.

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

From: Christopher Baines <mail <at> cbaines.net>
To: 46695 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: 0ad-data: Update to 0.0.24-alpha.
Date: Sun, 21 Feb 2021 21:41:35 +0000
* gnu/packages/games.scm (0ad-data): Update to 0.0.24-alpha.
---
 gnu/packages/games.scm | 56 ++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 6726cef303..63abec053b 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -142,6 +142,7 @@
   #:use-module (gnu packages less)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages libedit)
+  #:use-module (gnu packages libidn)
   #:use-module (gnu packages libunwind)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
@@ -162,6 +163,7 @@
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages perl-compression)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
@@ -6563,7 +6565,7 @@ fight against their plot and save his fellow rabbits from slavery.")
 (define-public 0ad-data
   (package
     (name "0ad-data")
-    (version "0.0.23b-alpha")
+    (version "0.0.24-alpha")
     (source
      (origin
        (method url-fetch)
@@ -6572,12 +6574,13 @@ fight against their plot and save his fellow rabbits from slavery.")
        (file-name (string-append name "-" version ".tar.xz"))
        (sha256
         (base32
-         "04x7729hk6zw1xj3n4s4lvaviijsnbjf5rhzvjxlr5fygvg4l6z1"))
+         "0nnpzn0l2sw7z9bwgg6vacip6blahxsk6m90znvl7hb3mak5b6lj"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
+            (delete-file "data/mods/public/mod.json") ; contained in public.zip
             (for-each (lambda (name)
-                        (let* ((dir (string-append "binaries/data/mods/" name))
+                        (let* ((dir (string-append "data/mods/" name))
                                (file (string-append dir "/" name ".zip"))
                                (unzip #$(file-append unzip "/bin/unzip")))
                           (invoke unzip "-d" dir file)
@@ -6616,7 +6619,7 @@ fight against their plot and save his fellow rabbits from slavery.")
 (define-public 0ad
   (package
     (name "0ad")
-    (version "0.0.23b-alpha")
+    (version "0.0.24-alpha")
     (source
      (origin
        (method url-fetch)
@@ -6625,22 +6628,24 @@ fight against their plot and save his fellow rabbits from slavery.")
        (file-name (string-append name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1"))))
+         "0lyccd3lxm50lhpzqhljq1rq37z4j20avpa1prlv2j0yy79f5bh0"))))
        ;; A snippet here would cause a build failure because of timestamps
        ;; reset.  See https://bugs.gnu.org/26734.
     (inputs
      `(("0ad-data" ,0ad-data)
        ("curl" ,curl)
        ("enet" ,enet)
+       ("fmt" ,fmt)
        ("gloox" ,gloox)
-       ("icu4c" ,icu4c)
+       ("icu4c" ,icu4c-68)
+       ("libidn" ,libidn)
        ("libpng" ,libpng)
        ("libsodium" ,libsodium)
        ("libvorbis" ,libvorbis)
        ("libxcursor" ,libxcursor)
        ("libxml2" ,libxml2)
        ("miniupnpc" ,miniupnpc)
-       ("mozjs-38" ,mozjs-38)
+       ("mozjs" ,mozjs-78)
        ("openal" ,openal)
        ("sdl2" ,sdl2)
        ("wxwidgets" ,wxwidgets)
@@ -6648,6 +6653,7 @@ fight against their plot and save his fellow rabbits from slavery.")
     (native-inputs
      `(("boost" ,boost)
        ("cmake" ,cmake-minimal)
+       ("cxxtest" ,cxxtest)
        ("mesa" ,mesa)
        ("pkg-config" ,pkg-config)
        ("python-2" ,python-2)))
@@ -6656,18 +6662,25 @@ fight against their plot and save his fellow rabbits from slavery.")
      `(#:make-flags '("config=release" "verbose=1" "-C" "build/workspaces/gcc")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'delete-bundles
+         (add-after 'unpack 'patch-/Users/wfg-references
            (lambda _
-             (delete-file-recursively "libraries/source/spidermonkey")
+             (for-each
+              (lambda (file)
+                (substitute* file
+                  (("\\/Users\\/wfg\\/Jenkins\\/workspace\\/macOS-all-bundles\\/source\\/")
+                   "")))
+              (find-files "source" "\\.cpp"))
              #t))
-         (add-after 'unpack 'fix-x11-includes
-           (lambda _
-             (substitute* "source/lib/sysdep/os/unix/x/x.cpp"
-               (("<Xlib.h>") "<X11/Xlib.h>"))
-             (substitute* "source/lib/sysdep/os/unix/x/x.cpp"
-               (("<Xatom.h>") "<X11/Xatom.h>"))
-             (substitute* "source/lib/sysdep/os/unix/x/x.cpp"
-               (("<Xcursor/Xcursor.h>") "<X11/Xcursor/Xcursor.h>"))
+         (add-after 'unpack 'delete-bundles
+           (lambda* (#:key inputs #:allow-other-keys)
+             (chdir "..")
+             (delete-file-recursively "libraries/source/spidermonkey")
+             (delete-file-recursively "libraries/source/cxxtest-4.4")
+             (substitute* "build/premake/premake5.lua"
+               (("rootdir\\.\\.\"\\/libraries\\/source\\/cxxtest-4.4\\/bin\\/cxxtestgen\"")
+                (string-append "\"" (assoc-ref inputs "cxxtest")
+                               "/bin/cxxtestgen"
+                               "\"")))
              #t))
          (replace 'configure
            (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -6682,7 +6695,7 @@ fight against their plot and save his fellow rabbits from slavery.")
                          (string-append "--libdir=" lib)
                          (string-append "--datadir=" data)
                          ;; TODO: "--with-system-nvtt"
-                         "--with-system-mozjs38")))))
+                         "--with-system-mozjs")))))
          (delete 'check)
          (replace 'install
            (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -6714,9 +6727,10 @@ fight against their plot and save his fellow rabbits from slavery.")
                  (install-file "0ad.png" pixmaps))
                #t)))
          (add-after 'install 'check
-           (lambda _
-             (with-directory-excursion "system"
-               (invoke "./test")))))))
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (with-directory-excursion "system"
+                 (invoke "./test"))))))))
     (home-page "https://play0ad.com")
     (synopsis "3D real-time strategy game of ancient warfare")
     (description "0 A.D. is a real-time strategy (RTS) game of ancient
-- 
2.30.0





Information forwarded to guix-patches <at> gnu.org:
bug#46695; Package guix-patches. (Sun, 21 Feb 2021 21:42:02 GMT) Full text and rfc822 format available.

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

From: Christopher Baines <mail <at> cbaines.net>
To: 46695 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: mozjs-78: Update to 78.6.1.
Date: Sun, 21 Feb 2021 21:41:34 +0000
This minor version is convinient for packaging 0ad.

* gnu/packages/gnuzilla.scm (mozjs-78): Update to 78.6.1.
---
 gnu/packages/gnuzilla.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 7f33019606..27551ac781 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -417,7 +417,7 @@ in C/C++.")
 (define-public mozjs-78
   (package
     (inherit mozjs-60)
-    (version "78.5.0")
+    (version "78.6.1")
     (source (origin
               (method url-fetch)
               ;; TODO: Switch to IceCat source once available on ftp.gnu.org.
@@ -426,7 +426,7 @@ in C/C++.")
                                   version "esr.source.tar.xz"))
               (sha256
                (base32
-                "1442yjmwz69hkfcvh8kkb60jf4c9ms0pac04nc3xw2da13v4zxai"))))
+                "1kp75838a38x4h0w98qn01g9asn7jlgm64bz7n70353bnr6bf1qd"))))
     (arguments
      `(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums'
        #:modules ((guix build cargo-utils)
@@ -453,6 +453,12 @@ in C/C++.")
          "--with-intl-api")
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-StructuredClone.h
+           (lambda _
+             (substitute* "js/public/StructuredClone.h"
+               (("class SharedArrayRawBufferRefs \\{")
+                "class JS_PUBLIC_API SharedArrayRawBufferRefs {"))
+             #t))
          (add-after 'patch-source-shebangs 'patch-cargo-checksums
            (lambda _
              (let ((null-hash
-- 
2.30.0





Information forwarded to guix-patches <at> gnu.org:
bug#46695; Package guix-patches. (Tue, 29 Jun 2021 03:13:02 GMT) Full text and rfc822 format available.

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

From: Brendan Tildesley <mail <at> brendan.scot>
To: "46695 <at> debbugs.gnu.org" <46695 <at> debbugs.gnu.org>
Subject: [PATCH 0/2] Update 0ad to 0.0.24-alpha
Date: Tue, 29 Jun 2021 05:12:02 +0200 (CEST)
[Message part 1 (text/plain, inline)]
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.
[0001-0ad-fix.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#46695; Package guix-patches. (Fri, 03 Sep 2021 20:15:02 GMT) Full text and rfc822 format available.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 46695 <at> debbugs.gnu.org, Brendan Tildesley <mail <at> brendan.scot>
Subject: Re: bug#46695: [PATCH 0/2] Update 0ad to 0.0.24-alpha
Date: Fri, 03 Sep 2021 22:14:37 +0200
Hello,

Christopher Baines <mail <at> cbaines.net> skribis:

> Work in progress patches to update 0ad, was more complicated than I'd
> imagined. There are issues with running the tests, and the program also
> doesn't start properly.
>
> Christopher Baines (2):
>   gnu: mozjs-78: Update to 78.6.1.
>   gnu: 0ad-data: Update to 0.0.24-alpha.

This LGTM at first sight, and given the changes Brendan proposed, we
should be all set?

I’d be more comfortable if you could confirm and apply these, Chris.

Thanks,
Ludo’.




Information forwarded to guix-patches <at> gnu.org:
bug#46695; Package guix-patches. (Sat, 04 Sep 2021 01:44:02 GMT) Full text and rfc822 format available.

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

From: Brendan Tildesley <mail <at> brendan.scot>
To: Ludovic Courtès <ludo <at> gnu.org>,
 Christopher Baines <mail <at> cbaines.net>
Cc: 46695 <at> debbugs.gnu.org
Subject: Re: bug#46695: [PATCH 0/2] Update 0ad to 0.0.24-alpha
Date: Sat, 4 Sep 2021 03:43:04 +0200 (CEST)
[Message part 1 (text/plain, inline)]
> On 09/03/2021 10:14 PM Ludovic Courtès <ludo <at> gnu.org> wrote:
> 
>  
> Hello,
> 
> Christopher Baines <mail <at> cbaines.net> skribis:
> 
> > Work in progress patches to update 0ad, was more complicated than I'd
> > imagined. There are issues with running the tests, and the program also
> > doesn't start properly.
> >
> > Christopher Baines (2):
> >   gnu: mozjs-78: Update to 78.6.1.
> >   gnu: 0ad-data: Update to 0.0.24-alpha.
> 
> This LGTM at first sight, and given the changes Brendan proposed, we
> should be all set?
> 
> I’d be more comfortable if you could confirm and apply these, Chris.
> 
> Thanks,
> Ludo’.

I have an update for 0.0.25b-alpha. I also added both our copyright notices if that's ok.
[0001-gnu-0ad-Update-to-0.0.25b-alpha.patch (text/x-patch, attachment)]

Reply sent to Nicolas Goaziou <mail <at> nicolasgoaziou.fr>:
You have taken responsibility. (Sun, 07 Nov 2021 22:07:02 GMT) Full text and rfc822 format available.

Notification sent to Christopher Baines <mail <at> cbaines.net>:
bug acknowledged by developer. (Sun, 07 Nov 2021 22:07:02 GMT) Full text and rfc822 format available.

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

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Brendan Tildesley <mail <at> brendan.scot>
Cc: Ludovic Courtès <ludo <at> gnu.org>,
 Christopher Baines <mail <at> cbaines.net>, 46695-done <at> debbugs.gnu.org
Subject: Re: [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha
Date: Sun, 07 Nov 2021 23:06:17 +0100
Hello,

Brendan Tildesley <mail <at> brendan.scot> writes:

> I have an update for 0.0.25b-alpha. I also added both our copyright
> notices if that's ok.

Applied! Thank you.

Regards,
-- 
Nicolas Goaziou




Information forwarded to guix-patches <at> gnu.org:
bug#46695; Package guix-patches. (Tue, 09 Nov 2021 11:47:01 GMT) Full text and rfc822 format available.

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

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Brendan Tildesley <mail <at> brendan.scot>
Cc: 46695 <at> debbugs.gnu.org, Ludovic Courtès <ludo <at> gnu.org>,
 Christopher Baines <mail <at> cbaines.net>
Subject: Re: [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha
Date: Tue, 09 Nov 2021 12:46:35 +0100
Hello,

Brendan Tildesley <mail <at> brendan.scot> writes:

> The mozjs-78 update by Christopher is also required otherwise the
> build fails. it's broken in master atm.
>
> This patch: https://issues.guix.gnu.org/46695#2

Applied!

Thank you for the heads up.

Regards,
-- 
Nicolas Goaziou




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 07 Dec 2021 12:24:10 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 112 days ago.

Previous Next


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