From patchwork Wed Oct 19 04:25:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles X-Patchwork-Id: 6769 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 A20E227BBE9; Wed, 19 Oct 2022 05:27:16 +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,HTML_MESSAGE,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 8132A27BBEA for ; Wed, 19 Oct 2022 05:27:15 +0100 (BST) Received: from localhost ([::1]:41124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ol0fh-0006MQ-Cs for patchwork@mira.cbaines.net; Wed, 19 Oct 2022 00:27:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ol0fX-0006MI-Gs for guix-patches@gnu.org; Wed, 19 Oct 2022 00:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ol0fW-0007y3-Sw for guix-patches@gnu.org; Wed, 19 Oct 2022 00:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ol0fW-0002YI-In for guix-patches@gnu.org; Wed, 19 Oct 2022 00:27: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: Wed, 19 Oct 2022 04:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58620 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58620@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.16661535699735 (code B ref -1); Wed, 19 Oct 2022 04:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Oct 2022 04:26:09 +0000 Received: from localhost ([127.0.0.1]:55433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ol0ee-0002Wx-Gx for submit@debbugs.gnu.org; Wed, 19 Oct 2022 00:26:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:37008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ol0eY-0002Wj-Ra for submit@debbugs.gnu.org; Wed, 19 Oct 2022 00:26:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ol0eY-0006JE-LG for guix-patches@gnu.org; Wed, 19 Oct 2022 00:26:02 -0400 Received: from mail-40138.protonmail.ch ([185.70.40.138]:36375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ol0eS-0007rU-KX for guix-patches@gnu.org; Wed, 19 Oct 2022 00:25:59 -0400 Date: Wed, 19 Oct 2022 04:25:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1666153551; x=1666412751; bh=hFc8Jm/RjIVMtKqgO+Z0LxGPX+2ChjsOmCn839C+NxI=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=T8h47oOyCD9D/eEMPn6rVRxJ/t34zOZA+kpHQpsrcxp+arUXImd3+xOTYe7Pv8fT3 53WOtFWzswl3Wzh9Y1NA3ooSIrJI1J4RSBw0N8oBpwYm/4U50P43u0qaxRk3LGi6R6 gAnjDNhmsEoB++s2cioldjsY0vpK+099qqgBsM696aZzOSwVC+gC7H+LtWD5EtYkCg 9Qllnw0Dv96SOHjxYLdu8mLTfUHrfaqrPffWG6tH+kfRUl4khk/MEnQt3z1utiNqXr qKnpohCsf2JRuTF8RbtQ9g1pQKkG153a27X5eVkNP2rbrPtkH27VkT/0ok8TskU2DN Xu/eD1NutK18w== Message-ID: <2mjT77G4wrrOWhYBkiBVH1zVeRlE9KRuQTFzbT2F9essoggB089RP0JjKU9srju0FpoQyexx9DI-s5eXWMKNiVY6nKGL01rmlB18SbRFf-I=@proton.me> Feedback-ID: 46146749:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.138; envelope-from=Charles.b.jackson@proton.me; helo=mail-40138.protonmail.ch 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, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Charles X-ACL-Warn: , Charles via Guix-patches X-Patchwork-Original-From: Charles via Guix-patches via From: Charles X-getmail-retrieved-from-mailbox: Patches Empty Message From 2fec71f98487e19f49c992a27a55d00ac5821662 Mon Sep 17 00:00:00 2001 From: Charles 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