From b071402d35427c7400dff224f54d6c57d35104e2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 15 Oct 2021 23:56:42 -0400 Subject: gnu: pango: Update to 1.48.10. * gnu/packages/gtk.scm (pango): Update to 1.48.10. Remove trailing #t. [inputs]: Remove conditional on the bash-minimal input. --- gnu/packages/gtk.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e92c6b1398..35c66e9d32 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -362,7 +362,7 @@ (define-public libthai (define-public pango (package (name "pango") - (version "1.48.9") + (version "1.48.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -371,10 +371,10 @@ (define-public pango (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "1akj11n0ycqrm1rvi0fdfldqk7l5zk9vb8sq77009ap57xyna4x9")))) + "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-cantarell-tests (lambda _ @@ -384,8 +384,7 @@ (define-public pango (("\\[ 'test-layout'.*") "") (("\\[ 'test-itemize'.*") "") (("\\[ 'test-font'.*") "") - (("\\[ 'test-harfbuzz'.*") "")) - #t))))) + (("\\[ 'test-harfbuzz'.*") ""))))))) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. `(("cairo" ,cairo) @@ -400,13 +399,10 @@ (define-public pango ("libxft" ,libxft) ("libxrender" ,libxrender))) (inputs - ;; TODO(core-updates): Unconditionally add "bash-minimal" - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ("zlib" ,zlib))) (native-inputs - `(("glib" ,glib "bin") ; glib-mkenums, etc. + `(("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler, etc. ("help2man" ,help2man) ("perl" ,perl) -- cgit v1.2.3