[bug#30960] [PATCH 0/4] Switch to font-build-system

[bug#30960] [PATCH 0/4] Switch to font-build-system

[Arun Isaac]

If someone could do a quick sanity check on these patches, I'll push.

Thanks!

Arun Isaac (4):
  gnu: font-lato: Switch to font-build-system.
  gnu: font-linuxlibertine: Switch to font-build-system.
  gnu: culmus: Switch to font-build-system.
  gnu: culmus: Rename to font-culmus.

 gnu/packages/fonts.scm | 133 +++++++++++++++----------------------------------
 1 file changed, 39 insertions(+), 94 deletions(-)

-- 
2.15.1

[bug#30960] [PATCH 1/4] gnu: font-lato: Switch to font-build-system.

[Arun Isaac]

* gnu/packages/fonts.scm (font-lato): Switch to font-build-system.
---
 gnu/packages/fonts.scm | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f57d5114a..567483889 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -202,27 +202,7 @@ sans-serif designed for on-screen reading.  It is used by GNOME@tie{}3.")
               (sha256
                (base32
                 "1f5540g0ja1nx3ddd3ywn77xc81ssrxpq8n3gyb9sabyq2b4xda2"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder (begin
-                   (use-modules (guix build utils)
-                                (srfi srfi-26))
-
-                   (let ((PATH     (string-append (assoc-ref %build-inputs
-                                                             "unzip")
-                                                  "/bin"))
-                         (font-dir (string-append %output
-                                                  "/share/fonts/truetype")))
-                     (setenv "PATH" PATH)
-                     (system* "unzip" (assoc-ref %build-inputs "source"))
-
-                     (mkdir-p font-dir)
-                     (for-each (lambda (ttf)
-                                 (install-file ttf font-dir))
-                               (find-files "." "\\.ttf$"))))))
-
-    (native-inputs `(("unzip" ,unzip)))
+    (build-system font-build-system)
     (home-page "http://www.latofonts.com/lato-free-fonts/")
     (synopsis "Lato sans-serif typeface")
     (description
-- 
2.15.1

[bug#30960] [PATCH 2/4] gnu: font-linuxlibertine: Switch to font-build-system.

[Arun Isaac]

* gnu/packages/fonts.scm (font-linuxlibertine): Switch to font-build-system.
[arguments]: Replace system* with invoke.
---
 gnu/packages/fonts.scm | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 567483889..763214647 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -305,37 +305,24 @@ The Liberation Fonts are sponsored by Red Hat.")
               (sha256
                (base32
                 "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"))))
-    (build-system gnu-build-system)
+    (build-system font-build-system)
     (arguments
-     `(#:tests? #f ; there are no tests
-       #:modules ((guix build utils)
-                  (guix build gnu-build-system)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
+         (add-before 'install 'build
            (lambda _
              (let ((compile
                     (lambda (name ext)
-                      (zero? (system*
-                              "fontforge" "-lang=ff"
-                              "-c" (string-append "Open('" name "');"
-                                                  "Generate('"
-                                                  (basename name "sfd") ext
-                                                  "')"))))))
-               (every (lambda (name)
-                        (and (compile name "ttf")
-                             (compile name "otf")))
-                      (find-files "." "\\.sfd$")))))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((font-dir (string-append (assoc-ref outputs "out")
-                                            "/share/fonts/truetype")))
-               (mkdir-p font-dir)
-               (for-each (cut install-file <> font-dir)
-                         (find-files "." "\\.(otf|ttf)$"))
+                      (invoke
+                       "fontforge" "-lang=ff"
+                       "-c" (string-append "Open('" name "');"
+                                           "Generate('"
+                                           (basename name "sfd") ext
+                                           "')")))))
+               (for-each (lambda (name)
+                           (and (compile name "ttf")
+                                (compile name "otf")))
+                         (find-files "." "\\.sfd$"))
                #t))))))
     (native-inputs
      `(("fontforge" ,fontforge)))
-- 
2.15.1

[bug#30960] [PATCH 3/4] gnu: culmus: Switch to font-build-system.

[Arun Isaac]

* gnu/packages/fonts.scm (culmus): Switch to font-build-system.
[arguments]: Replace system* with invoke.
---
 gnu/packages/fonts.scm | 52 +++++++++++++++-----------------------------------
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 763214647..a58478d43 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1202,49 +1202,27 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold")
         (sha256
          (base32
           "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z"))))
-    (build-system gnu-build-system)
+    (build-system font-build-system)
     (arguments
-     `(#:tests? #f ; no tests
-       #:modules ((guix build utils)
-                  (guix build gnu-build-system)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
+         (add-before 'install 'build
            (lambda _
              (let ((compile
                     (lambda (name ext)
-                      (zero? (system*
-                              "fontforge" "-lang=ff"
-                              "-c" (string-append "Open('" name "');"
-                                                  "Generate('"
-                                                  (basename name "sfd") ext
-                                                  "')"))))))
+                      (invoke
+                       "fontforge" "-lang=ff"
+                       "-c" (string-append "Open('" name "');"
+                                           "Generate('"
+                                           (basename name "sfd") ext
+                                           "')")))))
                ;; This part based on the fonts shipped in the non-source package.
-               (every (lambda (name)
-                        (compile name "ttf"))
-                      (find-files "." "^[^Nachlieli].*\\.sfd$"))
-               (every (lambda (name)
-                        (compile name "otf"))
-                      (find-files "." "^Nachlieli.*\\.sfd$"))
-               #t)))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out     (assoc-ref %outputs "out"))
-                    (ttf     (string-append out "/share/fonts/truetype"))
-                    (otf     (string-append out "/share/fonts/opentype"))
-                    (license (string-append out "/share/doc/" ,name)))
-               (for-each (lambda (file)
-                           (install-file file ttf))
-                         (find-files "." "\\.ttf$"))
-               (for-each (lambda (file)
-                           (install-file file otf))
-                         (find-files "." "\\.otf$"))
-               (for-each (lambda (file)
-                           (install-file file license))
-                         '("GNU-GPL" "LICENSE" "LICENSE-BITSTREAM"))
+               (for-each (lambda (name)
+                           (compile name "ttf"))
+                         (find-files "." "^[^Nachlieli].*\\.sfd$"))
+               (for-each (lambda (name)
+                           (compile name "otf"))
+                         (find-files "." "^Nachlieli.*\\.sfd$"))
                #t))))))
     (native-inputs
      `(("fontforge" ,fontforge)))
-- 
2.15.1

[bug#30960] [PATCH 4/4] gnu: culmus: Rename to font-culmus.

[Arun Isaac]

* gnu/packages/fonts.scm (culmus): Rename to...
(font-culmus): ...this. Re-indent.
---
 gnu/packages/fonts.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index a58478d43..7cfd3318d 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1189,19 +1189,19 @@ It comes in 7 incremental weights:
 ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold")
     (license license:silofl1.1)))
 
-(define-public culmus
+(define-public font-culmus
   (package
-    (name "culmus")
+    (name "font-culmus")
     (version "0.132")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://sourceforge.net/projects/"
-                            "culmus/files/culmus/" version "/culmus-src-"
-                            version ".tar.gz"))
-        (sha256
-         (base32
-          "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://sourceforge.net/projects/"
+                           "culmus/files/culmus/" version "/culmus-src-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z"))))
     (build-system font-build-system)
     (arguments
      `(#:phases
-- 
2.15.1

[bug#30960] [PATCH 0/4] Switch to font-build-system

[ng0]

Arun Isaac transcribed 430 bytes:
> If someone could do a quick sanity check on these patches, I'll push.

What does that mean? Did you not build them? Or just a simple request
for review?
I know I had my reasons for not using font-build-system with lato, but
maybe you succeeded.

> Thanks!
> 
> Arun Isaac (4):
>   gnu: font-lato: Switch to font-build-system.
>   gnu: font-linuxlibertine: Switch to font-build-system.
>   gnu: culmus: Switch to font-build-system.
>   gnu: culmus: Rename to font-culmus.
> 
>  gnu/packages/fonts.scm | 133 +++++++++++++++----------------------------------
>  1 file changed, 39 insertions(+), 94 deletions(-)
> 
> -- 
> 2.15.1
> 
> 
> 
> 

[bug#30960] [PATCH 0/4] Switch to font-build-system

[Arun Isaac]

ng0 <ng0@n0.is> writes:

> Arun Isaac transcribed 430 bytes:
>> If someone could do a quick sanity check on these patches, I'll push.
>
> What does that mean? Did you not build them? Or just a simple request
> for review?

I built all packages successfully. This is just a request to check
commit messages, point out any simple typos, etc.

> I know I had my reasons for not using font-build-system with lato, but
> maybe you succeeded.

Yes, I was able to build font-lato using the font-build-system. If you
have an issue with using the font-build-system, do let me know.

Thanks!

[bug#30960] [PATCH 0/4] Switch to font-build-system

[ng0]

Arun Isaac transcribed 585 bytes:
> ng0 <ng0@n0.is> writes:
> 
> > Arun Isaac transcribed 430 bytes:
> >> If someone could do a quick sanity check on these patches, I'll push.
> >
> > What does that mean? Did you not build them? Or just a simple request
> > for review?
> 
> I built all packages successfully. This is just a request to check
> commit messages, point out any simple typos, etc.

Okay

> > I know I had my reasons for not using font-build-system with lato, but
> > maybe you succeeded.
> 
> Yes, I was able to build font-lato using the font-build-system. If you
> have an issue with using the font-build-system, do let me know.

So I applied all your patches, all except lato built without errors.
Lato:

...
phase `install-license-files' succeeded after 0.0 seconds
starting phase `reset-gzip-timestamps'
find-files: /gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010: No such file or directory
phase `reset-gzip-timestamps' succeeded after 0.0 seconds
starting phase `compress-documentation'
phase `compress-documentation' succeeded after 0.0 seconds
builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
@ build-failed /gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv - 1 builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
guix build: error: build failed: build of `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed

Which could be what I experienced when I first tried to build it with the font-build-system
and then switched to what it uses now in master.

> Thanks!
> 
> 
> 

[bug#30960] [PATCH 0/4] Switch to font-build-system

[Arun Isaac]

> phase `install-license-files' succeeded after 0.0 seconds
> starting phase `reset-gzip-timestamps'
> find-files: /gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010: No such file or directory
> phase `reset-gzip-timestamps' succeeded after 0.0 seconds
> starting phase `compress-documentation'
> phase `compress-documentation' succeeded after 0.0 seconds
> builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
> @ build-failed /gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv - 1 builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
> guix build: error: build failed: build of `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed
>
> Which could be what I experienced when I first tried to build it with the font-build-system
> and then switched to what it uses now in master.

I tried building font-lato again on my machine, and it worked. I suspect
this problem you are facing is due to the __MACOSX folders in the zip
archive. I'm sending in a new patchset with url-fetch/zipbomb instead of
url-fetch. Let me know if it works.

Thanks.

[bug#30960] [PATCH 0/4] Switch to font-build-system

[ng0]

Arun Isaac transcribed 1.3K bytes:
> 
> > phase `install-license-files' succeeded after 0.0 seconds
> > starting phase `reset-gzip-timestamps'
> > find-files: /gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010: No such file or directory
> > phase `reset-gzip-timestamps' succeeded after 0.0 seconds
> > starting phase `compress-documentation'
> > phase `compress-documentation' succeeded after 0.0 seconds
> > builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
> > @ build-failed /gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv - 1 builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
> > guix build: error: build failed: build of `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed
> >
> > Which could be what I experienced when I first tried to build it with the font-build-system
> > and then switched to what it uses now in master.
> 
> I tried building font-lato again on my machine, and it worked. I suspect
> this problem you are facing is due to the __MACOSX folders in the zip

Out of scope of this patchset, but:
Those aren't really necessary in the use. Couldn't we just instruct the font-build-system
to ignore and/or delete them?

> archive. I'm sending in a new patchset with url-fetch/zipbomb instead of
> url-fetch. Let me know if it works.
>
> Thanks.

[bug#30960] [PATCH 0/4] Switch to font-build-system

[ng0]

ng0 transcribed 1.5K bytes:
> Arun Isaac transcribed 1.3K bytes:
> > 
> > > phase `install-license-files' succeeded after 0.0 seconds
> > > starting phase `reset-gzip-timestamps'
> > > find-files: /gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010: No such file or directory
> > > phase `reset-gzip-timestamps' succeeded after 0.0 seconds
> > > starting phase `compress-documentation'
> > > phase `compress-documentation' succeeded after 0.0 seconds
> > > builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
> > > @ build-failed /gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv - 1 builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
> > > guix build: error: build failed: build of `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed
> > >
> > > Which could be what I experienced when I first tried to build it with the font-build-system
> > > and then switched to what it uses now in master.
> > 
> > I tried building font-lato again on my machine, and it worked. I suspect
> > this problem you are facing is due to the __MACOSX folders in the zip
> 
> Out of scope of this patchset, but:
> Those aren't really necessary in the use. Couldn't we just instruct the font-build-system
> to ignore and/or delete them?
> 
> > archive. I'm sending in a new patchset with url-fetch/zipbomb instead of
> > url-fetch. Let me know if it works.

New patch-series lato build without problems.

> > Thanks.

[bug#30960] [PATCH 0/4] Switch to font-build-system

[ng0]

ng0 transcribed 1.5K bytes:
> Arun Isaac transcribed 1.3K bytes:
> > 
> > > phase `install-license-files' succeeded after 0.0 seconds
> > > starting phase `reset-gzip-timestamps'
> > > find-files: /gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010: No such file or directory
> > > phase `reset-gzip-timestamps' succeeded after 0.0 seconds
> > > starting phase `compress-documentation'
> > > phase `compress-documentation' succeeded after 0.0 seconds
> > > builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
> > > @ build-failed /gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv - 1 builder for `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed to produce output path `/gnu/store/8zr56l7gh1rh76l8gdyy2j5hn84r56nv-font-lato-2.010'
> > > guix build: error: build failed: build of `/gnu/store/85xg1bvd3xq79y41f7rvasy73jzpkcba-font-lato-2.010.drv' failed
> > >
> > > Which could be what I experienced when I first tried to build it with the font-build-system
> > > and then switched to what it uses now in master.
> > 
> > I tried building font-lato again on my machine, and it worked. I suspect
> > this problem you are facing is due to the __MACOSX folders in the zip
> 
> Out of scope of this patchset, but:
> Those aren't really necessary in the use. Couldn't we just instruct the font-build-system
> to ignore and/or delete them?
> 
> > archive. I'm sending in a new patchset with url-fetch/zipbomb instead of
> > url-fetch. Let me know if it works.

Yes, it does. New patch series LGTM.

> > Thanks.

bug#30960: [PATCH 0/4] Switch to font-build-system

[Arun Isaac]

> New patch series LGTM.

Pushed, thanks!

[bug#30960] [PATCH 0/4] Switch to font-build-system

[Arun Isaac]

>> I tried building font-lato again on my machine, and it worked. I suspect
>> this problem you are facing is due to the __MACOSX folders in the zip
>
> Out of scope of this patchset, but:
> Those aren't really necessary in the use. Couldn't we just instruct the font-build-system
> to ignore and/or delete them?

This problem is general to all zip archives. Therefore, I don't think
font-build-system is the place to delete them. This should probably go
into the unpack phase of the gnu-build-system, which is what handles
unpacking of all archives. WDYT?

[bug#30960] [PATCH 0/4] Switch to font-build-system

[ng0]

Arun Isaac transcribed 558 bytes:
> 
> >> I tried building font-lato again on my machine, and it worked. I suspect
> >> this problem you are facing is due to the __MACOSX folders in the zip
> >
> > Out of scope of this patchset, but:
> > Those aren't really necessary in the use. Couldn't we just instruct the font-build-system
> > to ignore and/or delete them?
> 
> This problem is general to all zip archives. Therefore, I don't think
> font-build-system is the place to delete them. This should probably go
> into the unpack phase of the gnu-build-system, which is what handles
> unpacking of all archives. WDYT?

Okay, sounds good.

[bug#30960] [PATCH 1/4] gnu: font-lato: Switch to font-build-system.

[Arun Isaac]

* gnu/packages/fonts.scm (font-lato): Switch to font-build-system.
[source]: Use url-fetch/zipbomb.
---
 gnu/packages/fonts.scm | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f57d5114a..8ab3cdcf8 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -197,32 +197,12 @@ sans-serif designed for on-screen reading.  It is used by GNOME@tie{}3.")
     (name "font-lato")
     (version "2.010")
     (source (origin
-              (method url-fetch)
+              (method url-fetch/zipbomb)
               (uri (string-append "http://www.latofonts.com/download/Lato2OFL.zip"))
               (sha256
                (base32
                 "1f5540g0ja1nx3ddd3ywn77xc81ssrxpq8n3gyb9sabyq2b4xda2"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder (begin
-                   (use-modules (guix build utils)
-                                (srfi srfi-26))
-
-                   (let ((PATH     (string-append (assoc-ref %build-inputs
-                                                             "unzip")
-                                                  "/bin"))
-                         (font-dir (string-append %output
-                                                  "/share/fonts/truetype")))
-                     (setenv "PATH" PATH)
-                     (system* "unzip" (assoc-ref %build-inputs "source"))
-
-                     (mkdir-p font-dir)
-                     (for-each (lambda (ttf)
-                                 (install-file ttf font-dir))
-                               (find-files "." "\\.ttf$"))))))
-
-    (native-inputs `(("unzip" ,unzip)))
+    (build-system font-build-system)
     (home-page "http://www.latofonts.com/lato-free-fonts/")
     (synopsis "Lato sans-serif typeface")
     (description
-- 
2.15.1

[bug#30960] [PATCH 2/4] gnu: font-linuxlibertine: Switch to font-build-system.

[Arun Isaac]

* gnu/packages/fonts.scm (font-linuxlibertine): Switch to font-build-system.
[arguments]: Replace system* with invoke.
---
 gnu/packages/fonts.scm | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 8ab3cdcf8..8252c1d72 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -305,37 +305,24 @@ The Liberation Fonts are sponsored by Red Hat.")
               (sha256
                (base32
                 "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"))))
-    (build-system gnu-build-system)
+    (build-system font-build-system)
     (arguments
-     `(#:tests? #f ; there are no tests
-       #:modules ((guix build utils)
-                  (guix build gnu-build-system)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
+         (add-before 'install 'build
            (lambda _
              (let ((compile
                     (lambda (name ext)
-                      (zero? (system*
-                              "fontforge" "-lang=ff"
-                              "-c" (string-append "Open('" name "');"
-                                                  "Generate('"
-                                                  (basename name "sfd") ext
-                                                  "')"))))))
-               (every (lambda (name)
-                        (and (compile name "ttf")
-                             (compile name "otf")))
-                      (find-files "." "\\.sfd$")))))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((font-dir (string-append (assoc-ref outputs "out")
-                                            "/share/fonts/truetype")))
-               (mkdir-p font-dir)
-               (for-each (cut install-file <> font-dir)
-                         (find-files "." "\\.(otf|ttf)$"))
+                      (invoke
+                       "fontforge" "-lang=ff"
+                       "-c" (string-append "Open('" name "');"
+                                           "Generate('"
+                                           (basename name "sfd") ext
+                                           "')")))))
+               (for-each (lambda (name)
+                           (and (compile name "ttf")
+                                (compile name "otf")))
+                         (find-files "." "\\.sfd$"))
                #t))))))
     (native-inputs
      `(("fontforge" ,fontforge)))
-- 
2.15.1

[bug#30960] [PATCH 3/4] gnu: culmus: Switch to font-build-system.

[Arun Isaac]

* gnu/packages/fonts.scm (culmus): Switch to font-build-system.
[arguments]: Replace system* with invoke.
---
 gnu/packages/fonts.scm | 52 +++++++++++++++-----------------------------------
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 8252c1d72..dfa96b148 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1202,49 +1202,27 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold")
         (sha256
          (base32
           "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z"))))
-    (build-system gnu-build-system)
+    (build-system font-build-system)
     (arguments
-     `(#:tests? #f ; no tests
-       #:modules ((guix build utils)
-                  (guix build gnu-build-system)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
+         (add-before 'install 'build
            (lambda _
              (let ((compile
                     (lambda (name ext)
-                      (zero? (system*
-                              "fontforge" "-lang=ff"
-                              "-c" (string-append "Open('" name "');"
-                                                  "Generate('"
-                                                  (basename name "sfd") ext
-                                                  "')"))))))
+                      (invoke
+                       "fontforge" "-lang=ff"
+                       "-c" (string-append "Open('" name "');"
+                                           "Generate('"
+                                           (basename name "sfd") ext
+                                           "')")))))
                ;; This part based on the fonts shipped in the non-source package.
-               (every (lambda (name)
-                        (compile name "ttf"))
-                      (find-files "." "^[^Nachlieli].*\\.sfd$"))
-               (every (lambda (name)
-                        (compile name "otf"))
-                      (find-files "." "^Nachlieli.*\\.sfd$"))
-               #t)))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out     (assoc-ref %outputs "out"))
-                    (ttf     (string-append out "/share/fonts/truetype"))
-                    (otf     (string-append out "/share/fonts/opentype"))
-                    (license (string-append out "/share/doc/" ,name)))
-               (for-each (lambda (file)
-                           (install-file file ttf))
-                         (find-files "." "\\.ttf$"))
-               (for-each (lambda (file)
-                           (install-file file otf))
-                         (find-files "." "\\.otf$"))
-               (for-each (lambda (file)
-                           (install-file file license))
-                         '("GNU-GPL" "LICENSE" "LICENSE-BITSTREAM"))
+               (for-each (lambda (name)
+                           (compile name "ttf"))
+                         (find-files "." "^[^Nachlieli].*\\.sfd$"))
+               (for-each (lambda (name)
+                           (compile name "otf"))
+                         (find-files "." "^Nachlieli.*\\.sfd$"))
                #t))))))
     (native-inputs
      `(("fontforge" ,fontforge)))
-- 
2.15.1

[bug#30960] [PATCH 4/4] gnu: culmus: Rename to font-culmus.

[Arun Isaac]

* gnu/packages/fonts.scm (culmus): Rename to...
(font-culmus): ...this. Re-indent.
---
 gnu/packages/fonts.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index dfa96b148..8e892da27 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1189,19 +1189,19 @@ It comes in 7 incremental weights:
 ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold")
     (license license:silofl1.1)))
 
-(define-public culmus
+(define-public font-culmus
   (package
-    (name "culmus")
+    (name "font-culmus")
     (version "0.132")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://sourceforge.net/projects/"
-                            "culmus/files/culmus/" version "/culmus-src-"
-                            version ".tar.gz"))
-        (sha256
-         (base32
-          "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://sourceforge.net/projects/"
+                           "culmus/files/culmus/" version "/culmus-src-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z"))))
     (build-system font-build-system)
     (arguments
      `(#:phases
-- 
2.15.1