[bug#61237] [PATCH 0/1] gnu: font-google-noto-emoji: Install correct license file.

[bug#61237] [PATCH 0/1] gnu: font-google-noto-emoji: Install correct license file.

[Simon South]

Currently the font-google-noto-emoji package correctly specifies the font's
license as the SIL Open Font License but inadvertently installs a copy of the
Apache license instead in the package's output.

This is because the source package groups the font's data and license files
together in a "fonts" subdirectory, while the license file at the top level
applies to "Tools and most image resources" according to the package's
README.md.  By default, it's the file at the top level that's installed.

The patch that follows corrects this issue.  I've tested it on x86-64 and
AArch64 and it seems to work fine.

--
Simon South
simon@simonsouth.net


Simon South (1):
  gnu: font-google-noto-emoji: Install correct license file.

 gnu/packages/fonts.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


base-commit: 301f12832601eef6b130f3946d9d597ae43a514a
-- 
2.38.1

[bug#61237] [PATCH 1/1] gnu: font-google-noto-emoji: Install correct license file.

[Simon South]

* gnu/packages/fonts.scm (font-google-noto-emoji)[arguments]<#:phases>: Add
"enter-font-directory" phase; remove now-superfluous prefix from paths in
"remove-unsupported" phase.
---
 gnu/packages/fonts.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 634c48db00..06b1c43d82 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -982,11 +982,15 @@ (define-public font-google-noto-emoji
      (list
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-unsupported
+          (add-after 'unpack 'enter-font-directory
+            (lambda _
+              ;; Note this ensures the correct license file is installed.
+              (chdir "fonts")))
+          (add-after 'enter-font-directory 'remove-unsupported
             (lambda* _
-              (delete-file "fonts/NotoColorEmoji_WindowsCompatible.ttf")
-              (delete-file "fonts/Noto-COLRv1-noflags.ttf")
-              (delete-file "fonts/Noto-COLRv1.ttf"))))))
+              (delete-file "NotoColorEmoji_WindowsCompatible.ttf")
+              (delete-file "Noto-COLRv1-noflags.ttf")
+              (delete-file "Noto-COLRv1.ttf"))))))
     (home-page "https://fonts.google.com/noto/specimen/Noto+Color+Emoji")
     (synopsis "Font for rendering color emoji characters")
     (description
-- 
2.38.1

[bug#61237] [PATCH 0/1] gnu: font-google-noto-emoji: Install correct license file.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 778 bytes --]


Simon South <simon@simonsouth.net> writes:

> Currently the font-google-noto-emoji package correctly specifies the font's
> license as the SIL Open Font License but inadvertently installs a copy of the
> Apache license instead in the package's output.
>
> This is because the source package groups the font's data and license files
> together in a "fonts" subdirectory, while the license file at the top level
> applies to "Tools and most image resources" according to the package's
> README.md.  By default, it's the file at the top level that's installed.
>
> The patch that follows corrects this issue.  I've tested it on x86-64 and
> AArch64 and it seems to work fine.

Looks good to me, I've pushed this master as
9a4dd01f1da2681fef8f89d43a43efa4ccbb5a16.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

bug#61237: [PATCH 0/1] gnu: font-google-noto-emoji: Install correct license file.

[Christopher Baines]

Marking as done.