[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/61: gnu: at-spi2-core: Update to 2.28.0.
From: |
guix-commits |
Subject: |
04/61: gnu: at-spi2-core: Update to 2.28.0. |
Date: |
Sat, 9 Mar 2019 02:53:20 -0500 (EST) |
rekado pushed a commit to branch staging
in repository guix.
commit 8c5b884c34382a2b436f6231d3a570e2d8aa03e3
Author: Ricardo Wurmus <address@hidden>
Date: Sun Aug 5 13:27:40 2018 +0200
gnu: at-spi2-core: Update to 2.28.0.
* gnu/packages/gtk.scm (at-spi2-core): Update to 2.28.0.
[build-system]: Use meson-build-system.
[arguments]: Adjust configure-flags; add build phases:
set-documentation-path,
prepare-doc-directory, move-documentation; move check phase after install.
[native-inputs]: Add gtk-doc and glib:bin.
---
gnu/packages/gtk.scm | 49 +++++++++++++++++++++++++++++++++++++------------
1 file changed, 37 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f824266..713bb85 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -560,7 +560,7 @@ in the GNOME project.")
(define-public at-spi2-core
(package
(name "at-spi2-core")
- (version "2.26.2")
+ (version "2.28.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -568,22 +568,45 @@ in the GNOME project.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8"))))
- (build-system gnu-build-system)
+ "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2"))))
+ (build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
'(#:configure-flags
- (list (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html"))
+ (list "-Denable_docs=true")
#:phases
(modify-phases %standard-phases
- (replace 'check
- ;; Run test-suite under a dbus session.
- (lambda _
- ;; Don't fail on missing '/etc/machine-id'.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- (invoke "dbus-launch" "make" "check"))))))
+ (add-after 'unpack 'set-documentation-path
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Ensure that the cross-references point to the "doc" output.
+ (substitute* "doc/libatspi/meson.build"
+ (("docpath =.*")
+ (string-append "docpath = '" (assoc-ref outputs "doc")
"/share/gtk-doc/html'\n")))
+ #t))
+ (add-before 'install 'prepare-doc-directory
+ (lambda* (#:key outputs #:allow-other-keys)
+ (mkdir-p (string-append (assoc-ref outputs "doc") "/share"))
+ #t))
+ (add-after 'install 'move-documentation
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (copy-recursively
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ (delete-file-recursively
+ (string-append out "/share/gtk-doc")))
+ #t))
+ (add-after 'install 'check
+ (lambda _
+ (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable
HOME
+ ;; Run test-suite under a dbus session.
+ (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
+ (string-append %output "/share"))
+ ;; Don't fail on missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0") ;
+ (invoke "dbus-launch" "ninja" "test")))
+ (delete 'check))))
(propagated-inputs
;; atspi-2.pc refers to all these.
`(("dbus" ,dbus)
@@ -593,6 +616,8 @@ in the GNOME project.")
("libxtst" ,libxtst)))
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("glib" ,glib "bin")
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(synopsis "Assistive Technology Service Provider Interface, core
components")
- branch staging updated (9776417 -> 2b0c755), guix-commits, 2019/03/09
- 02/61: gnu: Add gtksourceview-3., guix-commits, 2019/03/09
- 01/61: gnu: gtksourceview: Update to 4.0.2., guix-commits, 2019/03/09
- 10/61: gnu: glibmm: Update to 2.56.0., guix-commits, 2019/03/09
- 03/61: gnu: gtk-doc: Update to 1.28., guix-commits, 2019/03/09
- 05/61: gnu: yelp: Update to 3.28.1., guix-commits, 2019/03/09
- 12/61: gnu: libproxy: Remove network-manager., guix-commits, 2019/03/09
- 15/61: gnu: gsettings-desktop-schemas: Update to 3.28.0., guix-commits, 2019/03/09
- 04/61: gnu: at-spi2-core: Update to 2.28.0.,
guix-commits <=
- 08/61: gnu: file-roller: Update to 3.28.0., guix-commits, 2019/03/09
- 16/61: gnu: adwaita-icon-theme: Update to 3.28.0., guix-commits, 2019/03/09
- 19/61: gnu: geocode-glib: Update to 3.26.0., guix-commits, 2019/03/09
- 20/61: gnu: libgweather: Update to 3.28.2., guix-commits, 2019/03/09
- 14/61: gnu: gcr: Update to 3.28.0., guix-commits, 2019/03/09
- 38/61: gnu: python-pyatspi: Update to 2.26.0., guix-commits, 2019/03/09
- 23/61: gnu: eog: Update to 3.28.2., guix-commits, 2019/03/09
- 33/61: gnu: cheese: Propagate more inputs., guix-commits, 2019/03/09
- 35/61: gnu: gnome-session: Update to 3.28.1., guix-commits, 2019/03/09
- 27/61: gnu: gvfs: Update to 1.36.2., guix-commits, 2019/03/09