From patchwork Mon Oct 23 16:20:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55727 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1191627BBE9; Tue, 31 Oct 2023 11:14:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7422327BBE2 for ; Tue, 31 Oct 2023 11:14:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxmha-0002nE-Sw; Tue, 31 Oct 2023 07:14:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxmhY-0002lf-9I for guix-patches@gnu.org; Tue, 31 Oct 2023 07:14:28 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxmhY-0007q3-0q for guix-patches@gnu.org; Tue, 31 Oct 2023 07:14:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxmi5-0006VQ-Mm for guix-patches@gnu.org; Tue, 31 Oct 2023 07:15:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66814] [PATCH gnome-team v3] gnu: at-spi2-core: Update to 2.48.4. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Oct 2023 11:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: liliana.prikler@gmail.com Cc: rg@raghavgururajan.name, 66814@debbugs.gnu.org, maxim.cournoyer@gmail.com Received: via spool by 66814-submit@debbugs.gnu.org id=B66814.169875084324920 (code B ref 66814); Tue, 31 Oct 2023 11:15:01 +0000 Received: (at 66814) by debbugs.gnu.org; 31 Oct 2023 11:14:03 +0000 Received: from localhost ([127.0.0.1]:47613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxmh8-0006Tr-Ck for submit@debbugs.gnu.org; Tue, 31 Oct 2023 07:14:02 -0400 Received: from planete-kraus.eu ([89.234.140.182]:46940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxmh5-0006TH-SX for 66814@debbugs.gnu.org; Tue, 31 Oct 2023 07:14:01 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4a0ac114; Tue, 31 Oct 2023 11:13:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=h6c4JdbWPiSnfdLR6K7R5QXHCWg=; b=T IXKWmEgIItwGpbYZZwu1ijkVwO9Wn8uiA/Rg/Eo1KvDTNgXyV/mrSt+vur2JjlrY 5sDbgo5Gw+ASXNERROdGqZY+UNsHtssokjL6M4f7ixhxXAV0cxwu4lnA1bdFAmes o7nmXI+KaXO8NqWOcz0kY/4sve+qWB4FeohE5y/ZbIdziqrxGDh1P/OgqBe5gDgk oLFtoIt7FPLVyYP4eBpHBURrsHlCjpekOWZWYq/ruwv2IY+inTGKqxjO0dvd/Y3K UB6c57yNvawRLWGPYXThMqVrygmsRI7/hqBxoP2uOGcItZIBTfo28immpE6TMO69 ADpQl2M8loqJB0wDSJwQA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id eaa8d0c9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 31 Oct 2023 11:13:21 +0000 (UTC) Message-ID: In-Reply-To: <9b1b828225740531672a3ae2cbe0420013dc931f.1698601268.git.liliana.prikler@gmail.com> References: <9b1b828225740531672a3ae2cbe0420013dc931f.1698601268.git.liliana.prikler@gmail.com> Date: Mon, 23 Oct 2023 18:20:53 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 --- Thank you! The build was fine for x86_64, but it did fail on i686 with the described segfault of dbus-run-session. Using the other patch series to update (gnu packages glib), #66689, I could get dbus-run-session to print a warning about more entries than 128 to listen to for changes before crashing, which led me to the linked issue. It does not mean the issue we experience here is related: maybe there is a problem when listening for changes on more than 128 directories, and maybe there is another problem when actually reading them. In any case, it is worth remembering that when such a crash occurs in dbus-run-session, it may be because there are too many entries in XDG_DATA_DIRS. Now I’ll see if that fixes #66823 (it has about a hundred of XDG_DATA_DIRS, but less than 128). The solution is not very satisfying. Maybe we could create a directory-union of all the XDG_DATA_DIRS? I don’t know how to do that in the check phase of a build. At least it should now work. Best regards, Vivien gnu/packages/gtk.scm | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) base-commit: 2677bf985c0025d04ffdcff31763978b633dbc58 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)))))