Merge branch 'staging' into core-updates

This commit is contained in:
Marius Bakke 2018-08-25 16:44:07 +02:00
commit 839167ff9d
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
162 changed files with 51919 additions and 10837 deletions

View file

@ -6,7 +6,7 @@
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
@ -159,29 +159,30 @@ Converts WOFF fonts to OpenType fonts
(define-public ttf2eot
(package
(name "ttf2eot")
(version "0.0.2-2")
(version "0.0.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://storage.googleapis.com/"
"google-code-archive-downloads/v2/"
"code.google.com/ttf2eot/"
"ttf2eot-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/wget/ttf2eot.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1f4dzzmhn0208dvbm3ia5ar6ls9apwc6ampy5blmfxkigi6z0g02"))
"0l2yh2ialx7135pjzhjs204kk3br7zxjr09zwaia493by2adzigr"))
(patches (list (search-patch "ttf2eot-cstddef.patch")))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;no tests
`(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(delete 'configure) ;no configuration
(replace 'install
(delete 'configure) ; no configuration
(replace 'install ; no install target
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(install-file "ttf2eot" bin)))))))
(install-file "ttf2eot" bin)
#t))))))
(synopsis "Convert from TrueType to Embeddable Open Type")
(description
"This package contains a commandline wrapper around OpenTypeUtilities.cpp
@ -191,7 +192,7 @@ TTF (TrueType/OpenType Font) files.")
;; 2/LGPL 2.1", the single derived source file includes only BSD in its
;; license header, and the wrapper source contains no license header.
(license license:bsd-2)
(home-page "https://code.google.com/archive/p/ttf2eot/")))
(home-page "https://github.com/wget/ttf2eot")))
(define-public woff2
(let ((commit "4e698b8c6c5e070d53c340db9ddf160e21070ede")