From f2d56e39934d14f2107ede8598e228c461c7b44d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 17:43:46 +0100 Subject: gnu: libpeas: Update to 1.24.1. * gnu/packages/gnome.scm (libpeas): Update to 1.24.1. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: New field. [native-inputs]: Remove INTLTOOL. ADD GETTEXT-MINIMAL and XORG-SERVER-FOR-TESTS. --- gnu/packages/gnome.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a6a8307649..9cf3cbb07d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018, 2019 Timothy Sample ;;; Copyright © 2019 Danny Milosavljevic -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2019 Florian Pelz ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jelle Licht @@ -1883,7 +1883,7 @@ some form of information without getting in the user's way.") (define-public libpeas (package (name "libpeas") - (version "1.22.0") + (version "1.24.1") (source (origin (method url-fetch) @@ -1892,8 +1892,19 @@ some form of information without getting in the user's way.") name "-" version ".tar.xz")) (sha256 (base32 - "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv")))) - (build-system gnu-build-system) + "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw")))) + (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'start-xserver + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (disp ":1")) + (setenv "DISPLAY" disp) + ;; Tests require a running X server. + (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp)) + #t)))))) (inputs `(("gtk+" ,gtk+) ("glade" ,glade3) @@ -1901,9 +1912,10 @@ some form of information without getting in the user's way.") ("python-pygobject" ,python-pygobject))) (native-inputs `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool))) + ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs ;; The .pc file "Requires" gobject-introspection. `(("gobject-introspection" ,gobject-introspection))) -- cgit v1.2.3