mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
gnu: pango: Update to 1.44.7.
* gnu/packages/patches/pango-skip-libthai-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gtk.scm (pango): Update to 1.44.7. [source](patches): New field. [build-system]: Switch to MESON-BUILD-SYSTEM. [arguments]: Disable tests that require the Cantarell font. [inputs]: Move LIBXFT ... [propagated-inputs]: ... here. (pango-1.42): New public variable. * gnu/packages/gnome.scm (librsvg)[inputs]: Change from PANGO to PANGO-1.42.
This commit is contained in:
Marius Bakke
parent
8419a7ed44
commit
869b63cb93
4 changed files with 61 additions and 8 deletions
|
|
@ -1242,6 +1242,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
|
||||
%D%/packages/patches/p7zip-remove-unused-code.patch \
|
||||
%D%/packages/patches/pam-mount-luks2-support.patch \
|
||||
%D%/packages/patches/pango-skip-libthai-test.patch \
|
||||
%D%/packages/patches/patchutils-test-perms.patch \
|
||||
%D%/packages/patches/patch-hurd-path-max.patch \
|
||||
%D%/packages/patches/pcre2-fix-jit_match-crash.patch \
|
||||
|
|
|
|||
|
|
@ -1543,7 +1543,9 @@ (define-public librsvg
|
|||
("glib" ,glib "bin") ; glib-mkenums, etc.
|
||||
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
|
||||
(inputs
|
||||
`(("pango" ,pango)
|
||||
`(;; XXX: 1.44 causes some test failures, so we stick with 1.42 for
|
||||
;; this ancient version of librsvg.
|
||||
("pango" ,pango-1.42)
|
||||
("libcroco" ,libcroco)
|
||||
("bzip2" ,bzip2)
|
||||
("libgsf" ,libgsf)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
;;; Copyright © 2016 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
|
|
@ -222,16 +222,28 @@ (define-public harfbuzz
|
|||
(define-public pango
|
||||
(package
|
||||
(name "pango")
|
||||
(version "1.42.4")
|
||||
(version "1.44.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/pango/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(patches (search-patches "pango-skip-libthai-test.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"))))
|
||||
(build-system gnu-build-system)
|
||||
"07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-cantarell-tests
|
||||
(lambda _
|
||||
(substitute* "tests/meson.build"
|
||||
;; XXX FIXME: These tests require "font-cantarell", but
|
||||
;; adding it here would introduce a circular dependency.
|
||||
(("\\[ 'test-harfbuzz'.*") "")
|
||||
(("\\[ 'test-itemize'.*") "")
|
||||
(("\\[ 'test-layout'.*") ""))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
;; These are all in Requires or Requires.private of the '.pc' files.
|
||||
`(("cairo" ,cairo)
|
||||
|
|
@ -239,13 +251,13 @@ (define-public pango
|
|||
("fontconfig" ,fontconfig)
|
||||
("freetype" ,freetype)
|
||||
("glib" ,glib)
|
||||
("harfbuzz" ,harfbuzz)))
|
||||
(inputs
|
||||
`(("zlib" ,zlib)
|
||||
("harfbuzz" ,harfbuzz)
|
||||
|
||||
;; Some packages, such as Openbox, expect Pango to be built with the
|
||||
;; optional libxft support.
|
||||
("libxft" ,libxft)))
|
||||
(inputs
|
||||
`(("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("glib" ,glib "bin") ; glib-mkenums, etc.
|
||||
|
|
@ -258,6 +270,21 @@ (define-public pango
|
|||
(license license:lgpl2.0+)
|
||||
(home-page "https://developer.gnome.org/pango/")))
|
||||
|
||||
(define-public pango-1.42
|
||||
(package/inherit
|
||||
pango
|
||||
(version "1.42.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/pango/"
|
||||
(version-major+minor version) "/"
|
||||
"pango-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments '())))
|
||||
|
||||
(define-public pangox-compat
|
||||
(package
|
||||
(name "pangox-compat")
|
||||
|
|
|
|||
23
gnu/packages/patches/pango-skip-libthai-test.patch
Normal file
23
gnu/packages/patches/pango-skip-libthai-test.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
Skip Thai character test when libthai is unavailable.
|
||||
|
||||
Taken from upstream bug tracker:
|
||||
https://gitlab.gnome.org/GNOME/pango/merge_requests/161
|
||||
https://gitlab.gnome.org/GNOME/pango/commit/b73284747ac937e31dc9191f84ed6e24284c88ee
|
||||
|
||||
diff --git a/tests/test-break.c b/tests/test-break.c
|
||||
index 8549b678bba69360d07dce3af21d915412f20d51..47fa3009165e19a331aa04a0df4351ae2323933b 100644
|
||||
--- a/tests/test-break.c
|
||||
+++ b/tests/test-break.c
|
||||
@@ -305,6 +305,12 @@ main (int argc, char *argv[])
|
||||
if (!strstr (name, "break"))
|
||||
continue;
|
||||
|
||||
+#ifndef HAVE_LIBTHAI
|
||||
+ /* four.break involves Thai, so only test it when we have libthai */
|
||||
+ if (strstr (name, "four.break"))
|
||||
+ continue;
|
||||
+#endif
|
||||
+
|
||||
path = g_strdup_printf ("/break/%s", name);
|
||||
g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "breaks", name, NULL),
|
||||
test_break, g_free);
|
||||
Loading…
Reference in a new issue