svnno****@sourc*****
svnno****@sourc*****
2011年 12月 5日 (月) 17:04:22 JST
Revision: 576
http://sourceforge.jp/projects/macemacsjp/svn/view?view=rev&revision=576
Author: taiichi
Date: 2011-12-05 17:04:22 +0900 (Mon, 05 Dec 2011)
Log Message:
-----------
Added Paths:
-----------
inline_patch/trunk/lion.patch
-------------- next part --------------
Added: inline_patch/trunk/lion.patch
===================================================================
--- inline_patch/trunk/lion.patch (rev 0)
+++ inline_patch/trunk/lion.patch 2011-12-05 08:04:22 UTC (rev 576)
@@ -0,0 +1,54 @@
+diff -r -p -N -x '*.o' ../emacs-23.3-0/src/nsterm.m src/nsterm.m
+*** ../emacs-23.3-0/src/nsterm.m 2011-02-09 08:46:22.000000000 +0900
+--- src/nsterm.m 2011-12-05 16:50:06.000000000 +0900
+*************** ns_term_shutdown (int sig)
+*** 5106,5112 ****
+
+ win = [[EmacsWindow alloc]
+ initWithContentRect: r
+! styleMask: (NSResizableWindowMask |
+ NSMiniaturizableWindowMask |
+ NSClosableWindowMask)
+ backing: NSBackingStoreBuffered
+--- 5106,5113 ----
+
+ win = [[EmacsWindow alloc]
+ initWithContentRect: r
+! styleMask: (NSTitledWindowMask |
+! NSResizableWindowMask |
+ NSMiniaturizableWindowMask |
+ NSClosableWindowMask)
+ backing: NSBackingStoreBuffered
+diff -r -p -N -x '*.o' ../emacs-23.3-0/src/s/darwin.h src/s/darwin.h
+*** ../emacs-23.3-0/src/s/darwin.h 2011-01-09 02:45:14.000000000 +0900
+--- src/s/darwin.h 2011-12-05 16:49:29.000000000 +0900
+*************** along with GNU Emacs. If not, see <http
+*** 181,187 ****
+ 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 C_SWITCH_SYSTEM_TEMACS -Dtemacs
+
+--- 181,187 ----
+ 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 -fno-pie -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
+
+ #define C_SWITCH_SYSTEM_TEMACS -Dtemacs
+
+diff -r -p -N -x '*.o' ../emacs-23.3-0/src/unexmacosx.c src/unexmacosx.c
+*** ../emacs-23.3-0/src/unexmacosx.c 2011-01-09 02:45:14.000000000 +0900
+--- src/unexmacosx.c 2011-12-05 16:49:51.000000000 +0900
+*************** copy_data_segment (struct load_command *
+*** 822,827 ****
+--- 822,828 ----
+ }
+ else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
+ || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
++ || strncmp (sectp->sectname, "__got", 16) == 0
+ || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
+ || strncmp (sectp->sectname, "__dyld", 16) == 0
+ || strncmp (sectp->sectname, "__const", 16) == 0