From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 25 08:35:07 2021 Received: (at submit) by debbugs.gnu.org; 25 Dec 2021 13:35:07 +0000 Received: from localhost ([127.0.0.1]:38672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n17CV-0000eW-Jr for submit@debbugs.gnu.org; Sat, 25 Dec 2021 08:35:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:34974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n17CQ-0000eH-7V for submit@debbugs.gnu.org; Sat, 25 Dec 2021 08:35:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n17CN-0002vR-PV for guix-patches@gnu.org; Sat, 25 Dec 2021 08:35:02 -0500 Received: from mout02.posteo.de ([185.67.36.66]:48377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n17CK-0007lS-1w for guix-patches@gnu.org; Sat, 25 Dec 2021 08:34:59 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id EF9E6240101 for ; Sat, 25 Dec 2021 14:34:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640439279; bh=7/w2bOgNTfezFMBvGmNa5rJtCIevVqxkM/4He6l9S9Y=; h=From:To:Cc:Subject:Date:From; b=mKMvGzmseou2r4LpKrQO3J/CKhc5JeGiVrERAQRskeA0yzgDUhnz5owaw8pw/xumF v3J8hEDXnmbutPhgqhyzJGA2FdKELGAZwi9TU93PeYaTYYzEATN5KEK4EwzxAZmvFV 2D5w9CapvyR2+wg1pl0F9Df7GG1pamXBLkqq/IM+0HQukG373VIFdseDI89N4SK2g8 sPnYiZS6xFdh3ituZuo6vXXJAFVoiKHofm+rgGCqCmEHQFbHkeAoeJj8kO4jHjpgmH qvOLDWw250kmMkG1P5QIjEeihmGc+fEmtyFRkSVBlUExO2zgU5nTbTS8huH+uIAam7 DMghzPENTiXsw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JLlK96Sytz6tmb; Sat, 25 Dec 2021 14:34:37 +0100 (CET) From: Felix Gruber To: guix-patches@gnu.org Subject: [PATCH 0/3] Update naev to 0.9.0 Date: Sat, 25 Dec 2021 13:34:20 +0000 Message-Id: <20211225133420.2456-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This patch series updates naev to 0.9.0 and adds its two new dependencies naev-artwork and libunibreak. Felix Gruber (3): gnu: Add libunibreak. gnu: Add naev-artwork. gnu: naev: Update to 0.9.0. gnu/packages/games.scm | 74 +++++++++++++++++++++++++++++----------- gnu/packages/unicode.scm | 48 ++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 20 deletions(-) -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 25 08:37:28 2021 Received: (at 52789) by debbugs.gnu.org; 25 Dec 2021 13:37:28 +0000 Received: from localhost ([127.0.0.1]:38678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n17El-0000jH-VP for submit@debbugs.gnu.org; Sat, 25 Dec 2021 08:37:28 -0500 Received: from mout02.posteo.de ([185.67.36.66]:40133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n17Ej-0000ix-VD for 52789@debbugs.gnu.org; Sat, 25 Dec 2021 08:37:26 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 30928240104 for <52789@debbugs.gnu.org>; Sat, 25 Dec 2021 14:37:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640439440; bh=taKtth7d44SrWLFYhmsb5XOgcaePG3y5VjhzO7b0xO0=; h=From:To:Cc:Subject:Date:From; b=Pp1+ZGR+F9ZwBoowf1jAGj1NJ9fZ3LWiJxAGQfUYaiR1UilZP+L61U6nWW2qkZK3y jB9KM0ThVZAdqU2h+GmCywDqSJ2FnELxfo2CKXP6lCI3f2X8RSzFdZGsDw8FzhbeaT kAej8uyJ9qFFoXR6zDubSQlwkDqk5Weu78OqrXkXhVtG356ESd5XjnLVTW8mUsnuYf A4YO2QpIsrBD3oE99nwnmAh7YzGJBypM6JRdliDJlRi2t3+JN9irkW6W3oKD0eCEKY hzyAqwYFhID9X5b920x7NnNW75PyAhgsbf4zVdBjVME89vwOtD988PYu9q9VHJLCmj 56a11F8TqWDCA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JLlNH0qmHz9rxK; Sat, 25 Dec 2021 14:37:18 +0100 (CET) From: Felix Gruber To: 52789@debbugs.gnu.org Subject: [PATCH 1/3] gnu: Add libunibreak. Date: Sat, 25 Dec 2021 13:37:04 +0000 Message-Id: <20211225133706.2964-1-felgru@posteo.net> In-Reply-To: <20211225133420.2456-1-felgru@posteo.net> References: <20211225133420.2456-1-felgru@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/unicode.scm (libunibreak): New variable. --- gnu/packages/unicode.scm | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 806fe05fb6..a5216a38dd 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,60 @@ ;;; 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 "4.2-1") + (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 + "182327vv2bqn5pr7v2ain0j4f2q97fvgimyv08vj66bqkxmhm7a3")))) + (build-system gnu-build-system) + (native-inputs + (list autoconf-wrapper + automake + libtool + ucd ; required for tests + )) + (arguments + `(#: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") -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 25 08:37:33 2021 Received: (at 52789) by debbugs.gnu.org; 25 Dec 2021 13:37:33 +0000 Received: from localhost ([127.0.0.1]:38682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n17Er-0000ja-9G for submit@debbugs.gnu.org; Sat, 25 Dec 2021 08:37:33 -0500 Received: from mout02.posteo.de ([185.67.36.66]:42417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n17Eo-0000j9-TF for 52789@debbugs.gnu.org; Sat, 25 Dec 2021 08:37:31 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 4C14C240101 for <52789@debbugs.gnu.org>; Sat, 25 Dec 2021 14:37:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640439445; bh=2Wj9HYlI0KDP0/DHGHjTbw876XYWz+Ov9TT6JTxDCvs=; h=From:To:Cc:Subject:Date:From; b=kTgM3yLXSKxt8zwoFGotu37ByrP7StjiLb1rRs3aMiNw/ydY6ma1aQ18MQTDJsEfm Q77Eell4pfOSuZu7Hp8uHJ3sdfH+VcebY1eZsLYBlBXQyeSdUhNhaSAudA9eHtO2PD awlXnESr+nDYTl0NdGqVVfsPXqwQ1dl0ykV5QXzXjDvQEGqvdTVd2GvxKQr3HHvYu8 gW0WVjmUJAWtBELx3sj7AUITTFFeaTikqZWG3KlnWEfW4Heqloq3FZxXoB/KQrBpzK l5carEjEC0BkMkmzXATgoGrIvR5zGAly8LhqlGkgEGTr8iGl+XqQ2dAeKDBBjOCvG+ RgtgdE/ogifmQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JLlNN3vyNz6tmK; Sat, 25 Dec 2021 14:37:24 +0100 (CET) From: Felix Gruber To: 52789@debbugs.gnu.org Subject: [PATCH 2/3] gnu: Add naev-artwork. Date: Sat, 25 Dec 2021 13:37:05 +0000 Message-Id: <20211225133706.2964-2-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 fa6865c050..ed194c1bfe 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7967,6 +7967,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") -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 25 08:37:37 2021 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 To: 52789@debbugs.gnu.org Subject: [PATCH 3/3] gnu: naev: Update to 0.9.0. 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-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 26 15:54:35 2021 Received: (at 52789) by debbugs.gnu.org; 26 Dec 2021 20:54:35 +0000 Received: from localhost ([127.0.0.1]:41686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1aXL-0000CW-78 for submit@debbugs.gnu.org; Sun, 26 Dec 2021 15:54:35 -0500 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:36605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1aXI-0000CI-WD for 52789@debbugs.gnu.org; Sun, 26 Dec 2021 15:54:33 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 50A74240004; Sun, 26 Dec 2021 20:54:26 +0000 (UTC) From: Nicolas Goaziou To: Felix Gruber Subject: Re: [bug#52789] [PATCH 1/3] gnu: Add libunibreak. References: <20211225133420.2456-1-felgru@posteo.net> <20211225133706.2964-1-felgru@posteo.net> Date: Sun, 26 Dec 2021 21:54:25 +0100 In-Reply-To: <20211225133706.2964-1-felgru@posteo.net> (Felix Gruber's message of "Sat, 25 Dec 2021 13:37:04 +0000") Message-ID: <87a6gnaxz2.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52789 Cc: 52789@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Felix Gruber writes: > * gnu/packages/unicode.scm (libunibreak): New variable. Thanks. However, the check phase fails for me with the following backtrace: --8<---------------cut here---------------start------------->8--- starting phase `check' Making check in src make[1]: Entering directory '/tmp/guix-build-libunibreak-4.2-1.drv-0/source/src' gcc -DHAVE_CONFIG_H -I. -I.. -I. -g -O2 -MT tests-tests.o -MD -MP -MF .deps/tests-tests.Tpo -c -o tests-tests.o `test -f 'tests.c' || echo './'`tests.c make tests make[2]: Entering directory '/tmp/guix-build-libunibreak-4.2-1.drv-0/source/src' gcc -DHAVE_CONFIG_H -I. -I.. -I. -g -O2 -MT tests-tests.o -MD -MP -MF .deps/tests-tests.Tpo -c -o tests-tests.o `test -f 'tests.c' || echo './'`tests.c mv -f .deps/tests-tests.Tpo .deps/tests-tests.Po /gnu/store/vx6vfbmmazvfi7vp8xyjn2mcyylvw9gn-bash-minimal-5.1.8/bin/bash ../libtool --tag=CC --mode=link gcc -g -O2 -o tests tests-tests.o libunibreak.la mv -f .deps/tests-tests.Tpo .deps/tests-tests.Po mv: cannot stat '.deps/tests-tests.Tpo': No such file or directory make[2]: *** [Makefile:577: tests-tests.o] Error 1 make[2]: Leaving directory '/tmp/guix-build-libunibreak-4.2-1.drv-0/source/src' make[1]: *** [Makefile:702: check-am] Error 2 make[1]: *** Waiting for unfinished jobs.... libtool: link: gcc -g -O2 -o .libs/tests tests-tests.o ./.libs/libunibreak.so -Wl,-rpath -Wl,/gnu/store/s8vii50z9pw3q48dmmgfcbv613dhwfmc-libunibreak-4.2-1/lib make[1]: Leaving directory '/tmp/guix-build-libunibreak-4.2-1.drv-0/source/src' make: *** [Makefile:458: check-recursive] Error 1 --8<---------------cut here---------------end--------------->8--- Also, libunibreak 5.0 is out. Would it make sense to update it? Regard, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 09:48:52 2021 Received: (at 52789) by debbugs.gnu.org; 27 Dec 2021 14:48:52 +0000 Received: from localhost ([127.0.0.1]:42432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1rIl-0002qC-CX for submit@debbugs.gnu.org; Mon, 27 Dec 2021 09:48:52 -0500 Received: from mout02.posteo.de ([185.67.36.66]:34649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1rIj-0002pt-0n for 52789@debbugs.gnu.org; Mon, 27 Dec 2021 09:48:37 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id BA27B240101 for <52789@debbugs.gnu.org>; Mon, 27 Dec 2021 15:48:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640616510; bh=mChdzXO8LP/yMupZHus2am/ISuK8sR4BlGZuGmjXTOQ=; h=Subject:To:Cc:From:Date:From; b=lVf/Spy4gfR4bxjkzkX4XTqO9VY0pf1rbvOHx5qPF1RGe8XO33V7lbjNb5t31clwE 479HVYOSrrOeFAaLYsMaXwp1FzpGjwXJwzMr0Ya2wktFhqmS828aM1tqygWQNKQ66j OALlrSByXg7A4Yt5nLC4WcgE8AbhVu3K3RHTHpIU4SbT/M7GkCGXuf89ck225e6Rty eLVF1o6OIKGd0ZU+WaNUppOpnf3sT6vIOoS4zw+nb3X8PX3cKTwCGA1pwXE6+epThT nVXt+HkLtJvTpXiD/Ccn4PoincZuNOtTF05uH8twKGH8WRQ299ok8qvbRjm9g1L00/ HCPbiJfeXNIcA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JN0sV0Sgyz6tmR; Mon, 27 Dec 2021 15:48:29 +0100 (CET) Subject: Re: [bug#52789] [PATCH 1/3] gnu: Add libunibreak. To: Nicolas Goaziou References: <20211225133420.2456-1-felgru@posteo.net> <20211225133706.2964-1-felgru@posteo.net> <87a6gnaxz2.fsf@nicolasgoaziou.fr> From: Felix Gruber Message-ID: <547b73fb-1f60-d482-02b2-4734e2670e55@posteo.net> Date: Mon, 27 Dec 2021 14:48:22 +0000 MIME-Version: 1.0 In-Reply-To: <87a6gnaxz2.fsf@nicolasgoaziou.fr> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: 52789@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Nicolas, On 12/26/21 9:54 PM, Nicolas Goaziou wrote: > Felix Gruber writes: > >> * gnu/packages/unicode.scm (libunibreak): New variable. > > Thanks. > > However, the check phase fails for me with the following backtrace: > > --8<---------------cut here---------------start------------->8--- > starting phase `check' > Making check in src > make[1]: Entering directory '/tmp/guix-build-libunibreak-4.2-1.drv-0/source/src' > gcc -DHAVE_CONFIG_H -I. -I.. -I. -g -O2 -MT tests-tests.o -MD -MP -MF .deps/tests-tests.Tpo -c -o tests-tests.o `test -f 'tests.c' || echo './'`tests.c > make tests > make[2]: Entering directory '/tmp/guix-build-libunibreak-4.2-1.drv-0/source/src' > gcc -DHAVE_CONFIG_H -I. -I.. -I. -g -O2 -MT tests-tests.o -MD -MP -MF .deps/tests-tests.Tpo -c -o tests-tests.o `test -f 'tests.c' || echo './'`tests.c > mv -f .deps/tests-tests.Tpo .deps/tests-tests.Po > /gnu/store/vx6vfbmmazvfi7vp8xyjn2mcyylvw9gn-bash-minimal-5.1.8/bin/bash ../libtool --tag=CC --mode=link gcc -g -O2 -o tests tests-tests.o libunibreak.la > mv -f .deps/tests-tests.Tpo .deps/tests-tests.Po > mv: cannot stat '.deps/tests-tests.Tpo': No such file or directory > make[2]: *** [Makefile:577: tests-tests.o] Error 1 > make[2]: Leaving directory '/tmp/guix-build-libunibreak-4.2-1.drv-0/source/src' > make[1]: *** [Makefile:702: check-am] Error 2 > make[1]: *** Waiting for unfinished jobs.... > libtool: link: gcc -g -O2 -o .libs/tests tests-tests.o ./.libs/libunibreak.so -Wl,-rpath -Wl,/gnu/store/s8vii50z9pw3q48dmmgfcbv613dhwfmc-libunibreak-4.2-1/lib > make[1]: Leaving directory '/tmp/guix-build-libunibreak-4.2-1.drv-0/source/src' > make: *** [Makefile:458: check-recursive] Error 1 > --8<---------------cut here---------------end--------------->8--- Hmm, it seems that libunibreak's tests can cause non-deterministic test failures, probably because multiple make targets contain the line ``` mv -f .deps/tests-tests.Tpo .deps/tests-tests.Po ``` which causes race conditions between those targets. After adding the #:parallel-tests #f argument, I was able to built libunibreak five times in a row without observing any further build failures. > Also, libunibreak 5.0 is out. Would it make sense to update it? libunibreak 5.0 is based on Unicode 14, which unfortunately gives us test failures when we build it against our ucd package which only contains data for Unicode 12. libunibreak 4.2-1 was the last version based on Unicode 12. ucd has 505 (transitively) dependent packages, which is probably too much to update it on master. Do you think it would be viable to add a ucd-14 package next to our ucd package, so that I could update libunibreak to 5.0 using this new ucd-14 package as input? Best, Felix From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 11:18:23 2021 Received: (at 52789) by debbugs.gnu.org; 27 Dec 2021 16:18:23 +0000 Received: from localhost ([127.0.0.1]:44010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1shb-0008Lz-2H for submit@debbugs.gnu.org; Mon, 27 Dec 2021 11:18:23 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:43725) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1shZ-0008LW-1L for 52789@debbugs.gnu.org; Mon, 27 Dec 2021 11:18:22 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay12.mail.gandi.net (Postfix) with ESMTPSA id F14B7200005; Mon, 27 Dec 2021 16:18:13 +0000 (UTC) From: Nicolas Goaziou To: Felix Gruber Subject: Re: [bug#52789] [PATCH 1/3] gnu: Add libunibreak. References: <20211225133420.2456-1-felgru@posteo.net> <20211225133706.2964-1-felgru@posteo.net> <87a6gnaxz2.fsf@nicolasgoaziou.fr> <547b73fb-1f60-d482-02b2-4734e2670e55@posteo.net> Date: Mon, 27 Dec 2021 17:18:12 +0100 In-Reply-To: <547b73fb-1f60-d482-02b2-4734e2670e55@posteo.net> (Felix Gruber's message of "Mon, 27 Dec 2021 14:48:22 +0000") Message-ID: <87czli9g3f.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52789 Cc: 52789@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Felix Gruber writes: > libunibreak 5.0 is based on Unicode 14, which unfortunately gives us > test failures when we build it against our ucd package which only > contains data for Unicode 12. libunibreak 4.2-1 was the last version > based on Unicode 12. > ucd has 505 (transitively) dependent packages, which is probably too > much to update it on master. > > Do you think it would be viable to add a ucd-14 package next to our ucd > package, so that I could update libunibreak to 5.0 using this new ucd-14 > package as input? I think it should be done in two steps. First, do like above on master branch, perhaps naming it ucd-next, then replace ucd with ucd-next on staging branch. WDYT? Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 18:20:22 2021 Received: (at 52789) by debbugs.gnu.org; 27 Dec 2021 23:20:22 +0000 Received: from localhost ([127.0.0.1]:44518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zHy-0000Pu-Gr for submit@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:22 -0500 Received: from mout01.posteo.de ([185.67.36.65]:49303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zHs-0000PU-C8 for 52789@debbugs.gnu.org; Mon, 27 Dec 2021 18:20:20 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 29E5A240026 for <52789@debbugs.gnu.org>; Tue, 28 Dec 2021 00:20:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640647210; bh=eHuMznL7A1O4P923UOqXuA1r7FcZqTSmHlhuYAs4sV8=; h=From:To:Cc:Subject:Date:From; b=DCl5t2nxAQDz2Fut9e8vK4qNdpzRhI5nBstLPcMcBzHQP5J+YdkshxDdZ7qKtLGwb DGo0nJka/srjTOZ8iX9JIeJq9MkhHr2a/goIrCTZrm81sc5/4Mmbu8v03DvqlnmQbl y5ap3YGU/43q4Noj9NFJ3hJWK4XIqpwwrMCJAbZf4BTNvfJkJxJJj5IMM+vXNx4n3k S4owSgEE7xC6nBiXvqrwEMp7nYMJnp8fQOhxZiOOTkccwjOcIoYfs0lA6xnc0ite9a ZKwjXNMAwQANhzujkXE0LaaSZgRF/us2H8Xm1i75JFkgWTLBow037uCSxHIacAlvZ9 It3f9JiKTxUzA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JNDCr6PGtz6tnZ; Tue, 28 Dec 2021 00:20:08 +0100 (CET) From: Felix Gruber To: Nicolas Goaziou , 52789@debbugs.gnu.org Subject: [PATCH v2 0/4] Update naev to 0.9.0 Date: Mon, 27 Dec 2021 23:19:42 +0000 Message-Id: <20211227231946.105095-1-felgru@posteo.net> In-Reply-To: <87czli9g3f.fsf@nicolasgoaziou.fr> References: <87czli9g3f.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Nicolas, I've updated the patchset to add the ucd-next package as discussed and to package version 5.0 of libunibreak. I'll submit a separate patch for updating ucd to be applied to the staging branch. Felix Gruber (4): gnu: Add ucd-next. gnu: Add libunibreak. gnu: Add naev-artwork. gnu: naev: Update to 0.9.0. gnu/packages/games.scm | 74 +++++++++++++++++++++++++++++----------- gnu/packages/unicode.scm | 64 ++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 20 deletions(-) -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 18:20:46 2021 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 To: Nicolas Goaziou , 52789@debbugs.gnu.org Subject: [PATCH v2 1/4] gnu: Add ucd-next. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 18:20:53 2021 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 To: Nicolas Goaziou , 52789@debbugs.gnu.org Subject: [PATCH v2 2/4] gnu: Add libunibreak. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 18:20:53 2021 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 To: Nicolas Goaziou , 52789@debbugs.gnu.org Subject: [PATCH v2 4/4] gnu: naev: Update to 0.9.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 18:20:54 2021 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 To: Nicolas Goaziou , 52789@debbugs.gnu.org Subject: [PATCH v2 3/4] gnu: Add naev-artwork. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 18:26:15 2021 Received: (at 52789) by debbugs.gnu.org; 27 Dec 2021 23:26:15 +0000 Received: from localhost ([127.0.0.1]:44549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zNe-0000by-Vd for submit@debbugs.gnu.org; Mon, 27 Dec 2021 18:26:15 -0500 Received: from mout01.posteo.de ([185.67.36.65]:49171) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1zNc-0000bg-E9 for 52789@debbugs.gnu.org; Mon, 27 Dec 2021 18:26:13 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 2628C240027 for <52789@debbugs.gnu.org>; Tue, 28 Dec 2021 00:26:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640647566; bh=dYDOFE/YEBrUBd+tlrPraF10Apfu28Nx5BA6QI8VNuI=; h=From:To:Cc:Subject:Date:From; b=Omlzc2GkFK1YGSidNc89menrgUIskaI5LRA6oeeHOnWVTmR+cb8n8NRRAEIMPsXeh WMt5vaMEQjPfC/1LZW98nSgwx12+NI8l/YqHbzAdt3lW/ZNZv64OaTCkWf1DBKjLSl 5tIZRq92OhY7YFBhK0wnzocpaOBFgf75Yl18iAVj+rRK7OKeEa3mBgjy2S8Z5gTBxJ RIkFF/1w2PieTPi0vGRJGf9zzGFuT62ZVQs1Nb9HKaphgbRpUKkqN6CVzKk2VdAjiS jiHNfMoLkZOzegvSPZGouxzlGkn+WKUKS7ECVzG+xdWzcvkxjXa8WsycHOUAsEpBcN IHaAWgrZxltzQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JNDLj08nLz6tmg; Tue, 28 Dec 2021 00:26:05 +0100 (CET) From: Felix Gruber To: Nicolas Goaziou , 52789@debbugs.gnu.org Subject: [PATCH staging] gnu: ucd: Update to 14.0.0. Date: Mon, 27 Dec 2021 23:25:39 +0000 Message-Id: <20211227232539.105283-1-felgru@posteo.net> In-Reply-To: <20211227231946.105095-1-felgru@posteo.net> References: <20211227231946.105095-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52789 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/unicode.scm (ucd): Update to 14.0.0. (ucd-next): Remove as it is now identical to ucd. (libunibreak)[native-inputs]: Replace ucd-next with ucd. --- gnu/packages/unicode.scm | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 23c5de195c..7af3517af0 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -48,7 +48,7 @@ (list autoconf-wrapper automake libtool - ucd-next ; required for tests + ucd ; required for tests )) (arguments `(#:parallel-tests? #f ; parallel tests cause non-deterministic @@ -78,7 +78,7 @@ renderer.") (define-public ucd (package (name "ucd") - (version "12.0.0") + (version "14.0.0") (source (origin (method url-fetch/zipbomb) @@ -86,7 +86,7 @@ renderer.") "/UCD.zip")) (sha256 (base32 - "1ighy39cjkmqnv1797wrxjz76mv1fdw7zp5j04q55bkwxsdkvrmh")))) + "001nq9w52ijma0vps40xwy2q6ylpyf1393lzb128ibypnmv54fh3")))) (build-system copy-build-system) (arguments '(#:install-plan @@ -99,20 +99,6 @@ 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) -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 28 10:06:50 2021 Received: (at 52789-done) by debbugs.gnu.org; 28 Dec 2021 15:06:50 +0000 Received: from localhost ([127.0.0.1]:47186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2E3u-0000AU-4F for submit@debbugs.gnu.org; Tue, 28 Dec 2021 10:06:50 -0500 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:48495) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2E3s-0000AA-5l for 52789-done@debbugs.gnu.org; Tue, 28 Dec 2021 10:06:49 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 664AF240002; Tue, 28 Dec 2021 15:06:41 +0000 (UTC) From: Nicolas Goaziou To: Felix Gruber Subject: Re: [bug#52789] [PATCH v2 0/4] Update naev to 0.9.0 References: <87czli9g3f.fsf@nicolasgoaziou.fr> <20211227231946.105095-1-felgru@posteo.net> Date: Tue, 28 Dec 2021 16:06:40 +0100 In-Reply-To: <20211227231946.105095-1-felgru@posteo.net> (Felix Gruber's message of "Mon, 27 Dec 2021 23:19:42 +0000") Message-ID: <874k6sahvj.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52789-done Cc: 52789-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Felix Gruber writes: > I've updated the patchset to add the ucd-next package as discussed and > to package version 5.0 of libunibreak. Thank you. I applied them. > I'll submit a separate patch for updating ucd to be applied to the > staging branch. I tweaked this one because it couldn't be based off changes from master branch. Regards, -- Nicolas Goaziou From unknown Sun Jun 15 08:52:04 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 26 Jan 2022 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator