Merge branch 'master' into core-updates

This commit is contained in:
Christopher Baines 2021-03-05 22:56:40 +00:00
commit a8448da0f4
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
245 changed files with 62932 additions and 4624 deletions

View file

@ -13,6 +13,7 @@
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -57,6 +58,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
@ -499,7 +501,7 @@ primary means by which end users perform conversions, and they have not
been designed, tested, and debugged to the extent that general-purpose
applications should be.")
(license license:lgpl2.1+)
(home-page "http://scripts.sil.org/cms/scripts/page.php?cat_id=teckit")))
(home-page "https://scripts.sil.org/cms/scripts/page.php?cat_id=teckit")))
(define-public graphite2
(package
@ -875,7 +877,7 @@ generated list of fallback fonts are checked.")
(define-public fontmanager
(package
(name "fontmanager")
(version "0.7.7")
(version "0.8.4")
(source
(origin
(method git-fetch)
@ -885,7 +887,7 @@ generated list of fallback fonts are checked.")
(file-name (git-file-name name version))
(sha256
(base32
"1bzqvspplp1zj0n0869jqbc60wgbjhf0vdrn5bj8dfawxynh8s5f"))))
"09rv0srpj8ann2n1zpv1frlpxz0x10d2y21c5lys7pmfngljlxi9"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -895,19 +897,21 @@ generated list of fallback fonts are checked.")
(assoc-ref %outputs "out")
"/lib/font-manager"))))
(native-inputs
`(("pkg-config" ,pkg-config)
("vala" ,vala)
("yelp-tools" ,yelp-tools)
`(("desktop-file-utils" ,desktop-file-utils)
("gettext" ,gettext-minimal)
("glib" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("desktop-file-utils" ,desktop-file-utils)))
("pkg-config" ,pkg-config)
("vala" ,vala)
("yelp-tools" ,yelp-tools)))
(inputs
`(("json-glib" ,json-glib)
("sqlite" ,sqlite)
("fonconfig" ,fontconfig)
`(("fonconfig" ,fontconfig)
("freetype" ,freetype)
("gtk+" ,gtk+)))
("gtk+" ,gtk+)
("json-glib" ,json-glib)
("libsoup" ,libsoup)
("sqlite" ,sqlite)
("webkitgtk" ,webkitgtk)))
(home-page "https://fontmanager.github.io/")
(synopsis "Simple font management for GTK+ desktop environments")
(description "Font Manager is intended to provide a way for users to