emacs: move some patches inline

Gists for patches are bad, so move the shorter patches inline.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 48 insertions, 8 deletions

diff --git a/Library/Formula/emacs.rb b/Library/Formula/emacs.rb
index 856a34aeb..7356acadb 100644
--- a/Library/Formula/emacs.rb
+++ b/Library/Formula/emacs.rb
@@ -32,18 +32,12 @@ class Emacs < Formula
     # 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"
-      # Fix for address randomization on Darwin. Based on:
-      #   http://repo.or.cz/w/emacs.git/patch/f2cea124dffac9ca4b8ce1dbb9b746f8e81109a3
-      p << "https://raw.github.com/gist/1098107"
-      # Fix for the titlebar issue on Mac OS X 10.7
-      p << "https://raw.github.com/gist/1102744"
-      # Fix for Shift key for IME users
-      p << "https://raw.github.com/gist/1212776"
+      p << DATA
     end
 
     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/1746342/702dfe9e2dd79fddd536aa90d561efdeec2ba716"
     end
 
     return p
@@ -131,3 +125,49 @@ class Emacs < Formula
     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] */
+         {