[PATCH 1/2] gnu: Add font-ubuntu

[PATCH 1/2] gnu: Add font-ubuntu

[Eric Dvorsak]

* gnu/packages/fonts/scm (font-ubuntu): New variable.
---
 gnu/packages/fonts.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f72c542..f26a599 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014 Joshua Grant <tadni@riseup.net>
 ;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,10 +29,62 @@
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages zip)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages pkg-config))
 
+(define-public font-ubuntu
+  (package
+    (name "font-ubuntu")
+    (version "0.80")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://font.ubuntu.com/download/ubuntu-font-family-"
+                                  version ".zip"))
+              (sha256
+               (base32
+                "0k4f548riq23gmw4zhn30qqkcpaj4g2ab5rbc3lflfxwkc4p0w8h"))))
+    (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"))
+                         (doc-dir  (string-append %output "/share/doc/"
+                                                  ,name "-" ,version)))
+                     (setenv "PATH" PATH)
+                     (system* "unzip" (assoc-ref %build-inputs "source"))
+
+                     (mkdir-p font-dir)
+                     (mkdir-p doc-dir)
+                     (chdir (string-append "ubuntu-font-family-" ,version))
+                     (for-each (lambda (ttf)
+                                 (copy-file ttf
+                                            (string-append font-dir "/" ttf)))
+                               (find-files "." "\\.ttf$"))
+                     (for-each (lambda (doc)
+                                 (copy-file doc
+                                            (string-append doc-dir "/" doc)))
+                               (find-files "." "\\.txt$"))))))
+    (native-inputs `(("source" ,source)
+                     ("unzip" ,unzip)))
+    (home-page "http://font.ubuntu.com/")
+    (synopsis "The Ubuntu Font Family")
+    (description "The Ubuntu Font Family is a unique, custom designed font
+that has a very distinctive look and feel.  This package provides the
+TrueType (TTF) files.")
+    (license
+     (license:non-copyleft
+      "file://LICENCE.txt"
+      "See the LICENCE file in the distribution"))))
+
 (define-public font-dejavu
   (package
     (name "font-dejavu")
-- 
2.4.3

[PATCH 2/2] gnu: Add font-inconsolata

[Eric Dvorsak]

* gnu/packages/fonts.scm (font-inconsolata): New variable.
---
 gnu/packages/fonts.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f26a599..b0eac93 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -34,6 +34,34 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages pkg-config))
 
+(define-public font-incosolata
+  (package
+    (name "font-inconsolata")
+    (version "0.80")
+    (source (origin
+              (method url-fetch)
+              (uri "http://www.levien.com/type/myfonts/Inconsolata.otf")
+              (sha256
+               (base32
+                "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils))
+                   (let ((font-dir (string-append %output
+                                                  "/share/fonts/opentype"))
+                         (source (assoc-ref %build-inputs "source")))
+                     (mkdir-p font-dir)
+                     (copy-file source
+                                (string-append font-dir "/" "inconsolata.otf"))))))
+    (native-inputs `(("source" ,source)))
+    (home-page "http://levien.com/type/myfonts/inconsolata.html")
+    (synopsis "Monospace font")
+    (description "A monospace font, designed for code listings and the like,
+in print.  With attention to detail for high resolution rendering.")
+    (license license:silofl1.1)))
+
 (define-public font-ubuntu
   (package
     (name "font-ubuntu")
-- 
2.4.3

Re: [PATCH 1/2] gnu: Add font-ubuntu

[Ludovic Courtès]

Eric Dvorsak <eric@dvorsak.fr> skribis:

> * gnu/packages/fonts/scm (font-ubuntu): New variable.

I changed the license URL to
http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt and applied it.
Thank you!

Ludo’.

Re: [PATCH 2/2] gnu: Add font-inconsolata

[Ludovic Courtès]

Eric Dvorsak <eric@dvorsak.fr> skribis:

> * gnu/packages/fonts.scm (font-inconsolata): New variable.

Applied, thanks.

Ludo’.

Re: [PATCH 1/2] gnu: Add font-ubuntu

[Mark H Weaver]

Hi, sorry this is a bit late, but:

ludo@gnu.org (Ludovic Courtès) writes:
> Eric Dvorsak <eric@dvorsak.fr> skribis:
>
>> * gnu/packages/fonts/scm (font-ubuntu): New variable.

That last "/" should have been a ".".  Oh well.

> I changed the license URL to
> http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt and applied it.
> Thank you!

The patch labelled this license as 'non-copyleft', but I'm not sure
that's right.  It includes this text:

  4) The Font Software, modified or unmodified, in part or in whole,
  must be distributed entirely under this licence, and must not be
  distributed under any other licence.  [...]

So this ensures that additional restrictions cannot be added later, like
a copyleft license.  I'm not entirely sure it's a free software license
as indicated by 'fsf-free' either, but that's okay because fonts qualify
as non-functional data.  It might be that we don't yet have anything in
(guix licenses) that applies here.  Maybe we need another
license-producing procedure for non-functional works that satify the
FSDG requirements?

      Mark

Re: [PATCH 1/2] gnu: Add font-ubuntu

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>> Eric Dvorsak <eric@dvorsak.fr> skribis:
>>
>>> * gnu/packages/fonts/scm (font-ubuntu): New variable.
>
> That last "/" should have been a ".".  Oh well.

Oops. my bad.

>> I changed the license URL to
>> http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt and applied it.
>> Thank you!
>
> The patch labelled this license as 'non-copyleft', but I'm not sure
> that's right.  It includes this text:
>
>   4) The Font Software, modified or unmodified, in part or in whole,
>   must be distributed entirely under this licence, and must not be
>   distributed under any other licence.  [...]
>
> So this ensures that additional restrictions cannot be added later, like
> a copyleft license.

Good point.

> I'm not entirely sure it's a free software license as indicated by
> 'fsf-free' either,

Why?

> but that's okay because fonts qualify as non-functional data.  It
> might be that we don't yet have anything in (guix licenses) that
> applies here.  Maybe we need another license-producing procedure for
> non-functional works that satify the FSDG requirements?

Right, that’s something we could do in this case.  I’d be surprised if
this one were not considered FSF-free though?

Thank you,
Ludo’.

Re: [PATCH 1/2] gnu: Add font-ubuntu

[Mark H Weaver]

ludo@gnu.org (Ludovic Courtès) writes:

> Mark H Weaver <mhw@netris.org> skribis:
>
>> I'm not entirely sure it's a free software license as indicated by
>> 'fsf-free' either,
>
> Why?

The main thing that worries me is this combination of facts:

1. The license requires that both original and modified versions "which
   are not Substantially Changed" must retain the original name, which
   in this case contains "ubuntu".

2. The license explicitly says: "This licence does not grant any rights
   under trademark law and all such rights are reserved."

3. Ubuntu trademark policy, which states, among other things:

   * You can use the Trademarks, in accordance with Canonical’s brand
     guidelines, with Canonical’s permission in writing.  If you require
     a Trademark licence, please contact us (as set out below).

   * You cannot use the Trademarks in software titles.  [...]

Here's a relevant comment on the subject:

  https://bugs.launchpad.net/ubuntu-font-licence/+bug/769874/comments/21

If Canonical were still a friendly member of our community, I probably
wouldn't worry too much about this.  However, ever since I learned about
this:

  Matthew Garrett: Canonical's Ubuntu IP policy is garbage
  https://mjg59.dreamwidth.org/35969.html

and the way they treated Jonathan Riddell (creator of Kubuntu) who had
been trying to rectify this issue for years:

  http://jriddell.org/2015/07/15/ubuntu-policy-complies-with-gpl-but-fails-to-address-other-important-software-freedom-issues/

and the fact that they stubbornly refused to do more than the absolute
minimum needed to retain their right to distribute software covered by
the GNU GPL:

  https://www.fsf.org/news/canonical-updated-licensing-terms
  https://sfconservancy.org/news/2015/jul/15/ubuntu-ip-policy/
  http://www.ebb.org/bkuhn/blog/2015/07/15/ubuntu-ip-policy.html

I no longer consider Canonical a friend to the free software movement,
and frankly I don't want to touch any of their stuff with a ten foot
pole, unless it is crystal clear in legalese that we and our users have
the rights we need.  In this case, it is not clear to me.

   Thanks,
     Mark

Re: [PATCH 1/2] gnu: Add font-ubuntu

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Mark H Weaver <mhw@netris.org> skribis:
>>
>>> I'm not entirely sure it's a free software license as indicated by
>>> 'fsf-free' either,
>>
>> Why?
>
> The main thing that worries me is this combination of facts:

[...]

Indeed, those arguments make sense to me.

So I guess we can add a ‘non-functional-work’ procedure in (guix
licenses) to use in this and similar cases.  Would you like to propose a
patch?

Thanks,
Ludo’.