From patchwork Sat Oct 22 04:33:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles X-Patchwork-Id: 43814 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 370AA27BBE9; Sat, 22 Oct 2022 05:42:43 +0100 (BST) 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_H2,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 1FF3027BBEA for ; Sat, 22 Oct 2022 05:42:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1om6D5-0003T1-3M; Sat, 22 Oct 2022 00:34:11 -0400 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 1om6Cx-0003Sg-O8 for guix-patches@gnu.org; Sat, 22 Oct 2022 00:34:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1om6Cw-0008KK-Ub for guix-patches@gnu.org; Sat, 22 Oct 2022 00:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1om6Cw-0003Hh-EH for guix-patches@gnu.org; Sat, 22 Oct 2022 00:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58620] Update blur my shell Resent-From: Charles Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58620 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Liliana Marie Prikler Cc: 58620@debbugs.gnu.org Received: via spool by 58620-submit@debbugs.gnu.org id=B58620.166641324012616 (code B ref 58620); Sat, 22 Oct 2022 04:34:02 +0000 Received: (at 58620) by debbugs.gnu.org; 22 Oct 2022 04:34:00 +0000 Received: from localhost ([127.0.0.1]:39495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1om6Ct-0003HP-2S for submit@debbugs.gnu.org; Sat, 22 Oct 2022 00:33:59 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]:21115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1om6Cp-0003HB-7Q for 58620@debbugs.gnu.org; Sat, 22 Oct 2022 00:33:57 -0400 Date: Sat, 22 Oct 2022 04:33:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1666413228; x=1666672428; bh=m3thu0DWyVfIXXT+spEiqX9gAZchypmqnck79fahuO4=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=C73haJr7Alwq0acI+tLfA9awUeFD94nh09fPZ9Pjkj6RYHjWyUMQHthgdaDRkh6EF DK+9RrpvUTmb30pGrGybZjxq70dzM1DoCI+tDRmnQyIXi85VA6QFxfwD1phwQG0YUR ip15L753jA+ISrYE275iZl6RDrahkBg9z61NmnmzRXXRE3bV8IzBF3V31zz1uV8F9q sIUs4RIDuQ7KbR8HVJXBSKqqjLNo0nN7Pzb/25bjQQvJwWG/mSTtRYwNPo75af/HYO KLf1waLur9LfCtxKDHnekS/8UrA+ZZPrcbM+/bQF3Dt02bwv3W3sOe8GAqwg+xM2GJ YqbcpYeCtd45w== Message-ID: <06cSobEp775u_dSNlI451HkpvLL7bRRRNW7WSQ5PJCnmCeFUwoeRujzdP3KeHLhQk8rp1LICwwM9Qxwlf1KcMw0mkn-54M-G-geOyYeNldE=@proton.me> In-Reply-To: References: <2mjT77G4wrrOWhYBkiBVH1zVeRlE9KRuQTFzbT2F9essoggB089RP0JjKU9srju0FpoQyexx9DI-s5eXWMKNiVY6nKGL01rmlB18SbRFf-I=@proton.me> Feedback-ID: 46146749:user:proton 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: , Sender: "Guix-patches" Reply-to: Charles X-ACL-Warn: , Charles via Guix-patches X-Patchwork-Original-From: Charles via Guix-patches via From: Charles Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Thank you for the great review, Liliana. Using the install plan makes this so much better. I think I have addressed all your feedback. Updated patch attatched. ------- Original Message ------- On Thursday, October 20th, 2022 at 8:01 AM, Liliana Marie Prikler wrote: > Am Mittwoch, dem 19.10.2022 um 04:25 +0000 schrieb Charles: > > > [PATCH] gnu: gnome-shell-extensions: Update blur my shell to version > > 44. > > Should be: "gnu: update gnome-shell-extension-blur-my-shell to 44". > > > * gnu/packages/gnome-xyz.scm (gnome-shell-extension-blur-my-shell) > > Update version and hash. Add a phase to move the contents of the src > > and resources directories to project root so they get installed > > properly. > > Break lines between changes and make clear what's changed. Use > indicators such as [#:phases]. > > > --- > > gnu/packages/gnome-xyz.scm | 31 ++++++++++++++++++++++--------- > > 1 file changed, 22 insertions(+), 9 deletions(-) > > > > diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm > > index 68166978a1..89bb9c9d7b 100644 > > --- a/gnu/packages/gnome-xyz.scm > > +++ b/gnu/packages/gnome-xyz.scm > > @@ -996,7 +996,7 @@ (define-public gnome-shell-extension-burn-my- > > windows > > (define-public gnome-shell-extension-blur-my-shell > > (package > > (name "gnome-shell-extension-blur-my-shell") > > - (version "29") > > + (version "44") > > (source > > (origin > > (method git-fetch) > > @@ -1006,9 +1006,7 @@ (define-public gnome-shell-extension-blur-my- > > shell > > (file-name (git-file-name name version)) > > (sha256 > > (base32 > > - "13x7zgaj3dz7lypdv1bgmpmh0f2w53q567zxmhmqimi1gy5mjrvk")) > > - (snippet > > - '(begin (delete-file "src/schemas/gschemas.compiled"))))) > > + "0h7yfvrrg5r821mzrp42c09jws06mw6v9avvkfykqj8n8qnslmyx")))) > > Why is the snippet removed? > > > (build-system copy-build-system) > > (arguments > > `(#:install-plan > > @@ -1016,15 +1014,30 @@ (define-public gnome-shell-extension-blur-my- > > shell > > "share/gnome-shell/extensions/" > > "blur-my-shell@aunetx") > > #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" > > "\\.png$" > > - "\\.xml$" "\\.compiled$"))) > > + "\\.svg$" "\\.xml$" "\\.compiled$"))) > > Note the addition of "\\.svg$" in the ChangeLog. > > > #:phases > > (modify-phases %standard-phases > > - (add-after 'unpack 'cd-src > > - (lambda _ (chdir "src"))) > > - (add-before 'install 'compile-schemas > > + (add-after 'unpack 'compile-schemas > > (lambda _ > > (with-directory-excursion "schemas" > > - (invoke "glib-compile-schemas" "."))))))) > > + (invoke "glib-compile-schemas" ".")))) > > + (add-before 'install 'unpack-src > > + (lambda _ > > + (use-modules (ice-9 ftw)) > > + (define (explode-dir dir) > > + (for-each > > + (lambda (file) > > + (let ((full-file-name > > + (string-append (getcwd) "/" dir "/" file))) > > + (rename-file > > + full-file-name > > + (string-append (getcwd) "/" file)))) > > + (filter (lambda (file) > > + (not (or (string=? file ".") > > + (string=? file "..")))) > > + (scandir (string-append (getcwd) "/" > > dir))))) > > + (explode-dir "src") > > + (explode-dir "resources")))))) > > Adjust #:install-plan instead. > > > (native-inputs > > (list (list glib "bin"))) ; for glib-compile-schemas > > (home-page "https://github.com/aunetx/blur-my-shell") > > -- > > Cheers From 6181077fa41eac60929533e16716ac857d6f5576 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 18 Oct 2022 23:04:24 -0500 Subject: [PATCH] gnu: Update gnome-shell-extension-blur-my-shell to 44. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-blur-my-shell): Update version and hash. Remove snippet to delete compiled schemas because upstream stopped keeping them in version control. Install files from the resources and src directories into the root directory in [#:install-plan]. Add identifier glib:bin to satisfy guix lint. --- gnu/packages/gnome-xyz.scm | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 68166978a1..fbf110159f 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -996,7 +996,7 @@ (define-public gnome-shell-extension-burn-my-windows (define-public gnome-shell-extension-blur-my-shell (package (name "gnome-shell-extension-blur-my-shell") - (version "29") + (version "44") (source (origin (method git-fetch) @@ -1006,27 +1006,29 @@ (define-public gnome-shell-extension-blur-my-shell (file-name (git-file-name name version)) (sha256 (base32 - "13x7zgaj3dz7lypdv1bgmpmh0f2w53q567zxmhmqimi1gy5mjrvk")) - (snippet - '(begin (delete-file "src/schemas/gschemas.compiled"))))) + "0h7yfvrrg5r821mzrp42c09jws06mw6v9avvkfykqj8n8qnslmyx")))) (build-system copy-build-system) (arguments - `(#:install-plan - '(("." ,(string-append - "share/gnome-shell/extensions/" - "blur-my-shell@aunetx") - #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" - "\\.xml$" "\\.compiled$"))) + '(#:install-plan + (let ((install-location + (string-append + "share/gnome-shell/extensions/" + "blur-my-shell@aunetx"))) + `(("src/" ,install-location) + ("resources/" ,install-location + #:include-regexp ("\\.svg$" "\\.ui")) + ("." ,install-location + #:exclude-regexp ("src/" "resources/") + #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" + "\\.xml$" "\\.compiled$")))) #:phases (modify-phases %standard-phases - (add-after 'unpack 'cd-src - (lambda _ (chdir "src"))) - (add-before 'install 'compile-schemas + (add-after 'unpack 'compile-schemas (lambda _ (with-directory-excursion "schemas" (invoke "glib-compile-schemas" "."))))))) (native-inputs - (list (list glib "bin"))) ; for glib-compile-schemas + (list (list "glib:bin" glib "bin"))) ; for glib-compile-schemas (home-page "https://github.com/aunetx/blur-my-shell") (synopsis "Blurs different parts of the GNOME Shell") (description "Blur My Shell adds a blur look to different parts of the -- 2.38.0