GNU bug report logs - #76572
[PATCH 0/4] Fixes for gnome-shell-extension-gsconnect

Previous Next

Package: guix-patches;

Reported by: aurtzy <aurtzy <at> gmail.com>

Date: Tue, 25 Feb 2025 23:27:01 UTC

Severity: normal

Tags: patch

Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: aurtzy <aurtzy <at> gmail.com>
To: 76572 <at> debbugs.gnu.org
Cc: aurtzy <aurtzy <at> gmail.com>, aurtzy <aurtzy <at> gmail.com>, Liliana Marie Prikler <liliana.prikler <at> gmail.com>, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>, Vivien Kraus <vivien <at> planete-kraus.eu>
Subject: [bug#76572] [PATCH 1/4] gnu: gnome-shell-extension-gsconnect: Fix search path patching.
Date: Tue, 25 Feb 2025 18:34:21 -0500
* 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 <at> proton.me>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
 ;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas <at> gmail.com>
+;;; Copyright © 2025 aurtzy <aurtzy <at> gmail.com>
 ;;;
 ;;; 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





This bug report was last modified 76 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.