[bug#52789] [PATCH 0/3] Update naev to 0.9.0

[bug#52789] [PATCH 0/3] Update naev to 0.9.0

[Felix Gruber]

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

[bug#52789] [PATCH 1/3] gnu: Add libunibreak.

[Felix Gruber]

* 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 <liliana.prikler@gmail.com>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18,13 +19,60 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (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

[bug#52789] [PATCH 2/3] gnu: Add naev-artwork.

[Felix Gruber]

* 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

[bug#52789] [PATCH 3/3] gnu: naev: Update to 0.9.0.

[Felix Gruber]

* 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

[bug#52789] [PATCH 1/3] gnu: Add libunibreak.

[Nicolas Goaziou]

Hello,

Felix Gruber <felgru@posteo.net> 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

[bug#52789] [PATCH 1/3] gnu: Add libunibreak.

[Felix Gruber]

Hello Nicolas,

On 12/26/21 9:54 PM, Nicolas Goaziou wrote:
> Felix Gruber <felgru@posteo.net> 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

[bug#52789] [PATCH 1/3] gnu: Add libunibreak.

[Nicolas Goaziou]

Hello,

Felix Gruber <felgru@posteo.net> 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

[bug#52789] [PATCH v2 0/4] Update naev to 0.9.0

[Felix Gruber]

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

[bug#52789] [PATCH staging] gnu: ucd: Update to 14.0.0.

[Felix Gruber]

* 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

bug#52789: [PATCH v2 0/4] Update naev to 0.9.0

[Nicolas Goaziou]

Hello,

Felix Gruber <felgru@posteo.net> 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

[bug#52789] [PATCH v2 1/4] gnu: Add ucd-next.

[Felix Gruber]

* 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

[bug#52789] [PATCH v2 2/4] gnu: Add libunibreak.

[Felix Gruber]

* 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 <liliana.prikler@gmail.com>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18,13 +19,62 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (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

[bug#52789] [PATCH v2 3/4] gnu: Add naev-artwork.

[Felix Gruber]

* 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

[bug#52789] [PATCH v2 4/4] gnu: naev: Update to 0.9.0.

[Felix Gruber]

* 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