ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-15 07:27:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: at-spi2-core: Update to 2.48.4.

Browse source 
* gnu/packages/gtk.scm (at-spi2-core): Update to 2.48.4.
(at-spi2-core-with-documentation)[#:phases]: Adjust accordingly.
[native-inputs]: Remove docbook-xml-4.3 and gtk-doc/stable.
Add gi-docgen, python, and python-sphinx.

Change-Id: I3fc09c79f1ae5594fe9ad50e7212fbee11ce8a90
Co-authored-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Vivien Kraus 2023-10-23 18:20:53 +02:00 committed by Liliana Marie Prikler
parent 088aacb66e
commit a5118e5d97
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/gtk.scm
View file

@ -106,6 +106,7 @@ (define-module (gnu packages gtk)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
@ -792,7 +793,7 @@ (define-public at-spi2-core
(hidden-package
(package
(name "at-spi2-core")
(version "2.45.90")
(version "2.48.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -800,7 +801,7 @@ (define-public at-spi2-core
name "-" version ".tar.xz"))
(sha256
(base32
"03dba3c6m3sfapkkbbgzvbi1qcmrrlppydxjjs1m8ds9qb9hl1g9"))))
"05d5azffbglnvqzwk8ngg61jksm3brrwhmfpymsrccz8j8lv3v19"))))
(build-system meson-build-system)
(arguments
(list
@ -816,10 +817,15 @@ (define-public at-spi2-core
(lambda _
;; xfconfd requires a writable HOME
(setenv "HOME" (getenv "TMPDIR"))
;; Run test-suite under a dbus session.
(setenv "XDG_DATA_DIRS" ;for finding org.xfce.Xfconf.service
(string-append #$output "/share:"
(getenv "XDG_DATA_DIRS")))
;; dbus-run-session may crash if XDG_DATA_DIRS has too
;; many entries, maybe related to
;; https://gitlab.freedesktop.org/dbus/dbus/-/issues/481.
(setenv "XDG_DATA_DIRS"
(string-append
#$output "/share:"
#$(this-package-native-input
"gsettings-desktop-schemas")
"/share"))
;; Don't fail on missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
(with-directory-excursion (string-append "../at-spi2-core-"
@ -837,7 +843,8 @@ (define-public at-spi2-core
;; atspi-2.pc refers to all these.
(list dbus glib libx11 libxi libxtst))
(native-inputs
(list gettext-minimal
(list findutils
gettext-minimal
`(,glib "bin")
gobject-introspection
gsettings-desktop-schemas
@ -867,25 +874,13 @@ (define-public at-spi2-core-with-documentation
(add-after 'unpack 'set-documentation-path
(lambda _
;; Ensure that the cross-references point to the "doc" output.
(substitute* "doc/libatspi/meson.build"
(("docpath =.*")
(string-append "docpath = '" #$output:doc
"/share/gtk-doc/html'\n")))))
(add-before 'install 'prepare-doc-directory
(lambda _
(mkdir-p (string-append #$output:doc "/share"))))
#$@(if (%current-target-system)
#~()
#~((add-after 'install 'move-documentation
(lambda _
(copy-recursively
(string-append #$output "/share/gtk-doc")
(string-append #$output:doc "/share/gtk-doc"))
(delete-file-recursively
(string-append #$output "/share/gtk-doc"))))))))))
(substitute* "doc/meson.build"
(("docs_dir =.*")
(string-append "docs_dir = '" #$output:doc
"/share/doc'\n")))))))))
(native-inputs
(modify-inputs (package-native-inputs at-spi2-core)
(append docbook-xml-4.3 gtk-doc/stable)))
(append gi-docgen python python-sphinx)))
(properties (alist-delete 'hidden?
(package-properties at-spi2-core)))))