[bug#36124] [PATCH] Update emacs-realgud to 1.5.0.

[bug#36124] [PATCH] Update emacs-realgud to 1.5.0.

[Brian Leung]

[-- Attachment #1.1: Type: text/plain, Size: 14 bytes --]

See attached.

[-- Attachment #1.2: Type: text/html, Size: 39 bytes --]

[-- Attachment #2: 0001-gnu-emacs-realgud-Update-to-1.5.0.patch --]
[-- Type: text/x-patch, Size: 2206 bytes --]

From 09b315116ff014bc76a2b1d27d18dace53b1478c Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Fri, 7 Jun 2019 06:31:55 +0200
Subject: [PATCH] gnu: emacs-realgud: Update to 1.5.0.
To: guix-patches@gnu.org

* gnu/packages/emacs-xyz.scm (emacs-realgud): Update to 1.5.0.
[source]: Fetch from git.
---
 gnu/packages/emacs-xyz.scm | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 543ac5b2c6..9356878599 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4305,19 +4305,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
@@ -4336,11 +4333,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"))))
-- 
2.21.0

[bug#36124] [PATCH] Update emacs-realgud to 1.5.0

[Brian Leung]

[-- Attachment #1.1: Type: text/plain, Size: 44 bytes --]

Resubmitting with fixed indentation, sorry.

[-- Attachment #1.2: Type: text/html, Size: 69 bytes --]

[-- Attachment #2: 0001-gnu-emacs-realgud-Update-to-1.5.0.patch --]
[-- Type: text/x-patch, Size: 2167 bytes --]

From cb22305195be07ad9e4eb170c7e690803cacf33f Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Fri, 7 Jun 2019 06:31:55 +0200
Subject: [PATCH] gnu: emacs-realgud: Update to 1.5.0.

* gnu/packages/emacs-xyz.scm (emacs-realgud): Update to 1.5.0.
[source]: Fetch from git.
---
 gnu/packages/emacs-xyz.scm | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 543ac5b2c6..b0badbfcb9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4305,19 +4305,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
@@ -4336,11 +4333,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"))))
-- 
2.21.0

[bug#36124] [PATCH] Update emacs-realgud to 1.5.0

[Brian Leung]

[-- Attachment #1.1: Type: text/plain, Size: 226 bytes --]

Ignore the last two emails, this patch removes a now-unnecessary patch file
that I neglected to delete.

On Fri, Jun 7, 2019 at 6:42 AM Brian Leung <bkleung89@gmail.com> wrote:

> Resubmitting with fixed indentation, sorry.
>

[-- Attachment #1.2: Type: text/html, Size: 531 bytes --]

[-- Attachment #2: 0001-gnu-emacs-realgud-Update-to-1.5.0.patch --]
[-- Type: text/x-patch, Size: 3458 bytes --]

From b39970c3fdef6c9ddedf1416b545a22055ec049d Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Fri, 7 Jun 2019 06:31:55 +0200
Subject: [PATCH] gnu: emacs-realgud: Update to 1.5.0.

* gnu/packages/emacs-xyz.scm (emacs-realgud): Update to 1.5.0.
[source]: Fetch from git.
---
 gnu/packages/emacs-xyz.scm                    | 20 +++++---------
 .../emacs-realgud-fix-configure-ac.patch      | 27 -------------------
 2 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 gnu/packages/patches/emacs-realgud-fix-configure-ac.patch

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 543ac5b2c6..b0badbfcb9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4305,19 +4305,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
@@ -4336,11 +4333,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 8165857c87..0000000000
--- 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 <maxim.cournoyer@gmail.com>
-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
-
-- 
2.21.0

[bug#36124] [PATCH] Update emacs-realgud to 1.5.0

[Brian Leung]

[-- Attachment #1.1: Type: text/plain, Size: 416 bytes --]

Ignore the last three emails, I've amended the patch to remove the
upstreamed patch from local.mk also.

On Fri, Jun 7, 2019 at 8:38 AM Brian Leung <bkleung89@gmail.com> wrote:

> Ignore the last two emails, this patch removes a now-unnecessary patch
> file that I neglected to delete.
>
> On Fri, Jun 7, 2019 at 6:42 AM Brian Leung <bkleung89@gmail.com> wrote:
>
>> Resubmitting with fixed indentation, sorry.
>>
>

[-- Attachment #1.2: Type: text/html, Size: 1042 bytes --]

[-- Attachment #2: 0001-gnu-emacs-realgud-Update-to-1.5.0.patch --]
[-- Type: text/x-patch, Size: 4259 bytes --]

From 45a3c252deacf9b6f5e550bdcd9b76bc65de3db0 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Fri, 7 Jun 2019 06:31:55 +0200
Subject: [PATCH] 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.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/emacs-xyz.scm                    | 20 +++++---------
 .../emacs-realgud-fix-configure-ac.patch      | 27 -------------------
 3 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 gnu/packages/patches/emacs-realgud-fix-configure-ac.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 98f6ee9679..97fd5c72f5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -758,7 +758,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 7db46e81c5..07c914e451 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4305,19 +4305,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
@@ -4336,11 +4333,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 8165857c87..0000000000
--- 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 <maxim.cournoyer@gmail.com>
-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
-
-- 
2.21.0

bug#36124: [PATCH] Update emacs-realgud to 1.5.0

[Ludovic Courtès]

Hi,

Brian Leung <bkleung89@gmail.com> skribis:

> From 45a3c252deacf9b6f5e550bdcd9b76bc65de3db0 Mon Sep 17 00:00:00 2001
> From: Brian Leung <bkleung89@gmail.com>
> Date: Fri, 7 Jun 2019 06:31:55 +0200
> Subject: [PATCH] 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.

Applied, thanks!

Ludo’.