From patchwork Fri Jan 19 22:36:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 59750 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 BC7E627BBE9; Sun, 4 Feb 2024 07:04:08 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8E36427BBEA for ; Sun, 4 Feb 2024 07:04:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWWXq-0000Zt-E4; Sun, 04 Feb 2024 02:04:02 -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 1rWWXf-0000YU-QS for guix-patches@gnu.org; Sun, 04 Feb 2024 02:03:53 -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 1rWWXf-000590-3M for guix-patches@gnu.org; Sun, 04 Feb 2024 02:03:51 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWWXq-0006Ms-Qz for guix-patches@gnu.org; Sun, 04 Feb 2024 02:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68556] [PATCH gnome-team v7 2/7] gnu: gnome-shell-extensions: Wrap the extensions. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 07:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68556 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68556@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 68556-submit@debbugs.gnu.org id=B68556.170703020524366 (code B ref 68556); Sun, 04 Feb 2024 07:04:02 +0000 Received: (at 68556) by debbugs.gnu.org; 4 Feb 2024 07:03:25 +0000 Received: from localhost ([127.0.0.1]:48106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWWXE-0006Kq-Q6 for submit@debbugs.gnu.org; Sun, 04 Feb 2024 02:03:25 -0500 Received: from planete-kraus.eu ([89.234.140.182]:48872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWWXA-0006KE-Ni for 68556@debbugs.gnu.org; Sun, 04 Feb 2024 02:03:21 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 186a61ad; Sun, 4 Feb 2024 07:03:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=6X0tohjgoXuCnVAncoqzdALcY/g=; b=l kM/elaa1meQ8kt2ycz6Dc1h7hR/U2HaekE6dqn0Z9ym+CJbqhl0ScgmehIlrSKAn DaWfc7GKM8U97ZE30PjFxSv1dp1NfRasi0POmjO8GWR5u8QXLScigUnhrJ1TNVUV Ls+28E69jG3SPVqTHG9aTwBy61r9MSui2V+clbhPp9oS08aKGkw/8J2c6tPoYBH5 RCTs49M7QStAD/SM0No1MV9ZJilL/wJw4qBf+J1oLVbNONgjuORS0yUC2RcFcCLg ZodlfpS4sqrgrrwm/Ro0V+deqnp9MBvydq/OLciGnIqAgmpKlnbuSX2skkEWv6wl LM66klMsbgz/bgsnTehqg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id c90f55ed (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 4 Feb 2024 07:03:03 +0000 (UTC) Message-ID: <154ec9d16ec3372038ecea6b63255b978620044b.1707030000.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Fri, 19 Jan 2024 23:36:05 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The top-level modules that are wrapped are the /extension.js and /prefs.js of every extension sub-directory. The GI_TYPELIB_PATH used contains glib for every extension, and gnome-menus for Applications Menu. * gnu/packages/gnome.scm (gnome-shell-extensions) [#:phases]: Add 'wrap-extensions. [native-inputs]: Add gobject-introspection. [inputs]: Add gnome-menus and glib. [propagated-imputs]: Remove glib. Change-Id: I58b79ca92fbceebb9bbb150102fa428022e3eb63 --- gnu/packages/gnome.scm | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6919576eae..817d9c23cf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10726,13 +10726,34 @@ (define-public gnome-shell-extensions "1aq1n75m1svsv0ppg66n9qch26rhjxcv3q33a3skf7hsydr5wd4c")))) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dextension_set=all"))) + (list + #:configure-flags #~'("-Dextension_set=all") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'wrap-extensions + (lambda _ + (use-modules (ice-9 textual-ports) + (guix build utils)) + (for-each + (lambda (file-to-wrap) + (with-atomic-file-replacement file-to-wrap + (lambda (source wrapped) + (format wrapped "'~a'.split(':').forEach(" + (getenv "GI_TYPELIB_PATH")) + (display + (string-append "path => imports.gi.GIRepository.Repository" + ".prepend_search_path(path));\n") + wrapped) + (dump-port source wrapped)))) + (find-files "extensions" "(extension|prefs)\\.js"))))))) (native-inputs (list `(,glib "bin") gettext-minimal + gobject-introspection ; to set GI_TYPELIB_PATH pkg-config)) - (propagated-inputs - (list glib)) + (inputs + (list glib + gnome-menus)) ; for Applications Menu (synopsis "Extensions for GNOME Shell") (description "GNOME Shell extensions modify and extend GNOME Shell functionality and behavior.")