diff mbox series

[bug#36274] Add fix for emacs-unpackaged-el.

Message ID CAAc=MExU5++vcgza29n3YNoCpCUMGU+LY64B=-C7N4y=0cNr3A@mail.gmail.com
State Accepted
Headers show
Series [bug#36274] Add fix for emacs-unpackaged-el. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Brian Leung June 18, 2019, 4:54 a.m. UTC 
See attached.

Comments

Ludovic Courtès June 19, 2019, 8:52 p.m. UTC | #1 
Hello,

Brian Leung <bkleung89@gmail.com> skribis:

> From de0f5337dd5c30f6678d408efe5e8b8db03a9d7e Mon Sep 17 00:00:00 2001
> From: Brian Leung <bkleung89@gmail.com>
> Date: Tue, 18 Jun 2019 06:48:35 +0200
> Subject: [PATCH] gnu: emacs-unpackaged-el: Add patch for missing require
>  statement.
>
> * gnu/packages/emacs-xyz.scm (emacs-unpackaged-el)[source]: Add patch.
> * gnu/packages/patches/emacs-unpackaged-req.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.

Applied!

> --- /dev/null
> +++ b/gnu/packages/patches/emacs-unpackaged-req.patch
> @@ -0,0 +1,24 @@
> +From e5be173e201710538464c279335bef735a327a68 Mon Sep 17 00:00:00 2001
> +From: Brian Leung <bkleung89@gmail.com>
> +Date: Tue, 18 Jun 2019 06:37:46 +0200
> +Subject: [PATCH] Add missing require.

What’s the upstream status of this patch?

Thank you,
Ludo’.
diff mbox series

Patch

From de0f5337dd5c30f6678d408efe5e8b8db03a9d7e Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Tue, 18 Jun 2019 06:48:35 +0200
Subject: [PATCH] gnu: emacs-unpackaged-el: Add patch for missing require
 statement.

* gnu/packages/emacs-xyz.scm (emacs-unpackaged-el)[source]: Add patch.
* gnu/packages/patches/emacs-unpackaged-req.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/emacs-xyz.scm                    |  5 +++-
 .../patches/emacs-unpackaged-req.patch        | 24 +++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/emacs-unpackaged-req.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 74d2bafa8d..6380e86893 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -765,6 +765,7 @@  dist_patch_DATA =						\
   %D%/packages/patches/emacs-highlight-stages-add-gexp.patch	\
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch	\
   %D%/packages/patches/emacs-source-date-epoch.patch		\
+  %D%/packages/patches/emacs-unpackaged-req.patch		\
   %D%/packages/patches/emacs-undohist-ignored.patch	\
   %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch	\
   %D%/packages/patches/emacs-zones-called-interactively.patch	\
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3ef69ab9e0..408645f5cd 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -590,12 +590,15 @@  from within Emacs.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1yf3zrgqfhnr0az8gn1kqqwnhfi3nc0vbjkcagwcqwk3sp1jda86"))))
+           "1yf3zrgqfhnr0az8gn1kqqwnhfi3nc0vbjkcagwcqwk3sp1jda86"))
+         (patches
+          (search-patches "emacs-unpackaged-req.patch"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
          ("emacs-org" ,emacs-org)
          ("emacs-s" ,emacs-s)
+         ("emacs-hydra" ,emacs-hydra)
          ("emacs-use-package" ,emacs-use-package)))
       (home-page "https://github.com/alphapapa/unpackaged.el")
       (synopsis "Useful snippets of Emacs Lisp code")
diff --git a/gnu/packages/patches/emacs-unpackaged-req.patch b/gnu/packages/patches/emacs-unpackaged-req.patch
new file mode 100644
index 0000000000..ddb9277610
--- /dev/null
+++ b/gnu/packages/patches/emacs-unpackaged-req.patch
@@ -0,0 +1,24 @@ 
+From e5be173e201710538464c279335bef735a327a68 Mon Sep 17 00:00:00 2001
+From: Brian Leung <bkleung89@gmail.com>
+Date: Tue, 18 Jun 2019 06:37:46 +0200
+Subject: [PATCH] Add missing require.
+
+---
+ unpackaged.el | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/unpackaged.el b/unpackaged.el
+index 2d46b3c..e62184a 100644
+--- a/unpackaged.el
++++ b/unpackaged.el
+@@ -38,6 +38,7 @@
+ (require 'dash)
+ (require 's)
+ (require 'use-package)
++(require 'hydra)
+ 
+ ;;; Faces, fonts
+ 
+-- 
+2.22.0
+
-- 
2.22.0