From: Guy Grant <tadnimi@gmail.com>
To: Mark H Weaver <mhw@netris.org>
Cc: guix-devel@gnu.org
Subject: Re: Fwd: [PATCH] Add font-terminus.
Date: Tue, 12 Aug 2014 20:37:23 -0500 [thread overview]
Message-ID: <CABXEMcrnPvU5g9HXj=3XneNh8XxFpryvMpEch77C8CrnVJGgkQ@mail.gmail.com> (raw)
In-Reply-To: <87lhqvr9rc.fsf@yeeloong.lan>
[-- 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
next prev parent reply other threads:[~2014-08-13 1:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-09 0:15 [PATCH] Add font-terminus Guy Grant
2014-08-10 10:04 ` Andreas Enge
[not found] ` <CABXEMcpNkYY_Xdq+Op-9Lh35L3BeEMea9tVk3ZeALmtegOxXUQ@mail.gmail.com>
2014-08-10 14:25 ` Fwd: " Guy Grant
2014-08-10 18:39 ` Andreas Enge
2014-08-11 3:21 ` Mark H Weaver
2014-08-13 1:37 ` Guy Grant [this message]
2014-08-13 3:23 ` mhw
2014-11-10 15:34 ` Alex Kost
2014-11-10 22:18 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABXEMcrnPvU5g9HXj=3XneNh8XxFpryvMpEch77C8CrnVJGgkQ@mail.gmail.com' \
--to=tadnimi@gmail.com \
--cc=guix-devel@gnu.org \
--cc=mhw@netris.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.