* [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha
@ 2021-02-21 21:37 Christopher Baines
2021-02-21 21:41 ` [bug#46695] [PATCH 1/2] gnu: mozjs-78: Update to 78.6.1 Christopher Baines
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Christopher Baines @ 2021-02-21 21:37 UTC (permalink / raw)
To: 46695
[-- Attachment #1: Type: text/plain, Size: 433 bytes --]
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(-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* [bug#46695] [PATCH 1/2] gnu: mozjs-78: Update to 78.6.1. 2021-02-21 21:37 [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha Christopher Baines @ 2021-02-21 21:41 ` 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 ` [bug#46695] [PATCH 0/2] Update 0ad " Brendan Tildesley 2021-09-03 20:14 ` Ludovic Courtès 2 siblings, 1 reply; 8+ messages in thread From: Christopher Baines @ 2021-02-21 21:41 UTC (permalink / raw) To: 46695 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#46695] [PATCH 2/2] gnu: 0ad-data: Update to 0.0.24-alpha. 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 ` Christopher Baines 0 siblings, 0 replies; 8+ messages in thread From: Christopher Baines @ 2021-02-21 21:41 UTC (permalink / raw) To: 46695 * 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha 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-06-29 3:12 ` Brendan Tildesley 2021-09-03 20:14 ` Ludovic Courtès 2 siblings, 0 replies; 8+ messages in thread From: Brendan Tildesley @ 2021-06-29 3:12 UTC (permalink / raw) To: 46695@debbugs.gnu.org [-- 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha 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-06-29 3:12 ` [bug#46695] [PATCH 0/2] Update 0ad " Brendan Tildesley @ 2021-09-03 20:14 ` Ludovic Courtès 2021-09-04 1:43 ` Brendan Tildesley 2 siblings, 1 reply; 8+ messages in thread From: Ludovic Courtès @ 2021-09-03 20:14 UTC (permalink / raw) To: Christopher Baines; +Cc: 46695, Brendan Tildesley 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’. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha 2021-09-03 20:14 ` Ludovic Courtès @ 2021-09-04 1:43 ` Brendan Tildesley 2021-11-07 22:06 ` bug#46695: " Nicolas Goaziou 0 siblings, 1 reply; 8+ messages in thread From: Brendan Tildesley @ 2021-09-04 1:43 UTC (permalink / raw) To: Ludovic Courtès, Christopher Baines; +Cc: 46695 [-- Attachment #1: Type: text/plain, Size: 739 bytes --] > 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 #2: 0001-gnu-0ad-Update-to-0.0.25b-alpha.patch --] [-- Type: text/x-patch, Size: 10114 bytes --] From c8c04d24ffabaeecfe00dce05387448999b486e0 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley <mail@brendan.scot> Date: Thu, 2 Sep 2021 22:54:27 +1000 Subject: [PATCH] gnu: 0ad: Update to 0.0.25b-alpha. * gnu/packages/games.scm 0ad-data: Update to 0.0.25b-alpha. Unpack .zip files without need for a snippet. 0ad: Update to 0.0.25b-alpha. Properly unbundle cxxtest. Respect #:tests?. Disable tests for now since they don't run. Install Freedesktop mimeinfo. Install icon to hicolor theme instead of share/pixmaps, which I don't think is used. --- gnu/packages/games.scm | 87 +++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 79754d3185..6658a3a315 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -64,6 +64,8 @@ ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw> ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org> ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com> +;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot> +;;; Copyright © 2021 Christopher Baines <mail@cbaines.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -150,6 +152,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) @@ -170,6 +173,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) @@ -6588,7 +6592,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.25b-alpha") (source (origin (method url-fetch) @@ -6597,20 +6601,10 @@ fight against their plot and save his fellow rabbits from slavery.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "04x7729hk6zw1xj3n4s4lvaviijsnbjf5rhzvjxlr5fygvg4l6z1")) - (modules '((guix build utils))) - (snippet - #~(begin - (for-each (lambda (name) - (let* ((dir (string-append "binaries/data/mods/" name)) - (file (string-append dir "/" name ".zip")) - (unzip #$(file-append unzip "/bin/unzip"))) - (invoke unzip "-d" dir file) - (delete-file file))) - '("mod" "public")) - #t)))) + "1c9zrddmjxvvacismld6fbwbw9vrdbq6g6d3424p8w5p6xg5wlwy")))) (build-system trivial-build-system) (native-inputs `(("tar" ,tar) + ("unzip" ,unzip) ("xz" ,xz))) (arguments `(#:modules ((guix build utils)) @@ -6620,10 +6614,17 @@ fight against their plot and save his fellow rabbits from slavery.") (let ((out (assoc-ref %outputs "out")) (source (assoc-ref %build-inputs "source")) (tar (string-append (assoc-ref %build-inputs "tar") "/bin/tar")) + (unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip")) (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=3") + (for-each (lambda (name) + (let* ((dir (string-append out "/mods/" name)) + (file (string-append dir "/" name ".zip"))) + (invoke unzip "-o" "-d" dir file) + (delete-file file))) + '("mod" "public")))))) (synopsis "Data files for 0ad") (description "0ad-data provides the data files required by the game 0ad.") (home-page "https://play0ad.com") @@ -6641,7 +6642,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.25b-alpha") (source (origin (method url-fetch) @@ -6650,22 +6651,24 @@ fight against their plot and save his fellow rabbits from slavery.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1")))) + "1p9fa8f7sjb9c5wl3mawzyfqvgr614kdkhrj2k4db9vkyisws3fp")))) ;; 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) @@ -6673,29 +6676,28 @@ 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))) (build-system gnu-build-system) (arguments `(#:make-flags '("config=release" "verbose=1" "-C" "build/workspaces/gcc") + #:tests? #f ;; Tests fail currently #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-bundles - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (delete-file-recursively "libraries/source/spidermonkey") - #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>")) + (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) + (lambda* (#:key inputs outputs tests? #:allow-other-keys) (let* ((jobs (number->string (parallel-job-count))) (out (assoc-ref outputs "out")) (lib (string-append out "/lib")) @@ -6703,11 +6705,13 @@ fight against their plot and save his fellow rabbits from slavery.") (setenv "JOBS" (string-append "-j" jobs)) (setenv "CC" "gcc") (with-directory-excursion "build/workspaces" - (invoke "./update-workspaces.sh" - (string-append "--libdir=" lib) - (string-append "--datadir=" data) - ;; TODO: "--with-system-nvtt" - "--with-system-mozjs38"))))) + (apply invoke + `("./update-workspaces.sh" + ,(string-append "--libdir=" lib) + ,(string-append "--datadir=" data) + ;; TODO: "--with-system-nvtt" + "--with-system-mozjs" + ,@(if tests? '() '("--without-tests")))))))) (delete 'check) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) @@ -6717,7 +6721,9 @@ fight against their plot and save his fellow rabbits from slavery.") (lib (string-append out "/lib")) (data (string-append out "/share/0ad")) (applications (string-append out "/share/applications")) - (pixmaps (string-append out "/share/pixmaps")) + (hicolor (string-append out "/share/icons/hicolor/128x128/apps")) + (metainfo (string-append out "/share/metainfo")) + (mime (string-append out "/share/mime/application")) (0ad-data (assoc-ref inputs "0ad-data"))) ;; data (copy-recursively "data" data) @@ -6736,12 +6742,15 @@ fight against their plot and save his fellow rabbits from slavery.") ;; resources (with-directory-excursion "../build/resources" (install-file "0ad.desktop" applications) - (install-file "0ad.png" pixmaps)) + (install-file "0ad.png" hicolor) + (install-file "0ad.appdata.xml" metainfo) + (install-file "pyrogenesis.xml" mime)) #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.33.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* bug#46695: [PATCH 0/2] Update 0ad to 0.0.24-alpha 2021-09-04 1:43 ` Brendan Tildesley @ 2021-11-07 22:06 ` Nicolas Goaziou [not found] ` <8b5e70a8-da98-e690-017b-398bc4f6a5e9@brendan.scot> 0 siblings, 1 reply; 8+ messages in thread From: Nicolas Goaziou @ 2021-11-07 22:06 UTC (permalink / raw) To: Brendan Tildesley; +Cc: Ludovic Courtès, Christopher Baines, 46695-done Hello, Brendan Tildesley <mail@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 ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <8b5e70a8-da98-e690-017b-398bc4f6a5e9@brendan.scot>]
* [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha [not found] ` <8b5e70a8-da98-e690-017b-398bc4f6a5e9@brendan.scot> @ 2021-11-09 11:46 ` Nicolas Goaziou 0 siblings, 0 replies; 8+ messages in thread From: Nicolas Goaziou @ 2021-11-09 11:46 UTC (permalink / raw) To: Brendan Tildesley; +Cc: 46695, Ludovic Courtès, Christopher Baines Hello, Brendan Tildesley <mail@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 ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-11-09 11:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [bug#46695] [PATCH 0/2] Update 0ad " Brendan Tildesley
2021-09-03 20:14 ` 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
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.