From patchwork Sun Feb 21 21:41:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 27194 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 72A7927BC48; Sun, 21 Feb 2021 21:42:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1584627BC48 for ; Sun, 21 Feb 2021 21:42:28 +0000 (GMT) Received: from localhost ([::1]:46746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDwUl-0002lo-AQ for patchwork@mira.cbaines.net; Sun, 21 Feb 2021 16:42:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDwUO-0002eU-2e for guix-patches@gnu.org; Sun, 21 Feb 2021 16:42:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lDwUM-0001Dm-2n for guix-patches@gnu.org; Sun, 21 Feb 2021 16:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lDwUM-0003KE-0z for guix-patches@gnu.org; Sun, 21 Feb 2021 16:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46695] [PATCH 2/2] gnu: 0ad-data: Update to 0.0.24-alpha. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Feb 2021 21:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46695@debbugs.gnu.org Received: via spool by 46695-submit@debbugs.gnu.org id=B46695.161394370012749 (code B ref 46695); Sun, 21 Feb 2021 21:42:01 +0000 Received: (at 46695) by debbugs.gnu.org; 21 Feb 2021 21:41:40 +0000 Received: from localhost ([127.0.0.1]:55091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDwTz-0003JX-RL for submit@debbugs.gnu.org; Sun, 21 Feb 2021 16:41:40 -0500 Received: from mira.cbaines.net ([212.71.252.8]:59064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDwTw-0003JI-Q0 for 46695@debbugs.gnu.org; Sun, 21 Feb 2021 16:41:38 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 9D7EB27BC49 for <46695@debbugs.gnu.org>; Sun, 21 Feb 2021 21:41:35 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 324930d9 for <46695@debbugs.gnu.org>; Sun, 21 Feb 2021 21:41:35 +0000 (UTC) From: Christopher Baines Date: Sun, 21 Feb 2021 21:41:35 +0000 Message-Id: <20210221214135.28926-2-mail@cbaines.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210221214135.28926-1-mail@cbaines.net> References: <20210221214135.28926-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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" - (("") "")) - (substitute* "source/lib/sysdep/os/unix/x/x.cpp" - (("") "")) - (substitute* "source/lib/sysdep/os/unix/x/x.cpp" - (("") "")) + (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