all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
@ 2019-12-08 20:12 Leo Prikler
  2019-12-19  9:20 ` Efraim Flashner
  0 siblings, 1 reply; 10+ messages in thread
From: Leo Prikler @ 2019-12-08 20:12 UTC (permalink / raw)
  To: 38538

* gnu/packages/gnome-xyz.scm (gnome-shell-extension-hide-app-icon):
New variable.
---
 gnu/packages/gnome-xyz.scm | 47 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 7c3fb072c0..80870fd25d 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -26,6 +26,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
@@ -149,6 +150,52 @@ faster window switching.")
     (home-page "https://micheleg.github.io/dash-to-dock/")
     (license license:gpl2+)))
 
+(define-public gnome-shell-extension-hide-app-icon
+  (let ((commit "4188aa5f4ba24901a053a0c3eb0d83baa8625eab")
+        (revision "0"))
+    (package
+      (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))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:tests? #f
+         #:make-flags (list (string-append "EXTENSIONS_DIR="
+                                           (assoc-ref %outputs "out")
+                                           "/share/gnome-shell/extensions"))
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'bootstrap)
+           (delete 'configure)
+           (add-before 'install 'prepare-install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (mkdir-p (string-append (assoc-ref outputs "out")
+                                       "/share/gnome-shell/extensions")))))))
+      (native-inputs
+       `(("intltool" ,intltool)
+         ("unzip" ,unzip)
+         ("zip" ,zip)))
+      (propagated-inputs
+       `(("glib" ,glib)
+         ("glib" ,glib "bin")))
+      (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/")
+      (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)))))
+
 (define-public gnome-shell-extension-noannoyance
   (package
     (name "gnome-shell-extension-noannoyance")
-- 
2.24.0

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
  2019-12-08 20:12 [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon Leo Prikler
@ 2019-12-19  9:20 ` Efraim Flashner
  2019-12-19  9:22   ` Efraim Flashner
  2019-12-19 11:00   ` Leo Prikler
  0 siblings, 2 replies; 10+ messages in thread
From: Efraim Flashner @ 2019-12-19  9:20 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 38538

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

What does this need glib and glib:bin for? Is it just for building the
schemas or does it actually need it at runtime?

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
  2019-12-19  9:20 ` Efraim Flashner
@ 2019-12-19  9:22   ` Efraim Flashner
  2019-12-19 11:00   ` Leo Prikler
  1 sibling, 0 replies; 10+ messages in thread
From: Efraim Flashner @ 2019-12-19  9:22 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 38538


[-- Attachment #1.1: Type: text/plain, Size: 451 bytes --]

On Thu, Dec 19, 2019 at 11:20:04AM +0200, Efraim Flashner wrote:
> What does this need glib and glib:bin for? Is it just for building the
> schemas or does it actually need it at runtime?
> 

I also made some changes to the package

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #1.2: 0001-gnu-Add-gnome-shell-extension-hide-app-icon.patch --]
[-- Type: text/plain, Size: 3065 bytes --]

From f5d6a59409d6d119e40f5fda998287e4f7ca5a34 Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Sun, 8 Dec 2019 21:12:50 +0100
Subject: [PATCH] gnu: Add gnome-shell-extension-hide-app-icon.

* gnu/packages/gnome-xyz.scm (gnome-shell-extension-hide-app-icon):
New variable.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/gnome-xyz.scm | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 00ad701ad8..5aa2d292bf 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -151,6 +151,52 @@ faster window switching.")
     (home-page "https://micheleg.github.io/dash-to-dock/")
     (license license:gpl2+)))
 
+(define-public gnome-shell-extension-hide-app-icon
+  (let ((commit "4188aa5f4ba24901a053a0c3eb0d83baa8625eab")
+        (revision "0"))
+    (package
+      (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))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:tests? #f                ; no test target
+         #:make-flags (list (string-append "EXTENSIONS_DIR="
+                                           (assoc-ref %outputs "out")
+                                           "/share/gnome-shell/extensions"))
+         #:phases
+         (modify-phases %standard-phases
+           (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))))))
+      (native-inputs
+       `(("intltool" ,intltool)))
+      (propagated-inputs
+       `(("glib" ,glib)
+         ("glib" ,glib "bin")))
+      (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/")
+      (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)))))
+
 (define-public gnome-shell-extension-noannoyance
   (package
     (name "gnome-shell-extension-noannoyance")
-- 
2.24.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
  2019-12-19  9:20 ` Efraim Flashner
  2019-12-19  9:22   ` Efraim Flashner
@ 2019-12-19 11:00   ` Leo Prikler
  2019-12-19 12:44     ` Leo Prikler
  1 sibling, 1 reply; 10+ messages in thread
From: Leo Prikler @ 2019-12-19 11:00 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: 38538

Am Donnerstag, den 19.12.2019, 11:20 +0200 schrieb Efraim Flashner:
> What does this need glib and glib:bin for? Is it just for building
> the
> schemas or does it actually need it at runtime?
To be honest, I'm not quite sure.  I've copied this part from my dash-
to-dock extension, wherein I copied it from the gnome-shell-extensions
package.

As far as I'm aware both packages do build schemas, but I'm not sure
how extensions handle them at runtime.  Perhaps this is already wrong
in the package I originally copied the snippet from.  I'll try to see
how far I can get with depropagation.

Regards,
Leo

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
  2019-12-19 11:00   ` Leo Prikler
@ 2019-12-19 12:44     ` Leo Prikler
  2019-12-19 13:38       ` Efraim Flashner
  0 siblings, 1 reply; 10+ messages in thread
From: Leo Prikler @ 2019-12-19 12:44 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: 38538

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

Am Donnerstag, den 19.12.2019, 12:00 +0100 schrieb Leo Prikler:
> Am Donnerstag, den 19.12.2019, 11:20 +0200 schrieb Efraim Flashner:
> > What does this need glib and glib:bin for? Is it just for building
> > the
> > schemas or does it actually need it at runtime?
> To be honest, I'm not quite sure.  I've copied this part from my
> dash-
> to-dock extension, wherein I copied it from the gnome-shell-
> extensions
> package.
> 
> As far as I'm aware both packages do build schemas, but I'm not sure
> how extensions handle them at runtime.  Perhaps this is already wrong
> in the package I originally copied the snippet from.  I'll try to see
> how far I can get with depropagation.
> 
> Regards,
> Leo
Upon closer inspection, it appears depropagation is indeed possible. 
See the attached patch.

[-- Attachment #2: 0002-gnu-Depropagate-glib-from-GNOME-Shell-extensions.patch --]
[-- Type: text/x-patch, Size: 2877 bytes --]

From 8b468ac52e55560e8581a4b93ddefba00dbfab62 Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Thu, 19 Dec 2019 13:31:58 +0100
Subject: [PATCH 2/2] gnu: Depropagate glib from GNOME Shell extensions

* gnu/packages/gnome.scm (gnome-shell-extensions): Drop propagated inputs,
move them to more appropriate place.
[propagated-inputs]: Removed field.
[native-inputs] <glib:bin>: New input.
[inputs] <glib>: New input.
* gnu/packages/gnome-xyz.scm (gnome-shell-extension-dash-to-dock): Likewise.
(gnome-shell-extension-hide-app-icon): Likewise.
---
 gnu/packages/gnome-xyz.scm | 16 ++++++++--------
 gnu/packages/gnome.scm     |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 148f1db646..9dff38fa39 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -140,11 +140,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")))
+    (inputs
+     `(("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
@@ -182,12 +182,12 @@ faster window switching.")
                (mkdir-p (string-append (assoc-ref outputs "out")
                                        "/share/gnome-shell/extensions")))))))
       (native-inputs
-       `(("intltool" ,intltool)
+       `(("glib:bin" ,glib "bin")
+         ("intltool" ,intltool)
          ("unzip" ,unzip)
          ("zip" ,zip)))
-      (propagated-inputs
-       `(("glib" ,glib)
-         ("glib" ,glib "bin")))
+      (inputs
+       `(("glib" ,glib)))
       (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.")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 77d96987d6..117937a9ba 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7537,11 +7537,11 @@ GNOME Shell appearance and extension, etc.")
     (arguments
      '(#:configure-flags '("-Dextension_set=all")))
     (native-inputs
-     `(("intltool" ,intltool)
+     `(("glib" ,glib "bin")
+       ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-     `(("glib" ,glib)
-       ("glib" ,glib "bin")))
+    (inputs
+     `(("glib" ,glib)))
     (synopsis "Extensions for GNOME Shell")
     (description "GNOME Shell extensions modify and extend GNOME Shell
 functionality and behavior.")
-- 
2.24.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
  2019-12-19 12:44     ` Leo Prikler
@ 2019-12-19 13:38       ` Efraim Flashner
  2019-12-19 14:06         ` Leo Prikler
  0 siblings, 1 reply; 10+ messages in thread
From: Efraim Flashner @ 2019-12-19 13:38 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 38538

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

On Thu, Dec 19, 2019 at 01:44:47PM +0100, Leo Prikler wrote:
> Am Donnerstag, den 19.12.2019, 12:00 +0100 schrieb Leo Prikler:
> > Am Donnerstag, den 19.12.2019, 11:20 +0200 schrieb Efraim Flashner:
> > > What does this need glib and glib:bin for? Is it just for building
> > > the
> > > schemas or does it actually need it at runtime?
> > To be honest, I'm not quite sure.  I've copied this part from my
> > dash-
> > to-dock extension, wherein I copied it from the gnome-shell-
> > extensions
> > package.
> > 
> > As far as I'm aware both packages do build schemas, but I'm not sure
> > how extensions handle them at runtime.  Perhaps this is already wrong
> > in the package I originally copied the snippet from.  I'll try to see
> > how far I can get with depropagation.
> > 
> > Regards,
> > Leo
> Upon closer inspection, it appears depropagation is indeed possible. 
> See the attached patch.

It makes sense to me that glib:bin should be a native-input but I assume
glib, if it's needed at runtime, would probably need to be propagated
since the extension doesn't refer to it. Likely it's getting glib from
another package in the environment.

Also, the depropagation patch should really be a separate patch for each
package if we go that route.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
  2019-12-19 13:38       ` Efraim Flashner
@ 2019-12-19 14:06         ` Leo Prikler
  2019-12-20  7:02           ` bug#38538: " Efraim Flashner
  0 siblings, 1 reply; 10+ messages in thread
From: Leo Prikler @ 2019-12-19 14:06 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: 38538

Am Donnerstag, den 19.12.2019, 15:38 +0200 schrieb Efraim Flashner:
> On Thu, Dec 19, 2019 at 01:44:47PM +0100, Leo Prikler wrote:
> > Am Donnerstag, den 19.12.2019, 12:00 +0100 schrieb Leo Prikler:
> > > Am Donnerstag, den 19.12.2019, 11:20 +0200 schrieb Efraim
> > > Flashner:
> > > > What does this need glib and glib:bin for? Is it just for
> > > > building
> > > > the
> > > > schemas or does it actually need it at runtime?
> > > To be honest, I'm not quite sure.  I've copied this part from my
> > > dash-
> > > to-dock extension, wherein I copied it from the gnome-shell-
> > > extensions
> > > package.
> > > 
> > > As far as I'm aware both packages do build schemas, but I'm not
> > > sure
> > > how extensions handle them at runtime.  Perhaps this is already
> > > wrong
> > > in the package I originally copied the snippet from.  I'll try to
> > > see
> > > how far I can get with depropagation.
> > > 
> > > Regards,
> > > Leo
> > Upon closer inspection, it appears depropagation is indeed
> > possible. 
> > See the attached patch.
> 
> It makes sense to me that glib:bin should be a native-input but I
> assume
> glib, if it's needed at runtime, would probably need to be propagated
> since the extension doesn't refer to it. Likely it's getting glib
> from
> another package in the environment.
I'm not really sure, what the correct thing would be here.  I did have
very weird behaviour with hide-app-icon, where having glib as input vs.
not having it made the difference of having to reload the extension
after changing settings vs. not having to.  However, I'm really not
sure whether that was due to the extension or a weirdness in GNOME
Shell.

> Also, the depropagation patch should really be a separate patch for
> each
> package if we go that route.
Perhaps.  I just wanted to "prove" that you can at least depropagate
glib:bin and probably glib as well.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* bug#38538: [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
  2019-12-19 14:06         ` Leo Prikler
@ 2019-12-20  7:02           ` Efraim Flashner
  2019-12-22 15:33             ` [bug#38538] " Leo Prikler
  0 siblings, 1 reply; 10+ messages in thread
From: Efraim Flashner @ 2019-12-20  7:02 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 38538-done

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

On Thu, Dec 19, 2019 at 03:06:27PM +0100, Leo Prikler wrote:
> Am Donnerstag, den 19.12.2019, 15:38 +0200 schrieb Efraim Flashner:
> > On Thu, Dec 19, 2019 at 01:44:47PM +0100, Leo Prikler wrote:
> > > Am Donnerstag, den 19.12.2019, 12:00 +0100 schrieb Leo Prikler:
> > > > Am Donnerstag, den 19.12.2019, 11:20 +0200 schrieb Efraim
> > > > Flashner:
> > > > > What does this need glib and glib:bin for? Is it just for
> > > > > building
> > > > > the
> > > > > schemas or does it actually need it at runtime?
> > > > To be honest, I'm not quite sure.  I've copied this part from my
> > > > dash-
> > > > to-dock extension, wherein I copied it from the gnome-shell-
> > > > extensions
> > > > package.
> > > > 
> > > > As far as I'm aware both packages do build schemas, but I'm not
> > > > sure
> > > > how extensions handle them at runtime.  Perhaps this is already
> > > > wrong
> > > > in the package I originally copied the snippet from.  I'll try to
> > > > see
> > > > how far I can get with depropagation.
> > > > 
> > > > Regards,
> > > > Leo
> > > Upon closer inspection, it appears depropagation is indeed
> > > possible. 
> > > See the attached patch.
> > 
> > It makes sense to me that glib:bin should be a native-input but I
> > assume
> > glib, if it's needed at runtime, would probably need to be propagated
> > since the extension doesn't refer to it. Likely it's getting glib
> > from
> > another package in the environment.
> I'm not really sure, what the correct thing would be here.  I did have
> very weird behaviour with hide-app-icon, where having glib as input vs.
> not having it made the difference of having to reload the extension
> after changing settings vs. not having to.  However, I'm really not
> sure whether that was due to the extension or a weirdness in GNOME
> Shell.
> 

In any case, I've pushed the patch with glib:bin in native-inputs and
glib in propagated-inputs.

> > Also, the depropagation patch should really be a separate patch for
> > each
> > package if we go that route.
> Perhaps.  I just wanted to "prove" that you can at least depropagate
> glib:bin and probably glib as well.
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
  2019-12-20  7:02           ` bug#38538: " Efraim Flashner
@ 2019-12-22 15:33             ` Leo Prikler
  2019-12-23  7:41               ` Efraim Flashner
  0 siblings, 1 reply; 10+ messages in thread
From: Leo Prikler @ 2019-12-22 15:33 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: 38538-done

[-- 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


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon
  2019-12-22 15:33             ` [bug#38538] " Leo Prikler
@ 2019-12-23  7:41               ` Efraim Flashner
  0 siblings, 0 replies; 10+ messages in thread
From: Efraim Flashner @ 2019-12-23  7:41 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 38538-done

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

On Sun, Dec 22, 2019 at 04:33:48PM +0100, Leo Prikler wrote:
> 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

Oh no! I'm glad you caught it. The included install phase was way too
complicated for what it was supposed to do.

I've gone ahead and pushed these too. Thanks!

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2019-12-23  7:42 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-08 20:12 [bug#38538] [PATCH] gnu: Add gnome-shell-extension-hide-app-icon Leo Prikler
2019-12-19  9:20 ` Efraim Flashner
2019-12-19  9:22   ` Efraim Flashner
2019-12-19 11:00   ` Leo Prikler
2019-12-19 12:44     ` Leo Prikler
2019-12-19 13:38       ` Efraim Flashner
2019-12-19 14:06         ` Leo Prikler
2019-12-20  7:02           ` bug#38538: " Efraim Flashner
2019-12-22 15:33             ` [bug#38538] " Leo Prikler
2019-12-23  7:41               ` Efraim Flashner

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.