[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65376] [PATCH emacs-team 6/7] gnu: emacs-all-the-icons: Fix build.
From: |
Liliana Marie Prikler |
Subject: |
[bug#65376] [PATCH emacs-team 6/7] gnu: emacs-all-the-icons: Fix build. |
Date: |
Sat, 19 Aug 2023 01:55:30 +0200 |
* 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]<patches>: 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 <michael.wernthaler@posteo.de>
+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
--
2.41.0
- [bug#65376] [PATCH emacs-team 0/7] Fix some more builds, Liliana Marie Prikler, 2023/08/19
- [bug#65376] [PATCH emacs-team 2/7] gnu: emacs-haskell-mode: Update to 17.4., Liliana Marie Prikler, 2023/08/19
- [bug#65376] [PATCH emacs-team 1/7] gnu: emacs-all-the-icons: Honour #:tests?, Liliana Marie Prikler, 2023/08/19
- [bug#65376] [PATCH emacs-team 3/7] gnu: emacs-helpful: Update to 0.21., Liliana Marie Prikler, 2023/08/19
- [bug#65376] [PATCH emacs-team 7/7] gnu: emacs-yasnippet: Fix build., Liliana Marie Prikler, 2023/08/19
- [bug#65376] [PATCH emacs-team 4/7] guix: emacs-utils: Add ert-number-tests., Liliana Marie Prikler, 2023/08/19
- [bug#65376] [PATCH emacs-team 6/7] gnu: emacs-all-the-icons: Fix build.,
Liliana Marie Prikler <=
- [bug#65376] [PATCH emacs-team 5/7] gnu: emacs-libgit: Fix build., Liliana Marie Prikler, 2023/08/19
- [bug#65376] [PATCH emacs-team 0/7] Fix some more builds, Andrew Tropin, 2023/08/20