[bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon

[Leo Prikler <leo.prikler@student.tugraz.at>]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

Am Freitag, den 20.12.2019, 09:02 +0200 schrieb Efraim Flashner:
> In any case, I've pushed the patch with glib:bin in native-inputs and
> glib in propagated-inputs.
I just got around to checking and it appears the rewritten install
phase breaks the package.  I've attached a fix in 0001, and also split
up my depropagation patch for the other packages.

Regards,
Leo

[-- Attachment #2: 0001-gnu-gnome-shell-extension-hide-app-icon-Fix-installa.patch --]
[-- Type: text/x-patch, Size: 3342 bytes --]

From 5d5e14ae3a03a1981ed0d98fe4b17353decd0095 Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Sun, 22 Dec 2019 16:03:43 +0100
Subject: [PATCH 1/3] gnu: gnome-shell-extension-hide-app-icon: Fix
 installation.

* gnu/packages/gnome-xyz.scm: (gnome-shell-extension-hide-app-icon):
Install in subdirectory.  Adjust indentation.
---
 gnu/packages/gnome-xyz.scm | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 4b5e07a1a0..a43424026b 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -158,15 +158,16 @@ faster window switching.")
       (name "gnome-shell-extension-hide-app-icon")
       (version (git-version "2.7" revision commit))
       (source
-        (origin
-          (method git-fetch)
-          (uri (git-reference
-                 (url "https://github.com/michael-rapp/gnome-shell-extension-hide-app-icon.git")
-                 (commit commit)))
-          (sha256
-           (base32
-            "1i28n4bz6wrhn07vpxkr6l1ljyn7g8frp5xrr11z3z32h2hxxcd6"))
-          (file-name (git-file-name name version))))
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url (string-append "https://github.com/michael-rapp"
+                                   "/gnome-shell-extension-hide-app-icon.git"))
+               (commit commit)))
+         (sha256
+          (base32
+           "1i28n4bz6wrhn07vpxkr6l1ljyn7g8frp5xrr11z3z32h2hxxcd6"))
+         (file-name (git-file-name name version))))
       (build-system gnu-build-system)
       (arguments
        '(#:tests? #f                ; no test target
@@ -178,10 +179,11 @@ faster window switching.")
            (delete 'configure)      ; no configure script
            (replace 'install
              (lambda* (#:key outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out")))
-                 (copy-recursively "hide-app-icon@mrapp.sourceforge.com/"
-                                   (string-append out "/share/gnome-shell/extensions"))
-               #t))))))
+               (let ((out (assoc-ref outputs "out"))
+                     (pre "/share/gnome-shell/extensions/")
+                     (dir "hide-app-icon@mrapp.sourceforge.com"))
+                 (copy-recursively dir (string-append out pre dir))
+                 #t))))))
       (native-inputs
        `(("glib" ,glib "bin")
          ("intltool" ,intltool)))
@@ -190,12 +192,13 @@ faster window switching.")
       (synopsis "Hide app icon from GNOME's panel")
       (description "This extension allows to hide the icon and/or title of the
 currently focused application in the top panel of the GNOME shell.")
-      (home-page "https://github.com/michael-rapp/gnome-shell-extension-hide-app-icon/")
+      (home-page
+       "https://github.com/michael-rapp/gnome-shell-extension-hide-app-icon/")
       (license
        ;; README.md and LICENSE.txt disagree -- the former claims v3, the
        ;; latter v2.  No mention of "or later" in either place or in the code.
-        (list license:gpl2
-              license:gpl3)))))
+       (list license:gpl2
+             license:gpl3)))))
 
 (define-public gnome-shell-extension-dash-to-panel
   (package
-- 
2.24.1


[-- Attachment #3: 0002-gnu-gnome-shell-extension-dash-to-dock-Depropagate-g.patch --]
[-- Type: text/x-patch, Size: 1223 bytes --]

From d48135da48aca403477799db9bd9d58ec79ce5e4 Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Sun, 22 Dec 2019 16:10:04 +0100
Subject: [PATCH 2/3] gnu: gnome-shell-extension-dash-to-dock: Depropagate
 glib:bin.

* gnu/packages/gnome-xyz.scm (gnome-shell-extension-dash-to-dock):
[propagated-inputs]: Move glib:bin from here...
[native-inputs]: ... to here.
---
 gnu/packages/gnome-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index a43424026b..0d15532513 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -139,11 +139,11 @@ the Obsidian icon theme.")
          (delete 'bootstrap)
          (delete 'configure))))
     (native-inputs
-     `(("intltool" ,intltool)
+     `(("glib:bin" ,glib "bin")
+       ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (propagated-inputs
-     `(("glib" ,glib)
-       ("glib" ,glib "bin")))
+     `(("glib" ,glib)))
     (synopsis "Transforms GNOME's dash into a dock")
     (description "This extension moves the dash out of the
 overview, transforming it into a dock for easier application launching and
-- 
2.24.1


[-- Attachment #4: 0003-gnu-gnome-shell-extensions-Depropagate-glib-bin.patch --]
[-- Type: text/x-patch, Size: 1158 bytes --]

From 0b8dc9d4b8463c3f68d72c506e49c4706ae64144 Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Sun, 22 Dec 2019 16:12:32 +0100
Subject: [PATCH 3/3] gnu: gnome-shell-extensions: Depropagate glib:bin.

* gnu/packages/gnome.scm (gnome-shell-extensions):
[propagated-inputs]: Move glib:bin from here...
[native-inputs]: ... to here.
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2f772ee1b0..95da97e95d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7570,11 +7570,11 @@ GNOME Shell appearance and extension, etc.")
     (arguments
      '(#:configure-flags '("-Dextension_set=all")))
     (native-inputs
-     `(("intltool" ,intltool)
+     `(("glib:bin" ,glib "bin")
+       ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (propagated-inputs
-     `(("glib" ,glib)
-       ("glib" ,glib "bin")))
+     `(("glib" ,glib)))
     (synopsis "Extensions for GNOME Shell")
     (description "GNOME Shell extensions modify and extend GNOME Shell
 functionality and behavior.")
-- 
2.24.1