From patchwork Mon Oct 23 16:20:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 56466 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 8890027BBEA; Tue, 14 Nov 2023 20:11:41 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 84A2A27BBE2 for ; Tue, 14 Nov 2023 20:11:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2zkr-0007fg-2C; Tue, 14 Nov 2023 15:11:25 -0500 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 1r2zkn-0007fD-30 for guix-patches@gnu.org; Tue, 14 Nov 2023 15:11:21 -0500 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 1r2zkm-0006k9-RM for guix-patches@gnu.org; Tue, 14 Nov 2023 15:11:20 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r2zlT-0006o6-4h for guix-patches@gnu.org; Tue, 14 Nov 2023 15:12:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66814] [PATCH gnome-team v4 1/3] 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, 14 Nov 2023 20:12:03 +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.169999272226148 (code B ref 66814); Tue, 14 Nov 2023 20:12:03 +0000 Received: (at 66814) by debbugs.gnu.org; 14 Nov 2023 20:12:02 +0000 Received: from localhost ([127.0.0.1]:34198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2zlR-0006nX-FF for submit@debbugs.gnu.org; Tue, 14 Nov 2023 15:12:01 -0500 Received: from planete-kraus.eu ([89.234.140.182]:43148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2zlO-0006mm-G3 for 66814@debbugs.gnu.org; Tue, 14 Nov 2023 15:11:59 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 7715166a; Tue, 14 Nov 2023 20:11:14 +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=albinoniA; bh=fR6utVYBlCwTTavWCGUGRy3iYv4=; b=U 74cwH2lvPoMo+fuLT33f/uWhNa5lSl0tzkLcTAjPYvhagREuZSQOUONawCK7dOx7 NV4MIevwP5GU5OvCA1j4q1NEB39aK8tAzd68WsOSE4d0cbfyqDSbmPey7N675REf vDUowSNlaMYWmulEsMkDJWUjUBT7bboOgkLhlVv+Cbf4xbmep3tItiFue/L5WRUi 9z9D1Nhk3RZ3GBLhlzx4hh0bEonu5KTZTbSAddrOl6FM5BYEgYNeTnwHuK2NlRpY mqf+WxEKCCXzpCKh/IxZgM5sYkM698mQPfnniFEu1S/5kMwzJ5z++7nMecCxk7lT 5s7FF0UpzePl7RgWMVJsw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b6adb9b5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 14 Nov 2023 20:11:13 +0000 (UTC) Message-ID: <6286d591a8eb892aa5cd63732fe060b68371f04e.1699992503.git.vivien@planete-kraus.eu> In-Reply-To: References: 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 --- 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)))))