From patchwork Wed Apr 9 21:49:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?No=C3=A9_Lopez?= X-Patchwork-Id: 41515 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 D929127BC4A; Wed, 9 Apr 2025 22:50:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 DDD3227BC49 for ; Wed, 9 Apr 2025 22:50:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2dJA-0005Kr-Ef; Wed, 09 Apr 2025 17:50:08 -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 1u2dJ5-0005K9-6v for guix-patches@gnu.org; Wed, 09 Apr 2025 17:50:04 -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 1u2dJ4-0003Cq-TS for guix-patches@gnu.org; Wed, 09 Apr 2025 17:50:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=0xRLWlG/xuLVjBMWjUsVNoV9CRLZSxUOVZE3CUOe7cQ=; b=e3JYALGdtzk0ZRAczkA6fYP+Ml3UZea7LnQub/h9CleN5SLRciz4r7Bea4C9SPldodbmEbJ+GYv+M8FzCXwaLbyxKJGAjHNmyopNv7CnSwhqn6EbLapARQFa0TeK+FgoNNgdvrGNVG3hN9rG24z47A+WjlYCeOIL3f5xoutcoFPVJGDK+2de3lSj53wjwzdpwm2YN5o8pT04BJm64kLIu5DWBnbBwK5ET/WlErWqV/Jh9ZFD+fYo/D7G+VQZXexFCtSoTsCdo1vpI8zotVSh8S1QyBSHMvf3+J2Kv+O4zx+uutPqONeLwnEJG73HYZoEUHb7ZEEFjW+e0pZE7Z+m2g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2dJ4-0002xF-EE; Wed, 09 Apr 2025 17:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77682] [PATCH 1/2] gnu: liblouis: Fix library path for python extension. Resent-From: =?utf-8?q?No=C3=A9?= Lopez Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, rw-flurando@inventati.org, guix-patches@gnu.org Resent-Date: Wed, 09 Apr 2025 21:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77682@debbugs.gnu.org Cc: =?utf-8?q?No=C3=A9?= Lopez , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, rw-flurando@inventati.org X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, rw-flurando@inventati.org Received: via spool by 77682-submit@debbugs.gnu.org id=B77682.174423539311327 (code B ref 77682); Wed, 09 Apr 2025 21:50:02 +0000 Received: (at 77682) by debbugs.gnu.org; 9 Apr 2025 21:49:53 +0000 Received: from localhost ([127.0.0.1]:42497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2dIv-0002wd-4i for submit@debbugs.gnu.org; Wed, 09 Apr 2025 17:49:53 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:11890) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2dIs-0002wR-Nv for 77682@debbugs.gnu.org; Wed, 09 Apr 2025 17:49:51 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:990:a960:b4f3:8f44:ec4:5af5]) (Authenticated sender: noelopez@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id 1D09EB0054E; Wed, 9 Apr 2025 23:49:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1744235389; bh=5dwYdtUYL6gZ4DqcqjfynO+nxsaR2noIKLS/1MchF9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8ufAgbnhp7XfCX+0HE6WYyKcPV/bMsTKtrxzvtR5jFYtJz+ntAGkAMdej6iipUct DoobFIeaYnx06XcHiXzTGCDcBarLf0J9EhZujq9cuOpVHdDn1Jt8ohYBuOFtIUX6js SXl8KFpnyLpA4ROcn16ov07pOv8XQxtc5aKG2H+l/5mDclmGJY3OOHq/d1W6nc6PYo gElPIun6CgBDJ2K2MFd/nkXEY8sy12SOazXg1RVAA7Uj5k5kDlSjBX4QddWL0wsOyy iUMvGWpw1jQ+noSI3gZqXXBQUJ1UefAFEuJ0mxHSqadiU8i8YQRhd8Pcd4VfHQnLa7 TJlZgxu7qm+Kg== From: =?utf-8?q?No=C3=A9?= Lopez Date: Wed, 9 Apr 2025 23:49:42 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 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: , 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 This changes the extension to load the library from its absolute path instead of just with its name, which wouldn’t work. Fixes . * gnu/packages/language.scm (liblouis): Add fix-python-lib-path phase. Change-Id: Icdd476eed5a77ddb93c437ec4d92c79bf2db7bce --- gnu/packages/language.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index a6011bfce2..13957e12a0 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -351,6 +351,12 @@ (define-public liblouis #:configure-flags #~(list "--disable-static" "--enable-ucs4") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-python-lib-path + (lambda _ + (with-directory-excursion "python" + (substitute* "louis/__init__.py.in" + (("###LIBLOUIS_SONAME###") + (string-append #$output "/lib/###LIBLOUIS_SONAME###")))))) (add-after 'install 'install-python-extension (lambda _ (with-directory-excursion "python" From patchwork Wed Apr 9 21:49:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?No=C3=A9_Lopez?= X-Patchwork-Id: 41516 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 72C6227BC4B; Wed, 9 Apr 2025 22:51:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 32B8327BC49 for ; Wed, 9 Apr 2025 22:51:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2dK4-0005WR-GH; Wed, 09 Apr 2025 17:51:04 -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 1u2dK3-0005WI-M6 for guix-patches@gnu.org; Wed, 09 Apr 2025 17:51:03 -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 1u2dK2-0003Rt-W4 for guix-patches@gnu.org; Wed, 09 Apr 2025 17:51:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=tEm6hirj/dxLxLYcWpYXcav+k32aUUoY38lK9dFA+LM=; b=AY3B4NcfD9KkdsPvDYd177eiFdhQ0n9BmbbkWfXDnF9CMaU3PNHvKyTdmiRJc8Ee6N0Vns54piSYi2gR3n46IBauScXqLP0yBU/PEgNH5aTIVuV9CLC3cJDbH2McsyD+MAvMm5h5a5iULBhPvpo4X/tLf8hi9QnmzilJR91jsaCTJogk4hcZqfq+Th8QVi91px8vPUXjoHDUEu8q8E9jqTuIeNcHPDwrOvQ6PPO2eLJ2B8Sqfd/diapvwkhrshiOyIK+IGiRsCFxYSZLvTnqfNr2rvmGi6pgko6ToTHENt7Ia6X8vRvhGUxnIFeiYtq6rWJ/eZ9SQsKrjoACu1u50A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2dK2-00034z-8r; Wed, 09 Apr 2025 17:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77682] [PATCH 2/2] gnu: orca: Fix xkbcomp path. Resent-From: =?utf-8?q?No=C3=A9?= Lopez Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, rw-flurando@inventati.org, guix-patches@gnu.org Resent-Date: Wed, 09 Apr 2025 21:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77682@debbugs.gnu.org Cc: =?utf-8?q?No=C3=A9?= Lopez , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, rw-flurando@inventati.org X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, rw-flurando@inventati.org Received: via spool by 77682-submit@debbugs.gnu.org id=B77682.174423540411403 (code B ref 77682); Wed, 09 Apr 2025 21:51:02 +0000 Received: (at 77682) by debbugs.gnu.org; 9 Apr 2025 21:50:04 +0000 Received: from localhost ([127.0.0.1]:42503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2dJ5-0002xm-EZ for submit@debbugs.gnu.org; Wed, 09 Apr 2025 17:50:04 -0400 Received: from smtp1-g21.free.fr ([2a01:e0c:1:1599::10]:26896) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2dJ2-0002wr-Nf for 77682@debbugs.gnu.org; Wed, 09 Apr 2025 17:50:01 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:990:a960:b4f3:8f44:ec4:5af5]) (Authenticated sender: noelopez@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id E0A43B00572; Wed, 9 Apr 2025 23:49:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1744235399; bh=E7b0UDZiTCdHV/UXbMAlvqAq0SVTh6LGDh59IfHrbak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bOSm830ZEx8qxWdhk0KTIFANJa0c7xoBJiu5f+7a2iEK1O5ZwVgGIkLVhV1lEKaXc FJ02lLw2leKXz/P24vDZ9MSXyUVthyNDpsk9Gr6zmaUZgUnsNWIKZAp6bX9qUlNSvO L44Ism9D+dvGPzH+d0FFul9RpVdqNgTYgtlPT0jxES1lj/jSqIL0YZayh0YyPID4Gx Ij+Qz7sGTg8djoBRbcMWwbJJo4GAHnlrrAb6kbRo2kmjlVXHlO2MiNT28UWZ9nVU/D YiGiBKRS6BRFiyf8CoJ03i4VyuYuMbugUudXTHbFUGUXXAA582/h8OkZj4MJxw1lTp 7BkRrmdd1OyLw== From: =?utf-8?q?No=C3=A9?= Lopez Date: Wed, 9 Apr 2025 23:49:43 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 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: , 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 The calling code was moved to a different file where substitute* was not changing it. * gnu/packages/gnome.scm (orca): Change file for xkbcomp substitution. Change-Id: I92751b0fd639042007e956b234b9f248845a3970 --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 59c923d433..6251b1aa2c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11672,7 +11672,7 @@ (define-public orca (assoc-ref inputs "xkbcomp") "/bin/xkbcomp")) (pgrep (string-append (assoc-ref inputs "procps") "/bin/pgrep"))) - (substitute* "src/orca/orca.py" + (substitute* "src/orca/orca_modifier_manager.py" (("'xkbcomp'") (format #f "'~a'" xkbcomp))) (substitute* "src/orca/debug.py" (("'pgrep %s'")