From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id sKKTI2wdDGeavwAAe85BDQ:P1 (envelope-from ) for ; Sun, 13 Oct 2024 19:20:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sKKTI2wdDGeavwAAe85BDQ (envelope-from ) for ; Sun, 13 Oct 2024 21:20:12 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=vO8GFAlm; dkim=fail ("headers rsa verify failed") header.d=retrospec.tv header.s=fm1 header.b=ePuaFTvz; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=ldufzVwn; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1728847212; a=rsa-sha256; cv=none; b=UPw+CY1jcfjOFA+5ib51TZi8y7fpFSYCKxxhxkp7dv+npZ4HDwcG4tXO2u6SfdWEtsaS5g 0Mvq5smecwFXBiQI/MkLZ1C4U65q9md2eMZooCXutExowYWw2x/IZTJCC3KweP3BrONbyt OTjkJd55vucT3gOIQpfbgwNHqjB1b7t+Z21WZcnLV+OlskZWumQfsD8eu51PUPHPND2EkG RuSdTtAhUak1LU0xvmJumcj+otty5RAh9Xcl/W4nuP4pDC6w6SXwrJA+G34HAOpa2DN+Hn 6JbHalotKetRmp6iCP6ZpEf8++CPd569BUL5mSVlbjT95zHx4Q20ofSyUFzk4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=vO8GFAlm; dkim=fail ("headers rsa verify failed") header.d=retrospec.tv header.s=fm1 header.b=ePuaFTvz; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=ldufzVwn; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1728847212; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=lXIBy8C08tj2Q5vz70TTu2CK2Gx3wkGEq2NALKXRFgI=; b=BAB/DjRCoh0L/VctOWL5r+1eADthmjX95W+6EmY4scvyudkNWtb4QkCTy7aeYHJ2IYw57F LQdX4mXLc4hfcJFum/8hxwCbwenAAJJ/nC2OHOIGzA82hQgu3oANmBnOV+5J+3OqBBtAPR YtRkeV/yStaNm9ypbHZt75T0cFVTKWDs+bCyb/KoR/5kXwOmb7Z5sdQH7H/iL/sJcYmjCT EVxkebl6+KSfofoqmBL0LYUcbTD+c1rls43rn41/Od7knPKXDW3rfl6zTZxQ4zqXgL6Wfp AOVmlkyeLzpqgheRZ3kljX2YLzm1n/rCR8B+RVAMWOzRcG+XKN0AOGOEhCwMXw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 87FA363B84 for ; Sun, 13 Oct 2024 21:20:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0485-0000v6-OL; Sun, 13 Oct 2024 15:19:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0483-0000tJ-2C for guix-patches@gnu.org; Sun, 13 Oct 2024 15:19:47 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t0482-0006uW-LF for guix-patches@gnu.org; Sun, 13 Oct 2024 15:19:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=lXIBy8C08tj2Q5vz70TTu2CK2Gx3wkGEq2NALKXRFgI=; b=vO8GFAlmnnni7rjIBpGOah5jxduoNaXhJeyWK1SRt5tRrTh1+oEvUGXvBEM7H7opfW5hhEn2Oz54ySgSR+GXPuUttj0t6n3MrQ2Ji1VCXchSLdnvTEwvQVrO3bRGwS+L5SwNKV51itiFfyNlM7qaqGG2fl0ujnDxvayBbOsF3uKVwyLbF9WA3MHQ5uzD4Qyg/5cDkwPfRfwKbhHrvRPVY8Q6c2Pj+wCiEZifLKOI5Jc4wiKbc9GRvESFGYFGNAUE18NqL1V5PyFG9OIzOCeuMtnh8TAbNjY2X0xHrTEntbEGM9hzL/vNL3yPWpKEpC+bdAqzftEzYYno+GnUSsrU0w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t048I-0006XS-DL for guix-patches@gnu.org; Sun, 13 Oct 2024 15:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73796] [PATCH] gnu: jellyfin-mpv-shim: Fix icon & metainfo installation. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Oct 2024 19:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73796 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73796@debbugs.gnu.org Cc: Ian Eure X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172884719525062 (code B ref -1); Sun, 13 Oct 2024 19:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Oct 2024 19:19:55 +0000 Received: from localhost ([127.0.0.1]:55932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t048B-0006W5-By for submit@debbugs.gnu.org; Sun, 13 Oct 2024 15:19:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:34990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0486-0006Tl-Jq for submit@debbugs.gnu.org; Sun, 13 Oct 2024 15:19:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t03pz-0004oe-EQ for guix-patches@gnu.org; Sun, 13 Oct 2024 15:01:07 -0400 Received: from fhigh-a5-smtp.messagingengine.com ([103.168.172.156]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t03pv-0003lR-Ay for guix-patches@gnu.org; Sun, 13 Oct 2024 15:01:06 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id 35270114010F; Sun, 13 Oct 2024 15:01:00 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Sun, 13 Oct 2024 15:01:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm1; t=1728846060; x=1728932460; bh=lXIBy8C08tj2Q5vz70TTu 2CK2Gx3wkGEq2NALKXRFgI=; b=ePuaFTvzeyUXhV8IYNIvW9x+Gxo5xIgagCPTK H7fMbquKn/M9IT8gw+G5sj0SJKiExL8Gm+HyzmmEjcIas11Ap/NMbpaKJFoaExIi IlNHX7ZcaiAbGkIwKL1oOM4q6PM4yXS8D56Bywl8OP2WQ76+U0bH9S+3zgohNdvL Qi79x4SY6QmfYPfH1zfsFJ151VBt5Q2w4pm3CxK+//EjXfKOUwuR0KHlx0E/SKZx OSE/Asshqcxo6L2lcvnyEbdNFxZb3mLRm4mNME1kJtP+qbR1ncWgw5UV83TQkAWd 9QjNvrDQ9/zDl39clcnpJU1NLKJaBeErKdhwlTXY1QivtUSPg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1728846060; x=1728932460; bh=lXIBy8C08tj2Q5vz70TTu2CK2Gx3 wkGEq2NALKXRFgI=; b=ldufzVwn9wSS+BokyPPtiWn7yWAmpBu0P/Mfx4+gK8bT cMU+++zV5EAn+FNkd1CYLlRxK3S+CrzcFGnlyc6EL/QTolCT/dTigGV99ivN9T+Q kP5ZtmzWXljKvvToSHlhJtHCYwXPgUWwIxT3xWZhgvhfBzfPZ+OinzXMMhsByPT1 qxVS62f0NVtDep/LKHnlzBxYE3xM8VH78l1gJYPWaa9Kty+4tEfWGEXiAFAaBS7U xnhkHbTas34Nr/8bvOSW53ZxhBdly4qCZzf/l0z6grhSmN/7NGwC/9cMMZMbwDdQ tsQ4m7aAvduDcRvbmQifivTn6tHrxJdJaCPuiDo0sg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdegfedgudefgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofgggfestdekredtredttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhes rhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpefhieevleeiudekffehhf elieejtdevleelteeggffgheekleejhedtgeduvdevgfenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvh dpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhu ihigqdhprghttghhvghssehgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhroh hsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 13 Oct 2024 15:00:59 -0400 (EDT) From: Ian Eure Date: Sun, 13 Oct 2024 12:00:55 -0700 Message-ID: <20241013190055.14247-1-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=103.168.172.156; envelope-from=ian@retrospec.tv; helo=fhigh-a5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.39 X-Spam-Score: -0.39 X-Migadu-Queue-Id: 87FA363B84 X-Migadu-Scanner: mx12.migadu.com X-TUID: pUYVebJBL3Bp 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