From patchwork Mon Dec 27 23:19:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 35720 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 17BFF27BBEA; Mon, 27 Dec 2021 23:21:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA5D927BBE9 for ; Mon, 27 Dec 2021 23:21:54 +0000 (GMT) Received: from localhost ([::1]:60586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1zJR-0006QQ-Uv for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 18:21:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1zId-0005ZR-Fh for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1zIc-0008SA-N7 for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1zIc-0000SD-JX for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52789] [PATCH v2 1/4] gnu: Add ucd-next. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 23:21:02 +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: Nicolas Goaziou , 52789@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 52789-submit@debbugs.gnu.org id=B52789.16406472461665 (code B ref 52789); Mon, 27 Dec 2021 23:21:02 +0000 Received: (at 52789) by debbugs.gnu.org; 27 Dec 2021 23:20:46 +0000 Received: from localhost ([127.0.0.1]:44524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zIL-0000Qg-S9 for submit@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:46 -0500 Received: from mout01.posteo.de ([185.67.36.65]:60905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zIJ-0000QL-CU for 52789@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:44 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id CEC51240026 for <52789@debbugs.gnu.org>; Tue, 28 Dec 2021 00:20:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640647237; bh=jgPg/JfBgkVYaOBF2Ct343WbIqyr/GDn8V4SpKFrA8g=; h=From:To:Cc:Subject:Date:From; b=YBVITQja5E7quuafhz9jThhds9A2jqJea93An5jaydxjqNlzL5LSmmUV9SaYDCvMH mH+K0B1E5VBCd5jwOzya3evOJewS2iLkVjdKauh+yOnI7lzcMnkDJbbIO4GwzTYPZO kx8AZHg3fg6r1no0amt4yfhNT4UuJIwpSecN7pJcPREUk3x3v9MdobdwV79G22TGuN U/qlcHcr4IWrhqo1SEqSlvZpPrKkWqFZ00Wu1QEK/J+0AYhl6V/MAfPVI4qzJZks0g CLaWoBvaqrfWTe1ERhccDKb/0x0Q3wjfWR9FIK5gOpSEQ9OgH5v4uAHjFy47LXwEBl 54NAdqmj1Y9Qg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JNDDP24Bwz6tn9; Tue, 28 Dec 2021 00:20:37 +0100 (CET) From: Felix Gruber Date: Mon, 27 Dec 2021 23:19:43 +0000 Message-Id: <20211227231946.105095-2-felgru@posteo.net> In-Reply-To: <87czli9g3f.fsf@nicolasgoaziou.fr> References: <87czli9g3f.fsf@nicolasgoaziou.fr> 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/unicode.scm (ucd-next): New variable. --- gnu/packages/unicode.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 806fe05fb6..ef78875975 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -49,6 +49,20 @@ files listing Unicode character properties and related data. It also includes test data for conformance to several important Unicode algorithms.") (license unicode))) +(define-public ucd-next + (package + (inherit ucd) + (name "ucd-next") + (version "14.0.0") + (source + (origin + (method url-fetch/zipbomb) + (uri (string-append "https://www.unicode.org/Public/zipped/" version + "/UCD.zip")) + (sha256 + (base32 + "001nq9w52ijma0vps40xwy2q6ylpyf1393lzb128ibypnmv54fh3")))))) + (define (unicode-emoji-file name version hash) (origin (method url-fetch) From patchwork Mon Dec 27 23:19:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 35722 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 63B5F27BBEA; Mon, 27 Dec 2021 23:22:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D64D27BBE9 for ; Mon, 27 Dec 2021 23:22:49 +0000 (GMT) Received: from localhost ([::1]:34628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1zKK-0007gY-A7 for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 18:22:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1zId-0005ZV-Gq for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32986) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1zId-0008SP-4X for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1zId-0000SN-1L for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52789] [PATCH v2 2/4] gnu: Add libunibreak. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 23:21:02 +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: Nicolas Goaziou , 52789@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 52789-submit@debbugs.gnu.org id=B52789.16406472531687 (code B ref 52789); Mon, 27 Dec 2021 23:21:02 +0000 Received: (at 52789) by debbugs.gnu.org; 27 Dec 2021 23:20:53 +0000 Received: from localhost ([127.0.0.1]:44526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zIP-0000R3-Hi for submit@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:53 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zIK-0000QN-FR for 52789@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:45 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id E206B24002B for <52789@debbugs.gnu.org>; Tue, 28 Dec 2021 00:20:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640647238; bh=cOi/expp2frgyjNh7qE3Bu1I+GMGdAnkUYGa51PHsA4=; h=From:To:Cc:Subject:Date:From; b=lUViE5D/FEE/8xvbd3Upp26B0jkKitbEDX30LWxVwvHIAhjSb8BwMljthxI2oUqaY Vw7FRjrKN9VEIonFkz1HIbQZNPbKQtl2exDacukCG9ae3+V31ncjDPcA5KM0MPix+D UtIxa2DSmJHrUcqVqVsnAudX6g3pPCXZqxEApVcNJ4Yy666KSh8uoEFbicN5oXkGw5 1uVYqyBCPDvTps8xqs5BPwO7Rd2F4Lm0+xAfihRenzziSuH8llPtuE794Nb3QWhptv 0VWreoKchEvPMeiZMIJ7fPbBkO8pLVPNdf4FRUCYh/JJxD3Ehtr3o+WbBT296rF/lb 0Sj6YAxmx7hVQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JNDDQ07brz9rxG; Tue, 28 Dec 2021 00:20:37 +0100 (CET) From: Felix Gruber Date: Mon, 27 Dec 2021 23:19:44 +0000 Message-Id: <20211227231946.105095-3-felgru@posteo.net> In-Reply-To: <87czli9g3f.fsf@nicolasgoaziou.fr> References: <87czli9g3f.fsf@nicolasgoaziou.fr> 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/unicode.scm (libunibreak): New variable. --- gnu/packages/unicode.scm | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index ef78875975..23c5de195c 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,13 +19,62 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages unicode) + #:use-module (gnu packages autotools) + #:use-module (guix git-download) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system copy) + #:use-module (guix build-system gnu) #:use-module (guix build-system trivial)) +(define-public libunibreak + (package + (name "libunibreak") + (version "5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/adah1972/libunibreak") + (commit (string-append "libunibreak_" + (string-replace-substring version "." "_"))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r5dndhwsiy65lmavz3vdgal9nl8g97hbmdjg6zyq3zh5hs87vwf")))) + (build-system gnu-build-system) + (native-inputs + (list autoconf-wrapper + automake + libtool + ucd-next ; required for tests + )) + (arguments + `(#:parallel-tests? #f ; parallel tests cause non-deterministic + ; build failures + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + (for-each (lambda (file) + (copy-file + (search-input-file inputs + (string-append "/share/ucd/auxiliary/" + file)) + (string-append "src/" file))) + '("LineBreakTest.txt" + "WordBreakTest.txt" + "GraphemeBreakTest.txt"))))))) + (home-page "http://vimgadgets.sourceforge.net/libunibreak/") + (synopsis "Unicode line breaking and word breaking algorithms") + (description + "Libunibreak is an implementation of the line breaking and word +breaking algorithms as described in Unicode Standard Annex 14 and +Unicode Standard Annex 29. It is designed to be used in a generic text +renderer.") + (license zlib))) + (define-public ucd (package (name "ucd") From patchwork Mon Dec 27 23:19:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 35723 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 D46AD27BBEA; Mon, 27 Dec 2021 23:22:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9895927BBE9 for ; Mon, 27 Dec 2021 23:22:54 +0000 (GMT) Received: from localhost ([::1]:35064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1zKP-0007pX-RE for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 18:22:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1zIe-0005aF-Gc for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32988) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1zId-0008TX-SU for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1zId-0000Sb-PP for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52789] [PATCH v2 3/4] gnu: Add naev-artwork. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 23:21: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: Nicolas Goaziou , 52789@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 52789-submit@debbugs.gnu.org id=B52789.16406472541701 (code B ref 52789); Mon, 27 Dec 2021 23:21:03 +0000 Received: (at 52789) by debbugs.gnu.org; 27 Dec 2021 23:20:54 +0000 Received: from localhost ([127.0.0.1]:44530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zIT-0000RH-RN for submit@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:54 -0500 Received: from mout02.posteo.de ([185.67.36.66]:49221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zIL-0000QP-HW for 52789@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:46 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A35D0240107 for <52789@debbugs.gnu.org>; Tue, 28 Dec 2021 00:20:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640647239; bh=qTyBV2p6wlfMbYUGaoYxJIHFizQk+FxaCDzrWoqMG0o=; h=From:To:Cc:Subject:Date:From; b=mGsd7parQiqC/gAKK3KWc7PlALnviWsUercNNsadd1DM6GgqQzB9dtQgRy2WpHU1/ ibdftXuVaRksEOs8X9wxYmjOtjcjb2MTt2eS5JLr0ooCmxf7PFSfFV7TKLUK69qdEk KuJ33A4eqnyZ/eokVbEaVQ1DzuAa2vlFOgnvllANWC9NxS1VQSAqmYM1zwiH0aIOLn 6qX3UOb4rC4U2J9hOXfqU4EhhrdzhLnahJJX9ndfAyYArA0IhioBWN3MSsYh5JCCAJ HoNb5eI+mcvjFV11cW3iGC14rj+bvv2JZIrI1QNTUKr3jhG7UMm8uPDu81hv6HvPnV 0QOPTUKALN3hQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JNDDQ6rRBz9rxG; Tue, 28 Dec 2021 00:20:38 +0100 (CET) From: Felix Gruber Date: Mon, 27 Dec 2021 23:19:45 +0000 Message-Id: <20211227231946.105095-4-felgru@posteo.net> In-Reply-To: <87czli9g3f.fsf@nicolasgoaziou.fr> References: <87czli9g3f.fsf@nicolasgoaziou.fr> 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 (naev-artwork): New variable. --- gnu/packages/games.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 781074ed7c..8df44ffbed 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7958,6 +7958,34 @@ of lore accompanying everything from planets to equipment.") license:cc-by4.0 license:cc-by-sa4.0)))) +(define-public naev-artwork + (let ((version "0.9.0") + (commit "7f38a772ef2618f199ea68ecbd9f5c97e357fe36")) + (package + (name "naev-artwork") + (version (git-version version "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/naev/naev-artwork-production") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1g3dk3372k6g7k9andkip0vk146kwy43x98xwzzqdry1pa5m56v0")))) + (build-system copy-build-system) + (home-page "https://naev.org/") + (synopsis "Game about space exploration, trade and combat — data files") + (description + "This package contains graphics and sound files for Naev.") + (license (list 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 frotz-dumb-terminal (package (name "frotz-dumb-terminal") From patchwork Mon Dec 27 23:19:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 35721 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 5D6F327BBEA; Mon, 27 Dec 2021 23:22:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D014F27BBE9 for ; Mon, 27 Dec 2021 23:22:14 +0000 (GMT) Received: from localhost ([::1]:33822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1zJm-0007Gn-1v for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 18:22:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1zId-0005Zi-Uq for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1zId-0008Sj-GO for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1zId-0000SU-DB for guix-patches@gnu.org; Mon, 27 Dec 2021 18:21:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52789] [PATCH v2 4/4] gnu: naev: Update to 0.9.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 23:21: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: Nicolas Goaziou , 52789@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 52789-submit@debbugs.gnu.org id=B52789.16406472531695 (code B ref 52789); Mon, 27 Dec 2021 23:21:03 +0000 Received: (at 52789) by debbugs.gnu.org; 27 Dec 2021 23:20:53 +0000 Received: from localhost ([127.0.0.1]:44528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zIT-0000RA-EG for submit@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:53 -0500 Received: from mout01.posteo.de ([185.67.36.65]:42961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zIL-0000QQ-I6 for 52789@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:46 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 03C41240026 for <52789@debbugs.gnu.org>; Tue, 28 Dec 2021 00:20:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640647240; bh=8REkSCXUoFx873qtbhcTNnSA89fqGw2x6zZMskN/OTc=; h=From:To:Cc:Subject:Date:From; b=gH53JYeXyLOrua3BT40nUKWZnW0X07cBB7r432x6NSGppT34RFHmDEYY6uT7jtZNv NU1aJrWOnwRyrI7UfNmozmY2ecLU/XBtBk1F/+ubpg6YKoI7aAzOldFs6vM7m9BtR2 hdMKOiQydS8DzdGfF70fhbGZbBy2lCRqopCyfKFeijcIz8LuP/Sld+gQ9SugokCawS 3bGMMm0fOmhpjwdOqnozFmfp14ifkfc1Jw5wLl9DWxYJ+TdUvSEzVR+xzXJBAZ0GNc x4xYidBrLTQ6cYddWtVhfNAQEtqpfy/ffFHF2B9Gu5BU6McGL8GS473UZfuuclKfq7 S62xPnZ/94aUQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JNDDR2jTrz6tqD; Tue, 28 Dec 2021 00:20:39 +0100 (CET) From: Felix Gruber Date: Mon, 27 Dec 2021 23:19:46 +0000 Message-Id: <20211227231946.105095-5-felgru@posteo.net> In-Reply-To: <87czli9g3f.fsf@nicolasgoaziou.fr> References: <87czli9g3f.fsf@nicolasgoaziou.fr> 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 (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 8df44ffbed..a1b4409b91 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) @@ -7902,7 +7903,7 @@ ncurses for text display.") (define-public naev (package (name "naev") - (version "0.8.2") + (version "0.9.0") (source (origin (method git-fetch) @@ -7911,28 +7912,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 @@ -7949,14 +7962,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")