Commit graph

57 commits

Author SHA1 Message Date
William A. Kennington III
5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Jude Taylor
71d98332e9 make emacs buildable 2015-09-21 12:17:29 -07:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
John Wiegley
b3bd3eef38 emacsMacport: 24.5-mac-5.9 -> 24.5-mac-5.10 2015-09-01 08:39:45 -07:00
Shea Levy
3506c0bf04 emacs: Build cocoa on darwin 2015-08-20 08:37:04 -04:00
Vladimír Čunát
8f2be7122c emacs24: style fixups
Unused gtk parameter, "incorrect" usage of optional.
2015-08-11 17:26:51 +02:00
Eelco Dolstra
761fc1a457 Remove tabs 2015-07-26 12:00:43 +02:00
John Wiegley
60c6a9921e emacs: Update Mac Port Emacs to 24.5-mac-5.9 2015-07-20 14:22:43 -07:00
Asko Soukka
278287a99b emacs: fix to use \${gettext}/share/locale/locale.alias 2015-07-03 03:18:15 +03:00
Herwig Hochleitner
8b0b9be025 emacs24: add options for acl and gpm 2015-06-07 13:26:27 +02:00
John Wiegley
725005b89f emacs24Macport: Upgrade Mac Port patch to 5.8 2015-05-21 10:55:00 -05:00
Aycan iRiCAN
236d963a1e Removed all references to darwin-new-sections.patch 2015-04-20 09:04:15 +03:00
Aycan iRiCAN
41944ca5a7 Removed patch file. 2015-04-20 08:30:39 +03:00
Aycan iRiCAN
151456da27 emacs-24: Removed obsolete patch file 2015-04-20 08:28:17 +03:00
Luca Bruno
9d3f02c5de Revert "Emacs 24.5: Fix build on Darwin."
This reverts commit 869b86d925.

It breaks tarball evaluation, see 869b86d925
2015-04-17 13:01:09 +02:00
Moritz Ulrich
869b86d925 Emacs 24.5: Fix build on Darwin.
`darwin-new-sections.patch' is now in upstream.
2015-04-15 12:02:38 +02:00
Thomas Tuegel
e75a0c50bd emacs: allow gtk without X on Darwin 2015-04-14 09:16:21 -05:00
Thomas Tuegel
cebf589462 Merge pull request #7294 from ttuegel/emacs
emacs: allow choosing gtk2 or gtk3
2015-04-12 15:12:12 -05:00
Moritz Ulrich
034e1c4aef emacs24: Update to 24.5 2015-04-11 14:24:41 +02:00
John Wiegley
ff555c3b47 emacs24Macports: 24.4-mac-5.3 -> 24.5-mac-5.7 2015-04-11 00:02:56 -05:00
Thomas Tuegel
bc4f39f48b emacs: allow choosing gtk2 or gtk3 2015-04-09 11:38:46 -05:00
=
46d1dd5b11 Downgraded Emacs priority, for exuberant ctags
Exuberant ctags works with Emacs among with other editors, and if
installed is probably preferred to Emacs' ctags.
2015-03-26 21:42:36 +00:00
Moritz Ulrich
86bd152378 Emacs: Fix `woman'. 2015-03-07 12:03:26 +01:00
John Wiegley
6f30dcd456 emacs24Macport: upgrade Macport patch to 5.1 -> 5.3 2015-02-21 03:38:07 -06:00
Dan Peebles
d8ad39d2e6 Purification in preparation for pure-darwin merge (shouldsn't hurt anything in the meantime) 2015-02-08 19:15:09 -05:00
Dan Peebles
063c901d6c Minor purification of emacs24Macport (for upcoming pure darwin stdenv) 2015-02-08 18:53:38 -05:00
John Wiegley
0d1a16d48f emacs24: Add #define for building on Yosemite (darwin) 2015-01-03 07:32:38 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
John Wiegley
adeb4fb56b emacs24Macport: emacs-24.4-mac-5.0 -> emacs-24.4-mac-5.1 2014-11-17 02:49:06 -06:00
John Wiegley
198874e489 emacs24Macport: allow installing either 24.3 or 24.4 2014-11-03 10:51:29 -06:00
Moritz Ulrich
635d49e973 Emacs: remove --with-crt-dir (no longer supported) 2014-10-25 20:34:51 +02:00
John Wiegley
0fdd8b312e emacs24Macport: 23.4-mac-4.8 -> 24.4-mac-5.0 2014-10-21 13:40:53 -05:00
Moritz Ulrich
7e78166563 emacs24: Update to 24.4. 2014-10-20 22:08:19 +02:00
Moritz Ulrich
10ba4b67e4 Emacs: Use gnutls instead of OpenSSL.
It looks like this error was introduced accidentally with 0132e1b. Emacs
can't use openssl to make secure connections.
2014-08-21 12:45:28 +02:00
John Wiegley
326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Eelco Dolstra
0132e1bb48 emacs: On Darwin, don't depend on gconf and cairo 2014-08-09 19:08:37 +02:00
Eelco Dolstra
a7c1541a21 emacs: Fix building on Darwin with recent versions of GCC
This gets rid of the "unexec: unrecognized section __static_data in
__DATA segment" error while dumping Emacs.
2014-08-09 19:08:37 +02:00
John Wiegley
32c3bcaa80 emacs24Macport: new expression
This is "Mac port" addition to GNU Emacs 24. This provides a native GUI
support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later already
contain the official GUI support via the NS (Cocoa) port for Mac OS X
10.4 and later. So if it is good enough for you, then you don't need to
try this.
2014-05-31 20:39:48 +00:00
Petr Rockai
e3fae16a29 emacs: Allow non-GTK X11 builds (--with-x-toolkit=lucid). 2014-01-25 16:30:14 +01:00
Eric Kow
9a97b842c5 Emacs darwin: avoid X unless explictly requested
This keeps the dependencies lighter. Perhaps future work on this
derivation could enable the Cocoa interface by default on Mac.
2013-11-10 13:41:10 +00:00
Benno Fünfstück
351c9e310d Emacs: Fix TRAMP by adjusting its path so that it finds ls and other binaries on NixOS systems
Close #1094.
2013-10-22 09:56:43 +03:00
Vladimír Čunát
d3c6bd45ca emacs24: fix license typo, change indentation
Note that the double-quote "indented strings" strip indentation,
so this ugly style was pointless.
2013-09-14 15:30:27 +02:00
Jason \"Don\" O'Conal
ad454f3511 emacs24: fix build on darwin (clos #932) 2013-09-14 15:19:54 +02:00
Danie Roux
fcd9904be6 emacs24: Let -nox be a whole lot less X than it was
--with-x-toolkit=no still wants to -lX11 when checking for ncurses
2013-09-01 16:30:32 +02:00
Moritz Ulrich
a10812f792 Add emacs24-nox: emacs built without X (or GTK) libraries.
This commit also fixes an issue where pkgconfig was only added as a
dependency when gtk support was enabled. This made ./configure unable
to find other libraries (libtiff, libxml2, gnutls, and others).
2013-08-24 07:36:11 +03:00
Eelco Dolstra
7ac6b10446 emacs: Support building without GTK+ 2013-08-21 11:47:57 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Jason "Don" O'Conal
72a771b6e4 emacs24: fix build on darwin 2013-07-03 19:57:38 +10:00
Peter Simons
5186e75c4f emacs: update to version 24.3
The builder.sh script used to call "make bootstrap" before running the build.
This build step, however, removes all kinds of generated files normally
included in the distributions -- such as the 'configure' script. If that target
is run, then new version of Emacs require Autoconf and Automake to compile.
Since the benefit of running "make bootstrap" is unclean to me, I chose to
remove that build step instead. As far as I can tell, the Emacs binary that
results from this build works fine.
2013-03-11 19:18:31 +01:00
Ludovic Courtès
dc4cfe89ff emacs: Update to 24.2. 2012-08-27 18:16:06 +02:00