shishi · December 8, 2011 11:02 · Dec 8, 2011 · Dec 8, 2011 · Aug 6, 2011 · Aug 6, 2011
diff --git a/emacs.rb b/emacs.rb
@@ -2,7 +2,7 @@
 
 class Emacs < Formula
   url 'http://ftp.gnu.org/pub/gnu/emacs/emacs-23.3b.tar.bz2'
-  md5 'f2cf8dc6f28f8ae59bc695b4ddda339c'
+  md5 '917ce0054ef63773078a6e99b55df1ee'
   homepage 'http://www.gnu.org/software/emacs/'
 
   if ARGV.include? "--use-git-head"

diff --git a/emacs.rb b/emacs.rb
@@ -1,7 +1,7 @@
 require 'formula'
 
 class Emacs < Formula
-  url 'http://ftp.gnu.org/pub/gnu/emacs/emacs-23.3a.tar.bz2'
+  url 'http://ftp.gnu.org/pub/gnu/emacs/emacs-23.3b.tar.bz2'
   md5 'f2cf8dc6f28f8ae59bc695b4ddda339c'
   homepage 'http://www.gnu.org/software/emacs/'
 

diff --git a/emacs.rb b/emacs.rb
@@ -32,9 +32,9 @@ def patches
 
     if ARGV.include? "--cocoa"
       # Fullscreen patch, works against 23.3 and HEAD.
-      # p << "https://raw.github.com/gist/1012927"
-      p << "https://github.com/downloads/typester/emacs/feature-fullscreen.patch"
       p << "https://github.com/downloads/typester/emacs/fix-shiftmodifier-with-ime.patch"
+      p << "https://github.com/downloads/typester/emacs/feature-fullscreen.patch"
+      # p << "https://raw.github.com/gist/1012927"
     end
 
     if ARGV.include? "--lion"

diff --git a/emacs.rb b/emacs.rb
@@ -32,7 +32,9 @@ def patches
 
     if ARGV.include? "--cocoa"
       # Fullscreen patch, works against 23.3 and HEAD.
-      p << "https://raw.github.com/gist/1012927"
+      # p << "https://raw.github.com/gist/1012927"
+      p << "https://github.com/downloads/typester/emacs/feature-fullscreen.patch"
+      p << "https://github.com/downloads/typester/emacs/fix-shiftmodifier-with-ime.patch"
     end
 
     if ARGV.include? "--lion"

diff --git a/emacs.rb b/emacs.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Emacs < Formula
-  url 'http://ftp.gnu.org/pub/gnu/emacs/emacs-23.3.tar.bz2'
-  md5 'a673c163b4714362b94ff6096e4d784a'
+  url 'http://ftp.gnu.org/pub/gnu/emacs/emacs-23.3a.tar.bz2'
+  md5 'f2cf8dc6f28f8ae59bc695b4ddda339c'
   homepage 'http://www.gnu.org/software/emacs/'
 
   if ARGV.include? "--use-git-head"

diff --git a/emacs.rb b/emacs.rb
@@ -0,0 +1,120 @@
+require 'formula'
+
+class Emacs < Formula
+  url 'http://ftp.gnu.org/pub/gnu/emacs/emacs-23.3.tar.bz2'
+  md5 'a673c163b4714362b94ff6096e4d784a'
+  homepage 'http://www.gnu.org/software/emacs/'
+
+  if ARGV.include? "--use-git-head"
+    head 'git://repo.or.cz/emacs.git'
+  else
+    head 'bzr://http://bzr.savannah.gnu.org/r/emacs/trunk'
+  end
+
+  def options
+    [
+      ["--cocoa", "Build a Cocoa version of emacs"],
+      ["--lion", "Enable Lion full-screen mode"],
+      ["--srgb", "Enable sRGB colors in the Cocoa version of emacs"],
+      ["--with-x", "Include X11 support"],
+      ["--use-git-head", "Use repo.or.cz 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 << "https://raw.github.com/gist/1098107"
+    end
+
+    if ARGV.include? "--cocoa"
+      # Fullscreen patch, works against 23.3 and HEAD.
+      p << "https://raw.github.com/gist/1012927"
+    end
+
+    if ARGV.include? "--lion"
+      p << "https://raw.github.com/gist/1101856"
+    end
+
+    return p
+  end
+
+  fails_with_llvm "Duplicate symbol errors while linking."
+
+  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"
+
+      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
+    else
+      if ARGV.include? "--with-x"
+        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 = "For build options see:\n  brew options emacs\n\n"
+    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
+
+      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 repo.or.cz mirror. See
+      http://repo.or.cz/w/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
No results found