From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id uEoVGg+7VWWQxwAA9RJhRA:P1 (envelope-from ) for ; Thu, 16 Nov 2023 07:47:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id uEoVGg+7VWWQxwAA9RJhRA (envelope-from ) for ; Thu, 16 Nov 2023 07:47:43 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F0F5513E45 for ; Thu, 16 Nov 2023 07:47:42 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="jAL/3JbR"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1700117263; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+2nHofuSkMW7fWcwP0nZOK8vUxmWc/lAH7hOMY+7kNw=; b=m1xMIKCxLyS2r3lKnm4bd2hrWjR+ChF/432t9ZhE5qrN8ZvNatVOJMHmTUAwSkyRpEinUX XXYCVsxNFVqEkU/IVzcIg1WlYnJHbQJqiQATUzI9uO5THdGHxv5qxpRgmWqrHXPd0VNnz3 9G1FgMX9LHQKLrH99+sQtx80TWVqghz3NC513+IJR1qxtutGZehHgGAW2xgZFJO4MJ+P5u 5cec7hfX8NmRV9S7NWivpUiqCX/5mzEaKoLWeqdh75IBdnC0LO1+kDvTEdDxYVm6/Vs6Pe oiSGSj9C0oe2M3GcEms2mudWFnGFjkc9/k9DO+BWwyJtDjgaTiWxcGOhrQlQIg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="jAL/3JbR"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1700117263; a=rsa-sha256; cv=none; b=Ak/PehopAdhsg2TrCG8nFpd3EJLl4q1FaXMynkk2fNoNO82eCSzVtTxXwT1I4aURBqsyhk VgukVWUELbBZLDZXbRuXTq3A5F+OhHm7fnvnDB2dVL442AaLZXzCxQOp7iafqzYYzPZQSF AwxSGlxa2GToyWLjlPUV1W5MEQLGKtOTvQaQ6/YRv6+R4LPhwS2FySGoEJWsReB1qvKhGK EHCBLk7tBUxisuPSGKK/+7gEHiBRfDTrDbPJm3s6bxwg08Hwjl26NgFEmLORaTd9z/WHBF bLKBNEacOLCktMhEK8QzR934FmxdJzylcjNSnSIyOe7R2QBA0oju94rLxHqvXQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3W9b-00022M-4h; Thu, 16 Nov 2023 01:47:07 -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 1r3W9Y-00021F-FC for guix-patches@gnu.org; Thu, 16 Nov 2023 01:47:05 -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 1r3W9Y-0005AP-6j for guix-patches@gnu.org; Thu, 16 Nov 2023 01:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3W9X-0000RZ-KZ for guix-patches@gnu.org; Thu, 16 Nov 2023 01:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66814] [PATCH gnome-team v5 1/3] gnu: at-spi2-core: Update to 2.48.4. References: <7249cc2130949445f57d8b9265e0da952d048b6a.1698583747.git.vivien@planete-kraus.eu> In-Reply-To: <7249cc2130949445f57d8b9265e0da952d048b6a.1698583747.git.vivien@planete-kraus.eu> Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 06:47: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 Marie Prikler Cc: rg@raghavgururajan.name, 66814@debbugs.gnu.org, maxim.cournoyer@gmail.com Received: via spool by 66814-submit@debbugs.gnu.org id=B66814.17001171821543 (code B ref 66814); Thu, 16 Nov 2023 06:47:03 +0000 Received: (at 66814) by debbugs.gnu.org; 16 Nov 2023 06:46:22 +0000 Received: from localhost ([127.0.0.1]:54356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3W8r-0000Ok-V5 for submit@debbugs.gnu.org; Thu, 16 Nov 2023 01:46:22 -0500 Received: from planete-kraus.eu ([89.234.140.182]:51976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3W8p-0000O6-FW for 66814@debbugs.gnu.org; Thu, 16 Nov 2023 01:46:20 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1377b832; Thu, 16 Nov 2023 06:46:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:cc:mime-version; s=albinoniA; bh=mZE7Ty+JLDLGke1JSSDZGaI1H/w=; b=jAL/3JbRjtlePMhECMqcWNDCNllB 0oWfuAUp+rRF4jxJO4Z39jS1diWKH0vA0+Z2bS+NNSXiSJEQGvLKHb9zi9pZyq/X IisZum7m2CaOJvWBk1EleFGoDAwLvku4Zd3kTFl6HKo6vf9T25cNOGMow09dDzLL mgbQg2SsjMJi7cx+GA611rSXVsWCP8l853pacgObQttd1fvtcjmr4ZT/yxCkRfla wQ2gNs4NhhScdjYWo1j6Ripp7XxDeYHcnfOIhZEJWF4DzY9F1r18C+0iP8XA9BPq QF7+PbRbZYY35U/Z3xxz9v37+XJ/9lQmGD+eu/cqDS3OorcDvAIsXtpUBA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 4bfc6d9a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 16 Nov 2023 06:46:16 +0000 (UTC) Message-ID: <6286d591a8eb892aa5cd63732fe060b68371f04e.1700116480.git.vivien@planete-kraus.eu> 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 From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.09 X-Spam-Score: -4.09 X-Migadu-Queue-Id: F0F5513E45 X-Migadu-Scanner: mx10.migadu.com X-TUID: aCBqniX3XGAY * 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))))) base-commit: 72e886328c14c832b2ed71c400069b63852ee18d -- 2.41.0