From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>
Cc: rg@raghavgururajan.name, 66814@debbugs.gnu.org,
maxim.cournoyer@gmail.com
Subject: [bug#66814] [PATCH gnome-team v5 1/3] gnu: at-spi2-core: Update to 2.48.4.
Date: Mon, 23 Oct 2023 18:20:53 +0200 [thread overview]
Message-ID: <6286d591a8eb892aa5cd63732fe060b68371f04e.1700116480.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <7249cc2130949445f57d8b9265e0da952d048b6a.1698583747.git.vivien@planete-kraus.eu>
* 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>
---
gnu/packages/gtk.scm | 43 +++++++++++++++++++------------------------
1 file changed, 19 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 21a12689b7..08fed555c9 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -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)))))
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
next prev parent reply other threads:[~2023-11-16 6:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 16:20 [bug#66814] [PATCH gnome-team] gnu: at-spi2-core: Update to 2.48.4 Vivien Kraus via Guix-patches via
2023-10-23 16:20 ` [bug#66814] [PATCH gnome-team WIP v2] " Vivien Kraus
2023-10-23 16:20 ` [bug#66814] [PATCH gnome-team v3] " Vivien Kraus via Guix-patches via
2023-10-23 16:20 ` Vivien Kraus via Guix-patches via [this message]
2023-11-14 16:08 ` [bug#66814] [PATCH gnome-team v5 3/3] gnu: orca: Update to 44.2 Vivien Kraus via Guix-patches via
2023-11-19 8:55 ` bug#66814: " Liliana Marie Prikler
2023-11-14 16:45 ` [bug#66814] [PATCH gnome-team v5 2/3] gnu: libical: Update to 3.0.17 Vivien Kraus via Guix-patches via
2023-11-14 20:08 ` [bug#66814] [PATCH gnome-team v4 0/3] Update at-spi2-core and orca Vivien Kraus via Guix-patches via
2023-10-23 16:20 ` [bug#66814] [PATCH gnome-team v4 1/3] gnu: at-spi2-core: Update to 2.48.4 Vivien Kraus via Guix-patches via
2023-11-14 16:08 ` [bug#66814] [PATCH gnome-team v4 3/3] gnu: orca: Update to 44.2 Vivien Kraus via Guix-patches via
2023-11-14 20:51 ` Liliana Marie Prikler
2023-11-14 16:45 ` [bug#66814] [PATCH gnome-team v4 2/3] gnu: libical: Update to 3.0.17 Vivien Kraus via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6286d591a8eb892aa5cd63732fe060b68371f04e.1700116480.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=66814@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.