From patchwork Sat Sep 4 01:43:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 32579 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 E5E7827BBE3; Sat, 4 Sep 2021 02:44:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, 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 9BA2A27BBE1 for ; Sat, 4 Sep 2021 02:44:10 +0100 (BST) Received: from localhost ([::1]:32952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMKj3-00024F-62 for patchwork@mira.cbaines.net; Fri, 03 Sep 2021 21:44:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMKiw-00023q-On for guix-patches@gnu.org; Fri, 03 Sep 2021 21:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMKiw-0007bM-Gd for guix-patches@gnu.org; Fri, 03 Sep 2021 21:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMKiw-00018a-C3 for guix-patches@gnu.org; Fri, 03 Sep 2021 21:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Sep 2021 01:44:02 +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: Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines Cc: 46695@debbugs.gnu.org Received: via spool by 46695-submit@debbugs.gnu.org id=B46695.16307198054321 (code B ref 46695); Sat, 04 Sep 2021 01:44:02 +0000 Received: (at 46695) by debbugs.gnu.org; 4 Sep 2021 01:43:25 +0000 Received: from localhost ([127.0.0.1]:46175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMKiE-00017V-Ca for submit@debbugs.gnu.org; Fri, 03 Sep 2021 21:43:25 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:58080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMKiC-00017G-2j for 46695@debbugs.gnu.org; Fri, 03 Sep 2021 21:43:17 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4H1cqx5hmRzQk38; Sat, 4 Sep 2021 03:43:09 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1630719788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tHX6mjwgT1CO8p2drfSVEfQJpMOuELMIF6m7QZK5xBs=; b=KNRDSdNoty8EdSuDSn3k1YdhNI7Z0+P4UIPDO7T1GQQN+nlAlVXJlWlhvAC/a0y/FIRZae u8twnb+5MdPxijpqw2HgVu7gozT4siYRq075iXsFOPIgRDviAe8m0+D+1iLeCaYGDXBQfm SkeDABSsuJgjplh7dm32AFmo5vWKHDq3i2Du9kBu3rK3dKZvrsdAE/OLQCbX+5rRXCS0Gb DOX7dOHbK/ObiI2llwSPBnA6fQznOBsOymTq0XRnRbzIPcPbgbiq9wOoyXiiT25oC/j6FC 0odEMBiBLEvHfVtI3HznNJwLu5ltsdrjMjAJpOkNMC9EorZtFGz2xGmj4PQZPg== Date: Sat, 4 Sep 2021 03:43:04 +0200 (CEST) From: Brendan Tildesley Message-ID: <1872927810.103187.1630719784241@office.mailbox.org> In-Reply-To: <87tuj1zaaa.fsf@gnu.org> References: <871rd9f6g0.fsf@cbaines.net> <87tuj1zaaa.fsf@gnu.org> MIME-Version: 1.0 X-Priority: 3 Importance: Normal X-Rspamd-Queue-Id: 8BABB268 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 > On 09/03/2021 10:14 PM Ludovic Courtès wrote: > > > Hello, > > Christopher Baines 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. From c8c04d24ffabaeecfe00dce05387448999b486e0 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley 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 ;;; Copyright © 2021 Noisytoot ;;; Copyright © 2019 Pkill -9 +;;; Copyright © 2021 Brendan Tildesley +;;; Copyright © 2021 Christopher Baines ;;; ;;; 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" - (("") "")) - (substitute* "source/lib/sysdep/os/unix/x/x.cpp" - (("") "")) - (substitute* "source/lib/sysdep/os/unix/x/x.cpp" - (("") "")) + (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