From patchwork Fri Aug 18 23:55:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 53009 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C68F927BBE9; Sat, 19 Aug 2023 09:44:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A41B727BBEA for ; Sat, 19 Aug 2023 09:44:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXHZ1-0000lD-Oo; Sat, 19 Aug 2023 04:44:07 -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 1qXHYx-0000c9-K0 for guix-patches@gnu.org; Sat, 19 Aug 2023 04:44:03 -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 1qXHYx-0000f2-Bm for guix-patches@gnu.org; Sat, 19 Aug 2023 04:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXHYy-0005B6-2h; Sat, 19 Aug 2023 04:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65376] [PATCH emacs-team 6/7] gnu: emacs-all-the-icons: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 19 Aug 2023 08:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65376 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65376@debbugs.gnu.org Cc: andrew@trop.in, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, liliana.prikler@gmail.com Received: via spool by 65376-submit@debbugs.gnu.org id=B65376.169243460719783 (code B ref 65376); Sat, 19 Aug 2023 08:44:04 +0000 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:27 +0000 Received: from localhost ([127.0.0.1]:49406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYM-00058y-N1 for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:27 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:44504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYC-00057V-57 for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:17 -0400 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-99c136ee106so213932166b.1 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434589; x=1693039389; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=BJg/AYoWDStOtDgWQJmPZkO+OIikRa/2+Ho9uVMbQSY=; b=W0xibdXLCna1kKw5yfF3ojnrF1pGex9UjVTSECqGhTqBKs/Z/9IxlE58lPWFE/rr5D aQV/NizCVyaKDxDTSpS/qv9uak4GLsTFLcZXoHS+Uy/y8r7F+pQgb/IYQxZ88Czp3WsU O7U5qCrzaHCv2LPZImBe4AFp/vjKdighAmemHa2zUk5Y71PMw8sTDKxU9aXkQe9TbPS1 MWRdeT8KWDIqx7lg3vz/7KCgIkXNHfYouTDhSZiK0R4FK55hahafBZ3hgsSR65oetKN7 R/TlejNXmKn0xamqMoWLF9SfxMBRLAcEegAuHecxv6DhO2aMlXE/tVIEaYRcusVUpKn9 weKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434589; x=1693039389; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BJg/AYoWDStOtDgWQJmPZkO+OIikRa/2+Ho9uVMbQSY=; b=iNMfZRl7dvAYIjPnJSrNv/xc6cZcVFTDeNvtJ1t4BItB9SkXQab8/nHPjRIijagmnn DqV3r84K+xW0THMr+H41k0v/k37YrmdKianc05cqIf0R8Cq6WiyrQ2EzfSA0N2vPtW0L idjgYtX41MWl4B2Xtw2xXsPIqoQdDSZr7XqA3uGQ/Xb3FPmCEdPpd8U1lTjqHw8zLc20 DGWKRguyQqz0FTxIGrspbFXxdaKZvrEfJk+SXxkDvr287a4opzVhEtSBubGu6orslxMD nr6bN7TKDWwy46WApr53oMug/1IO5oRi2UvcUXmDhmHxb6nJrJsQ7lD54MPhfqsC3yoj KcQw== X-Gm-Message-State: AOJu0YwAmAdgt2psO7w5TC71a4bpfhvTgyTSWMnGeqBZTVfN2i54fUYE dPbVS3oFqRXXCHk6lUP519JabhOILPMMzw== X-Google-Smtp-Source: AGHT+IGZbWzYPcv1OjnOBNexum1HTNLcke9h6gv7robp9Xpcpx2f3cteWyhMdysd5eKY/a8d1UfK+w== X-Received: by 2002:a17:906:2011:b0:99b:f820:5d0e with SMTP id 17-20020a170906201100b0099bf8205d0emr1066801ejo.25.1692434589261; Sat, 19 Aug 2023 01:43:09 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.08 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:08 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 01:55:30 +0200 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-all-the-icons)[source]: Use it here. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 2 ++ ...cs-all-the-icons-remove-duplicate-rs.patch | 21 +++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3b087a6d5e..fb58b4eac8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1090,6 +1090,7 @@ dist_patch_DATA = \ %D%/packages/patches/elm-offline-package-registry.patch \ %D%/packages/patches/elm-reactor-static-files.patch \ %D%/packages/patches/elogind-revert-polkit-detection.patch \ + %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9aaac5142f..89ce0fa900 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27776,6 +27776,8 @@ (define-public emacs-all-the-icons (url "https://github.com/domtronn/all-the-icons.el") (commit version))) (file-name (git-file-name name version)) + (patches + (search-patches "emacs-all-the-icons-remove-duplicate-rs.patch")) (sha256 (base32 "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g")))) (build-system emacs-build-system) diff --git a/gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch b/gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch new file mode 100644 index 0000000000..2c6b14e0aa --- /dev/null +++ b/gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch @@ -0,0 +1,21 @@ +From 24b8d5b63e347bd4cdcf79bf897fc0097fa20fc7 Mon Sep 17 00:00:00 2001 +From: Michael Wernthaler +Date: Thu, 22 Jul 2021 11:27:31 +0200 +Subject: [PATCH] Fixed icon for .rs-files + +--- + all-the-icons.el | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/all-the-icons.el b/all-the-icons.el +index e1f4cb7695..3399906cfb 100644 +--- a/all-the-icons.el ++++ b/all-the-icons.el +@@ -194,7 +194,6 @@ + ("r" all-the-icons-fileicon "R" :face all-the-icons-lblue) + ("rd" all-the-icons-fileicon "R" :face all-the-icons-lblue) + ("rdx" all-the-icons-fileicon "R" :face all-the-icons-lblue) +- ("rs" all-the-icons-fileicon "R" :face all-the-icons-lblue) + ("rsx" all-the-icons-fileicon "R" :face all-the-icons-lblue) + ;; There seems to be a a bug with this font icon which does not + ;; let you propertise it without it reverting to being a lower