From patchwork Thu Mar 6 08:44:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 39729 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 C007227BBE2; Thu, 6 Mar 2025 08:50:04 +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=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2B85E27BBEA for ; Thu, 6 Mar 2025 08:50:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tq6ur-0004Sb-C2; Thu, 06 Mar 2025 03:49:17 -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-0004Qq-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 1tq6ue-0003Wc-2S for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:04 -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=aTtfmeIq8acXyXFA+totnJvCq14FUExr20OYfnkVtG8=; b=XibIW9Pf/F6N9cHIKfxsCIbsbjar3V1WRbu4df7wmR+KJL74M9pDZCaO7SSu73rLiDyk7D0zvJnzoHlSmEhaWSgyIyWJy/fQcvJDDO1/0GzWCzqO3gl8M6GlbxSO5KKkIhwKzJeMhIGE44e9S8H9NHo/Wj10ypZXHrCEKCDHtj+uICxoWxFjBuMONAhVpsFZDy1aa+KwA6V2o9SyfaPvPstwShOQhWcNcPIraYCOu9kXCYDSrakCuZPFhY8xOt+yXDoU+oLDLAfIFRvtyWTa6BraguPpz7kalywyF9VVo9Pw8FVKKRtJG6qNpLkj8WCOIuvZy7wHqDJolRhu7Z9SFw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tq6ud-00028e-0i; Thu, 06 Mar 2025 03:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76572] [PATCH v2 1/4] gnu: gnome-shell-extension-gsconnect: Fix search path patching. 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:02 +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.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 ) id 1tq6uD-000275-So for submit@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 ) id 1tq6u6-00026F-98 for 76572@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@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 Date: Thu, 6 Mar 2025 03:44:50 -0500 Message-ID: <033b6e91689a129386f2722024378f884ac23b40.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 * 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 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 Eidvilas Markevičius +;;; Copyright © 2025 aurtzy ;;; ;;; 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)