gnu: pango: Update to 1.48.3.

* gnu/packages/gtk.scm (pango) [version]: Update to 1.48.3.
[arguments]<#:phases>['disable-cantarell-tests]: Modify.
[propagated-inputs]: Add libthai and libxrender.
[native-inputs]: Add help2man, perl and python-wrapper.

Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
This commit is contained in:
Raghav Gururajan 2021-03-23 23:32:15 -04:00
parent feb246fbff
commit 2a6f070e2d
No known key found for this signature in database
GPG key ID: 45A8B1E86BCD10A6

View file

@ -78,6 +78,7 @@ (define-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages man)
#:use-module (gnu packages pdf) #:use-module (gnu packages pdf)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -313,7 +314,7 @@ (define-public libthai
(define-public pango (define-public pango
(package (package
(name "pango") (name "pango")
(version "1.44.7") (version "1.48.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/" (uri (string-append "mirror://gnome/sources/pango/"
@ -322,7 +323,7 @@ (define-public pango
(patches (search-patches "pango-skip-libthai-test.patch")) (patches (search-patches "pango-skip-libthai-test.patch"))
(sha256 (sha256
(base32 (base32
"07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6")))) "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
@ -332,9 +333,10 @@ (define-public pango
(substitute* "tests/meson.build" (substitute* "tests/meson.build"
;; XXX FIXME: These tests require "font-cantarell", but ;; XXX FIXME: These tests require "font-cantarell", but
;; adding it here would introduce a circular dependency. ;; adding it here would introduce a circular dependency.
(("\\[ 'test-harfbuzz'.*") "") (("\\[ 'test-layout'.*") "")
(("\\[ 'test-itemize'.*") "") (("\\[ 'test-itemize'.*") "")
(("\\[ 'test-layout'.*") "")) (("\\[ 'test-font'.*") "")
(("\\[ 'test-harfbuzz'.*") ""))
#t))))) #t)))))
(propagated-inputs (propagated-inputs
;; These are all in Requires or Requires.private of the '.pc' files. ;; These are all in Requires or Requires.private of the '.pc' files.
@ -344,15 +346,20 @@ (define-public pango
("fribidi" ,fribidi) ("fribidi" ,fribidi)
("glib" ,glib) ("glib" ,glib)
("harfbuzz" ,harfbuzz) ("harfbuzz" ,harfbuzz)
("libthai" ,libthai)
;; Some packages, such as Openbox, expect Pango to be built with the ;; Some packages, such as Openbox, expect Pango to be built with the
;; optional libxft support. ;; optional libxft support.
("libxft" ,libxft))) ("libxft" ,libxft)
("libxrender" ,libxrender)))
(inputs (inputs
`(("zlib" ,zlib))) `(("zlib" ,zlib)))
(native-inputs (native-inputs
`(("glib" ,glib "bin") ; glib-mkenums, etc. `(("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection) ; g-ir-compiler, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler, etc.
("pkg-config" ,pkg-config))) ("help2man" ,help2man)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(synopsis "GNOME text and font handling library") (synopsis "GNOME text and font handling library")
(description (description
"Pango is the core text and font handling library used in GNOME "Pango is the core text and font handling library used in GNOME