GNU bug report logs - #73796
[PATCH] gnu: jellyfin-mpv-shim: Fix icon & metainfo installation.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#73796: closed ([PATCH] gnu: jellyfin-mpv-shim: Fix icon &
 metainfo installation.)
Date: Tue, 15 Oct 2024 16:23:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Tue, 15 Oct 2024 18:21:39 +0200
with message-id <87ed4hwd4c.fsf <at> gnu.org>
and subject line Re: [bug#73796] [PATCH] gnu: jellyfin-mpv-shim: Fix icon & metainfo installation.
has caused the debbugs.gnu.org bug report #73796,
regarding [PATCH] gnu: jellyfin-mpv-shim: Fix icon & metainfo installation.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
73796: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73796
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Ian Eure <ian <at> retrospec.tv>
To: guix-patches <at> gnu.org
Cc: Ian Eure <ian <at> retrospec.tv>
Subject: [PATCH] gnu: jellyfin-mpv-shim: Fix icon & metainfo installation.
Date: Sun, 13 Oct 2024 12:00:55 -0700

The icons and appdata.xml were getting installed into share/applications, when
they should have gone into share/icons/hicolor and share/metainfo.  Put them
in the right place, which allows DEs to find them.

*  (jellyfin-mpv-shim): Fix icon & metainfo installation.

Change-Id: Ic6cdae2fe0b348b94285bf8b39c014922baae6c1
---
 gnu/packages/video.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1d2ab5fbeb..92c0acef3c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2830,16 +2830,24 @@ (define-public jellyfin-mpv-shim
              (lambda* (#:key outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
                       (apps (string-append out "/share/applications"))
+                      (metainfo (string-append out "/share/metainfo"))
+                      (icons (string-append out "/share/icons"))
                       (desktop-base "jellyfin_mpv_shim/integration/")
                       (package-id
                        "com.github.iwalton3.jellyfin-mpv-shim"))
                  (for-each (lambda (size)
-                             (install-file (format #f
-                                                   "~ajellyfin-~a.png"
-                                                   desktop-base size) apps))
+                             (let ((dir (format
+                                         #f "~a/hicolor/~ax~a/apps/"
+                                         icons size size package-id)))
+                               (mkdir-p dir)
+                               (copy-file
+                                (format #f
+                                        "~ajellyfin-~a.png"
+                                        desktop-base size)
+                                (string-append dir package-id ".png"))))
                            '(256 128 64 48 32 16))
                  (install-file (string-append desktop-base package-id
-                                              ".appdata.xml") apps)
+                                              ".appdata.xml") metainfo)
                  (install-file (string-append desktop-base package-id
                                               ".desktop") apps)))))))
     (inputs (list `(,python "tk")
-- 
2.46.0

[Message part 3 (message/rfc822, inline)]

From: Ludovic Courtès <ludo <at> gnu.org>
To: Ian Eure <ian <at> retrospec.tv>
Cc: 73796-done <at> debbugs.gnu.org
Subject: Re: [bug#73796] [PATCH] gnu: jellyfin-mpv-shim: Fix icon & metainfo
 installation.
Date: Tue, 15 Oct 2024 18:21:39 +0200

Ian Eure <ian <at> retrospec.tv> skribis:

> The icons and appdata.xml were getting installed into share/applications, when
> they should have gone into share/icons/hicolor and share/metainfo.  Put them
> in the right place, which allows DEs to find them.
>
> *  (jellyfin-mpv-shim): Fix icon & metainfo installation.
>
> Change-Id: Ic6cdae2fe0b348b94285bf8b39c014922baae6c1

I tweaked the commit log and applied it, thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.