homebrew-core/Formula/emacs.rb
Jack Nagel 237a42a133 emacs: move some patches inline
Gists for patches are bad, so move the shorter patches inline.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-02-25 17:28:24 -06:00

173 lines
5.7 KiB
Ruby

require 'formula'
class Emacs < Formula
url 'http://ftpmirror.gnu.org/emacs/emacs-23.3b.tar.bz2'
mirror 'http://ftp.gnu.org/gnu/emacs/emacs-23.3b.tar.bz2'
md5 '917ce0054ef63773078a6e99b55df1ee'
homepage 'http://www.gnu.org/software/emacs/'
fails_with_llvm "Duplicate symbol errors while linking.", :build => 2334
# Stripping on Xcode 4 causes malformed object errors
skip_clean ["bin/emacs", "bin/emacs-23.3", "bin/emacs-24.0.50"]
if ARGV.include? "--use-git-head"
head 'git://git.sv.gnu.org/emacs.git'
else
head 'bzr://http://bzr.savannah.gnu.org/r/emacs/trunk'
end
def options
[
["--cocoa", "Build a Cocoa version of emacs"],
["--srgb", "Enable sRGB colors in the Cocoa version of emacs"],
["--with-x", "Include X11 support"],
["--use-git-head", "Use Savannah git mirror for HEAD builds"],
]
end
def patches
p = []
# Fix for building with Xcode 4; harmless on Xcode 3.x.
unless ARGV.build_head?
p << "http://repo.or.cz/w/emacs.git/commitdiff_plain/c8bba48c5889c4773c62a10f7c3d4383881f11c1"
p << DATA
end
if ARGV.include? "--cocoa"
# Fullscreen patch, works against 23.3 and HEAD.
p << "https://raw.github.com/gist/1746342/702dfe9e2dd79fddd536aa90d561efdeec2ba716"
end
return p
end
def install
args = ["--prefix=#{prefix}",
"--without-dbus",
"--enable-locallisppath=#{HOMEBREW_PREFIX}/share/emacs/site-lisp",
"--infodir=#{info}/emacs"]
if ARGV.build_head? and File.exists? "./autogen/copy_autogen"
opoo "Using copy_autogen"
puts "See https://github.com/mxcl/homebrew/issues/4852"
system "autogen/copy_autogen"
end
if ARGV.include? "--cocoa"
# Patch for color issues described here:
# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8402
if ARGV.include? "--srgb"
inreplace "src/nsterm.m",
"*col = [NSColor colorWithCalibratedRed: r green: g blue: b alpha: 1.0];",
"*col = [NSColor colorWithDeviceRed: r green: g blue: b alpha: 1.0];"
end
args << "--with-ns" << "--disable-ns-self-contained"
system "./configure", *args
system "make bootstrap"
system "make install"
prefix.install "nextstep/Emacs.app"
unless ARGV.build_head?
bin.mkpath
ln_s prefix+'Emacs.app/Contents/MacOS/Emacs', bin+'emacs'
ln_s prefix+'Emacs.app/Contents/MacOS/bin/emacsclient', bin
ln_s prefix+'Emacs.app/Contents/MacOS/bin/etags', bin
end
else
if ARGV.include? "--with-x"
ENV.x11
args << "--with-x"
args << "--with-gif=no" << "--with-tiff=no" << "--with-jpeg=no"
else
args << "--without-x"
end
system "./configure", *args
system "make"
system "make install"
end
end
def caveats
s = ""
if ARGV.include? "--cocoa"
s += <<-EOS.undent
Emacs.app was installed to:
#{prefix}
Command-line emacs can be used by setting up an alias:
alias emacs="#{prefix}/Emacs.app/Contents/MacOS/Emacs -nw"
To link the application to a normal Mac OS X location:
brew linkapps
or:
ln -s #{prefix}/Emacs.app /Applications
EOS
end
s += <<-EOS.undent
Because the official bazaar repository might be slow, we include an option for
pulling HEAD from an unofficial Git mirror:
brew install emacs --HEAD --use-git-head
There is inevitably some lag between checkins made to the official Emacs bazaar
repository and their appearance on the Savannah mirror. See
http://git.savannah.gnu.org/cgit/emacs.git for the mirror's status. The Emacs
devs do not provide support for the git mirror, and they might reject bug
reports filed with git version information. Use it at your own risk.
EOS
return s
end
end
__END__
# Fix for address randomization on Darwin. Based on:
# http://repo.or.cz/w/emacs.git/patch/f2cea124dffac9ca4b8ce1dbb9b746f8e81109a3
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 2b0addb..89d010a 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -181,7 +181,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
end of the header for adding load commands. Needed for dumping.
0x690 is the total size of 30 segment load commands (at 56
each); under Cocoa 31 commands are required. */
-#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
+#define LD_SWITCH_SYSTEM_TEMACS -fno-pie -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
#define C_SWITCH_SYSTEM_TEMACS -Dtemacs
# Fix for the titlebar issue on Mac OS X 10.7
diff --git a/src/nsterm.m b/src/nsterm.m
index 30b73c2..234b8b5 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5107,6 +5107,9 @@ ns_term_shutdown (int sig)
win = [[EmacsWindow alloc]
initWithContentRect: r
styleMask: (NSResizableWindowMask |
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+ NSTitledWindowMask |
+#endif
NSMiniaturizableWindowMask |
NSClosableWindowMask)
backing: NSBackingStoreBuffered
# Fix for Shift key for IME users
diff --git a/src/nsterm.m b/src/nsterm.m
index 30b73c2..f0c154e 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4489,6 +4489,7 @@ ns_term_shutdown (int sig)
/* if it was a function key or had modifiers, pass it directly to emacs */
if (fnKeysym || (emacs_event->modifiers
+ && (emacs_event->modifiers != shift_modifier)
&& [[theEvent charactersIgnoringModifiers] length] > 0))
/*[[theEvent characters] length] */
{