Subject: bug#58620: closed (Re: Update blur my shell)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 22 Oct 2022 09:08:01 +0000

Your bug report

#58620: Update blur my shell

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
58620: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=58620
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: Update blur my shell
From: Liliana Marie Prikler <[email-masked]>
To: Charles <[email-masked]>
Cc: [email-masked]
Date: Sat, 22 Oct 2022 11:07:03 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Am Samstag, dem 22.10.2022 um 04:33 +0000 schrieb Charles:

> 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.
Pushed with the following changes:

> +     '(#: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$"))))
Used a shorter name for install-location for the sake of conciseness.

> -     (list (list glib "bin"))) ; for glib-compile-schemas
> +     (list (list "glib:bin" glib "bin"))) ; for glib-compile-schemas
Dropped this, because the linter warning is a false positive.

I also rewrote the commit message to fall in line with the others.

Cheers

Subject: Update blur my shell
From: Charles <[email-masked]>
To: "[email-masked]" <[email-masked]>
Date: Wed, 19 Oct 2022 04:25:47 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

Empty Message

From 2fec71f98487e19f49c992a27a55d00ac5821662 Mon Sep 17 00:00:00 2001
From: Charles <[email-masked]>
Date: Tue, 18 Oct 2022 23:04:24 -0500
Subject: [PATCH] gnu: gnome-shell-extensions: Update blur my shell to version
 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.
---
 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"))))
     (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$")))
        #: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"))))))
     (native-inputs
      (list (list glib "bin"))) ; for glib-compile-schemas
     (home-page "https://github.com/aunetx/blur-my-shell")
-- 
2.38.0