diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-03-14 17:47:26 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-14 17:47:26 +0100 |
| commit | 3be9f724f58b0e0ec3a905de3a29d0b54bcb7628 (patch) | |
| tree | 2418fc227c8ca04b26aa9e51fa45b25a997ca504 /gnu | |
| parent | b5c56e628fdf41f688a67724ea5a6d075bd4dca3 (diff) | |
| download | patches-3be9f724f58b0e0ec3a905de3a29d0b54bcb7628.tar patches-3be9f724f58b0e0ec3a905de3a29d0b54bcb7628.tar.gz | |
gnu: emacs: Update to 24.3.
* gnu/packages/emacs.scm (emacs): Update to 24.3. Use the .xz tarball.
* gnu/packages/patches/emacs-configure-sh.patch: Adjust.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/emacs.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/emacs-configure-sh.patch | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6b2cda6e73..9a107967a3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -31,14 +31,14 @@ (define-public emacs (package (name "emacs") - (version "24.2") + (version "24.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "13wbjfjmz13qpjwssy44nw2230lllmkkgjsy0rqfm6am2cf87n3k")))) + "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh")))) (build-system gnu-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/patches/emacs-configure-sh.patch b/gnu/packages/patches/emacs-configure-sh.patch index fd34d06ced..6f5f3fe93a 100644 --- a/gnu/packages/patches/emacs-configure-sh.patch +++ b/gnu/packages/patches/emacs-configure-sh.patch @@ -1,14 +1,13 @@ Make sure the right shell is used when creating src/epaths.h. ---- emacs-24.2/configure 2013-01-13 17:01:53.000000000 +0100 -+++ emacs-24.2/configure 2013-01-13 17:01:57.000000000 +0100 -@@ -24135,7 +24135,7 @@ done +--- emacs-24.3/configure 2013-03-14 17:42:26.000000000 +0100 ++++ emacs-24.3/configure 2013-03-14 17:42:58.000000000 +0100 +@@ -26463,7 +26463,7 @@ done ;; "epaths":C) echo creating src/epaths.h --${MAKE-make} epaths-force -+${MAKE-make} epaths-force SHELL="$CONFIG_SHELL" +-${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force ++${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force SHELL="$CONFIG_SHELL" ;; "gdbinit":C) if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then - |