[PATCH 0/2] Update 0ad to 0.0.24-alpha

Done

Details

4 participants

Ludovic Courtès
Brendan Tildesley
Christopher Baines
Nicolas Goaziou

Owner: unassigned

Submitted by: Christopher Baines

Severity: normal

Christopher Baines wrote on 21 Feb 2021 22:37

Recipients:(address . guix-patches@gnu.org)

Message-ID:871rd9f6g0.fsf@cbaines.net

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(-)

Christopher Baines wrote on 21 Feb 2021 22:41

[PATCH 2/2] gnu: 0ad-data: Update to 0.0.24-alpha.

Recipients:(address . 46695@debbugs.gnu.org)

Message-ID:20210221214135.28926-2-mail@cbaines.net

* gnu/packages/games.scm (0ad-data): Update to 0.0.24-alpha.

---

gnu/packages/games.scm | 56 ++++++++++++++++++++++++++----------------

1 file changed, 35 insertions(+), 21 deletions(-)

Toggle diff (151 lines)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

Christopher Baines wrote on 21 Feb 2021 22:41

[PATCH 1/2] gnu: mozjs-78: Update to 78.6.1.

Recipients:(address . 46695@debbugs.gnu.org)

Message-ID:20210221214135.28926-1-mail@cbaines.net

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(-)

Toggle diff (37 lines)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

Brendan Tildesley wrote on 29 Jun 2021 05:12

[PATCH 0/2] Update 0ad to 0.0.24-alpha

Recipients:(name . 46695@debbugs.gnu.org)(address . 46695@debbugs.gnu.org)

Message-ID:830239188.255753.1624936322642@office.mailbox.org

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.

From 850a8511c2e65d558fd88f31251e06c5a347fa9f Mon Sep 17 00:00:00 2001

---

gnu/packages/games.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)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

Ludovic Courtès wrote on 3 Sep 2021 22:14

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)

Message-ID:87tuj1zaaa.fsf@gnu.org

Hello,

Christopher Baines <mail@cbaines.net> skribis:

Toggle quote (8 lines)

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

Brendan Tildesley wrote on 4 Sep 2021 03:43

Recipients:(address . 46695@debbugs.gnu.org)

Message-ID:1872927810.103187.1630719784241@office.mailbox.org

Toggle quote (23 lines)> On 09/03/2021 10:14 PM Ludovic Courtès <ludo@gnu.org> wrote:
> 
>  
> Hello,
> 
> Christopher Baines <mail@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.

Attachment: 0001-gnu-0ad-Update-to-0.0.25b-alpha.patch

Nicolas Goaziou wrote on 7 Nov 2021 23:06

Re: [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha

Recipients:(name . Brendan Tildesley)(address . mail@brendan.scot)

Message-ID:874k8noc2u.fsf@nicolasgoaziou.fr

Hello,

Brendan Tildesley <mail@brendan.scot> writes:

Toggle quote (3 lines)

> 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

Closed

Nicolas Goaziou wrote on 9 Nov 2021 12:46

Recipients:(name . Brendan Tildesley)(address . mail@brendan.scot)

Message-ID:874k8lmu04.fsf@nicolasgoaziou.fr

Hello,

Brendan Tildesley <mail@brendan.scot> writes:

Toggle quote (5 lines)

> 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

Your comment

This issue is archived.

To comment on this conversation send an email to 46695@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 46695

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date