From unknown Wed Aug 20 01:20:15 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26944: [PATCH] gnu: emacspeak: Update to 46.0. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 19:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26944 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26944@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149487613624168 (code B ref -1); Mon, 15 May 2017 19:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 May 2017 19:22:16 +0000 Received: from localhost ([127.0.0.1]:46916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dALZO-0006Hi-LQ for submit@debbugs.gnu.org; Mon, 15 May 2017 15:22:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dALZL-0006HQ-G6 for submit@debbugs.gnu.org; Mon, 15 May 2017 15:22:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dALZF-0006S8-7a for submit@debbugs.gnu.org; Mon, 15 May 2017 15:22:06 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dALZF-0006S4-4R for submit@debbugs.gnu.org; Mon, 15 May 2017 15:22:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dALZD-0006a7-UY for guix-patches@gnu.org; Mon, 15 May 2017 15:22:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dALZ9-0006R5-Ot for guix-patches@gnu.org; Mon, 15 May 2017 15:22:03 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:44451 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dALZ9-0006Qd-Hu for guix-patches@gnu.org; Mon, 15 May 2017 15:21:59 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id E734850611B; Mon, 15 May 2017 21:21:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494876117; bh=LV09lHAJW/NZH3DCt4hy7VBOVcGkOtjr4Zg2SS0bPq4=; h=From:To:Cc:Subject:Date:From; b=bIidqhCg8X2O31n9SrkQAzeMhlIRMq/w3bs1BjCsdQFuRLLW/geO/3CgMLk5w0jVg 8lfPUeQJRFM0kLrz4qf8Sif/RmvtfM/M1BoUlW4yhJ5fVUGMnE/pkj8SstgVthE3oq 066rgG6ThCfiXUi2DET0gyi7jWqfPtYw/DJBZHKg= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494876117; bh=LV09lHAJW/NZH3DCt4hy7VBOVcGkOtjr4Zg2SS0bPq4=; h=From:To:Cc:Subject:Date:From; b=bIidqhCg8X2O31n9SrkQAzeMhlIRMq/w3bs1BjCsdQFuRLLW/geO/3CgMLk5w0jVg 8lfPUeQJRFM0kLrz4qf8Sif/RmvtfM/M1BoUlW4yhJ5fVUGMnE/pkj8SstgVthE3oq 066rgG6ThCfiXUi2DET0gyi7jWqfPtYw/DJBZHKg= Date: Mon, 15 May 2017 15:21:48 -0400 Message-Id: <20170515192148.15539-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * gnu/packages/emacs.scm (emacspeak): Update to 46.0. [source]: Add snippet to delete pre-compiled Emacs Lisp files. [arguments]: Adjust phases for the update. --- gnu/packages/emacs.scm | 52 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3d9e83713..228b2a47f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4145,7 +4145,7 @@ jQuery and Bootstrap resources included via osscdn.") (define-public emacspeak (package (name "emacspeak") - (version "45.0") + (version "46.0") (source (origin (method url-fetch) @@ -4154,7 +4154,11 @@ jQuery and Bootstrap resources included via osscdn.") version "/emacspeak-" version ".tar.bz2")) (sha256 (base32 - "0npcr867xbbhwa0i7v26hnk4z2d51522jwcfwc594j74kbv3g6ka")))) + "15x4yfp3wl2fxm1nkx6pz3clw6zyw3argcsqxgcx6pa28sivlg2n")) + (modules '((guix build utils))) + (snippet + ;; Delete the bundled byte-compiled elisp files. + '(for-each delete-file (find-files "lisp" "\\.elc$"))))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "prefix=" @@ -4162,25 +4166,35 @@ jQuery and Bootstrap resources included via osscdn.") #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("\\$\\(INSTALL\\) -d \\$\\(libdir\\)/servers/linux-outloud") - "") - (("\\$\\(INSTALL\\) -m 755 \\$\\{OUTLOUD\\}.*$") "") - (("\\*info\\*") "*")) - (substitute* "etc/emacspeak.sh.def" - (("") - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/emacspeak/lisp"))) + (lambda _ + ;; Configure Emacspeak according to etc/install.org. (zero? (system* "make" "config")))) - (add-after 'install 'install-espeak-server + (add-after 'build 'build-espeak + (lambda _ + (zero? (system* "make" "espeak")))) + (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion "servers/linux-espeak" - (and (zero? (system* "make")) - (zero? (system* "make" "install" - (string-append "PREFIX=" out)))))))) - (add-after 'install-espeak-server 'wrap-program + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lisp (string-append out "/share/emacs/site-lisp/emacspeak")) + (info (string-append out "/share/info"))) + ;; According to etc/install.org, the Emacspeak directory should + ;; be copied to its installation destination. + (for-each + (lambda (file) + (copy-recursively file (string-append lisp "/" file))) + '("etc" "info" "lisp" "media" "servers" "sounds" "stumpwm" + "xsl")) + ;; Make sure emacspeak is loaded from the correct directory. + (substitute* "etc/emacspeak.sh" + (("exec emacs.*$") + (string-append "exec emacs -l " lisp + "/lisp/emacspeak-setup.el $CL_ALL"))) + ;; Install the convenient startup script. + (mkdir-p bin) + (copy-file "etc/emacspeak.sh" (string-append bin "/emacspeak"))) + #t)) + (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (emacspeak (string-append out "/bin/emacspeak")) -- 2.12.2 From unknown Wed Aug 20 01:20:15 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26944: [PATCH] gnu: emacspeak: Update to 46.0. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2017 19:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26944 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau Cc: 26944@debbugs.gnu.org Received: via spool by 26944-submit@debbugs.gnu.org id=B26944.14949644842564 (code B ref 26944); Tue, 16 May 2017 19:55:02 +0000 Received: (at 26944) by debbugs.gnu.org; 16 May 2017 19:54:44 +0000 Received: from localhost ([127.0.0.1]:49129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAiYO-0000fH-IM for submit@debbugs.gnu.org; Tue, 16 May 2017 15:54:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAiYL-0000f3-4T for 26944@debbugs.gnu.org; Tue, 16 May 2017 15:54:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAiYB-0005pb-Vn for 26944@debbugs.gnu.org; Tue, 16 May 2017 15:54:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:44660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAiYB-0005pP-SM; Tue, 16 May 2017 15:54:31 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:46536 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dAiYB-0001Tp-4G; Tue, 16 May 2017 15:54:31 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170515192148.15539-1-kei@openmailbox.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 27 =?UTF-8?Q?Flor=C3=A9al?= an 225 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Tue, 16 May 2017 21:54:28 +0200 In-Reply-To: <20170515192148.15539-1-kei@openmailbox.org> (Kei Kebreau's message of "Mon, 15 May 2017 15:21:48 -0400") Message-ID: <8737c47f2j.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Kei Kebreau skribis: > * gnu/packages/emacs.scm (emacspeak): Update to 46.0. > [source]: Add snippet to delete pre-compiled Emacs Lisp files. > [arguments]: Adjust phases for the update. LGTM, thanks! Ludo=E2=80=99. From unknown Wed Aug 20 01:20:15 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kei Kebreau Subject: bug#26944: closed (Re: bug#26944: [PATCH] gnu: emacspeak: Update to 46.0.) Message-ID: References: <87efvoh8l3.fsf@openmailbox.org> <20170515192148.15539-1-kei@openmailbox.org> X-Gnu-PR-Message: they-closed 26944 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26944@debbugs.gnu.org Date: Tue, 16 May 2017 20:05:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1494965102-3553-1" This is a multi-part message in MIME format... ------------=_1494965102-3553-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26944: [PATCH] gnu: emacspeak: Update to 46.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26944@debbugs.gnu.org. --=20 26944: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26944 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1494965102-3553-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26944-done) by debbugs.gnu.org; 16 May 2017 20:04:31 +0000 Received: from localhost ([127.0.0.1]:49149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAihr-0000uV-2a for submit@debbugs.gnu.org; Tue, 16 May 2017 16:04:31 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:54722 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAihq-0000uO-2h for 26944-done@debbugs.gnu.org; Tue, 16 May 2017 16:04:30 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 2F3EC50FF3D; Tue, 16 May 2017 22:04:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494965069; bh=iBFf0IPBA1cdUqgAEM4kjQ7Pu2P1PpH78zi5i9qW2s8=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=g1H57JLfV5iQsy2LJxfwDmBbtrrV0fs6ECUlqbpWeIGQD8jUxwB3srzpjgu7iTa/U +9eod0hePnaq6JRA1qylfw/mWFyhPnln0TbVift4Rq4jcoCnB48WomTzVNHE4jgjJc k7yKjMfRw0DosCWA6vbaAENXztWGIFIVV9O5TkmQ= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494965068; bh=iBFf0IPBA1cdUqgAEM4kjQ7Pu2P1PpH78zi5i9qW2s8=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=k1r3t+H+PqFqkmRYbl6kXQnrx9+xiRldundMam/nAd50RX75MJAbsi1cse02z1M3N SQAplNqL+Si16o1k/pDP4AnLwUeT051VfF16nOH2yC9xEiMLtKd1L+jo98jQazanIg V/DIk6lEJDTUYXt1r2Xy5fNq7aORT6VpC8SeGk2E= To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: bug#26944: [PATCH] gnu: emacspeak: Update to 46.0. References: <20170515192148.15539-1-kei@openmailbox.org> <8737c47f2j.fsf@gnu.org> Date: Tue, 16 May 2017 16:04:24 -0400 In-Reply-To: <8737c47f2j.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 16 May 2017 21:54:28 +0200") Message-ID: <87efvoh8l3.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26944-done Cc: 26944-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Kei Kebreau skribis: > >> * gnu/packages/emacs.scm (emacspeak): Update to 46.0. >> [source]: Add snippet to delete pre-compiled Emacs Lisp files. >> [arguments]: Adjust phases for the update. > > LGTM, thanks! > > Ludo=E2=80=99. Okay! Pushed as 231e48d6db692910b1a8c94fdc954f2721329211. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlkbW0kACgkQ5qXuPBlG eg3eUg/9FX9CpBkyxerAyjtOIRAqJcgS5nlD4YA/MkFlfwciCj/hE7+ZZ6RuQD4z KXhgx+A5F8hON6ZMg1YqWcgQY2/5skhFjWQjbKohST1msz/0aiIviqoKsV3KVks1 IwkkeLZxcSYIGpTloI1/tPPAKHxqYh1Sf9Bak0txS+ERz3an/0jw3OZ7rOeIo86G 4CxJigpfNoR4IDVG6fdIOgrmVdzJIys5UZfDD0ZTGY1lZDIsVNg48FLKYnnJ3POa NwJy+hGlGJWH7kX3x/PjycqjnJdQxYz2P9ln5uZQUEEpD+/R8gYFJrsFFrR9z1El s+NZNDKl68CehAZndVL/l/MNOSAX35U9t3FZujvg2mEdZi/VK/Jl/JXxelNu5M56 O+F7U+Y9yX0+3NWZGxHg9UaWjQrhoGETBn926p1S3qZPT2pebd4mHxfg2ClEJ73l coJBjA1wFgEQI9KzVtYCrGNIuEbXllFE9UU1WN5I8LgdS6+rKZ09Br/yMibWN6q/ MSYry3XQWpzQ/MBhM0G3yN/8d1kAryhqzI5G1OcLpPrpy51NpDSrdoHNHsJjlZP1 VYvobyWJOhZpBnD+vakZ40jj4Jn28gv6M5+XAVbW1HtwsVQH7etXPql88ioB6DkJ jQZ+5BFRvHf2lxIL7Qe+jkRQGdFgtQ5sLLjbj3hD4TezHGMh6Wc= =c9TT -----END PGP SIGNATURE----- --=-=-=-- ------------=_1494965102-3553-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 15 May 2017 19:22:16 +0000 Received: from localhost ([127.0.0.1]:46916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dALZO-0006Hi-LQ for submit@debbugs.gnu.org; Mon, 15 May 2017 15:22:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dALZL-0006HQ-G6 for submit@debbugs.gnu.org; Mon, 15 May 2017 15:22:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dALZF-0006S8-7a for submit@debbugs.gnu.org; Mon, 15 May 2017 15:22:06 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dALZF-0006S4-4R for submit@debbugs.gnu.org; Mon, 15 May 2017 15:22:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dALZD-0006a7-UY for guix-patches@gnu.org; Mon, 15 May 2017 15:22:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dALZ9-0006R5-Ot for guix-patches@gnu.org; Mon, 15 May 2017 15:22:03 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:44451 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dALZ9-0006Qd-Hu for guix-patches@gnu.org; Mon, 15 May 2017 15:21:59 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id E734850611B; Mon, 15 May 2017 21:21:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494876117; bh=LV09lHAJW/NZH3DCt4hy7VBOVcGkOtjr4Zg2SS0bPq4=; h=From:To:Cc:Subject:Date:From; b=bIidqhCg8X2O31n9SrkQAzeMhlIRMq/w3bs1BjCsdQFuRLLW/geO/3CgMLk5w0jVg 8lfPUeQJRFM0kLrz4qf8Sif/RmvtfM/M1BoUlW4yhJ5fVUGMnE/pkj8SstgVthE3oq 066rgG6ThCfiXUi2DET0gyi7jWqfPtYw/DJBZHKg= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494876117; bh=LV09lHAJW/NZH3DCt4hy7VBOVcGkOtjr4Zg2SS0bPq4=; h=From:To:Cc:Subject:Date:From; b=bIidqhCg8X2O31n9SrkQAzeMhlIRMq/w3bs1BjCsdQFuRLLW/geO/3CgMLk5w0jVg 8lfPUeQJRFM0kLrz4qf8Sif/RmvtfM/M1BoUlW4yhJ5fVUGMnE/pkj8SstgVthE3oq 066rgG6ThCfiXUi2DET0gyi7jWqfPtYw/DJBZHKg= To: guix-patches@gnu.org Subject: [PATCH] gnu: emacspeak: Update to 46.0. Date: Mon, 15 May 2017 15:21:48 -0400 Message-Id: <20170515192148.15539-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * gnu/packages/emacs.scm (emacspeak): Update to 46.0. [source]: Add snippet to delete pre-compiled Emacs Lisp files. [arguments]: Adjust phases for the update. --- gnu/packages/emacs.scm | 52 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3d9e83713..228b2a47f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4145,7 +4145,7 @@ jQuery and Bootstrap resources included via osscdn.") (define-public emacspeak (package (name "emacspeak") - (version "45.0") + (version "46.0") (source (origin (method url-fetch) @@ -4154,7 +4154,11 @@ jQuery and Bootstrap resources included via osscdn.") version "/emacspeak-" version ".tar.bz2")) (sha256 (base32 - "0npcr867xbbhwa0i7v26hnk4z2d51522jwcfwc594j74kbv3g6ka")))) + "15x4yfp3wl2fxm1nkx6pz3clw6zyw3argcsqxgcx6pa28sivlg2n")) + (modules '((guix build utils))) + (snippet + ;; Delete the bundled byte-compiled elisp files. + '(for-each delete-file (find-files "lisp" "\\.elc$"))))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "prefix=" @@ -4162,25 +4166,35 @@ jQuery and Bootstrap resources included via osscdn.") #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("\\$\\(INSTALL\\) -d \\$\\(libdir\\)/servers/linux-outloud") - "") - (("\\$\\(INSTALL\\) -m 755 \\$\\{OUTLOUD\\}.*$") "") - (("\\*info\\*") "*")) - (substitute* "etc/emacspeak.sh.def" - (("") - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/emacspeak/lisp"))) + (lambda _ + ;; Configure Emacspeak according to etc/install.org. (zero? (system* "make" "config")))) - (add-after 'install 'install-espeak-server + (add-after 'build 'build-espeak + (lambda _ + (zero? (system* "make" "espeak")))) + (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion "servers/linux-espeak" - (and (zero? (system* "make")) - (zero? (system* "make" "install" - (string-append "PREFIX=" out)))))))) - (add-after 'install-espeak-server 'wrap-program + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lisp (string-append out "/share/emacs/site-lisp/emacspeak")) + (info (string-append out "/share/info"))) + ;; According to etc/install.org, the Emacspeak directory should + ;; be copied to its installation destination. + (for-each + (lambda (file) + (copy-recursively file (string-append lisp "/" file))) + '("etc" "info" "lisp" "media" "servers" "sounds" "stumpwm" + "xsl")) + ;; Make sure emacspeak is loaded from the correct directory. + (substitute* "etc/emacspeak.sh" + (("exec emacs.*$") + (string-append "exec emacs -l " lisp + "/lisp/emacspeak-setup.el $CL_ALL"))) + ;; Install the convenient startup script. + (mkdir-p bin) + (copy-file "etc/emacspeak.sh" (string-append bin "/emacspeak"))) + #t)) + (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (emacspeak (string-append out "/bin/emacspeak")) -- 2.12.2 ------------=_1494965102-3553-1--