diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2018-08-05 13:27:40 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-03-07 13:41:03 +0100 |
commit | 8c5b884c34382a2b436f6231d3a570e2d8aa03e3 (patch) | |
tree | d0019e2886b1541d82c43369b2b7b8a83571b5c6 /gnu/packages/gtk.scm | |
parent | 7a1bb44a5d3528355501cbb3219ea1dd4a1b5159 (diff) | |
download | gnu-guix-8c5b884c34382a2b436f6231d3a570e2d8aa03e3.tar gnu-guix-8c5b884c34382a2b436f6231d3a570e2d8aa03e3.tar.gz |
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.
Diffstat (limited to 'gnu/packages/gtk.scm')
-rw-r--r-- | gnu/packages/gtk.scm | 49 |
1 files changed, 37 insertions, 12 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f8242664dc..713bb85430 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") |