[bug#49021] [PATCH 1/2] gnu: font-terminus: Update to 4.49.1.

[bug#49021] [PATCH 1/2] gnu: font-terminus: Update to 4.49.1.

[Boris A. Dekshteyn]

* gnu/packages/fonts.scm (font-terminus): Update to 4.49.1.
---
 gnu/packages/fonts.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 973393acc4..b2aad5a011 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -414,14 +414,14 @@ The unified Libertinus family consists of:
 (define-public font-terminus
   (package
     (name "font-terminus")
-    (version "4.48")
+    (version "4.49.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/terminus-font/terminus-font-"
-                           version "/terminus-font-" version ".tar.gz"))
+                           (version-major+minor version) "/terminus-font-" version ".tar.gz"))
        (sha256
-        (base32 "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l"))))
+        (base32 "0yggffiplk22lgqklfmd2c0rw8gwchynjh5kz4bz8yv2h6vw2qfr"))))
     (build-system gnu-build-system)
     (outputs (list "out" "pcf-8bit"))
     (arguments
-- 
2.32.0

[bug#49021] [PATCH 2/2] gnu: font-terminus: Build Open Type Bitmap.

[Boris A. Dekshteyn]

* gnu/packages/fonts.scm (font-terminus): Build Open Type Bitmap version.
---
 gnu/packages/fonts.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index b2aad5a011..2f0a55e3ff 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -423,7 +423,7 @@ The unified Libertinus family consists of:
        (sha256
         (base32 "0yggffiplk22lgqklfmd2c0rw8gwchynjh5kz4bz8yv2h6vw2qfr"))))
     (build-system gnu-build-system)
-    (outputs (list "out" "pcf-8bit"))
+    (outputs (list "out" "pcf-8bit" "otb"))
     (arguments
      `(#:tests? #f                      ; no test target in tarball
        #:phases
@@ -438,6 +438,15 @@ The unified Libertinus family consists of:
              (let ((pcf-8bit (assoc-ref outputs "pcf-8bit")))
                (apply invoke "make" "install-pcf-8bit" (string-append "prefix="
                                                                       pcf-8bit)
+                      make-flags))))
+         (add-after 'build-more-bits 'build-otb
+           ;; Build Open Type Bitmap
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (apply invoke "make" "otb" make-flags)))
+         (add-after 'install 'install-otb
+           (lambda* (#:key make-flags outputs #:allow-other-keys)
+             (let ((otb (assoc-ref outputs "otb")))
+               (apply invoke "make" "install-otb" (string-append "prefix=" otb)
                       make-flags)))))))
     (native-inputs
      `(("bdftopcf" ,bdftopcf)
-- 
2.32.0

[bug#49021] [PATCH 2/2] gnu: font-terminus: Build Open Type Bitmap.

[Efraim Flashner]

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

What do the Open Type Bitmap bits do? Is it actually worth putting it in
a separate output or would it make more sense to install it by default?

On Tue, Jun 15, 2021 at 01:31:13AM +1200, Boris A. Dekshteyn wrote:
> * gnu/packages/fonts.scm (font-terminus): Build Open Type Bitmap version.
> ---
>  gnu/packages/fonts.scm | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
> index b2aad5a011..2f0a55e3ff 100644
> --- a/gnu/packages/fonts.scm
> +++ b/gnu/packages/fonts.scm
> @@ -423,7 +423,7 @@ The unified Libertinus family consists of:
>         (sha256
>          (base32 "0yggffiplk22lgqklfmd2c0rw8gwchynjh5kz4bz8yv2h6vw2qfr"))))
>      (build-system gnu-build-system)
> -    (outputs (list "out" "pcf-8bit"))
> +    (outputs (list "out" "pcf-8bit" "otb"))
>      (arguments
>       `(#:tests? #f                      ; no test target in tarball
>         #:phases
> @@ -438,6 +438,15 @@ The unified Libertinus family consists of:
>               (let ((pcf-8bit (assoc-ref outputs "pcf-8bit")))
>                 (apply invoke "make" "install-pcf-8bit" (string-append "prefix="
>                                                                        pcf-8bit)
> +                      make-flags))))
> +         (add-after 'build-more-bits 'build-otb
> +           ;; Build Open Type Bitmap
> +           (lambda* (#:key make-flags #:allow-other-keys)
> +             (apply invoke "make" "otb" make-flags)))
> +         (add-after 'install 'install-otb
> +           (lambda* (#:key make-flags outputs #:allow-other-keys)
> +             (let ((otb (assoc-ref outputs "otb")))
> +               (apply invoke "make" "install-otb" (string-append "prefix=" otb)
>                        make-flags)))))))
>      (native-inputs
>       `(("bdftopcf" ,bdftopcf)
> -- 
> 2.32.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#49021] [PATCH 2/2] gnu: font-terminus: Build Open Type Bitmap.

[Boris A. Dekshteyn]

Hi,

Efraim Flashner <efraim@flashner.co.il> writes:

> What do the Open Type Bitmap bits do? Is it actually worth putting it in
> a separate output or would it make more sense to install it by default?

As of version 1.44, pango no longer supports bitmap fonts other than
in Opentype format. So, without the OTB format, you cannot use terminus in pango
enabled apps (most x apps).

The package already has a separate output for pcf-8bit, so I decided to
make a separate output for the OTB format. Which might make sense for users
without x/wayland environments.

-- 
WBR, Boris Dekshteyn

bug#49021: [PATCH 2/2] gnu: font-terminus: Build Open Type Bitmap.

[Efraim Flashner]

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

On Wed, Jun 16, 2021 at 05:48:33PM +1200, Boris A. Dekshteyn wrote:
> Hi,
> 
> Efraim Flashner <efraim@flashner.co.il> writes:
> 
> > What do the Open Type Bitmap bits do? Is it actually worth putting it in
> > a separate output or would it make more sense to install it by default?
> 
> As of version 1.44, pango no longer supports bitmap fonts other than
> in Opentype format. So, without the OTB format, you cannot use terminus in pango
> enabled apps (most x apps).
> 
> The package already has a separate output for pcf-8bit, so I decided to
> make a separate output for the OTB format. Which might make sense for users
> without x/wayland environments.
> 

Makes sense to me. (Other) Patch pushed!

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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