From patchwork Thu Mar 6 08:44:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 39730 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 521CE27BBE9; Thu, 6 Mar 2025 08:50:12 +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=-7.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,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 572BC27BBE2 for ; Thu, 6 Mar 2025 08:50:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tq6uo-0004S5-Nh; Thu, 06 Mar 2025 03:49:14 -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 1tq6uf-0004Qr-F3 for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:06 -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 1tq6uf-0003Wp-3L for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:05 -0500 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=MVLH5hsov4yM1TsnPIZaL/Dv9eP77NWhiWfB6gAZIv4=; b=Z3MrQmNxS1UxvlbuRgXi+cNc8y6jaD7iAbak84xLWGZlW2pFjVZa4frnIjEZMndNYlzW558GXuDFwWDzLdPWiXrTuf2Sgg4baeKvTZNDmbc0i9c3buUOsI2X+E6JgNgHWtKOsQ2tyP7LALYjtmUI+zJt05Snm+J7B6io7vFJ/ktgum3RYYqTklJzRO/Spp3dkEtHExQY9ypv9fzitR9jUzxFTRFNkhNgsr2szKBfsTqCJiHMdhz+lhUIEW3QR5a7YlNtdenrR/f7tpX/32MJandf2nXCeYfU6Mmk4aRwJSvzqg4VnBe8p/R1u32cJzPcCz31P+6Dfm4Yf3aeIU09HQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tq6ue-00028y-0t; Thu, 06 Mar 2025 03:49:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76572] [PATCH v2 3/4] gnu: gnome-shell-extension-gsconnect: Patch shebangs with gjs. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: aurtzy@gmail.com, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 06 Mar 2025 08:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76572@debbugs.gnu.org Cc: aurtzy , aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 76572-submit@debbugs.gnu.org id=B76572.17412509228156 (code B ref 76572); Thu, 06 Mar 2025 08:49:03 +0000 Received: (at 76572) by debbugs.gnu.org; 6 Mar 2025 08:48:42 +0000 Received: from localhost ([127.0.0.1]:41402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tq6uF-00027O-0z for submit@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:42 -0500 Received: from mail-qv1-xf29.google.com ([2607:f8b0:4864:20::f29]:59635) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tq6uA-00026S-Vb for 76572@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:35 -0500 Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-6df83fd01cbso1618516d6.2 for <76572@debbugs.gnu.org>; Thu, 06 Mar 2025 00:48:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741250909; x=1741855709; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MVLH5hsov4yM1TsnPIZaL/Dv9eP77NWhiWfB6gAZIv4=; b=EkYYO47d1OHnToALALvS54vYmR7BSms8ngC/CTL4zivkhwxB7i0nQF34zTPuEjZinL m8sQpmxQ8fFOgOkhydASzSxhw+xec5VLIExZKbH9inyPbw/j8tuoq0JagMLBiP64Wi3k WipgLnbw/KJ30ENo6R5c+b7I+o92aC8zZD+/wXeYZjkmL2je7ijGSQoicS1a43pz/WuI wr6ryEhrTnvS6f51oKpPpC1aj4ohi0cnX7pQNUKhYj2uqPuRhhkAesXIuB3GV4fA5AEm LJZf44nO0WLcpVzwX5G1daUTJ+joZmXQ+DzNn7eOY0yS57mQxWBd7CNyLEmWqI4KeXYz wXEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741250909; x=1741855709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MVLH5hsov4yM1TsnPIZaL/Dv9eP77NWhiWfB6gAZIv4=; b=voPG2TEIPr1A9Qh9PpDxy4rbZmq5VucFAM5unysDjrCdVyxd0g9MVLkc3dgRl9m7qC +pHVQumwhrN4PcrMfc16rkk9Cv1BaEaMBOvoqc7qZLqp3eD8ACALFM3yBJ38b+xJFNzL 7XQPumq9ZlC6Yjq/iRW684MrD3yEgrqcExkLneHld27gnDf4KF+sCnpHHdKgKUQDib5n F3e+2gBY1B+qYcO193q031z5iF7LsqOTb+LnmFZt8jAAE4kGpZc4hgrAe4IPXmgvQ8/c rNiQbh98ScWnOG1CxmaXR1X+ugmwuWORgFkGpMnJK+gOsL99lTl867627oOx0xOcOaVy aZow== X-Gm-Message-State: AOJu0YyHrFfYzF7bFuKYe04FRrEKQvh4YdGUxTmAGsirIlpTJM4rXrHk TaCrR3hjeZCo+zjHhj5DWQXOXkuFy+abujN0s4DJuWmkHxhPDQqFJfQ1cg== X-Gm-Gg: ASbGnctm3G0RiBiKxW+8XdP06ZG+Mrm6aoCIg/drzfSbAqRzhxzPCvGvJsDfMoEjzge 3ZdMnkJsVfsaQbMqnARwC8rMHy1ozJJVSyKfyY9BkPdDHPzfDvt2oAsfjyd7lJmtSBXo4LcDQHw FWEBtXjyKkveU1j+3D6g3qHMT9m0v4JqpdS5bAtjf/2PDDw+4O/q3OAKSonMzUndpFYUJjpbvbz LKdXPMI2s2LdQ7f9B+LkYLZE/XeXLKiphwuumde0mLhQQQuBg0v66nl91iat8EUeueZLw4sv5IH dadZ8iN8fK7+nlvO2GNC7HgA0+PpobsrwAfC0jc= X-Google-Smtp-Source: AGHT+IGEM1NCHqQeACr/+u39X17h+kARkoiZE1+HZpnSddY+7Z7D2gclHZTu1/jZCwgtcLzTTj2Uyg== X-Received: by 2002:a05:6214:212d:b0:6e4:2f7f:d0bb with SMTP id 6a1803df08f44-6e8e6cc5c74mr94399106d6.4.1741250908585; Thu, 06 Mar 2025 00:48:28 -0800 (PST) Received: from localhost.localdomain ([2600:4808:a053:1800::4448]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4751db2f15dsm5183451cf.52.2025.03.06.00.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 00:48:28 -0800 (PST) From: aurtzy Date: Thu, 6 Mar 2025 03:44:52 -0500 Message-ID: <1da0ded149587945d839379568152cc52efeeb28.1741250406.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.48.1 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 'patch-shebangs phase does not handle shebangs of the form "/usr/bin/env -S", so we manually patch them to fix a not-found error. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect): [arguments]<#:phases>: Add 'patch-gjs-shebangs phase to patch shebangs using "/usr/bin/env -S" to execute gjs. Change-Id: I6b84474e4976484f1203b7cf78fe5e882694cd22 --- gnu/packages/gnome-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 359dc757fd..09e73a9c0a 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -761,6 +761,19 @@ (define-public gnome-shell-extension-gsconnect "gtk_update_icon_cache: false") (("update_desktop_database: true") "update_desktop_database: false")))) + ;; TODO: Remove after 'patch-shebangs is fixed to handle '/usr/bin/env -S' + ;; shebangs (see bug#74450). + (add-after 'unpack 'patch-gjs-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (for-each (lambda (file) + (substitute* file + (("^#!/usr/bin/env -S gjs.*$") + (string-append "#!" (which "gjs") " -m")))) + '("installed-tests/minijasmine" + "src/gsconnect-preferences" + "src/service/nativeMessagingHost.js" + "src/service/daemon.js" + "webextension/gettext.js")))) (add-before 'configure 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (let ((gapplication (search-input-file inputs "/bin/gapplication"))