diff options
Diffstat (limited to 'gnu/packages/glib.scm')
| -rw-r--r-- | gnu/packages/glib.scm | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9cc2b1b69e..fdbe6d0cdf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -9,10 +9,12 @@ ;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> -;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2019, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> +;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Arthur Margerit <ruhtra.mar@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -58,7 +60,6 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages selinux) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -90,7 +91,7 @@ (define dbus (package (name "dbus") - (version "1.12.16") + (version "1.12.20") (source (origin (method url-fetch) (uri (string-append @@ -98,9 +99,8 @@ version ".tar.gz")) (sha256 (base32 - "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl")) - (patches (search-patches "dbus-CVE-2020-12049.patch" - "dbus-helper-search-path.patch")))) + "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp")) + (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -190,24 +190,25 @@ shared NFS home directories.") #t)))) (build-system meson-build-system) (outputs '("out" ; everything - "bin")) ; glib-mkenums, gtester, etc.; depends on Python + "bin" ; glib-mkenums, gtester, etc.; depends on Python + "debug")) (propagated-inputs `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc ;; These are in the Requires.private field of gio-2.0.pc ("util-linux" ,util-linux "lib") ;for libmount - ("libselinux" ,libselinux) ("zlib" ,zlib))) (native-inputs `(("gettext" ,gettext-minimal) ("m4" ,m4) ; for installing m4 macros ("dbus" ,dbus) ; for GDBus tests ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) + ("python" ,python-minimal-wrapper) ("perl" ,perl) ; needed by GIO tests ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c (arguments `(#:disallowed-references (,tzdata-for-tests) + #:configure-flags '("-Dselinux=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-dbus-launch-path @@ -331,11 +332,14 @@ shared NFS home directories.") (for-each (lambda (x) (apply disable x)) failing-tests) #t))) (replace 'check - (lambda _ - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky"))) + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "MESON_TESTTHREADS" + (number->string (parallel-job-count))) + ;; Do not run tests marked as "flaky". + (invoke "meson" "test" "--no-suite" "flaky")) + #t))) ;; TODO: meson does not permit the bindir to be outside of prefix. ;; See https://github.com/mesonbuild/meson/issues/2561 ;; We can remove this once meson is patched. @@ -420,21 +424,18 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.62.0") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) - (patches - (search-patches - "gobject-introspection-cc.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path.patch")))) + (version "1.66.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" + "gobject-introspection/" (version-major+minor version) + "/gobject-introspection-" version ".tar.xz")) + (sha256 + (base32 "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x")) + (patches (search-patches + "gobject-introspection-cc.patch" + "gobject-introspection-girepository.patch" + "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -552,7 +553,7 @@ The intltool collection can be used to do these things: (let ((prog (string-append (assoc-ref outputs "out") "/bin/itstool"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH")))) + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))) #t)))))) (home-page "http://www.itstool.org") (synopsis "Tool to translate XML documents with PO files") |