guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/11: gnu: libpeas: Update to 1.24.1.


From: guix-commits
Subject: 07/11: gnu: libpeas: Update to 1.24.1.
Date: Thu, 16 Jan 2020 13:22:13 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit f2d56e39934d14f2107ede8598e228c461c7b44d
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Jan 16 17:43:46 2020 +0100

    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 a6a8307..9cf3cbb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -34,7 +34,7 @@
 ;;; Copyright © 2018 Björn Höfling <address@hidden>
 ;;; Copyright © 2018, 2019 Timothy Sample <address@hidden>
 ;;; Copyright © 2019 Danny Milosavljevic <address@hidden>
-;;; Copyright © 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
 ;;; Copyright © 2019 Florian Pelz <address@hidden>
 ;;; Copyright © 2019 Giacomo Leidi <address@hidden>
 ;;; Copyright © 2019 Jelle Licht <address@hidden>
@@ -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)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]