From patchwork Tue Nov 14 16:08:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 56512 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 55A1827BBE2; Thu, 16 Nov 2023 06:47:48 +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=unavailable 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 BD3C627BBE9 for ; Thu, 16 Nov 2023 06:47:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3W9b-00022V-8l; 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 1r3W9Z-00021M-AJ 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 1r3W9Z-0005Bx-1n for guix-patches@gnu.org; Thu, 16 Nov 2023 01:47:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3W9Y-0000Ro-Ft for guix-patches@gnu.org; Thu, 16 Nov 2023 01:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66814] [PATCH gnome-team v5 3/3] gnu: orca: Update to 44.2. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 06:47:04 +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.17001172131656 (code B ref 66814); Thu, 16 Nov 2023 06:47:04 +0000 Received: (at 66814) by debbugs.gnu.org; 16 Nov 2023 06:46:53 +0000 Received: from localhost ([127.0.0.1]:54373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3W9M-0000Qe-HN for submit@debbugs.gnu.org; Thu, 16 Nov 2023 01:46:52 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3W9J-0000Po-Ur for 66814@debbugs.gnu.org; Thu, 16 Nov 2023 01:46:50 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4a846640; Thu, 16 Nov 2023 06:46:49 +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=0JERUZ+KJNsd8GYRKxbZvroSMMs=; b=L +deXBvvgAUTlwpKxXVc6eeARB9T2Kw44vxFA5dVDL37EtwP3MlDFJlm9pO9xjIoG Fx1xQbyqvWRGmz9Bq2BneVqdh2946hK5rQ0abypYuKNsIAKJgCDFVEbEoLmThH7f JP+IEHQcWqClbKdHUCsFiJwb96Ogq+PEy+K2LK0wEjElKBKVeshLixRPnNdcTnZf EWyKGG0XB113rYMZXUulvzUbQuldvwRiDddY6pXaNxDzCVLiAJhkVNByYa6939m6 a/CRdkhkWgSU7knqdZXtNREfKKrLlWYr+jV1LO+ulrxUCdfTsh1L8785vGeTWP1G a5xMwdbd3GaYY75tFWEMA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3dc89b7c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 16 Nov 2023 06:46:48 +0000 (UTC) Message-ID: <80f3e38d7ff1c028044dbdf510318bd245fcae59.1700116481.git.vivien@planete-kraus.eu> In-Reply-To: <6286d591a8eb892aa5cd63732fe060b68371f04e.1700116480.git.vivien@planete-kraus.eu> References: <6286d591a8eb892aa5cd63732fe060b68371f04e.1700116480.git.vivien@planete-kraus.eu> Date: Tue, 14 Nov 2023 17:08:02 +0100 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/gnome.scm (orca): Update to 44.2. [#:phases]: Also expand pgrep. [inputs]: Add procps. Replace at-spi2-atk with at-spi2-core. Change-Id: I05fdab970909edda44ca9957d2ad721f62e6bfec --- gnu/packages/gnome.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2958da2cd9..bfc16159c0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11089,7 +11089,7 @@ (define-public python-pyatspi (define-public orca (package (name "orca") - (version "42.3") + (version "44.2") (source (origin (method url-fetch) (uri (string-append @@ -11098,17 +11098,25 @@ (define-public orca name "-" version ".tar.xz")) (sha256 (base32 - "097pyav3z5ssic8vwd7v1s7vynpycdpyfr324rr6c7mfzq5vmp7s")))) + "11jn925ga970y74did96ms78pc3lshkd9rd8v82i6zdzigxa7yvd")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'qualify-xkbcomp + (add-before 'configure 'qualify-programs (lambda* (#:key inputs #:allow-other-keys) (let ((xkbcomp (string-append - (assoc-ref inputs "xkbcomp") "/bin/xkbcomp"))) + (assoc-ref inputs "xkbcomp") "/bin/xkbcomp")) + (pgrep (string-append + (assoc-ref inputs "procps") "/bin/pgrep"))) (substitute* "src/orca/orca.py" - (("'xkbcomp'") (format #f "'~a'" xkbcomp)))))) + (("'xkbcomp'") (format #f "'~a'" xkbcomp))) + (substitute* "src/orca/debug.py" + (("'pgrep %s'") + (format #f "'~a %s'" pgrep))) + (substitute* "src/orca/orca_bin.py.in" + (("'pgrep -u %s -x orca'") + (format #f "'~a -u %s -x orca'" pgrep)))))) (add-after 'install 'wrap-orca (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/orca") @@ -11124,13 +11132,14 @@ (define-public orca pkg-config libxml2)) (inputs - (list at-spi2-atk + (list at-spi2-core bash-minimal gsettings-desktop-schemas gstreamer gst-plugins-base gst-plugins-good gtk+ + procps ; for pgrep python python-pygobject python-pyatspi