From patchwork Fri Jun 7 16:15:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Leung X-Patchwork-Id: 14257 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 1D666170AE; Fri, 7 Jun 2019 19:36:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 54A6517060 for ; Fri, 7 Jun 2019 19:36:48 +0100 (BST) Received: from localhost ([::1]:50516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZJjL-0000xs-24 for patchwork@mira.cbaines.net; Fri, 07 Jun 2019 14:36:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39259) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZHYR-0007Zf-EC for guix-patches@gnu.org; Fri, 07 Jun 2019 12:17:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZHYF-0001aL-Vo for guix-patches@gnu.org; Fri, 07 Jun 2019 12:17:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38737) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hZHY6-00015f-DU for guix-patches@gnu.org; Fri, 07 Jun 2019 12:17:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hZHY6-0008DF-6c for guix-patches@gnu.org; Fri, 07 Jun 2019 12:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36124] [PATCH] Update emacs-realgud to 1.5.0 Resent-From: Brian Leung Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Jun 2019 16:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36124 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36124@debbugs.gnu.org Received: via spool by 36124-submit@debbugs.gnu.org id=B36124.155992421331547 (code B ref 36124); Fri, 07 Jun 2019 16:17:02 +0000 Received: (at 36124) by debbugs.gnu.org; 7 Jun 2019 16:16:53 +0000 Received: from localhost ([127.0.0.1]:52281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZHXv-0008Ck-Tl for submit@debbugs.gnu.org; Fri, 07 Jun 2019 12:16:52 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:36490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZHXn-0008CN-Vv for 36124@debbugs.gnu.org; Fri, 07 Jun 2019 12:16:49 -0400 Received: by mail-qt1-f194.google.com with SMTP id u12so2912864qth.3 for <36124@debbugs.gnu.org>; Fri, 07 Jun 2019 09:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=kJ3hoKgwm19wbCkAEy7SLl4jLCLUgTaewv7aNB9rJIk=; b=XC+Bzh4iMM3qK/kaUjREkOI9JBQqmq6ua9HCUhN27O5XSex8yeKtxJv+HIxieOPG8N 4sAsW8JFa6Z6dk5X2Ps+tbQmdOaD2yMn/QTyznYsQieGdJLcSrsJ3B726fs3rxPxJILQ RvB32rb/Y7e+GwM0LS7Gwt2T1DazL8F1KR+aF/PhYnoMZfuj8DkqAPU2h3LeHps6ekg8 b0eglPq9QxK3zBB06BIKZDj0UvvP/qPSqtPGm6wLZZV2FlbL45eQ+qCVADZhX8tKBVeR JToxDXYlL/QkXTkejT/nKQjNRdG4xyg9/mDVIDWSyXSGLl8CSVoCegfRZcPYUKiLLoda fnRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=kJ3hoKgwm19wbCkAEy7SLl4jLCLUgTaewv7aNB9rJIk=; b=r1vkAMOy+0eJ0nLKmnISwPnTQQYpuZ8RJKJPIK/bqEN65UDSAMIXFpcoixpPma484y CPKFPKLx00ad7iGnz3B+sYud65q7OqCLIl1s6wyebFaT4Ui5nZ38F3SJk/x9EOJMprv1 ac0EynecldLN61472ivP0Gmn1DNUzMVxYmsm3plyzvDOj3VxYIJPAfYmXmRGLw/u7QH6 1ueuKrZjrIpUpusx6BKBvu+3LMnoloFGrzVdqirkScqjpetdeevvkgZZ4+P7SZwb9iTi YTZjkO117jMVfuoX57jcMI77/HLuI/yQdVxiZJf2QrM0cRR/5cPQNQxVwEEZNOOeKK1g ZCCA== X-Gm-Message-State: APjAAAVCgja4Aq+xN2tpAYrevNoQgoiocwpfqS/FwYorIRPgrFxH2Wbf HPHAjVAJoAN0LIwQy7TcPo/m1cj2CssOXN9Zf66qI+S0 X-Google-Smtp-Source: APXvYqzwmpVJ00hf+73OeyOjxsUQpODrROMXw/aZh5N00Na7G5jBpjSvCBXxMcmZ4Je1kNygn0VIfWIiKBQtuIKPSUM= X-Received: by 2002:ac8:3fe6:: with SMTP id v35mr20524329qtk.282.1559924198285; Fri, 07 Jun 2019 09:16:38 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Brian Leung Date: Fri, 7 Jun 2019 18:15:59 +0200 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches 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 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 wrote: > >> Resubmitting with fixed indentation, sorry. >> > From 45a3c252deacf9b6f5e550bdcd9b76bc65de3db0 Mon Sep 17 00:00:00 2001 From: Brian Leung 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 -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