From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4ea1::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iNqGNPgex2Es8wAAgWs5BA (envelope-from ) for ; Sat, 25 Dec 2021 14:39:04 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id uHI9Lvgex2EycQAAG6o9tA (envelope-from ) for ; Sat, 25 Dec 2021 14:39:04 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4AFDC23CD7 for ; Sat, 25 Dec 2021 14:39:04 +0100 (CET) Received: from localhost ([::1]:35342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n17GJ-0004Q7-IC for larch@yhetil.org; Sat, 25 Dec 2021 08:39:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n17FO-0004OD-TJ for guix-patches@gnu.org; Sat, 25 Dec 2021 08:38:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n17FL-0000Ga-6a for guix-patches@gnu.org; Sat, 25 Dec 2021 08:38:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n17FL-0000ks-4x for guix-patches@gnu.org; Sat, 25 Dec 2021 08:38:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52789] [PATCH 3/3] gnu: naev: Update to 0.9.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Dec 2021 13:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52789 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52789@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 52789-submit@debbugs.gnu.org id=B52789.16404394572847 (code B ref 52789); Sat, 25 Dec 2021 13:38:03 +0000 Received: (at 52789) by debbugs.gnu.org; 25 Dec 2021 13:37:37 +0000 Received: from localhost ([127.0.0.1]:38686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n17Eu-0000jr-NU for submit@debbugs.gnu.org; Sat, 25 Dec 2021 08:37:37 -0500 Received: from mout02.posteo.de ([185.67.36.66]:57707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n17Er-0000jP-Oo for 52789@debbugs.gnu.org; Sat, 25 Dec 2021 08:37:34 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2BB85240101 for <52789@debbugs.gnu.org>; Sat, 25 Dec 2021 14:37:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640439448; bh=/T2+qXgb0UvrduXUunPq6OEVrnhjalh/i4F6dYUw4iY=; h=From:To:Cc:Subject:Date:From; b=corpUKCPv2o9ihLWHBuwMZ73kKWB6ovAoiYZQf+/VprwdMWmBFmw2A7cwbZftLhuN kParT1Ep+DX+F+v8/6x9uJ8oyyoFLmpxynRRPKY1cUAu0xDMBBifOM28jc2KvjqDUe Ew/BgSgZg8lBGrFnZsSjAHt2qfO5CIsdmL3ctESWpblbeZLCjVch3VLrJhyLxA8kij fx+jYfpActFH4a+DiUtVBzgeZ/zpZ2cDGzMPRhmGYf2QmpO/TCoj3AnJurCsxdU8p8 0ywMHZ9l4Eb/uDgczIZq6SolCmLuzc+a3Za8hAu9uOd4c3/TIMtHe88mqTioIB9rQd bsXpeFeCRFq8g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JLlNR3wK0z6tm5; Sat, 25 Dec 2021 14:37:27 +0100 (CET) From: Felix Gruber Date: Sat, 25 Dec 2021 13:37:06 +0000 Message-Id: <20211225133706.2964-3-felgru@posteo.net> In-Reply-To: <20211225133706.2964-1-felgru@posteo.net> References: <20211225133420.2456-1-felgru@posteo.net> <20211225133706.2964-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640439544; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+8FavxtiRi0QF8Wqk+roD4WsH3s3rJWj99EDdpB62mw=; b=i33crZdVRiVxyehZHypMjp/Vw7GAzM3+v2udKf436fQkaVw3q2f+UmDK2faJk9xxnxnQAn 9nLOKn3idDsvdu6k0M+f4OO+PZwUEJf2JDBbRlqG6iWIo+2i2t4sPsznNp6qcMshC4xuLl isxaD3J/sjlX8nW/rPVEYYznnumDElEhAM+BDqSI5nid8XNm4k2eFxuN//tLdaGxMUkph2 EOSh5Ila10UX5LAJdLbNVYxwT9Z3V2vZppJYV11SIKADdxa7w6Yl2OeB2AmZEcpq0bc5hK JdDfmtxt1VMn70FudHCuw8CebI2yeYLcDafwRGnXc92HewHLJsF4mnzRu2lifg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640439544; a=rsa-sha256; cv=none; b=NBXvg4obTwMC7JwESjb1rGcl5pls7mRFx3eFt0rpL8TRSX1MGNbaWK7+5FoFBzrgYGCHHx 73aOr25T2BUdq8gWM/8yKWO42WJ6vaA0qfPFH4VOukTKVroXX+8llMtdLWr71N7yoRNOPI iGNiImTEk1lZ7CxmlRka49fuO3G2PPlcokJeoMRKpAfwsfoMBs12aOzPuAZr6qAJoOeJI6 K830lNaJ91hD9v/cwr96nuY7jTww4lPXEqxr3Y7yAGcFqRm8p4dpbuIuibBy54LnVDBuxV DniDaODCZNRTDwdMvdFcQGXSFwHlwAxmTOk4E1J8ICzfBCIl5kG+ankgG1gZeA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=corpUKCP; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=corpUKCP; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4AFDC23CD7 X-Spam-Score: -0.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: QBzXZRhNUkrI * gnu/packages/games.scm (naev): Update to 0.9.0. [arguments]: Add phases to copy artwork and fix msgfmt path. [native-inputs]: Use new simplified format and add naev-artwork. [inputs]: Use new simplified format and add libunibreak and python-pyyaml. [license]: Remove licenses of artwork which is now found in the new naev-artwork package. --- gnu/packages/games.scm | 56 +++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ed194c1bfe..bd143582d3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -196,6 +196,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) + #:use-module (gnu packages unicode) #:use-module (gnu packages upnp) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) @@ -7911,7 +7912,7 @@ ncurses for text display.") (define-public naev (package (name "naev") - (version "0.8.2") + (version "0.9.0") (source (origin (method git-fetch) @@ -7920,28 +7921,40 @@ ncurses for text display.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02rk2fv2nhx5xsi0cariisamab3dpncwps4q3i3ki0y27xpwxzfx")))) + (base32 "0m4bny6wcxmqavi8sf87yjg4mamhyixzz4gb9m97xwkn6ga5669b")))) (build-system meson-build-system) (arguments ;; XXX: Do not add debugging symbols, which cause the build to fail. `(#:configure-flags (list "--buildtype=release") - #:tests? #f)) ;sole test fails with a missing "/dev/dri" error + #:tests? #f ;sole test fails with a missing "/dev/dri" error + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-artwork + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "naev-artwork") + "artwork"))) + (add-before 'configure 'find-msgfmt + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "utils/build/gen_gettext_stats.py" + (("msgfmt") + (search-input-file inputs "/bin/msgfmt")))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + (list gettext-minimal naev-artwork pkg-config)) (inputs - `(("freetype" ,freetype) - ("glpk" ,glpk) - ("libpng" ,libpng) - ("libvorbis" ,libvorbis) - ("libwebp" ,libwebp) - ("libxml2" ,libxml2) - ("luajit" ,luajit) - ("openal" ,openal) - ("openblas" ,openblas) - ("physfs" ,physfs) - ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer))) - ("suitesparse" ,suitesparse))) + (list freetype + glpk + libpng + libunibreak + libvorbis + libwebp + libxml2 + luajit + openal + openblas + physfs + python-pyyaml + (sdl-union (list sdl2 sdl2-image sdl2-mixer)) + suitesparse)) (home-page "https://naev.org/") (synopsis "Game about space exploration, trade and combat") (description @@ -7958,14 +7971,7 @@ of lore accompanying everything from planets to equipment.") license:expat ;edtaa3func.c license:bsd-2 ;distance_field.c license:bsd-3 ;perlin.c - ;; Assets. - license:silofl1.1 - license:gpl2+ - license:cc0 - license:cc-by3.0 - license:cc-by-sa3.0 - license:cc-by4.0 - license:cc-by-sa4.0)))) + )))) (define-public naev-artwork (let ((version "0.9.0") -- 2.30.2