From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gLjGKBkvNmI+KQAAgWs5BA (envelope-from ) for ; Sat, 19 Mar 2022 20:29:29 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iBmYJRkvNmL+WAAAauVa8A (envelope-from ) for ; Sat, 19 Mar 2022 20:29:29 +0100 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 263A593D4 for ; Sat, 19 Mar 2022 20:29:29 +0100 (CET) Received: from localhost ([::1]:35846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVelU-0003bB-9Y for larch@yhetil.org; Sat, 19 Mar 2022 15:29:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVc5a-0007d0-Bw for bug-guix@gnu.org; Sat, 19 Mar 2022 12:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38376) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVc5a-0003LL-3a for bug-guix@gnu.org; Sat, 19 Mar 2022 12:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nVc5Z-0005ga-QJ for bug-guix@gnu.org; Sat, 19 Mar 2022 12:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#50329: [PATCH] Bundle icons for emacs-lsp-treemacs References: In-Reply-To: Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 19 Mar 2022 16:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50329 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164770783021781 (code B ref -1); Sat, 19 Mar 2022 16:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Mar 2022 16:37:10 +0000 Received: from localhost ([127.0.0.1]:60506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVc4j-0005fF-Qa for submit@debbugs.gnu.org; Sat, 19 Mar 2022 12:37:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:51810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVb4x-0003tz-25 for submit@debbugs.gnu.org; Sat, 19 Mar 2022 11:33:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVb4w-0001N7-Q6 for guix-patches@gnu.org; Sat, 19 Mar 2022 11:33:18 -0400 Received: from [2a00:1450:4864:20::52c] (port=34546 helo=mail-ed1-x52c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVb4u-0001Av-SK for guix-patches@gnu.org; Sat, 19 Mar 2022 11:33:18 -0400 Received: by mail-ed1-x52c.google.com with SMTP id h1so13375019edj.1 for ; Sat, 19 Mar 2022 08:33:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=user-agent:from:to:subject:date:message-id:mime-version; bh=z5pELkVsIAwgSdo6qUsfifNT/TZ4eY3B17pR2fKJiho=; b=sSo2EAjQndbAMF7r9y6/j02nfPn8c61VFwMbgnS5DvGH9BBt0vVpdT9ZFjMK3j7akb fES03glquWBW8Jzu9EZbVvi+2WklwiPCt8/r2TSCPgACBPSeBBK9p83/ItxO8JpIBLcw B7JKKxZZRjctLFHsOBCllHnIby+5FpCYbEOexNsdhn1XgzXkjbnlURyLyHqqG7MRku5Y EGhmicNllQrPyiTKfCZxeHHhNP7y5hetn/REGFH9fmg8OzpDCT/84q5AKElL9zMfxd74 K4tVye3l8KsrcgerMRv/uwSryMfdReU0bf29eK8WXMMO8Ur7MyTL3pqaIhuc6R3xzf3J zkHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=z5pELkVsIAwgSdo6qUsfifNT/TZ4eY3B17pR2fKJiho=; b=T+2A+tZt2xbCozzN1WGNps23rLhsVVWjf0qJ/NOuAMboDtlZuL9+86IJ7uUKTcm/Wm un4OnlGMeQdjehcmOb3lRwvGbdeKyHj9PM2vDwrl19ZI8BVJ/dkCOs+NrP/18steWxuV IZU7n3aeMQzbrBvbTVYk6sEbJhWPX7wSf/3zcZ/Y5UJeqe1uQG8tlNo1CB9Sxu/+obRs y+nLyoOdzMgBcTHFISn8onHKcaxFk9qnuddppQ9TRmLFJNLIkN2IrHCjucU2DsnJOH4u qXHItBjcLkhgnFh3uS8qafCgoGJ/CuDHb1Dec7RH04KUvYidEX1aViPu+OfHXX+8m56d ePEQ== X-Gm-Message-State: AOAM533Jm2vkFizjz76Iv5Ywjhn5n9pbKBTnsuLUA1K+T5Uy4uLVzAwr 8qFCLTAP/SeVdm7H4o2JD1efV5GADs90rW2C X-Google-Smtp-Source: ABdhPJxDzIVnoUWlwVq02xxx21/yKZW9q2apSSrkFXgPcZAG81aEQfmQ3JJByTZ1GI2N4GcGMBi8XQ== X-Received: by 2002:a05:6402:1ca2:b0:419:1e4e:3244 with SMTP id cz2-20020a0564021ca200b004191e4e3244mr4040078edb.289.1647703994849; Sat, 19 Mar 2022 08:33:14 -0700 (PDT) Received: from thinkpad (tmo-117-20.customers.d1-online.com. [80.187.117.20]) by smtp.gmail.com with ESMTPSA id s11-20020a056402520b00b00416c0baee96sm5878882edd.6.2022.03.19.08.33.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Mar 2022 08:33:14 -0700 (PDT) User-agent: mu4e 1.6.10; emacs 28.0.50 From: Roman Scherer Date: Sat, 19 Mar 2022 16:29:54 +0100 Message-ID: <87fsnevtxi.fsf@burningswell.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52c (failed) Received-SPF: none client-ip=2a00:1450:4864:20::52c; envelope-from=roman.scherer@burningswell.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 19 Mar 2022 12:37:09 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 19 Mar 2022 15:29:09 -0400 X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1647718169; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=z5pELkVsIAwgSdo6qUsfifNT/TZ4eY3B17pR2fKJiho=; b=U4YUBJMttuw4+mHiKenHe0VcBNQW5sTM3RBg4KvSwJwoekOiO4tWpUxYynoo6j7qWgx+39 3tKB83cpWjOpDp1CxrlFkehAW+rN34mysVoVOtUEY5psyfIauF7xEy30egsR9upWhvD21G dflHbbReIY99AHhQk44KJxyIqiz4uxwPDh2WgwwjVv4pzSPSgHaXAoPQtSLlVROVrUgWZT 08UFsXXz8m5MNl9alOzaw5J/hda0znUHitNrCtMgQXHgnKnI3NHD8K+HcrKu94SdKXXD2g kEZGbGtTAvg8K5fIzgGWF8NvPdgwmEY7f2aWwiNC23giYGFkGB+vM0tGEoypgQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647718169; a=rsa-sha256; cv=none; b=KEPn2S5PTCu3DjVYQYB0VuMMrWdK2+AJ5GTQFvoZagLsyj7tF0DSUm153jmHQiJeOKC16D Y4qsLSjVQTeDGvb+5x1Mbo1fyZ47FfaTOUERUk6EEHQ9z3lgzjR7Ep8VClXboYPkmKplTR gvGSSVSvEAfCciV6gkD/a0yEBecA2Pz6yqjiLnvpcu09d8pI4PI8PMeGk2OqLY1ZvoFt3G H8RyTJM2yUZnjEOjjJVLAChhF9xtEpdDeiz91xUoE64jFkQt8Om/XZEu1fn6Q3KEK5eJuf zzn6gTZIpt0tnGwSdHhn6VesYGiCzQZzWPI9X6Ow37VP2pDX7AB4JhLJTWNm3g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=burningswell-com.20210112.gappssmtp.com header.s=20210112 header.b=sSo2EAjQ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 0.77 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=burningswell-com.20210112.gappssmtp.com header.s=20210112 header.b=sSo2EAjQ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 263A593D4 X-Spam-Score: 0.77 X-Migadu-Scanner: scn1.migadu.com X-TUID: xGfB+qUTQf+N --=-=-= Content-Type: text/plain Hello, the emacs-lsp-treemacs package does not bundle it's icons. This patch fixes the issue by copying the icons to `share/emacs-lsp-treemacs/icons` and patching the paths in `lsp-treemacs-themes.el`. This is the link to the issue in bug tracker: https://issues.guix.gnu.org/50329 Would you like to apply this patch? Thanks, Roman. This is my 2nd mail, because I forgot to set the subject in the previous. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Bundle-emacs-lsp-treemacs-icons.patch Content-Description: Patch >From 70b409e51ea655c79fac20d9990b9644ddd4f19c Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 19 Mar 2022 15:33:24 +0100 Subject: [PATCH] Bundle emacs-lsp-treemacs icons --- gnu/packages/emacs-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dcd36291fb..a1328ef57a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24429,6 +24429,19 @@ (define-public emacs-lsp-treemacs (sha256 (base32 "05ivqa5900139jzjhwc3nggwznhm8564dz4ydcxym2ddd63571k0")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "lsp-treemacs-themes.el" + (("\\(f-join \\(f-dirname \\(or load-file-name buffer-file-name\\)\\) \"icons/([^\"]+)\"\\)" all name) + (string-append "\"" out "/share/" ,name "/icons/" name "\"")))))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "icons" (string-append out "/share/" ,name "/icons")))))))) (propagated-inputs (list emacs-lsp-mode emacs-treemacs)) (home-page "https://github.com/emacs-lsp/lsp-treemacs") -- 2.34.0 --=-=-=--