all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Felix Gruber <felgru@posteo.net>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>, 52789@debbugs.gnu.org
Cc: Felix Gruber <felgru@posteo.net>
Subject: [bug#52789] [PATCH v2 4/4] gnu: naev: Update to 0.9.0.
Date: Mon, 27 Dec 2021 23:19:46 +0000	[thread overview]
Message-ID: <20211227231946.105095-5-felgru@posteo.net> (raw)
In-Reply-To: <87czli9g3f.fsf@nicolasgoaziou.fr>

* 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





      parent reply	other threads:[~2021-12-27 23:22 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-25 13:34 [bug#52789] [PATCH 0/3] Update naev to 0.9.0 Felix Gruber
2021-12-25 13:37 ` [bug#52789] [PATCH 1/3] gnu: Add libunibreak Felix Gruber
2021-12-25 13:37   ` [bug#52789] [PATCH 2/3] gnu: Add naev-artwork Felix Gruber
2021-12-25 13:37   ` [bug#52789] [PATCH 3/3] gnu: naev: Update to 0.9.0 Felix Gruber
2021-12-26 20:54   ` [bug#52789] [PATCH 1/3] gnu: Add libunibreak Nicolas Goaziou
2021-12-27 14:48     ` Felix Gruber
2021-12-27 16:18       ` Nicolas Goaziou
2021-12-27 23:19         ` [bug#52789] [PATCH v2 0/4] Update naev to 0.9.0 Felix Gruber
2021-12-27 23:25           ` [bug#52789] [PATCH staging] gnu: ucd: Update to 14.0.0 Felix Gruber
2021-12-28 15:06           ` bug#52789: [PATCH v2 0/4] Update naev to 0.9.0 Nicolas Goaziou
2021-12-27 23:19         ` [bug#52789] [PATCH v2 1/4] gnu: Add ucd-next Felix Gruber
2021-12-27 23:19         ` [bug#52789] [PATCH v2 2/4] gnu: Add libunibreak Felix Gruber
2021-12-27 23:19         ` [bug#52789] [PATCH v2 3/4] gnu: Add naev-artwork Felix Gruber
2021-12-27 23:19         ` Felix Gruber [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211227231946.105095-5-felgru@posteo.net \
    --to=felgru@posteo.net \
    --cc=52789@debbugs.gnu.org \
    --cc=mail@nicolasgoaziou.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.