X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH 0/4] Fixes for gnome-shell-extension-gsconnect
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 25 Feb 2025 23:27:01 +0000
Resent-Message-ID: <handler.76572.B.17405260043826 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
X-Debbugs-Original-Xcc: Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by submit <at> debbugs.gnu.org id=B.17405260043826
(code B ref -1); Tue, 25 Feb 2025 23:27:01 +0000
Received: (at submit) by debbugs.gnu.org; 25 Feb 2025 23:26:44 +0000
Received: from localhost ([127.0.0.1]:49034 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tn4K4-0000ze-4o
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:26:44 -0500
Received: from lists.gnu.org ([2001:470:142::17]:54570)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tn4K1-0000zM-By
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:26:41 -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 <aurtzy@HIDDEN>) id 1tn4Ju-0003Xq-VD
for guix-patches@HIDDEN; Tue, 25 Feb 2025 18:26:35 -0500
Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <aurtzy@HIDDEN>) id 1tn4Js-0007hG-Qh
for guix-patches@HIDDEN; Tue, 25 Feb 2025 18:26:34 -0500
Received: by mail-qv1-xf33.google.com with SMTP id
6a1803df08f44-6e65be7d86fso3164806d6.1
for <guix-patches@HIDDEN>; Tue, 25 Feb 2025 15:26:32 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740525991; x=1741130791; darn=gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=RGb0cwcPLlP+t0X6gC0KXurKKp9Gmngit/zS/qteN5c=;
b=JmgMNNQCUfbjV+0cOK2YcSwaTFD6AUwIL7MMokRRckd+zsJYYJFU+lIrUB/2NXSOs1
YiLjlg+q6bOBpHvoR/w493v/5HUjgfW6E8Z3nNplhpFGZakejaiETTbCAXN+cFORyxMt
8PZbnRERJOokTzGuJG5PC7CugKxs2COlCDJoMyXfjRq8F2HXMIlQ0wWOUdg4N9ye0ikb
ysY7hZmpba9lHCxD/DhaNROu+lYHZm44WAI0N54nU285fuYUpwvTxT8I3f6I++7jVyxb
4TZ82aI07Fkx6Tba/GB9EsMNaHTXF6fk2sITyH63g3V4SSrsRYbF7gPkvFSSLHlfm5AU
i1QQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740525991; x=1741130791;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=RGb0cwcPLlP+t0X6gC0KXurKKp9Gmngit/zS/qteN5c=;
b=eVKQQuDfCii/nxghzCL+jsrAq1hhTCGQKtH1Q1dSHTm+DzldPiERrfjV3iUHqdxT9J
9bUl9+GmhKMsWKo/8YgOlGOqH3DzJKksmDdja2OmVHJQD64eL2vCVQrIGxuu3k1y6IS3
2sI28M37MOdyaWQucE+qu0YdmSlLuPvlMs5OXLn1qZlxOEZAfEBiDxtp4YBX+LhDxi0C
FvnhFsq2osNEUItlJpvjNoCR2pZgfbtTD+euDa9oP14pGMzIl66ECUc3yRx0KedSDHX9
lJM9AWzI3m/92AJG44PCjh8Q4Gzo8sSAC3mbl+IxtaTxFGSHBp/E9RkNx+mHRnnS6yzk
RJWg==
X-Gm-Message-State: AOJu0YwY6HJkisYzJ29dbcM3/88iREdbM8yqY8eSULukAdZAZe5kLyL7
6DngZg8X0ME4ae04yui2BzOj0T7P1lkmoSODCx4aVrSjYR4Fx+5at4dFvw==
X-Gm-Gg: ASbGncsUBs0nBhHdXFJfdQ03qESjRvRS1NvM/NdQgqRVlRGvu+SL6hJ6/ICabXvo22l
Sv0oxgCQejhS8cczhChbKD+JQ75449yCq1jf9838W9BXaA90pqHFKfnW38fvLJHJBnFsOIuYDzz
UsSGc7eR/QhIDjEJpuzIZrKOV/cUIKuap/WuzpxQRAqpWd2VfYJik+PgPXIUqn9LIFiYGk0PJCH
ckt03kcpEW+5qp5PfXF5GR7fT5FjS18NF0UGtlLQwmlb3poa+lQTu4Q75wZ681+Zd715NJ4rU4A
EYyK7KEPVuySpn3p3Q8x
X-Google-Smtp-Source: AGHT+IFI8fivZTVVN6NP0SE0vfCYSSMMFcJMLfqrcM3SQBGCR5todRpWl7Y9CwizJYRa00k800pYKw==
X-Received: by 2002:a05:6214:e6a:b0:6e4:3455:eba3 with SMTP id
6a1803df08f44-6e6ae778adbmr223275466d6.6.1740525990893;
Tue, 25 Feb 2025 15:26:30 -0800 (PST)
Received: from localhost.localdomain ([2600:4808:a053:1800::4448])
by smtp.gmail.com with ESMTPSA id
6a1803df08f44-6e87b06e256sm15132406d6.13.2025.02.25.15.26.29
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 25 Feb 2025 15:26:30 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
Date: Tue, 25 Feb 2025 18:21:48 -0500
Message-ID: <cover.1740522373.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::f33;
envelope-from=aurtzy@HIDDEN; helo=mail-qv1-xf33.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Hello!
This patch series addresses issues with GSConnect generally not working.
I've been mainly testing this on the gnome-team branch (no relation to
the issues, which have been present in master), but I can confirm that
these patches don't break the main branch (guix pull still works), and
gnome-shell-extension-gsconnect still builds there.
Cheers,
aurtzy
aurtzy (4):
gnu: gnome-shell-extension-gsconnect: Fix search path patching.
gnu: gnome-shell-extension-gsconnect: Wrap gsconnect-preferences.
gnu: gnome-shell-extension-gsconnect: Patch shebangs with gjs.
gnu: gnome-shell-extension-gsconnect: Fix paths in additional desktop
file.
gnu/packages/gnome-xyz.scm | 45 ++++++++++++++++++++++++++++----------
1 file changed, 34 insertions(+), 11 deletions(-)
base-commit: 8bc831325a905dbd9015739b58e3a5138d2217da
--
2.48.1
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: aurtzy <aurtzy@HIDDEN> Subject: bug#76572: Acknowledgement ([PATCH 0/4] Fixes for gnome-shell-extension-gsconnect) Message-ID: <handler.76572.B.17405260043826.ack <at> debbugs.gnu.org> References: <cover.1740522373.git.aurtzy@HIDDEN> X-Gnu-PR-Message: ack 76572 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 76572 <at> debbugs.gnu.org Date: Tue, 25 Feb 2025 23:27:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. As you requested using X-Debbugs-CC, your message was also forwarded to Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim= .cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN> (after having been given a bug report number, if it did not have one). Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 76572 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 76572: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76572 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH 1/4] gnu: gnome-shell-extension-gsconnect: Fix search path patching.
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: aurtzy@HIDDEN, liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 25 Feb 2025 23:36:01 +0000
Resent-Message-ID: <handler.76572.B76572.174052651717341 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, aurtzy <aurtzy@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-Xcc: aurtzy <aurtzy@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.174052651717341
(code B ref 76572); Tue, 25 Feb 2025 23:36:01 +0000
Received: (at 76572) by debbugs.gnu.org; 25 Feb 2025 23:35:17 +0000
Received: from localhost ([127.0.0.1]:49068 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tn4SK-0004Vc-HM
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:35:16 -0500
Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:53614)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tn4SH-0004Tj-AV
for 76572 <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:35:14 -0500
Received: by mail-qk1-x72b.google.com with SMTP id
af79cd13be357-7c08b14baa9so565837485a.3
for <76572 <at> debbugs.gnu.org>; Tue, 25 Feb 2025 15:35:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740526507; x=1741131307; 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=ffB2hj2cCA5YbEFMPKNhq52zx3QNStrka1of4jnb8LA=;
b=PkGkPt+RBw3apWDs9L5wN66QkOENGW5rjz+W7qEYQ384QsLk+nirWHXFZPEXPBTaGt
RCg3HVrfdWS+MRRMcWo06N083RNVdV5H20qms7Vn9hrBGZtMnlD24WB3CdIFJ/bLGwPG
MrpXdSOr3TTsKacD6ijMzjwVMmV2baTCPDXrCwh6OB6qjy/ugeqCLYs5wRRhdyUgLlGW
hYCSI4M6NmFbl2hRIA1uHnfgetRnQ1pJEOwlSVoP4lfneCPkatrNWhjcBKPMzoqLDZlj
49axrWw7bpkarVNfwbNt6MIDA3bJQmgwD03jW+Gnx9rGdhZK/SiGZyQN4tkhM3ZX0t+t
ND4g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740526507; x=1741131307;
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=ffB2hj2cCA5YbEFMPKNhq52zx3QNStrka1of4jnb8LA=;
b=wQZoz0TK5cndcuUNG0aRN9ZrjQoJ092aeNBBeA2ZCchYz+tFs8wN13YAK2k1Ua3Fkb
vvBltMAzkrNN3l4tkmLoLO53J4yDlkC6mb/lxrO3syOFsRD6gJxBXV5Mbxltm/+FnTxj
/bqoEKzCpkxwX3uqUNDVG03WvMoKCVhFhpXMibWCbxUwFF4ZuL0IJS1A7Fert7KHuU0L
YFwYpdUc71AaUe++q9XTevmXDOvaydgi1sy2ZBZVaszKSAUS3PQHneUvz6cIWljWbAN4
x2DgbFEXW5wtGHhDPhPsE6VN7deGe63JgHKC0nJP3D4nUU82uHNeFVRyKD2JbXsbJPkM
8MZA==
X-Gm-Message-State: AOJu0Yz7msEYb5ZJ3SB3IP8P55QMrgoSVXNyk4t0iEXIiED4zjwQZRRT
PPOIfRqoHIwnjY51fev6EO0Q0/8+1fYIYl5UdJv5tbzaYStH9r/jjpqWNQ==
X-Gm-Gg: ASbGncuCwQsRuRLkSOLP63xeLvOmq5W660jkd6gW3/1W0/JUOK4WaztPyinRASh/Cfw
rCLUprxZ/QDbRBMt+rFSOUO2bIS96k0DUUq2LCGhm3OFK+mhL0i890KGV2zfRTSde2/rkF/U/b2
CT12+pJ7bLmG25xc6k67a7LWBg9v4RYtWq7AoXNuFyBKMfFC+rmMjvL6sT81e6Ec3qDlwz6wKz2
KLVp9tiODFTpUDkY/HUHi/iMSnizXMEN/Mw4dK8+poimxNAzA04X/myWkS6vqAWv/RkEIFwmHpy
Jx2NrtodMs17G5V4REem
X-Google-Smtp-Source: AGHT+IH4wYbphPjwrEGYVAZuXn/IzULHXaO3JwE73dhqEMrso/GwQWB+ZcyxqMUMLIbtq3Omte6GvQ==
X-Received: by 2002:a05:620a:5ef4:b0:7c2:40ae:cfac with SMTP id
af79cd13be357-7c240aecfc1mr482050685a.4.1740526506624;
Tue, 25 Feb 2025 15:35:06 -0800 (PST)
Received: from localhost.localdomain ([2600:4808:a053:1800::4448])
by smtp.gmail.com with ESMTPSA id
af79cd13be357-7c23c327238sm166538485a.67.2025.02.25.15.35.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 25 Feb 2025 15:35:05 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
Date: Tue, 25 Feb 2025 18:34:21 -0500
Message-ID: <89f5b7271c9568ffd58a61748a010510b3e9ee58.1740522373.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <cover.1740522373.git.aurtzy@HIDDEN>
References: <cover.1740522373.git.aurtzy@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect):
[arguments]<#:phases>: Fix 'fix-paths phase substitutions no longer applying.
Change-Id: I99aa0204c1dfad836aed62261d2ffc0c75366510
---
gnu/packages/gnome-xyz.scm | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index f975926e94..8c1c000feb 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2022 Sughosha <sughosha@HIDDEN>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@HIDDEN>
;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas@HIDDEN>
+;;; Copyright © 2025 aurtzy <aurtzy@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -772,12 +773,15 @@ (define-public gnome-shell-extension-gsconnect
(("gapplication") gapplication))
(for-each
(lambda (file)
- (substitute* file
- (("'use strict';")
- (string-append "'use strict';\n\n"
- "'" gi-typelib-path "'.split(':').forEach("
- "path => imports.gi.GIRepository.Repository."
- "prepend_search_path(path));"))))
+ (with-atomic-file-replacement
+ file
+ (lambda (input output)
+ (format output "~a"
+ (string-append
+ "'" gi-typelib-path "'.split(':').forEach("
+ "path => imports.gi.GIRepository.Repository."
+ "prepend_search_path(path));\n"))
+ (dump-port input output))))
'("src/extension.js" "src/prefs.js")))))
(add-after 'install 'wrap-daemons
(lambda _
--
2.48.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH 2/4] gnu: gnome-shell-extension-gsconnect: Wrap gsconnect-preferences.
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: aurtzy@HIDDEN, liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 25 Feb 2025 23:36:02 +0000
Resent-Message-ID: <handler.76572.B76572.174052652317364 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, aurtzy <aurtzy@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-Xcc: aurtzy <aurtzy@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.174052652317364
(code B ref 76572); Tue, 25 Feb 2025 23:36:02 +0000
Received: (at 76572) by debbugs.gnu.org; 25 Feb 2025 23:35:23 +0000
Received: from localhost ([127.0.0.1]:49072 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tn4SQ-0004Vw-Uw
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:35:23 -0500
Received: from mail-qk1-x72a.google.com ([2607:f8b0:4864:20::72a]:60609)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tn4SJ-0004Uq-IX
for 76572 <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:35:15 -0500
Received: by mail-qk1-x72a.google.com with SMTP id
af79cd13be357-7c0b0ca6742so661454585a.0
for <76572 <at> debbugs.gnu.org>; Tue, 25 Feb 2025 15:35:15 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740526509; x=1741131309; 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=rLnp+iURlAww7z7BA2rpH4VPJtDH896AEVvqFDabwFQ=;
b=hWkQhauKduJLgWBw+VkPX8iMhWjpKV66sYAtcUJ1KnuGxhR5jivmSbUypvS5nUo74i
9yPS3EuVw/YC8Oh4PGnYMnJloVwwCqvaZGeM4xKDzJ7EkS3hVBirDO9v7j1xdFeda0dP
xG4X5fyGH38GkYG0RS/DP95deAtxKnXuA0cZsBziLXXFsEgblm3oKCBEI2WQCSNlqmFs
o6TXXhkZ9ITIC8Ofh99RmG6HGhS4w+9YHXWBHkH59O3Yny+8uDQIqLyApFuYJZ4ItLao
J+F3ZsBwuQ8a6IIOldQUH6oRGn76t3LbqafEuUyjxtYNG12F/Fg2kDGREXch76Ha9kl5
SsIA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740526509; x=1741131309;
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=rLnp+iURlAww7z7BA2rpH4VPJtDH896AEVvqFDabwFQ=;
b=HFr+xj5N41TMYr61WEM/ozuP4opXoPexJAn8V9zY/Qpp3Cmx1+YFYHwBW66rv/09YL
baGnjfPnpSsKoD4p+J10LaP0AiXfrFtCVqq8uRw+NptOUh1O4f61xDHNp+4h4X3+yQJ/
gOxZFNyQLO5MiwLdYs7vPngtK12S0zC+bvxnCthLT98STRU3gCLW422ZQfcB0TrjPG05
I3WwZOokP7Ofv6IqcP7oWsm/+giTroYFPNWn61+6R1E40iMYHMv8EVoYjx+GUo4GkLU0
JX/Ywp5FjWhjakIu/UAu86sKHXDFYS440vivgdPepHIJP1E9wIoKGbSNRFJ6CGwi5SUi
CtzA==
X-Gm-Message-State: AOJu0YzVQQ6N1utHHJnTzKMIlsDmdfWEs2xYTiyUUlWsFV27TVfMOUS0
Qy3hO81ECUBUMtt/97p30FvygBIEQGOej85HSoD0Pt3EjKGuFoo7U3WbAA==
X-Gm-Gg: ASbGnctKC9QuapSClcjbw1s1iHPqwh4BCujvqYBIEfX9+eMoLAnwPuqatOOMkFUC8cZ
H5ORmWKdBXZ4Db3a/gJ5mMlgb9/7g3Z175HmnGRM5lYtZTH9gFfLyhZun0Tiwxxye0la92SKhsH
GxIgIwGh5okS9JlhQFdZ4D7g1TXs9UIMXLqwlKQCIEK3MoieUIo33eJcejE5dkkgsGuJTvbCG+a
MUTKsdKSab7jlYZQRRk37wuY0vAEDpItK7vPFdtbVNbXsRAaRixOuxNdIS76sg5vhlJVnhoONQE
ZDSVJRIl7TdA6EVc4Z/b
X-Google-Smtp-Source: AGHT+IGeePMsdrUUNOrzmV4CSNaKaHjVPnWL+vNPMtRCXV36hwonKASHpoBreQ0z+abO7GZzvHv7bg==
X-Received: by 2002:a05:620a:f02:b0:7c0:6419:8bd3 with SMTP id
af79cd13be357-7c247f259e8mr223043085a.22.1740526509594;
Tue, 25 Feb 2025 15:35:09 -0800 (PST)
Received: from localhost.localdomain ([2600:4808:a053:1800::4448])
by smtp.gmail.com with ESMTPSA id
af79cd13be357-7c23c327238sm166538485a.67.2025.02.25.15.35.07
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 25 Feb 2025 15:35:08 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
Date: Tue, 25 Feb 2025 18:34:22 -0500
Message-ID: <88100c77035f4d0a2e7749b4a7902525e8f63c77.1740522373.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <cover.1740522373.git.aurtzy@HIDDEN>
References: <cover.1740522373.git.aurtzy@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This fixes an error when attempting to open the gsconnect-preferences
application due to Typelib files not being found.
* gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect):
[arguments]<#:phases>: Wrap gsconnect-preferences with GI_TYPELIB_PATH
environment variable. Rename 'wrap-daemons phase to 'wrap-programs.
Change-Id: Ib330766d46dba00a7c68fa3956b28223f07000f8
---
gnu/packages/gnome-xyz.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 8c1c000feb..0a785193c4 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -783,13 +783,16 @@ (define-public gnome-shell-extension-gsconnect
"prepend_search_path(path));\n"))
(dump-port input output))))
'("src/extension.js" "src/prefs.js")))))
- (add-after 'install 'wrap-daemons
+ (add-after 'install 'wrap-programs
(lambda _
(let* ((out #$output)
- (service-dir
- (string-append out "/share/gnome-shell/extensions"
- "/gsconnect@HIDDEN/service"))
+ (gsconnect-dir (string-append
+ out "/share/gnome-shell/extensions"
+ "/gsconnect@HIDDEN"))
+ (service-dir (string-append gsconnect-dir "/service"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+ (wrap-program (string-append gsconnect-dir "/gsconnect-preferences")
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
(wrap-program (string-append service-dir "/daemon.js")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
(inputs
--
2.48.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH 3/4] gnu: gnome-shell-extension-gsconnect: Patch shebangs with gjs.
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: aurtzy@HIDDEN, liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 25 Feb 2025 23:36:02 +0000
Resent-Message-ID: <handler.76572.B76572.174052652317373 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, aurtzy <aurtzy@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-Xcc: aurtzy <aurtzy@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.174052652317373
(code B ref 76572); Tue, 25 Feb 2025 23:36:02 +0000
Received: (at 76572) by debbugs.gnu.org; 25 Feb 2025 23:35:23 +0000
Received: from localhost ([127.0.0.1]:49074 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tn4SR-0004W3-Ce
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:35:23 -0500
Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:60614)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tn4SL-0004VK-6z
for 76572 <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:35:17 -0500
Received: by mail-qk1-x72f.google.com with SMTP id
af79cd13be357-7c0b0ca6742so661457485a.0
for <76572 <at> debbugs.gnu.org>; Tue, 25 Feb 2025 15:35:17 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740526511; x=1741131311; 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=bugHtWulAYpuG1+h9bWK6hXEwxlgocak3dRwfrUapYc=;
b=U1IJMIYwh4N1zx0xotIAtbu0m89dzzzgG7PfaRSTdHCeDjmCsO7AZ5KRjkfIm6an5y
ss+M0KqwB6S3tnE0QGb1V+hpGB3scD+c+/Y9CctaD6T1WeSV8wFRlctJgDHgXxLtqxRT
buuOP95OedDH8UFuM6UXKKmNiAlW3cphiCbLHQzKNE4LRORHjNaNUFklJBKS5rXx0nM3
S4sidykpxULljHawy44A8ORGZqX4FIXcjaMoCHgGHuphPvRWtzZB/7Sywz+P4AkAdNNw
adCEenKhIzGr9HsMeXMFqRvYFtXxLKPUqeLjxjxCHm2vhduP1nFP2qUh2kdJE19Rf01M
wQzA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740526511; x=1741131311;
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=bugHtWulAYpuG1+h9bWK6hXEwxlgocak3dRwfrUapYc=;
b=o0C01r5DQW8fqSdLVZMwBTPVdaQt7jkC0qsGicwkq8kRalM1sQXZqyBj4k4Qo+pr8M
tY8TNPUtLHz0ZF7qPCCTVYzYDHv9Nh2df/hrFD9mNsRrbee3UzmJLBcQQhJ0FYRA1UjV
lcZQYc1961HInfnU/HkLGfsVaNQtBp1wcc2FKWX0EHh/ml29icXYlG5ozCs9MvN5d9fs
bfSPZgoG94T6lwM/u+Gi7D7caGMup5UTU7WX95dv1Od6XuDDAi37I5Bch5a22VHkoPic
kaIiqKqgR7RQbuz9l8IfWb/SKKJeBQHYmF64+4mxtPiCnRX0amGdxAf7tsxmPtNSGMtl
a3JQ==
X-Gm-Message-State: AOJu0YwO38S6U/zlfsLE2t/mvh9jlrljutvtXkayz6Kn2Rz/LyNCJ65w
IPx6i9/qpI7dQTdciHvrNdzHRMBDF8a6G0UZ47wGiLWhkNOODLuAydmFuA==
X-Gm-Gg: ASbGncsOtws83sF45JgF/wCoQQtE+MGj6FlbkENpFKLv03tC17tZZNEscFB8rGEWkkf
VFlBOzp2e7DoeC5mftQ/w6W/9tzGRfX9Clmk+vps71CSUGo28XjDyEZf0ZwB1zCsVbIRFFV9WEk
PwM43ywX/mhC4GzM+BoEHFOe8Jo8g+G7DjzQKAn0SuLRskrGoN3n8pcerGuWWwns1rsN4lPXTzQ
QLy6VZnM0rg8iQ0hGv8bXp/FTR2vx+MU/1ICLW24jfG+rpkIOCXiBevrHN6sGb8kfko95tJxvNB
OjzM6om/4MGlQYWb6fX4
X-Google-Smtp-Source: AGHT+IExvWxCi+Gqjjt+3G8gDWEMup3/4kcQ7j5vwDRS4gNzivh55l+IUohQH8VsuM96lLvh8MS6ag==
X-Received: by 2002:a05:620a:3190:b0:7c0:a1ca:93b6 with SMTP id
af79cd13be357-7c247fe196bmr199108185a.50.1740526511244;
Tue, 25 Feb 2025 15:35:11 -0800 (PST)
Received: from localhost.localdomain ([2600:4808:a053:1800::4448])
by smtp.gmail.com with ESMTPSA id
af79cd13be357-7c23c327238sm166538485a.67.2025.02.25.15.35.10
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 25 Feb 2025 15:35:10 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
Date: Tue, 25 Feb 2025 18:34:23 -0500
Message-ID: <1dfdb01b26950651265cb6281eb5766a0f111091.1740522373.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <cover.1740522373.git.aurtzy@HIDDEN>
References: <cover.1740522373.git.aurtzy@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
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 | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 0a785193c4..abcbe2c9f9 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -765,6 +765,18 @@ (define-public gnome-shell-extension-gsconnect
"gtk_update_icon_cache: false")
(("update_desktop_database: true")
"update_desktop_database: false"))))
+ (add-after 'unpack 'patch-gjs-shebangs
+ (lambda* (#:key inputs #:allow-other-keys)
+ (for-each
+ (lambda (file)
+ (substitute* file
+ (("^#!.*$")
+ (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"))
--
2.48.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH 4/4] gnu: gnome-shell-extension-gsconnect: Fix paths in additional desktop file.
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: aurtzy@HIDDEN, liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 25 Feb 2025 23:36:03 +0000
Resent-Message-ID: <handler.76572.B76572.174052653717410 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, aurtzy <aurtzy@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-Xcc: aurtzy <aurtzy@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.174052653717410
(code B ref 76572); Tue, 25 Feb 2025 23:36:03 +0000
Received: (at 76572) by debbugs.gnu.org; 25 Feb 2025 23:35:37 +0000
Received: from localhost ([127.0.0.1]:49077 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tn4Sf-0004Wj-3Y
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:35:37 -0500
Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:43505)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tn4SN-0004VN-M0
for 76572 <at> debbugs.gnu.org; Tue, 25 Feb 2025 18:35:25 -0500
Received: by mail-qk1-x735.google.com with SMTP id
af79cd13be357-7c0a974d433so32018085a.1
for <76572 <at> debbugs.gnu.org>; Tue, 25 Feb 2025 15:35:19 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740526514; x=1741131314; 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=Dck3Q0Mwzruj9tOm4OVDml44XINI0Fo+p5Dam9S25UA=;
b=W5SnHHGDfNVCiXVBn6e6arqTGJlEEiFqKTPS6RM88vCGH8QbDKl+bDCXMCRogyUYEG
RmpfYtVLBSaqVAudbgXa7ffzOsyg9kmZ1UjhhNKhNExeAQe3ij7u88KJUiqtuQk1XwR8
xoY7RTRTQmKjWNyZLB1cTLoUzYM3zIizeZyYXWf3c8/Fl5wz4ieDVWI5jml7wcZylVu0
qDfh3RGxFH0NJniKw4/oD7CM3THXG9rzTM49IslViHo0lDW5dspNWjyV496kR5MLpRlu
tYxRt7FCpM/qKMmAbLONkFTL/Bk0zpq1EIHbNY/nq6WgNJqZWsqv5qbQg+OSIV4oBtN0
imlQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740526514; x=1741131314;
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=Dck3Q0Mwzruj9tOm4OVDml44XINI0Fo+p5Dam9S25UA=;
b=sO0RMZwCucgNtzg94I7UBey3jjxOJR6VjDs6U3g5Y1pxwNtUw3qTmkt1OZ8zXzqn/I
E1gfjPM6NmTuoA34RCf4m4Kl+ptJTMVS7BFIPd9paPbeHIHEcnqIDQPV+sad+YPESBqh
p7xFglfFZS60VHGD77c4QkfheEhND397iNM9Fo8LjZCwM1MimBJsJ+dtHPiv+gEMFxjC
qhRxy5rDlZD/uEWRRyrUtVPZY98hi5qim55kF7SZ02sA5onCvALQDdfFTMwYZE/M+dRZ
bu0Ca4a3vyZCaKpuHrkgk9k15TPc9m8qemJk7stlA5gBBw6VnjCAAy6SRbjutIyrzTam
RLfw==
X-Gm-Message-State: AOJu0YxnhykBQO+Rq07P7C68pfY7f5Qp4a86gKtc3qMylgpOOIJHqfmr
Ii2oRres2TzRoUoLJcttKvv3+7f/hq+KMsr6BaGxuCkxIz4Ze+cdSNpzaQ==
X-Gm-Gg: ASbGncsBFt44Y7sN1CfT9ALYqV/PIRffP2z3iob2jffr+itFuN6bDzTaFDZU34hzIP0
ysQLitfPCj4PywEy1EltqENqrUAD2aFBVmod4Odm2N2oN+pMOHs4wU5JcenDHealiWqnVBGXaeD
RNok6PzzUsQATQxYxFz/H/mHgz1OCoOLk4U3E6UwR/WCd420mHM3MvoQGnJm9FzReR38ZAAlIop
PBVfV71JIQeV6GkCqkAg65OY/Blk6veuXKZDTwYrGlDiUTEnVqzZe7PPSf2bRnRlBD8D8jbXqnq
IaCsYfxw5DYs8miepgN2
X-Google-Smtp-Source: AGHT+IHl6pGtiAXxhUtZvRre2yDGiQoxFZ1OUunL3mrvRBLiYJbePM9fD828xpNJu18s0tE2N3YAEA==
X-Received: by 2002:a05:620a:1aa5:b0:7c0:b220:3502 with SMTP id
af79cd13be357-7c0cf0e2e9emr2638060285a.4.1740526513657;
Tue, 25 Feb 2025 15:35:13 -0800 (PST)
Received: from localhost.localdomain ([2600:4808:a053:1800::4448])
by smtp.gmail.com with ESMTPSA id
af79cd13be357-7c23c327238sm166538485a.67.2025.02.25.15.35.12
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 25 Feb 2025 15:35:12 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
Date: Tue, 25 Feb 2025 18:34:24 -0500
Message-ID: <4656de9a71919aed426cf4658aba6ec699c9b18f.1740522373.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <cover.1740522373.git.aurtzy@HIDDEN>
References: <cover.1740522373.git.aurtzy@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 2.8 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: This fixes the gsconnect preferences button ("Mobile
Settings")
in the top-right quick-access menu not opening the preferences application.
The window icon also displays properly with this commit. *
gnu/packages/gnome-xyz.scm
(gnome-shell-extension-gsconnect): [arguments]<#:phases>: Patch gapplication
path in an additional desktop file in 'fix-paths phase.
Content analysis details: (2.8 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_PASS SPF: sender matches SPF record
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2607:f8b0:4864:20:0:0:0:735 listed in]
[list.dnswl.org]
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (aurtzy[at]gmail.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
2.8 MANY_SUBDOM Lots and lots of subdomain parts in a URI
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This fixes the gsconnect preferences button ("Mobile Settings") in the
top-right quick-access menu not opening the preferences application. The
window icon also displays properly with this commit.
* gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect):
[arguments]<#:phases>: Patch gapplication path in an additional desktop file
in 'fix-paths phase.
Change-Id: I6b84474e4976484f1203b7cf78fe5e882694cd22
---
gnu/packages/gnome-xyz.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index abcbe2c9f9..d011ae51d0 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -781,8 +781,12 @@ (define-public gnome-shell-extension-gsconnect
(lambda* (#:key inputs #:allow-other-keys)
(let ((gapplication (search-input-file inputs "/bin/gapplication"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
- (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in"
- (("gapplication") gapplication))
+ (for-each
+ (lambda (file)
+ (substitute* file
+ (("gapplication") gapplication)))
+ '("data/org.gnome.Shell.Extensions.GSConnect.desktop.in"
+ "data/org.gnome.Shell.Extensions.GSConnect.Preferences.desktop.in"))
(for-each
(lambda (file)
(with-atomic-file-replacement
--
2.48.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH 3/4] gnu: gnome-shell-extension-gsconnect: Patch shebangs with gjs.
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 28 Feb 2025 00:54:03 +0000
Resent-Message-ID: <handler.76572.B76572.17407040376717 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: aurtzy <aurtzy@HIDDEN>
Cc: Vivien Kraus <vivien@HIDDEN>, 76572 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.17407040376717
(code B ref 76572); Fri, 28 Feb 2025 00:54:03 +0000
Received: (at 76572) by debbugs.gnu.org; 28 Feb 2025 00:53:57 +0000
Received: from localhost ([127.0.0.1]:40630 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tnodW-0001k7-NE
for submit <at> debbugs.gnu.org; Thu, 27 Feb 2025 19:53:56 -0500
Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:46579)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1tnodS-0001j4-8u
for 76572 <at> debbugs.gnu.org; Thu, 27 Feb 2025 19:53:52 -0500
Received: by mail-pj1-x1033.google.com with SMTP id
98e67ed59e1d1-2fe98d173daso2667208a91.1
for <76572 <at> debbugs.gnu.org>; Thu, 27 Feb 2025 16:53:50 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740704024; x=1741308824; darn=debbugs.gnu.org;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=StnfSDPMIfyMx5fJPbPCbKWpk5j6Aj/XvrtUBY/Kc0w=;
b=erLec+9IhbXT5CVkOyNqM0L61NITtd6UCUE419+LJHjLr0cfxVdPG1QFpEZuSMBFiu
dwZSiTW9KZ6v4QHXiiW1FmcH+DyftbBEo2dRhGDC6O9jUr1IcAwYp5b2h/h9i+/ckQYN
KRaQsFH+2OKmILJunjEOZ35VJbX70qviu2Axj9FpCMiiZZsfG3GmOe5cfWxd9H6fEfs/
cpGS+DK6h5zf9bwzI+e/xNFCA14SY5ehQM1YPJJSnxefj0ogjGQbUxpkjimt5SKUruE+
IXIlGMSx+0q7Yn7NHsUJvpSUoPkwjgkNzj8FlUz5uBpxGqWCsdqRUcm+252hacox0ibR
ketA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740704024; x=1741308824;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=StnfSDPMIfyMx5fJPbPCbKWpk5j6Aj/XvrtUBY/Kc0w=;
b=dgUkU5m5Hraqd1jHCfKQMqviDCehdJJM481JXWvWmUI4odxITGCvo755FmWqHJayl/
s4k7Fn0XlmKMDagBAL+A/zW/sKew+1znouaxFGg81FAEWhhVSfiPfyM5qyFzb3bwyo51
IdCcZvTJDU0aQqfcXrqMbEzdlP/fFIudJWpx0BegKzdGBEVT+7iaPjLR6/s/wkFAdekk
p250b655xszE5jkJYrpxgRlVbolsBSx1Lu0nLV2u7Lkp24jXjYK3v8CpkWZPl/U3RiRR
l2uUduyIXS7nKk4yzS5Tu4dQ4aou2rrdifpn2gASn5Q6zLfbGMMRdvzsyQEUbwUkGzvG
4p5g==
X-Gm-Message-State: AOJu0YyXWt0hE7twLdrkxsLTWJbhZg5wd9M/4guPLsD6VkRWMLcmpHkQ
Zq4ZiKXNceOBB3wvGrula+sW1U8p8ZwCDTunH5+K9WqRaGrTd9M9
X-Gm-Gg: ASbGnctSsW4Ht59i8IJLUdXCO9fa30/9pC3S8Ts2vjl/Ksdrgy6pPBTi4YC3A1bkUaq
TLTat3g2kddd5dlsA5Ko67Yh3CSz0shKQIIhBBe9fPBBhuIdQ/TajH8sy4G8EYyDw738TMl7vge
CBanEU8h1VW5P3gJOE6KbP9DP3VGh4SJamAgMMz9I0+CKR4bDVet9R/w7GWaMD8k7avJlOTCEix
F0/KTgmQ6Dq18SarAKiDCiIstBbAvqs35yNhD59V5yuRekYtdGJc7dqEFsVTTCQW+Mms2kZRl4d
CDb/dDSgUNR5zIoY28mnwe5d
X-Google-Smtp-Source: AGHT+IFUGELCTu0yTbReKQ7BXFN1jVWB9yqiSknrYjG2ogyaAA8bP6aN6NJUu2MB6sbckNc8YbPpXg==
X-Received: by 2002:a17:90b:28cb:b0:2ee:c6c8:d89f with SMTP id
98e67ed59e1d1-2febab63449mr2538047a91.14.1740704023914;
Thu, 27 Feb 2025 16:53:43 -0800 (PST)
Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2fe825d2c61sm4593589a91.25.2025.02.27.16.53.41
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 27 Feb 2025 16:53:43 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <1dfdb01b26950651265cb6281eb5766a0f111091.1740522373.git.aurtzy@HIDDEN>
(aurtzy@HIDDEN's message of "Tue, 25 Feb 2025 18:34:23 -0500")
References: <cover.1740522373.git.aurtzy@HIDDEN>
<1dfdb01b26950651265cb6281eb5766a0f111091.1740522373.git.aurtzy@HIDDEN>
Date: Fri, 28 Feb 2025 09:53:30 +0900
Message-ID: <87y0xqj3ed.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi!
aurtzy <aurtzy@HIDDEN> writes:
> 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.
Oh! Could you please open an issue about this open so we remember to
fix the problem at its root?
> * 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 | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
> index 0a785193c4..abcbe2c9f9 100644
> --- a/gnu/packages/gnome-xyz.scm
> +++ b/gnu/packages/gnome-xyz.scm
> @@ -765,6 +765,18 @@ (define-public gnome-shell-extension-gsconnect
> "gtk_update_icon_cache: false")
> (("update_desktop_database: true")
> "update_desktop_database: false"))))
> + (add-after 'unpack 'patch-gjs-shebangs
I'd also mention and cross-reference the newly opened issue about
/usr/bin/env -S not being patched here, with e.g.
TODO: Remove after patch-shebangs is fixed to handle '/usr/bin/env -S'
shebangs (see bug#NNNNN).
> + (lambda* (#:key inputs #:allow-other-keys)
> + (for-each
> + (lambda (file)
> + (substitute* file
> + (("^#!.*$")
That pattern seems a bit too wide? Can'twe match at least gjs in it, to
avoid breaking non-gjs shebangs which may be introduced in the future
and forgotten?
> + (string-append "#!" (which "gjs") " -m"))))
> + '("installed-tests/minijasmine"
> + "src/gsconnect-preferences"
> + "src/service/nativeMessagingHost.js"
> + "src/service/daemon.js"
> + "webextension/gettext.js"))))
Otherwise, LGTM. Could you please submit a v2 with my above
suggestions?
--
Thanks,
Maxim
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH 4/4] gnu: gnome-shell-extension-gsconnect: Fix paths in additional desktop file.
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 28 Feb 2025 00:58:04 +0000
Resent-Message-ID: <handler.76572.B76572.17407042728455 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: aurtzy <aurtzy@HIDDEN>
Cc: Vivien Kraus <vivien@HIDDEN>, 76572 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.17407042728455
(code B ref 76572); Fri, 28 Feb 2025 00:58:04 +0000
Received: (at 76572) by debbugs.gnu.org; 28 Feb 2025 00:57:52 +0000
Received: from localhost ([127.0.0.1]:40678 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tnohK-0002CC-Rs
for submit <at> debbugs.gnu.org; Thu, 27 Feb 2025 19:57:52 -0500
Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:53743)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1tnogM-00026G-Gx
for 76572 <at> debbugs.gnu.org; Thu, 27 Feb 2025 19:56:53 -0500
Received: by mail-pl1-x632.google.com with SMTP id
d9443c01a7336-22104c4de96so27052965ad.3
for <76572 <at> debbugs.gnu.org>; Thu, 27 Feb 2025 16:56:50 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740704204; x=1741309004; darn=debbugs.gnu.org;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=fBC7yXuF7y6I/R1QfQmdZNOt26VQusLzuQNYlE8/aGs=;
b=TabZXe5gK7GPq4aVv6TCy6S/9ImhzCZyO/jAp3mevSKnoA7lRKaA3mhGJVU+rF/Xv6
KPnnsr8slLN27bHyINnALLgI2Up28h0MQX7t3QJR9lrouZOKLCANvV8P7YKmvajB3cab
tLLuMENjC+YIe/XwLt3AjRiPqRgI3co8+mLgTszdkZ1gAWKN3QD8jbSKptcmKSmJt0i1
pzS/W80dpDLK/mviDK/FQulLMSuW8uNF0PEtv+2xWP1GHdfjggIHyohhUSm6GZ/aRkSP
dSrYmB9U2L0jzggcfdcfkiDWS86bfOOvdz6NqFwO405cNnmPguRf13ADjj7xIUHANmWU
nSNg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740704204; x=1741309004;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=fBC7yXuF7y6I/R1QfQmdZNOt26VQusLzuQNYlE8/aGs=;
b=PdX6006kY3UfEO6wA/x1fMzauT4XEBWFe/BxjH5IzhJirLSekhtYbBHroGypoDvFS5
nKY3t1BIheASnpc/Yz/CgLZsl4Oeu2psusts4npW/bRqkaORUHKqPhdDuax/eOLbvA1S
rB1eFu7PQn1N0WFKV3TpZkwujD8fxJCHESZwJ6urCt9jfGjMxFx/1PqSDAqLTtUPWXFJ
Zu3fgeAWGcODE+OfVSOWqWoFGyreFxO3YX2EF6aCpD0Cn3CsPy8IT4u4jKzygMXWbshl
xxcCsrrDVDPLa9ZT18Y4JNC8GjCQ557zm4AGrEGzQeIGu4tn7c3mrbQn2mLVvoptOo11
fTcA==
X-Gm-Message-State: AOJu0YzYB68KghVfbL7GKXuerb+NbdMFvRqcEGC/DQ9sfqA+TDEIRuIY
hrMfc60LBH9zjy3M6jAzGbPEhP1H+D1hzJtuNHLskwClU5lrwKkEQkaGe5wsx6I=
X-Gm-Gg: ASbGnctHPmYl6eJicqXAvqV6x6EWQiQvidm/AKiEyU/I2Zk9jnOatQRfIHjEje4rSVC
miRXZIuzDAa0lDnGL+GpLSXmIv4VQ1nnW0fJ9ijyH8eaLk6gzzNa/AIfpim/3+10gLNsunSTVM8
v3v231ANNLCjqQjerX8f1XJ8At/OXV+riA9SAJ6JfLuDIdGneXrCwF+AIEJageIkwR0OtadOQVd
GZCpVPNKuJ2hQijcOcf+gKMyvUEvx4uIWONwtzRdvVv6U7/BI6/OSzQRSkDQwE5CGQddKW9nlvw
OHXblGq2bpdqpK8ACIo9g4wW
X-Google-Smtp-Source: AGHT+IGjLbAjGDE+U/R73ReDbRb8FXKMDfJMOaSKQjBZWl9+0crCITE+weWSg/0YkVkh8cVx9lxJFQ==
X-Received: by 2002:a17:902:c946:b0:21f:3e2d:7d42 with SMTP id
d9443c01a7336-22368fa8ee8mr18230605ad.23.1740704204087;
Thu, 27 Feb 2025 16:56:44 -0800 (PST)
Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-2235050d94csm21960855ad.201.2025.02.27.16.56.41
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 27 Feb 2025 16:56:43 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <4656de9a71919aed426cf4658aba6ec699c9b18f.1740522373.git.aurtzy@HIDDEN>
(aurtzy@HIDDEN's message of "Tue, 25 Feb 2025 18:34:24 -0500")
References: <cover.1740522373.git.aurtzy@HIDDEN>
<4656de9a71919aed426cf4658aba6ec699c9b18f.1740522373.git.aurtzy@HIDDEN>
Date: Fri, 28 Feb 2025 09:56:29 +0900
Message-ID: <87tt8ej39e.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 2.8 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Hi, aurtzy writes: > This fixes the gsconnect preferences
button ("Mobile Settings") in the > top-right quick-access menu not opening
the preferences application. The > window icon also displays properly with
this commi [...]
Content analysis details: (2.8 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2607:f8b0:4864:20:0:0:0:632 listed in]
[list.dnswl.org]
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (maxim.cournoyer[at]gmail.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
2.8 MANY_SUBDOM Lots and lots of subdomain parts in a URI
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
aurtzy <aurtzy@HIDDEN> writes:
> This fixes the gsconnect preferences button ("Mobile Settings") in the
> top-right quick-access menu not opening the preferences application. The
> window icon also displays properly with this commit.
Thank you!
> * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect):
> [arguments]<#:phases>: Patch gapplication path in an additional desktop file
> in 'fix-paths phase.
>
> Change-Id: I6b84474e4976484f1203b7cf78fe5e882694cd22
> ---
> gnu/packages/gnome-xyz.scm | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
> index abcbe2c9f9..d011ae51d0 100644
> --- a/gnu/packages/gnome-xyz.scm
> +++ b/gnu/packages/gnome-xyz.scm
> @@ -781,8 +781,12 @@ (define-public gnome-shell-extension-gsconnect
> (lambda* (#:key inputs #:allow-other-keys)
> (let ((gapplication (search-input-file inputs "/bin/gapplication"))
> (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
> - (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in"
> - (("gapplication") gapplication))
> + (for-each
> + (lambda (file)
> + (substitute* file
> + (("gapplication") gapplication)))
> + '("data/org.gnome.Shell.Extensions.GSConnect.desktop.in"
> + "data/org.gnome.Shell.Extensions.GSConnect.Preferences.desktop.in"))
Nitpick: it's a bit more conventional to indent map/filter/for-each,
etc. like:
(for-each procedure
things)
instead of
(for-each
procedure
things)
Unless perhaps when the hanging indent is already deep and there's not
enough columns to accomodate the former.
Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
--
Thanks,
Maxim
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH v2 0/4] Fixes for gnome-shell-extension-gsconnect
References: <cover.1740522373.git.aurtzy@HIDDEN>
In-Reply-To: <cover.1740522373.git.aurtzy@HIDDEN>
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: aurtzy@HIDDEN, maxim.cournoyer@HIDDEN, liliana.prikler@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 06 Mar 2025 08:49:02 +0000
Resent-Message-ID: <handler.76572.B76572.17412509108097 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-Xcc: aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.17412509108097
(code B ref 76572); Thu, 06 Mar 2025 08:49:02 +0000
Received: (at 76572) by debbugs.gnu.org; 6 Mar 2025 08:48:30 +0000
Received: from localhost ([127.0.0.1]:41392 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tq6u6-00026W-5c
for submit <at> debbugs.gnu.org; Thu, 06 Mar 2025 03:48:30 -0500
Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:52628)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tq6u2-000265-Ft
for 76572 <at> debbugs.gnu.org; Thu, 06 Mar 2025 03:48:27 -0500
Received: by mail-qt1-x835.google.com with SMTP id
d75a77b69052e-46fa764aac2so2576081cf.1
for <76572 <at> debbugs.gnu.org>; Thu, 06 Mar 2025 00:48:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1741250900; x=1741855700; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=n2+5ZmSSWe7dC8/64xT0lvU1NjOPDIEh5uqfyCuL9xw=;
b=DM7ipdTaZXchtOqxAO8PAuiZfEjEkJNHL1aqeb2qrov0k5v8zK08HuqP/hEODrURWU
zrHvXcrEam/Q1ZTInlglfbEe0vjsXp/ycggqL/lk2A5nf4ITQavSzj22NV8X1XErZz9f
rgaBpOy8sEY+6qdj69R/E0GNemIhnZxYeoDB3R6wz80hLMUIHKNaS/mvHq/8PHEdG8uC
OMHyV9qz5FKSDHkPoDB9m8g0k8+LnvHRNZnBP/poI/jn8JN4tawBZsNBA9DDZbICUwBk
2tD7EZntXM+qa6XFiV35SinVvaiZqSXnPtf/R9vkbh8Z6iPwfmEMPZZgAwAs6kV32XtA
mRQQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741250900; x=1741855700;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=n2+5ZmSSWe7dC8/64xT0lvU1NjOPDIEh5uqfyCuL9xw=;
b=df+79qxtsjUJ+pOd/YXXmVBAamT4+CKIWLw5DIDl455iWK9kJdqe9C+QdesrTG+F+k
9vasvi8eMzEGQPwJM4OLiJLYE036ugGdPbAb+2jwGdM6xj/jpSbvDpfsgSZKKVwKn4kt
kBLdG6oBeelRWJfOxA1PHD5Np3iv5ccEa08OK1MmZknsPDUqLYpNykCV5eqkbOU1jKDg
pdEdabeAuRVv62snb/v4zvlZhaVuVL4wcyv0LBLU/LVlCLxnrRnONrC3ekKn42ddED3S
/nI7pN5UvHCpNzKEYsjxxCVE2JrNY4+6fCnC6ySZT6MXhiz9cVt1RsYzqKKEoVrmRRdv
g4UQ==
X-Gm-Message-State: AOJu0YytUXgVMQIPxGSsDHdMq1uF68YQvSvwBT6LBYlwUxidaTSJ6P2f
TrRok3GQagCGfaPak+hc7VpucWMa+ogh5rC5r2GLuLQ4WLuF9SkIvHttEA==
X-Gm-Gg: ASbGnctF/X1TSN5ADDq/KQ9fK0/Wps/Y73zAPFXNnM/J2/Jp2+amKtQ9CUi+bUxczQP
nYhx56xW/NyvSi5ysXlfQOh+hldIXa30IV042+vvCo7QOEpYR3Ffr86nAxh4CObKYl9qAE91PNP
Qyt4fEzM1jvUiEdj9iXH7ZvAzKPBbsUcTFq0sEWDJS+JMvRFvg8UPWSkSns2GbAx6Pc3jgGtorB
sO0rxjy2NXZ8d8rwxj4SWcFGlx5hhD9f56milHd6oI1EWIbGNFX+1H3pxrdPdzTzIy1EO8ZYvT7
Vj2u55a0/eW/wHDIDAvbqGseVQYcIasqllWWaII=
X-Google-Smtp-Source: AGHT+IGO8fsrv+50Auwu05RMbJ6DIMErxqqpjmY+jrfFUsKX465SiGtqua1HKR6ANflKjQtiSZAv1Q==
X-Received: by 2002:a05:622a:1991:b0:475:531:9b1a with SMTP id
d75a77b69052e-4750b243c59mr71847321cf.10.1741250899984;
Thu, 06 Mar 2025 00:48:19 -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.17
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 06 Mar 2025 00:48:18 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
Date: Thu, 6 Mar 2025 03:44:49 -0500
Message-ID: <cover.1741250406.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hey Maxim,
> > 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.
>
> Oh! Could you please open an issue about this open so we remember to
> fix the problem at its root?
[...]
> I'd also mention and cross-reference the newly opened issue about
> /usr/bin/env -S not being patched here, with e.g.
>
> TODO: Remove after patch-shebangs is fixed to handle '/usr/bin/env -S'
> shebangs (see bug#NNNNN).
Looks like someone already beat me to it [1]! Adjusted to reference
that report.
> That pattern seems a bit too wide? Can'twe match at least gjs in it, to
> avoid breaking non-gjs shebangs which may be introduced in the future
> and forgotten?
Adjusted.
> Nitpick: it's a bit more conventional to indent map/filter/for-each,
> etc. like:
>
> (for-each procedure
> things)
>
> instead of
>
> (for-each
> procedure
> things)
>
> Unless perhaps when the hanging indent is already deep and there's not
> enough columns to accomodate the former.
Thanks for the tip; noted! I've adjusted the forms where they don't
cross column 85 (following editorconfig).
[1] <https://issues.guix.gnu.org/74450>
Cheers,
aurtzy
aurtzy (4):
gnu: gnome-shell-extension-gsconnect: Fix search path patching.
gnu: gnome-shell-extension-gsconnect: Wrap gsconnect-preferences.
gnu: gnome-shell-extension-gsconnect: Patch shebangs with gjs.
gnu: gnome-shell-extension-gsconnect: Fix paths in additional desktop
file.
gnu/packages/gnome-xyz.scm | 47 ++++++++++++++++++++++++++++----------
1 file changed, 35 insertions(+), 12 deletions(-)
base-commit: 310adf4ce70cbb864859274fcc7842bd519bbddc
--
2.48.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH v2 1/4] gnu: gnome-shell-extension-gsconnect: Fix search path patching.
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: aurtzy@HIDDEN, maxim.cournoyer@HIDDEN, liliana.prikler@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 06 Mar 2025 08:49:02 +0000
Resent-Message-ID: <handler.76572.B76572.17412509188131 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-Xcc: aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.17412509188131
(code B ref 76572); Thu, 06 Mar 2025 08:49:02 +0000
Received: (at 76572) by debbugs.gnu.org; 6 Mar 2025 08:48:38 +0000
Received: from localhost ([127.0.0.1]:41397 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tq6uD-000275-So
for submit <at> debbugs.gnu.org; Thu, 06 Mar 2025 03:48:38 -0500
Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]:47404)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tq6u6-00026F-98
for 76572 <at> debbugs.gnu.org; Thu, 06 Mar 2025 03:48:31 -0500
Received: by mail-qt1-x833.google.com with SMTP id
d75a77b69052e-47521af4422so1319561cf.3
for <76572 <at> debbugs.gnu.org>; Thu, 06 Mar 2025 00:48:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1741250903; x=1741855703; 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=aTtfmeIq8acXyXFA+totnJvCq14FUExr20OYfnkVtG8=;
b=g4368SHT686oKJ2D7iaTgZwlSCXHKVcjH0kwKfjmn2YvqpPONmMbzPZkBihQGn6x/1
5WU7vyGva5Z95C/c8Im3ui6ng3GiSVcLRoR5+iITcBeQmMXS98yUR2o4wtlr242a6On8
DRsYdIoI8gCgCM/duDbzHBAtSpKeCjSpmbQxAzNyfWmHA5ARlyKIgNL1ZAeVcjCMh/ny
rTcKSCOlvHjfld1bXaA85s+IN5PQXqPngfoFpYJktZ1RnaRgK8zz6kQTkQQ+MR6l58FZ
vZMsuTsDQpjXmYTxgocYC/UbLP0gDqyg63e7sAj6xos6jGjx/pbDG4Y/MmxCV/pWCf/v
JtRg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741250903; x=1741855703;
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=aTtfmeIq8acXyXFA+totnJvCq14FUExr20OYfnkVtG8=;
b=IrQaq3IDEgqmy/4KbmSBC91dBE19p0hUJ12GiysyPsWzP6HpVy+5ENPAvJS32N3gLg
VyJZx+GOO5QMX9znN1BC+bDqMevMHld3pp/aM2hWJP0MTpmYLgkZC+olOpYUHsGB3RqZ
jI5blY9Vt7PLQBmXNiwq3lavTj3XR8UHEk+mlf0DWZYoF6KPIP4GrEHQY45co+jsl7Za
/F6mIrfQ4ne0kZwSweei8Yo+YHN3q7o4MHQHFv/MVGCYH1OypuXu8ky2zlnhhJqMiTnd
sxyncQkQNrsKSfaHtd9jOqhKEexrWLsZwlvvPPhjehFnXUrmF4OFZNCpVdlkxTDMxD5z
Hu/w==
X-Gm-Message-State: AOJu0YywrItlurRRRr5qUZ+bO9AQ4q6g7uOdYoBglQWUaMKmv9oHl5GR
EcG4Lc36Oy9gVdpA8tJleistwQrVlg7L8Ui3j6Md7QpEZ+ooHuTVHMX6lg==
X-Gm-Gg: ASbGnctBDLANMYWniYNbEUK3Mk65Nz09q+U5XeDSEcTsiUzc/4yzdkbWfaRriBW7zg+
FeD5zd5SadFZxwEM8y6/kuWSyIXqftShP5outSiSzw2ddsN8CGs52APi0Hc+ntaCgkVGEUweNs6
hN9W8Rp8au0GefqmoG9fgwqsAmsi4nZLUWbmOEVzfxns2wHqmfj7ffXsoiaWg0gYWBA0wFPBQUN
0xjg3fS4G8dwAmVlXIdR2QsISfKWCgT98JMnnKDwkmCQwAcaz8nQ39C7EF+ZfuWTsD60/aBPSDL
06oxnHPnIVZEObOViQPZzZsks7BgeoIElm3M0gw=
X-Google-Smtp-Source: AGHT+IEp87MVB/CDIZ86yH2JjmnI1x+UEOgSYn0dul7EUaWuzbHHlUL8lXTuLqvmQvND6O9uMNMCgw==
X-Received: by 2002:ac8:7c45:0:b0:474:db2f:bd32 with SMTP id
d75a77b69052e-4750b4b630emr92318891cf.38.1741250903484;
Thu, 06 Mar 2025 00:48:23 -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.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 06 Mar 2025 00:48:22 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
Date: Thu, 6 Mar 2025 03:44:50 -0500
Message-ID: <033b6e91689a129386f2722024378f884ac23b40.1741250406.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <cover.1741250406.git.aurtzy@HIDDEN>
References: <cover.1741250406.git.aurtzy@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/gnome-xyz.scm
(gnome-shell-extension-gsconnect):
[arguments]<#:phases>: Fix 'fix-paths phase substitutions no longer applying.
Change-Id: I99aa0204c1dfad836aed62261d2ffc0c75366510 ---
gnu/packages/gnome-xyz.scm
| 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
Content analysis details: (2.6 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (aurtzy[at]gmail.com)
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2607:f8b0:4864:20:0:0:0:833 listed in]
[list.dnswl.org]
2.6 MANY_SUBDOM Lots and lots of subdomain parts in a URI
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect):
[arguments]<#:phases>: Fix 'fix-paths phase substitutions no longer applying.
Change-Id: I99aa0204c1dfad836aed62261d2ffc0c75366510
---
gnu/packages/gnome-xyz.scm | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 92d8b7cb03..1a3a275db5 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2022 Sughosha <sughosha@HIDDEN>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@HIDDEN>
;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas@HIDDEN>
+;;; Copyright © 2025 aurtzy <aurtzy@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -766,15 +767,17 @@ (define-public gnome-shell-extension-gsconnect
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in"
(("gapplication") gapplication))
- (for-each
- (lambda (file)
- (substitute* file
- (("'use strict';")
- (string-append "'use strict';\n\n"
- "'" gi-typelib-path "'.split(':').forEach("
- "path => imports.gi.GIRepository.Repository."
- "prepend_search_path(path));"))))
- '("src/extension.js" "src/prefs.js")))))
+ (for-each (lambda (file)
+ (with-atomic-file-replacement
+ file
+ (lambda (input output)
+ (format output "~a"
+ (string-append
+ "'" gi-typelib-path "'.split(':').forEach("
+ "path => imports.gi.GIRepository.Repository."
+ "prepend_search_path(path));\n"))
+ (dump-port input output))))
+ '("src/extension.js" "src/prefs.js")))))
(add-after 'install 'wrap-daemons
(lambda _
(let* ((out #$output)
--
2.48.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH v2 2/4] gnu: gnome-shell-extension-gsconnect: Wrap gsconnect-preferences.
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: aurtzy@HIDDEN, maxim.cournoyer@HIDDEN, liliana.prikler@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 06 Mar 2025 08:49:03 +0000
Resent-Message-ID: <handler.76572.B76572.17412509198144 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-Xcc: aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.17412509198144
(code B ref 76572); Thu, 06 Mar 2025 08:49:03 +0000
Received: (at 76572) by debbugs.gnu.org; 6 Mar 2025 08:48:39 +0000
Received: from localhost ([127.0.0.1]:41400 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tq6uE-00027B-Fs
for submit <at> debbugs.gnu.org; Thu, 06 Mar 2025 03:48:38 -0500
Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:45365)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tq6u8-00026K-7z
for 76572 <at> debbugs.gnu.org; Thu, 06 Mar 2025 03:48:32 -0500
Received: by mail-qk1-x729.google.com with SMTP id
af79cd13be357-7c07cd527e4so34901085a.3
for <76572 <at> debbugs.gnu.org>; Thu, 06 Mar 2025 00:48:32 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1741250906; x=1741855706; 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=n8RI46+FY5lkGwElTtMhYT8kJ+oSoi5ruHTd7rvbyfg=;
b=cJ18rzhOkuVHju6BZ1EyWkMLom1ETAIkGrOfCPZwAiD+unB5vIE2JSO8af32tuu6D0
k9C81F9IIPeQZ/CxlHRNVgPFUKOLH5+8g8SsweDUafRo+gCzBvMFH+Cq+g+uhQ0V8N9X
In6QvuioLasI1PC1sTVha4BUo6v897WDCsPLEmSGKZPvE/lGpP611hihY76fu+PuRvCg
kDXSTS6/FavXe+9SR99hFP70Yl4Qje8NRghU3cy82s67mCXrcNZJZ4XvKK/Odte+AIVC
q8ce1yyb32zIt1rwo9FqsWlAUFQol+0IUAFQAzlxa85XxgB4uTbqrjcZ6nqHPK9w/mt2
Ju5w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741250906; x=1741855706;
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=n8RI46+FY5lkGwElTtMhYT8kJ+oSoi5ruHTd7rvbyfg=;
b=o3yUlzBZUEZ+cE3vSwmcLvh2NOZEo3cZTAU9EU+9DlSz3fWKKoyvV1J0cvAxVV1VNI
0MG2wqK6Wj4XpMsdZk8n/p/rW5XWuFIv8cIkAtJspecmqtMaoabXeutkWXHXCd2sy7nC
rfnlbqKOD8Jjq5EW3hBLnx265Weu8+EadbfSaub/zZkcHUJjHVtlkT9hJd43th1fi59d
1dlKXxgrmtFA0hoJQXpr/AgbrAMYm98O+u3sZsHghCLUdINJvi1rh2TOe9LwtgASlnu2
Q5GKeT1VCB+Nror7kbQ0x/4GSPWAFv6RndVE4XB0eRjquTqlDF1HMSKkiKIL2nUD7cp0
GBVg==
X-Gm-Message-State: AOJu0YyM3MMPa7dvmutvur+GGxmkFFVpHUf5YbtWYK+puGKwRK/Eu+/W
ycBaCl0eB7b4djJGNtpQ8F4gePEmjWeYF6E5saHvqJaHsAvUmmaDEtCZhw==
X-Gm-Gg: ASbGncvO8BCRh5R39EvHWo898ZAmmUMgNZtF+I9xrxuTlyfnMIvI+lOwcb7FQ4phWEw
cUN+ZliPyc56eeYU0fhZvoILESJp48EnkVvxJLFbDD5V/bWfvNqdB6O9H6rMEocx3Axy4R+Xsv/
x9vehJ+sG18ZACo1kBzCuR4nxP/npkte8Yrga/6ScRQhUt2rRcBjqx4kxx96R9SX3nkfCi0L7zf
MANKutyZixxZ3Rawt+k7roJYAyekfHV03pIrFK7b+RnViyqUQM4r6T/Y8B0hk8cKMLzcITsEiIH
G1V7hlGxwD9ubMvqJPUZTdgw/d0jD/hIpPvPg3A=
X-Google-Smtp-Source: AGHT+IHSpAdlV3bJhhbXuRqGb/2Neead7YOtoF32l4LiC+s6mcjFc2AYysKULqMXm6NApHMUZI7Zlg==
X-Received: by 2002:a05:620a:1a03:b0:7c3:dc4c:7789 with SMTP id
af79cd13be357-7c3dc4c7a6fmr626030885a.42.1741250906034;
Thu, 06 Mar 2025 00:48:26 -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.24
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 06 Mar 2025 00:48:25 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
Date: Thu, 6 Mar 2025 03:44:51 -0500
Message-ID: <36e7a401b7209480c03cb87d5b5c8ef62bb601b0.1741250406.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <cover.1741250406.git.aurtzy@HIDDEN>
References: <cover.1741250406.git.aurtzy@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This fixes an error when attempting to open the gsconnect-preferences
application due to Typelib files not being found.
* gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect):
[arguments]<#:phases>: Wrap gsconnect-preferences with GI_TYPELIB_PATH
environment variable. Rename 'wrap-daemons phase to 'wrap-programs.
Change-Id: Ib330766d46dba00a7c68fa3956b28223f07000f8
---
gnu/packages/gnome-xyz.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 1a3a275db5..359dc757fd 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -778,13 +778,16 @@ (define-public gnome-shell-extension-gsconnect
"prepend_search_path(path));\n"))
(dump-port input output))))
'("src/extension.js" "src/prefs.js")))))
- (add-after 'install 'wrap-daemons
+ (add-after 'install 'wrap-programs
(lambda _
(let* ((out #$output)
- (service-dir
- (string-append out "/share/gnome-shell/extensions"
- "/gsconnect@HIDDEN/service"))
+ (gsconnect-dir (string-append
+ out "/share/gnome-shell/extensions"
+ "/gsconnect@HIDDEN"))
+ (service-dir (string-append gsconnect-dir "/service"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+ (wrap-program (string-append gsconnect-dir "/gsconnect-preferences")
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
(wrap-program (string-append service-dir "/daemon.js")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
(inputs
--
2.48.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH v2 3/4] gnu: gnome-shell-extension-gsconnect: Patch shebangs with gjs.
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: aurtzy@HIDDEN, maxim.cournoyer@HIDDEN, liliana.prikler@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 06 Mar 2025 08:49:03 +0000
Resent-Message-ID: <handler.76572.B76572.17412509228156 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-Xcc: aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by 76572-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tq6uF-00027O-0z
for submit <at> 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 <aurtzy@HIDDEN>) id 1tq6uA-00026S-Vb
for 76572 <at> 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 <at> 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 <aurtzy@HIDDEN>
Date: Thu, 6 Mar 2025 03:44:52 -0500
Message-ID: <1da0ded149587945d839379568152cc52efeeb28.1741250406.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <cover.1741250406.git.aurtzy@HIDDEN>
References: <cover.1741250406.git.aurtzy@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
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"))
--
2.48.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76572] [PATCH v2 4/4] gnu: gnome-shell-extension-gsconnect: Fix paths in additional desktop file.
Resent-From: aurtzy <aurtzy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: aurtzy@HIDDEN, maxim.cournoyer@HIDDEN, liliana.prikler@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 06 Mar 2025 08:49:04 +0000
Resent-Message-ID: <handler.76572.B76572.17412509278168 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76572
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy@HIDDEN>, aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
X-Debbugs-Original-Xcc: aurtzy <aurtzy@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Vivien Kraus <vivien@HIDDEN>
Received: via spool by 76572-submit <at> debbugs.gnu.org id=B76572.17412509278168
(code B ref 76572); Thu, 06 Mar 2025 08:49:04 +0000
Received: (at 76572) by debbugs.gnu.org; 6 Mar 2025 08:48:47 +0000
Received: from localhost ([127.0.0.1]:41404 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tq6uM-00027e-IS
for submit <at> debbugs.gnu.org; Thu, 06 Mar 2025 03:48:46 -0500
Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]:50425)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tq6uE-00026o-3H
for 76572 <at> debbugs.gnu.org; Thu, 06 Mar 2025 03:48:38 -0500
Received: by mail-qt1-x830.google.com with SMTP id
d75a77b69052e-47521c604efso2849321cf.0
for <76572 <at> debbugs.gnu.org>; Thu, 06 Mar 2025 00:48:38 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1741250912; x=1741855712; 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=CgCX2t3u38eARHpjJNt1YaAIlA1Ln4DGRc1h8aABYTs=;
b=fCWhcSoBwJN+JbByIRhnPYqTHiMJV0AIfkiV1Ig0vmGe+gPpCHaeTMxVdB5ha+j51h
g5JWZah34N5T9P21ED1+mQooFT4Fb9qXy/RTdAp2c2+m3v82o79CDIhfnd5b3yy9wZ4I
tYgZKXyIjI6UH1hQRjNp213ObentBtHM5qR4OHhsKP4cActKDAJ8DQDprJTVoLWWdqoY
LJMx2xgOfEZhFqPXI540JiLhiVzOk9d7hyGDUS+OXN1UleZGvLuzEXWcTwGlTYtye0mD
2sXyvCXMhhjiK2bj0AFfYjgfmskuF1grSbzurK/pelsFfcaDEzWD7VZJcpk2OpHAcM2i
/OjA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741250912; x=1741855712;
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=CgCX2t3u38eARHpjJNt1YaAIlA1Ln4DGRc1h8aABYTs=;
b=t3QBAWkzvygx3JDQOsF53RkvvKiUuUPwyJAj86OW3PBwMvVkjs/ax6gTz1shgWSk7T
gEi/QI90qtUQHixlKu8fY3I+SZdwuPqSHnOf7GqhB5FL8+o2UCV4SnnC9CgvHluJJSqi
LsGBbWZ6nPZ9VmFKhLNNo96MfybyxU3b9n/JM/D2BDYY4zhBhDxFCgIH/0w/FnRJN3Vh
TiLiMXqg17zFfhuG1ED6ysI0JsUnehWG+cio32kt0TkYWGlrTh5cPTXWxdytYJMn9Ck7
j6l/P7tqsuvI4HEx5iP7i3TSP2ge62RiOb45rZonsaNdSFXOa9xSNlmjeQYXOqB+ZXqP
i7tw==
X-Gm-Message-State: AOJu0YwYt3k6sNm4345WVHYQlSH5mB5sEJv/yeAMq6xf9LY+7n3xwe2Q
Fur683VTcS+ZSK5uY1cPzEqsyfBzITCIX/l3BQu/KfEoL6uLqZwtds967w==
X-Gm-Gg: ASbGncu29muZb9wjYKH7KV/DbEHNIHfOWR1H9W4+6sT8ULkbVtCU7Fn6xA8xwTLbkyV
ZEcR6ud5/zo1YhYaxET+fNHyCftbyFw+kJk8TQiEVFXYnuMhU9n3ktuvteRig0hjbbt4BnqCntr
dhiiZwRW1fss5jBSrzMaoDM2Vklh9/SWp22syryrDIoE+iexmLg4jhcm8cHrGaCWQIIfBYIsmuT
OucQNs8aV2o0z0R+gasfsYUEhBXyexMey2TAzzc6hVFvgn1sbBrtBgsRAs9hEI3eIheT2C0Ci9P
dTO4O54fLmuEAi6+hSS8+oP5cWZjRWZ+iCNSDzU=
X-Google-Smtp-Source: AGHT+IFm64eCI5Iepa2OWOAYtA1XYoQnhehuGHS5wdmpR4fV4Mzahs43Yxv/tHOirSZc2JRVObKDuw==
X-Received: by 2002:ac8:5153:0:b0:474:fa6e:ff3a with SMTP id
d75a77b69052e-4750b4e0e47mr85581521cf.49.1741250912048;
Thu, 06 Mar 2025 00:48:32 -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.29
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 06 Mar 2025 00:48:30 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
Date: Thu, 6 Mar 2025 03:44:53 -0500
Message-ID: <446341581d2f75f3f86eec45ed3cffbc46be66bf.1741250406.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <cover.1741250406.git.aurtzy@HIDDEN>
References: <cover.1741250406.git.aurtzy@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: This fixes the gsconnect preferences button ("Mobile
Settings")
in the top-right quick-access menu not opening the preferences application.
The window icon also displays properly with this commit. *
gnu/packages/gnome-xyz.scm
(gnome-shell-extension-gsconnect): [arguments]<#:phases>: Patch gapplication
path in an additional desktop file in 'fix-paths phase.
Content analysis details: (2.6 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_PASS SPF: sender matches SPF record
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2607:f8b0:4864:20:0:0:0:830 listed in]
[list.dnswl.org]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (aurtzy[at]gmail.com)
2.6 MANY_SUBDOM Lots and lots of subdomain parts in a URI
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This fixes the gsconnect preferences button ("Mobile Settings") in the
top-right quick-access menu not opening the preferences application. The
window icon also displays properly with this commit.
* gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect):
[arguments]<#:phases>: Patch gapplication path in an additional desktop file
in 'fix-paths phase.
Change-Id: I6b84474e4976484f1203b7cf78fe5e882694cd22
---
gnu/packages/gnome-xyz.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 09e73a9c0a..d3bf068dbc 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -778,8 +778,12 @@ (define-public gnome-shell-extension-gsconnect
(lambda* (#:key inputs #:allow-other-keys)
(let ((gapplication (search-input-file inputs "/bin/gapplication"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
- (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in"
- (("gapplication") gapplication))
+ (for-each
+ (lambda (file)
+ (substitute* file
+ (("gapplication") gapplication)))
+ '("data/org.gnome.Shell.Extensions.GSConnect.desktop.in"
+ "data/org.gnome.Shell.Extensions.GSConnect.Preferences.desktop.in"))
(for-each (lambda (file)
(with-atomic-file-replacement
file
--
2.48.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.