From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daNL8-00008r-NK for guix-patches@gnu.org; Wed, 26 Jul 2017 10:31:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daNL4-0005le-Ei for guix-patches@gnu.org; Wed, 26 Jul 2017 10:31:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:54827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1daNL4-0005lX-Bg for guix-patches@gnu.org; Wed, 26 Jul 2017 10:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1daNL3-00006D-O6 for guix-patches@gnu.org; Wed, 26 Jul 2017 10:31:02 -0400 Subject: [bug#27790] text-editor: mg Resent-Message-ID: Date: Wed, 26 Jul 2017 14:30:20 +0000 From: ng0 Message-ID: <20170726143020.colgkqoy6yv3oxhc@abyayala> References: <20170722113613.shefcwrn3m2t6suu@abyayala> <0be93d82-ed4c-6024-62c9-426ed6e3a268@tobias.gr> <87zibr8t0j.fsf@gnu.org> <20170726133111.rs52t7bm2t4oerhp@abyayala> <20170726141115.kfd7ghtcdjkemvcn@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="lgdpioq3grphcygr" Content-Disposition: inline In-Reply-To: <20170726141115.kfd7ghtcdjkemvcn@abyayala> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Tobias Geerinckx-Rice , 27790@debbugs.gnu.org --lgdpioq3grphcygr Content-Type: multipart/mixed; boundary="3w6g7wb7ivwx2jnz" Content-Disposition: inline --3w6g7wb7ivwx2jnz Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Patches. 1: Update 2: Fetch via https 3: new phase to use our "diff" --=20 ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org --3w6g7wb7ivwx2jnz Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-mg-Update-to-20170401.patch" Content-Transfer-Encoding: quoted-printable =46rom ff4bcddd0eeeb1de283ef0931ac73d698026d6c6 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Wed, 26 Jul 2017 14:21:21 +0000 Subject: [PATCH 1/3] gnu: mg: Update to 20170401. * gnu/packages/text-editors.scm (mg): Update to 20170401. --- gnu/packages/text-editors.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 756c2beab..7b9732ab8 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -3,7 +3,7 @@ ;;; Copyright =C2=A9 2016 Carlo Zancanaro ;;; Copyright =C2=A9 2017 Eric Bavier ;;; Copyright =C2=A9 2017 Feng Shu -;;; Copyright =C2=A9 2017 ng0 +;;; Copyright =C2=A9 2017 ng0 ;;; Copyright =C2=A9 2014 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer ;;; ;;; This file is part of GNU Guix. @@ -234,14 +234,14 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key binding= s. e3 can be used on (define-public mg (package (name "mg") - (version "20161005") + (version "20170401") (source (origin (method url-fetch) (uri (string-append "http://homepage.boetes.org/software/mg/= mg-" version ".tar.gz")) (sha256 (base32 - "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p")) + "1arasswgdadbb265rahq3867r9s54jva6k4m3p5n0f8mgjqhhdha")) (modules '((guix build utils))) (snippet '(begin --=20 2.13.3 --3w6g7wb7ivwx2jnz Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-mg-Fetch-source-via-HTTPS.patch" Content-Transfer-Encoding: quoted-printable =46rom e21e12416918266b7f3660b62ccd2784012c00f0 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Wed, 26 Jul 2017 14:22:54 +0000 Subject: [PATCH 2/3] gnu: mg: Fetch source via HTTPS. * gnu/packages/text-editors.scm (mg)[source]: Use HTTPS. --- gnu/packages/text-editors.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7b9732ab8..7357df7fb 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -237,7 +237,7 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.= e3 can be used on (version "20170401") (source (origin (method url-fetch) - (uri (string-append "http://homepage.boetes.org/software/mg/= mg-" + (uri (string-append "https://homepage.boetes.org/software/mg= /mg-" version ".tar.gz")) (sha256 (base32 --=20 2.13.3 --3w6g7wb7ivwx2jnz Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-gnu-mg-Add-new-phase-to-find-diff.patch" Content-Transfer-Encoding: quoted-printable =46rom cc80c01c3732f8881a05c6afea0fff363311ffa0 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Wed, 26 Jul 2017 14:24:56 +0000 Subject: [PATCH 3/3] gnu: mg: Add new phase to find 'diff'. * gnu/packages/text-editors.scm (mg)[phases]: Add new 'correct-location-of-= difftool'. --- gnu/packages/text-editors.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7357df7fb..7843c120a 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -261,6 +261,12 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings= =2E e3 can be used on "CC=3Dgcc") #:phases (modify-phases %standard-phases (delete 'configure) + (add-before 'build 'correct-location-of-difftool + (lambda _ + (substitute* "buffer.c" + (("/usr/bin/diff") + (which "diff"))) + #t)) (add-before 'install 'patch-tutorial-location (lambda* (#:key outputs #:allow-other-keys) (substitute* "mg.1" --=20 2.13.3 --3w6g7wb7ivwx2jnz-- --lgdpioq3grphcygr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAll4p3wACgkQ4i+bv+40 hYj+Uw/+IURKHFzKoGD6KNxbkghXofdlND4+efRHS+xcNWkKvlW9jAyn+o/D8ftf s8bcLBYvRLJaRxfm0VCsfN/JFmUuQseo/yUMXYn/V8tDSwHu7yHL8JunNHKcKxw2 2ZTxbGOzV0lXTNdXNpBsbcTjX7RaKKYdWPs0gfgPgrjieky/ioj7kt0HmOTQdfpB ZcgGtjft+uCPhDabkoggPcqlINZjiK037Id2LF2paPVrr8K3SKKDq9VGhEqu31EY 8J5HuRgnYyq1b4rAlTnPqTSYCMNL5e929IlkWlvHRkhWBxp1aHAAbyIdmaYHY1j7 EwuJs119T8wtGqyEiuaKhBqJq/u6DurfE1pO9x8fT8mjBXjT76xhfdZt4PPXeg/a QkTgTE3+CiB8VYKhnrNVCBpVFEJHDM10rWyiJ2MurbRhlvVF1tsjLEn0M0My/BWd IXM+oswHSzCBvgCnLDn2vucRFr5+2KApG1MUHIanHVJYubrGfTqFJII3VJ5FA04/ TvjDLHWmtFLOd2JoyMakxwfLuNtJ4iNAatgmEZI+1sY4YE3TnP7obWqGhrxO8Vr0 I5PGbQDl/6xB9q7gVVc3mk8yszG0YuzOxeEQivXJBg50jyqtlvM0dDcT1Tiba2y1 N8dP8PldNiJlLOSOT+OT3b6d0cEysj9EyQ7tQq2TnBxWB1Xv/Uw= =1Vl0 -----END PGP SIGNATURE----- --lgdpioq3grphcygr--