[PATCH] Add font-terminus.

[PATCH] Add font-terminus.

[Guy Grant]

[-- Attachment #1.1: Type: text/plain, Size: 189 bytes --]

A bitmap font, aimed at programming.
Patch attatched. Feel free to comment on it... not sure if it's best as a
seperate module, or in fonts.scm. The latter only has ttf in it now, so
yeah.

[-- Attachment #1.2: Type: text/html, Size: 233 bytes --]

[-- Attachment #2: 0001-add-package-font-terminus.patch --]
[-- Type: text/x-patch, Size: 3080 bytes --]

From 4a87a1851449020c96353c8cacb5b4d187e7d2f0 Mon Sep 17 00:00:00 2001
From: Guy Grant <tadnimi@gmail.com>
Date: Fri, 8 Aug 2014 18:59:43 -0500
Subject: [PATCH 2/2] add package font-terminus

---
 gnu/packages/font-terminus.scm | 66 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 gnu/packages/font-terminus.scm

diff --git a/gnu/packages/font-terminus.scm b/gnu/packages/font-terminus.scm
new file mode 100644
index 0000000..7b65ea5
--- /dev/null
+++ b/gnu/packages/font-terminus.scm
@@ -0,0 +1,66 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Guy Grant <tadnimi@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages font-terminus)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages pkg-config))
+
+(define-public font-terminus
+  (package
+    (name "font-terminus")
+    (version "4.39")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://sourceforge/project/terminus-font"
+               version
+               "/terminus-font-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32
+            "1gzmn7zakvy6yrvmswyjfklnsvqrjm0imhq8rjws8rdkhqwkh21i"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("bdftopcf" ,bdftopcf)
+        ("font-util", font-util)
+        ("mkfontdir" ,mkfontdir)
+        ("perl" ,perl)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (arguments
+      `(#:configure-flags (list
+        ;; install fonts into subdirectory of package output instead of
+        ;; font-util-?.?.?/share/fonts/X11
+        (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))
+         #:tests? #f))
+    (home-page "http://terminus-font.sourceforge.net/")
+    (synopsis "xorg implementation of the X Window System")
+    (description "Terminus Font is a clean, fixed width bitmap font, designed for long
+ (8 and more hours per day) work with computers.")
+    (license 
+     (l:x11-style
+      "http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web"))))
-- 
1.9.3

Re: [PATCH] Add font-terminus.

[Andreas Enge]

On Fri, Aug 08, 2014 at 07:15:27PM -0500, Guy Grant wrote:
> A bitmap font, aimed at programming.
> Patch attatched. Feel free to comment on it... not sure if it's best as a
> seperate module, or in fonts.scm. The latter only has ttf in it now, so yeah.

That there are only ttfs so far is a coincidence. I would put the package
fonts.scm.

> +(define-public font-terminus
> +               "mirror://sourceforge/project/terminus-font"

The name of the package should be the same as of the source tarball, so it
should be "terminus-font". We have exceptions for perl and python modules
with a special naming scheme. It would be conceivable to do the same for
fonts, but I do not think it is really needed.

> +         #:tests? #f))

Please add a comment (supposedly, there is no test target here).

Andreas

Fwd: [PATCH] Add font-terminus.

[Guy Grant]

[-- Attachment #1.1: Type: text/plain, Size: 117 bytes --]

Okay, patch updated as recomended; Patch attatched. Again, if something
looks wrong -- feel free to comment. Thanks!

[-- Attachment #1.2: Type: text/html, Size: 142 bytes --]

[-- Attachment #2: 0001-add-terminus-font.patch --]
[-- Type: text/x-patch, Size: 2848 bytes --]

From 3244099f65c1c6bd99d6b0921213c0749e04be47 Mon Sep 17 00:00:00 2001
From: Guy Grant <tadnimi@gmail.com>
Date: Sun, 10 Aug 2014 08:58:08 -0500
Subject: [PATCH 1/1] add terminus-font

---
 gnu/packages/fonts.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 8ec59e4..b2037d7 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Guy Grant <tadnimi@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,10 +23,14 @@
                 #:renamer (symbol-prefix-proc 'license:))
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module ((gnu packages base)
                 #:select (tar))
-  #:use-module (gnu packages compression))
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages pkg-config))
 
 (define-public ttf-dejavu
   (package
@@ -198,3 +203,41 @@ package provides the TrueType (TTF) files.")
  (PostScript Type0, TrueType, OpenType...) fonts covering the ISO
 10646/Unicode UCS (Universal Character Set).")
    (license license:gpl3+)))
+
+(define-public terminus-font
+  (package
+    (name "terminus-font")
+    (version "4.39")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://sourceforge/project/terminus-font"
+               version
+               "/terminus-font-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32
+            "1gzmn7zakvy6yrvmswyjfklnsvqrjm0imhq8rjws8rdkhqwkh21i"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("bdftopcf" ,bdftopcf)
+        ("font-util", font-util)
+        ("mkfontdir" ,mkfontdir)
+        ("perl" ,perl)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (arguments
+      `(#:configure-flags (list
+        ;; install fonts into subdirectory of package output instead of
+        ;; font-util-?.?.?/share/fonts/X11
+        (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))
+         #:tests? #f)) ;; No test target in tarball
+    (home-page "http://terminus-font.sourceforge.net/")
+    (synopsis "Simple bitmap programming font")
+    (description "Terminus Font is a clean, fixed width bitmap font, designed for long
+ (8 and more hours per day) work with computers.")
+    (license 
+     (license:x11-style
+      "http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web"))))
-- 
1.9.3

Re: Fwd: [PATCH] Add font-terminus.

[Andreas Enge]

On Sun, Aug 10, 2014 at 09:25:59AM -0500, Guy Grant wrote:
> Okay, patch updated as recomended; Patch attatched. Again, if something looks
> wrong -- feel free to comment. Thanks!

Looks good to me, thanks!

Andreas

Re: Fwd: [PATCH] Add font-terminus.

[Mark H Weaver]

Guy Grant <tadnimi@gmail.com> writes:

> Okay, patch updated as recomended; Patch attatched. Again, if
> something looks wrong -- feel free to comment. Thanks!
>
>
> From 3244099f65c1c6bd99d6b0921213c0749e04be47 Mon Sep 17 00:00:00 2001
> From: Guy Grant <tadnimi@gmail.com>
> Date: Sun, 10 Aug 2014 08:58:08 -0500
> Subject: [PATCH 1/1] add terminus-font
>
> ---

This needs a proper commit message.  Look in the git logs for examples.

> +    (inputs
> +      `(("bdftopcf" ,bdftopcf)
> +        ("font-util", font-util)
> +        ("mkfontdir" ,mkfontdir)
> +        ("perl" ,perl)))
> +    (native-inputs
> +      `(("pkg-config" ,pkg-config)))

I suspect that all of those inputs should instead be native-inputs.  If
the code in those packages is executed at build time, then they should
be native-inputs.  If the code is executed at run-time, they should be
normal inputs.  The distinction is important when cross compiling.

> +    (arguments
> +      `(#:configure-flags (list
> +        ;; install fonts into subdirectory of package output instead of
> +        ;; font-util-?.?.?/share/fonts/X11
> +        (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))
> +         #:tests? #f)) ;; No test target in tarball

Please fix the indentation here.

> +    (home-page "http://terminus-font.sourceforge.net/")
> +    (synopsis "Simple bitmap programming font")
> +    (description "Terminus Font is a clean, fixed width bitmap font, designed for long
> + (8 and more hours per day) work with computers.")
> +    (license 
> +     (license:x11-style
> +      "http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web"))))

Otherwise looks good to me.

    Thanks!
      Mark

Re: Fwd: [PATCH] Add font-terminus.

[Guy Grant]

[-- Attachment #1.1: Type: text/plain, Size: 2073 bytes --]

Okay, I think I got it all up to snuff.
xorg.scm has a number of fonts which should be native-inputs too, but
aren't. I'll handle them if they don't get resolved by the end of the month.

Patch attatched.


On Sun, Aug 10, 2014 at 10:21 PM, Mark H Weaver <mhw@netris.org> wrote:

> Guy Grant <tadnimi@gmail.com> writes:
>
> > Okay, patch updated as recomended; Patch attatched. Again, if
> > something looks wrong -- feel free to comment. Thanks!
> >
> >
> > From 3244099f65c1c6bd99d6b0921213c0749e04be47 Mon Sep 17 00:00:00 2001
> > From: Guy Grant <tadnimi@gmail.com>
> > Date: Sun, 10 Aug 2014 08:58:08 -0500
> > Subject: [PATCH 1/1] add terminus-font
> >
> > ---
>
> This needs a proper commit message.  Look in the git logs for examples.
>
> > +    (inputs
> > +      `(("bdftopcf" ,bdftopcf)
> > +        ("font-util", font-util)
> > +        ("mkfontdir" ,mkfontdir)
> > +        ("perl" ,perl)))
> > +    (native-inputs
> > +      `(("pkg-config" ,pkg-config)))
>
> I suspect that all of those inputs should instead be native-inputs.  If
> the code in those packages is executed at build time, then they should
> be native-inputs.  If the code is executed at run-time, they should be
> normal inputs.  The distinction is important when cross compiling.
>
> > +    (arguments
> > +      `(#:configure-flags (list
> > +        ;; install fonts into subdirectory of package output instead of
> > +        ;; font-util-?.?.?/share/fonts/X11
> > +        (string-append "--with-fontrootdir=" %output
> "/share/fonts/X11"))
> > +         #:tests? #f)) ;; No test target in tarball
>
> Please fix the indentation here.
>
> > +    (home-page "http://terminus-font.sourceforge.net/")
> > +    (synopsis "Simple bitmap programming font")
> > +    (description "Terminus Font is a clean, fixed width bitmap font,
> designed for long
> > + (8 and more hours per day) work with computers.")
> > +    (license
> > +     (license:x11-style
> > +      "http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web"))))
>
> Otherwise looks good to me.
>
>     Thanks!
>       Mark
>

[-- Attachment #1.2: Type: text/html, Size: 3167 bytes --]

[-- Attachment #2: 0001-gnu-Add-terminus-font.patch --]
[-- Type: text/x-patch, Size: 2826 bytes --]

From 1439078e562369ae4f45eddca41db5e79f076280 Mon Sep 17 00:00:00 2001
From: Guy Grant <tadnimi@gmail.com>
Date: Tue, 12 Aug 2014 20:33:58 -0500
Subject: [PATCH] gnu: Add terminus-font

---
 gnu/packages/fonts.scm | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 8ec59e4..43f96fb 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Guy Grant <tadnimi@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,10 +23,14 @@
                 #:renamer (symbol-prefix-proc 'license:))
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module ((gnu packages base)
                 #:select (tar))
-  #:use-module (gnu packages compression))
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages pkg-config))
 
 (define-public ttf-dejavu
   (package
@@ -198,3 +203,40 @@ package provides the TrueType (TTF) files.")
  (PostScript Type0, TrueType, OpenType...) fonts covering the ISO
 10646/Unicode UCS (Universal Character Set).")
    (license license:gpl3+)))
+
+(define-public terminus-font
+  (package
+    (name "terminus-font")
+    (version "4.39")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://sourceforge/project/terminus-font/terminus-font-"
+               version
+               "/terminus-font-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32
+            "1gzmn7zakvy6yrvmswyjfklnsvqrjm0imhq8rjws8rdkhqwkh21i"))))
+    (build-system gnu-build-system)
+    (native-inputs
+      `(("pkg-config" ,pkg-config)
+	("perl" ,perl)
+        ("bdftopcf" ,bdftopcf)
+        ("font-util", font-util)
+        ("mkfontdir" ,mkfontdir)))
+    (arguments
+     `(#:configure-flags (list
+			  ;; install fonts into subdirectory of package output instead of
+			  ;; font-util-?.?.?/share/fonts/X11
+			  (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))
+			 #:tests? #f)) ;; No test target in tarball
+    (home-page "http://terminus-font.sourceforge.net/")
+    (synopsis "Simple bitmap programming font")
+    (description "Terminus Font is a clean, fixed width bitmap font, designed for long
+ (8 and more hours per day) work with computers.")
+    (license 
+     (license:x11-style
+      "http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web"))))
-- 
1.9.3

Re: Fwd: [PATCH] Add font-terminus.

[mhw]

Guy Grant <tadnimi@gmail.com> writes:

> Okay, I think I got it all up to snuff.

Pushed with minor formatting changes and with a proper commit log added.

    Thanks!
      Mark

Re: Fwd: [PATCH] Add font-terminus.

[Alex Kost]

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

A bit too late for the comment, but still:

Guy Grant (2014-08-10 18:25 +0400) wrote:

> +    (license
> +     (license:x11-style
> +      "http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web"))))

Since it's not an "X11-style", but an "OFL" license, why not use the
latter?  The patch for fixing it is attached.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-fonts-Fix-license-of-terminus-font.patch --]
[-- Type: text/x-diff, Size: 920 bytes --]

From 73873d10466680ffed64e11f5c96fe7a5343fb69 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Mon, 10 Nov 2014 18:26:29 +0300
Subject: [PATCH] gnu: fonts: Fix license of 'terminus-font'.

* gnu/packages/fonts.scm (terminus-font): Use 'silofl1.1' license.
---
 gnu/packages/fonts.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 825395b..4ed86d9 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -237,6 +237,4 @@ package provides the TrueType (TTF) files.")
     (synopsis "Simple bitmap programming font")
     (description "Terminus Font is a clean, fixed width bitmap font, designed
 for long (8 and more hours per day) work with computers.")
-    (license
-     (license:x11-style
-      "http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web"))))
+    (license license:silofl1.1)))
-- 
2.1.2

Re: Fwd: [PATCH] Add font-terminus.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Guy Grant (2014-08-10 18:25 +0400) wrote:
>
>> +    (license
>> +     (license:x11-style
>> +      "http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web"))))
>
> Since it's not an "X11-style", but an "OFL" license, why not use the
> latter?  The patch for fixing it is attached.

Indeed.  Feel free to push the fix.

Ludo’.