guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/06: gnu: emacs-realgud: Update to 1.5.0.


From: guix-commits
Subject: 04/06: gnu: emacs-realgud: Update to 1.5.0.
Date: Thu, 13 Jun 2019 07:01:46 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 0882c491f0b98c6febc4224d2fc8eb4310086fc1
Author: Brian Leung <address@hidden>
Date:   Fri Jun 7 06:31:55 2019 +0200

    gnu: emacs-realgud: Update to 1.5.0.
    
    * gnu/packages/emacs-xyz.scm (emacs-realgud): Update to 1.5.0.
    [source]: Fetch from git.
    Remove upstreamed patch.
    * gnu/packages/patches/emacs-realgud-fix-configure-ac.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
    
    Signed-off-by: Ludovic Court├Ęs <address@hidden>
---
 gnu/local.mk                                       |  1 -
 gnu/packages/emacs-xyz.scm                         | 20 +++++-----------
 .../patches/emacs-realgud-fix-configure-ac.patch   | 27 ----------------------
 3 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 34a3958..24b5ee4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -762,7 +762,6 @@ 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-realgud-fix-configure-ac.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 b263e92..cc99814 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4336,19 +4336,16 @@ after buffer changes.")
 (define-public emacs-realgud
   (package
     (name "emacs-realgud")
-    (version "1.4.5")
+    (version "1.5.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://elpa.gnu.org/packages/realgud-";
-                           version ".tar"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/realgud/realgud/";)
+             (commit version)))
        (sha256
         (base32
-         "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24"))
-       (patches
-        ;; Patch awaiting inclusion upstream (see:
-        ;; https://github.com/realgud/realgud/pull/226).
-        (search-patches "emacs-realgud-fix-configure-ac.patch"))))
+         "0xnick9016wxrgi8v0lycvxhyz8l2k4nfvdpjc5yq476vwrjfzbz"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
@@ -4367,11 +4364,6 @@ after buffer changes.")
              (setenv "HOME" (getenv "TMPDIR"))))
          (add-before 'patch-el-files 'remove-realgud-pkg.el
            (lambda _
-             ;; XXX: This file is auto-generated at some point and causes
-             ;; substitute* to crash during the `patch-el-files' phase with:
-             ;; ERROR: In procedure stat: No such file or directory:
-             ;; "./realgud-pkg.el"
-             (delete-file "./realgud-pkg.el")
              ;; FIXME: `patch-el-files' crashes on this file with error:
              ;; unable to locate "bashdb".
              (delete-file "./test/test-regexp-bashdb.el"))))
diff --git a/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch 
b/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch
deleted file mode 100644
index 8165857..0000000
--- a/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a293690f29407ac54a218d6d20c2142e1a0319d1 Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <address@hidden>
-Date: Wed, 31 Oct 2018 00:08:34 -0400
-Subject: [PATCH] configure.ac: Fix NO_CHECK_EMACS_PACKAGES elisp.
-
-Remove the extraneous trailing parenthesis.
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index de0d932..69bcea7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,8 +25,7 @@ AC_MSG_NOTICE("Checking prerequiste packages")
- $EMACS -batch -q --no-site-file -eval \
-   '(dolist (package
-          (quote (cl-lib loc-changes load-relative test-simple)))
--        (require package))
--   )'
-+        (require package))'
- fi
- if test $? -ne 0 ; then
-     AC_MSG_ERROR([Can't continue until above error is corrected.])
--- 
-2.19.0
-



reply via email to

[Prev in Thread] Current Thread [Next in Thread]