GNU bug report logs - #76375
[PATCH gnome-team] gnu: gnome-shell: Fix substitutions for imports.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 17 Feb 2025 21:17:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 17 16:17:30 2025
Received: from localhost ([127.0.0.1]:50144 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tk8Ub-0001cJ-O1
	for submit <at> debbugs.gnu.org; Mon, 17 Feb 2025 16:17:30 -0500
Received: from lists.gnu.org ([2001:470:142::17]:49204)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <aurtzy@HIDDEN>) id 1tk8UY-0001be-J1
 for submit <at> debbugs.gnu.org; Mon, 17 Feb 2025 16:17:27 -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 1tk8UD-00026O-NO
 for guix-patches@HIDDEN; Mon, 17 Feb 2025 16:17:14 -0500
Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <aurtzy@HIDDEN>) id 1tk8UB-0005uV-0I
 for guix-patches@HIDDEN; Mon, 17 Feb 2025 16:17:04 -0500
Received: by mail-qv1-xf2a.google.com with SMTP id
 6a1803df08f44-6e6827984b2so12425116d6.1
 for <guix-patches@HIDDEN>; Mon, 17 Feb 2025 13:17:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1739827021; x=1740431821; 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=pg3ohk8I+csJpu82WRN26DHEUf/gBKE2jO8fLlLffVM=;
 b=NDuXLRLYNNFvwWqflHePyd6IgPkZWa8jsWJpNCBuqLyWsXCB/bO0Co0dFg9XrMHoft
 YKLBuxGyaORRE97wiEUpoeBBO6eQLl6wXimqvn5GH3kxizgCruIDXixs02OLuk+JiU6F
 tdvZKLMPybmnLwr0NPjvf/Dcfvux0ktftPYn8wazsDFqTaiOIqIjp+l5b0SVo1rsQxLA
 3yYVgQ6cjYCVLlAG19VX+icHcAkXuEKBS3V8zokqd1cNAM1+jiKzwrGEj2GU0kiZ/rCr
 wLhUhb+H4XEAvQ+utjS0vzHhjZHe+CaIOsXYHJktGjH1hotrLgip28FQjKg3dpCiQhtm
 fpug==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1739827021; x=1740431821;
 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=pg3ohk8I+csJpu82WRN26DHEUf/gBKE2jO8fLlLffVM=;
 b=jwuVN5k0Jh2b5s2SX1C64bfuCeKfXebjkJwRaTMFcW2hl53AIC2dytB1bUoNR9GarK
 gHf9q86eX2E61EmpT52y53fDleRCJsCOZvPMmAuQd5BLZ9XurkOBWvmABz2cYjUPk8kk
 yGODCl04Lm0FnYmOei0FP3jv1MkMsoByCx8fefFpkbkzuMgiVQuyqBzRJsFR4LXQKacE
 0kd0Z3JecoGlOb3jR3f2EN8gr32AevyMIc71uk4Aaf+FQWlTGAo/5qsofnGkvwZpZtzG
 LoYSnTvCvMD+65i6lEyZCmGhOVb9mzruwz/FobbSgKGgAo6S545fjeL5INDeLBi3ACh+
 IWzQ==
X-Gm-Message-State: AOJu0YysG29KSXLLfnX08fPPfAPZrCMXpOr42kjh5e7GbSDqNZnhmfiz
 migKaLUkSkDzT2oiZ1VXghMH6hOn8TmQVc7+L72fhxqjSaKi/JqGft2tYA==
X-Gm-Gg: ASbGncv9Cf7KSH01kB6n8dlDIiusq9RpQZcGiSrbxtjz7oGACkqh3mY1eM8nFdu7mZE
 yzy3DSb5YU2OUTObO6oPpNWryi2kOis4CFSfG+aqkPcv+KV4eqAkmMMUUjrVUfMYcg4Pyc05Nap
 Eyxt1xtCRAsPRgLFfG0uJtdQzRPjGlKU34imFnLazf2PXHUNmnHDXzp8hYmPdAuHzrGPpL+U+JV
 BKz4CfdFO5ggvSxPEF4udpJE2QqG3MnrqHdxvpiuRob2d9w5vK2frnmdgKIbMd5YCrBscxa77Hc
 zuPAzUrh/A==
X-Google-Smtp-Source: AGHT+IEqUXXdD8XSC9Sd2a0Ul98yiDw2AVknwLlY+YOUGCCiBDA9xofBWXsK9ErcP+TBiDD9r/ebsg==
X-Received: by 2002:ad4:5fcd:0:b0:6d8:a0c8:e468 with SMTP id
 6a1803df08f44-6e66ccd4b26mr147831616d6.24.1739827020750; 
 Mon, 17 Feb 2025 13:17:00 -0800 (PST)
Received: from localhost.localdomain ([2600:4808:a053:1800::4448])
 by smtp.gmail.com with ESMTPSA id
 d75a77b69052e-471c2a30bb4sm51567201cf.43.2025.02.17.13.16.59
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 17 Feb 2025 13:17:00 -0800 (PST)
From: aurtzy <aurtzy@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH gnome-team] gnu: gnome-shell: Fix substitutions for imports.
Date: Mon, 17 Feb 2025 16:15:41 -0500
Message-ID: <8c3e3020bfac69625d020626babd798d4ba2cb89.1739826317.git.aurtzy@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
 Vivien Kraus <vivien@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::f2a;
 envelope-from=aurtzy@HIDDEN; helo=mail-qv1-xf2a.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-Debbugs-Envelope-To: submit
Cc: aurtzy <aurtzy@HIDDEN>
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 (/)

* gnu/packages/gnome.scm (gnome-shell)[arguments]<#:phases>: Update regexps
for substitutions in 'wrap-programs phase so search paths can be included
again.

Change-Id: Ie3582edbcb1e5712787c9292c449b161c7c9d869
---

Hi!

I noticed the Extensions app was no longer allowing me to view and set up
extensions while testing this branch, and discovered after some investigation
that the substitutions for imports were not applying due to changes in the
file.  Applying this patch fixed it for me.

I didn't pick this up before, but since it looked like Screencast had the same
issue, I applied the same change, which seems to also "re-enable" screen
recording with Screencast.

Cheers,

aurtzy

 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c1896336cb..30c93c0ac3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9595,7 +9595,7 @@ (define-public gnome-shell
                    '("gnome-shell" "gnome-extensions" "gnome-extensions-app"))
                   (substitute* (string-append #$output "/share/gnome-shell/"
                                               "org.gnome.Shell.Extensions")
-                    (("imports\\.package\\.start" all)
+                    (("^import " all)
                      (string-append "'" gi-typelib-path "'.split(':').forEach("
                                     "path => imports.gi.GIRepository.Repository."
                                     "prepend_search_path(path));\n"
@@ -9604,7 +9604,7 @@ (define-public gnome-shell
                   ;; (i.e. as provided by home-pipewire-service-type)
                   (substitute* (string-append #$output "/share/gnome-shell/"
                                               "org.gnome.Shell.Screencast")
-                    (("imports\\.package\\.start" all)
+                    (("^import " all)
                      (string-append "'" gi-typelib-path "'.split(':').forEach("
                                     "path => imports.gi.GIRepository.Repository."
                                     "prepend_search_path(path));\n"

base-commit: 5e3e1b782b87d5bfe903f978490955cc20a70e5a
-- 
2.48.1