[103994] trunk/dports/aqua/emacs-app
hum at macports.org
hum at macports.org
Tue Mar 12 06:04:37 PDT 2013
Revision: 103994
https://trac.macports.org/changeset/103994
Author: hum at macports.org
Date: 2013-03-12 06:04:37 -0700 (Tue, 12 Mar 2013)
Log Message:
-----------
emacs-app: update to 24.3; add pkgconfig to depends_build (#38068); obsolete fullscreen, oldfullscreen and patches variants to use built-in fullscreen; modify inline patch; set default_variants +inline.
Modified Paths:
--------------
trunk/dports/aqua/emacs-app/Portfile
trunk/dports/aqua/emacs-app/files/patch-macemacsjp-inline.diff
Removed Paths:
-------------
trunk/dports/aqua/emacs-app/files/patch-fullscreen.diff
trunk/dports/aqua/emacs-app/files/patch-lion-fullscreen.diff
Modified: trunk/dports/aqua/emacs-app/Portfile
===================================================================
--- trunk/dports/aqua/emacs-app/Portfile 2013-03-12 10:36:05 UTC (rev 103993)
+++ trunk/dports/aqua/emacs-app/Portfile 2013-03-12 13:04:37 UTC (rev 103994)
@@ -4,8 +4,7 @@
PortSystem 1.0
name emacs-app
-version 24.2
-revision 1
+version 24.3
categories aqua editors
maintainers hum css openmaintainer
@@ -18,9 +17,6 @@
of GNU Emacs in that it makes a more concerted attempt \
from the ground up to follow OS X desktop and UI conventions.
-# Note that this distribution can support GNUstep as well, but that
-# configuration is untested at this time.
-
homepage http://www.gnu.org/software/emacs/
platforms darwin
license GPL-3+
@@ -28,11 +24,13 @@
master_sites gnu:emacs
distname emacs-${version}
dist_subdir emacs
-checksums rmd160 26f6c2b671ed7f160875d62e47c89afec085110f \
- sha256 6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357
+checksums rmd160 b67e847861002bbb76ae6588ff659408763313cf \
+ sha256 0098ca3204813d69cd8412045ba33e8701fa2062f4bff56bedafc064979eef41
conflicts emacs-app-devel
+depends_build port:pkgconfig
+
depends_lib port:ncurses \
port:libxml2 \
port:gnutls
@@ -58,30 +56,15 @@
${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
}
-variant fullscreen conflicts oldfullscreen description {Apply fullscreen patch} {
- if {${os.major} >= 11} {
- # patch-lion-fullscreen.diff
- # http://techresearchinfo.blogspot.jp/2011/12/emacs-24-on-lion-mention-top-right.html
- # https://gist.github.com/1355895
- # (modified for 'patch -p0')
- patchfiles-append patch-lion-fullscreen.diff
- } else {
- # patch-fullscreen.diff
- # https://github.com/downloads/typester/emacs/feature-fullscreen.patch
- # (modified for 'patch -p0')
- patchfiles-append patch-fullscreen.diff
- }
-}
+variant fullscreen description {Obsolete compatibility variant} {}
-variant oldfullscreen conflicts fullscreen description {Apply pre-lion fullscreen patch} {
- patchfiles-append patch-fullscreen.diff
-}
+variant oldfullscreen description {Obsolete compatibility variant} {}
variant inline description {Apply inline patch from MacEmacsJP} {
# inline patch fetched from MacEmacsJP.
# patch-macemacsjp-inline.diff
# http://svn.sourceforge.jp/svnroot/macemacsjp/inline_patch/trunk/emacs-inline.patch
- # revision 582 (2012/05/20).
+ # revision 582 (2012/05/20) modified for emacs-24.3.
patchfiles-append patch-macemacsjp-inline.diff
# http://sakito.jp/emacs/emacs24.html
depends_build port:autoconf
@@ -90,13 +73,9 @@
variant jpfont requires inline description {Obsolete compatibility variant} {}
-variant patches requires fullscreen inline description {Apply all patches: fullscreen and inline} {}
+variant patches requires inline description {Obsolete compatibility variant} {}
-if {![variant_isset oldfullscreen]} {
- default_variants +fullscreen +inline
-} else {
- default_variants +inline
-}
+default_variants +inline
livecheck.type regex
livecheck.url http://ftp.gnu.org/gnu/emacs/?C=M&O=D
Deleted: trunk/dports/aqua/emacs-app/files/patch-fullscreen.diff
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-fullscreen.diff 2013-03-12 10:36:05 UTC (rev 103993)
+++ trunk/dports/aqua/emacs-app/files/patch-fullscreen.diff 2013-03-12 13:04:37 UTC (rev 103994)
@@ -1,223 +0,0 @@
---- lisp/term/ns-win.el
-+++ lisp/term/ns-win.el
-@@ -1263,6 +1263,11 @@ the operating system.")
- (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system))
-
-
-+(declare-function ns-toggle-fullscreen-internal "nsfns.m" ())
-+(defun ns-toggle-fullscreen ()
-+ (interactive)
-+ (ns-toggle-fullscreen-internal))
-+
- (provide 'ns-win)
-
- ;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644
---- src/nsfns.m
-+++ src/nsfns.m
-@@ -2589,6 +2589,34 @@ Value is t if tooltip was open, nil otherwise. */)
-
- #endif
-
-+DEFUN ("ns-toggle-fullscreen-internal", Fns_toggle_fullscreen_internal, Sns_toggle_fullscreen_internal,
-+ 0, 0, 0,
-+ doc: /* Toggle fulscreen mode */)
-+ ()
-+{
-+ struct frame *f = SELECTED_FRAME();
-+ EmacsWindow *window = ns_get_window(f);
-+
-+ EmacsWindow *new_window = [window toggleFullscreen];
-+ FRAME_NS_WINDOW(f) = new_window;
-+
-+ NSRect r = [new_window contentRectForFrameRect:[new_window frame]];
-+ int cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS(f, r.size.width);
-+ int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES(f, r.size.height);
-+
-+ change_frame_size (f, rows, cols, 0, 1, 0); /* pretend, delay, safe */
-+ FRAME_PIXEL_WIDTH (f) = (int)r.size.width;
-+ FRAME_PIXEL_HEIGHT (f) = (int)r.size.height;
-+
-+ f->border_width = [new_window frame].size.width - r.size.width;
-+ FRAME_NS_TITLEBAR_HEIGHT (f) =
-+ [new_window frame].size.height - r.size.height;
-+
-+ [[new_window delegate] windowDidMove:nil];
-+
-+ return Qnil;
-+}
-+
-
- /* ==========================================================================
-
-@@ -2676,6 +2704,8 @@ be used as the image of the icon representing the frame. */);
- defsubr (&Sx_show_tip);
- defsubr (&Sx_hide_tip);
-
-+ defsubr (&Sns_toggle_fullscreen_internal);
-+
- /* used only in fontset.c */
- check_window_system_func = check_ns;
-
---- src/nsterm.h
-+++ src/nsterm.h
-@@ -95,8 +95,25 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
- {
- NSPoint grabOffset;
- }
-+
-+-(EmacsWindow *)toggleFullscreen;
-+
-+ at end
-+
-+/* 10.5 or below is not supported [NSWindow setStyleMask:], so require content swap hack */
-+ at interface EmacsFullWindow : EmacsWindow {
-+ EmacsWindow *normalWindow;
-+}
-+
-+-(id)initWithNormalWindow:(EmacsWindow *)window;
-+-(EmacsWindow *)getNormalWindow;
-+
- @end
-
-+// dummy for 10.5-
-+#define NSApplicationPresentationDefault 0
-+#define NSApplicationPresentationAutoHideDock (1 << 0)
-+#define NSApplicationPresentationAutoHideMenuBar (1 << 2)
-
- /* ==========================================================================
-
---- src/nsterm.m
-+++ src/nsterm.m
-@@ -686,6 +686,13 @@ ns_focus (struct frame *f, NSRect *r, int n)
- /*debug_lock--; */
- }
-
-+ if (view) {
-+ EmacsFullWindow *win = [view window];
-+ if ([win isKindOfClass:[EmacsFullWindow class]]) {
-+ [[win getNormalWindow] orderOut:nil];
-+ }
-+ }
-+
- if (view)
- #ifdef NS_IMPL_GNUSTEP
- r ? [view lockFocusInRect: u] : [view lockFocus];
-@@ -1131,8 +1138,14 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows)
- f->scroll_bar_actual_width = NS_SCROLL_BAR_WIDTH (f);
- compute_fringe_widths (f, 0);
-
-- pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
-- pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
-+ if ([window isKindOfClass:[EmacsFullWindow class]]) {
-+ pixelwidth = [[window screen] frame].size.width;
-+ pixelheight = [[window screen] frame].size.height;
-+ }
-+ else {
-+ pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
-+ pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
-+ }
-
- /* If we have a toolbar, take its height into account. */
- if (tb)
-@@ -1197,7 +1210,7 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows)
- change_frame_size (f, rows, cols, 0, 1, 0); /* pretend, delay, safe */
- FRAME_PIXEL_WIDTH (f) = pixelwidth;
- FRAME_PIXEL_HEIGHT (f) = pixelheight;
--/* SET_FRAME_GARBAGED (f); // this short-circuits expose call in drawRect */
-+ /* SET_FRAME_GARBAGED (f); // this short-circuits expose call in drawRect */
-
- mark_window_cursors_off (XWINDOW (f->root_window));
- cancel_mouse_face (f);
-@@ -5609,6 +5622,59 @@ extern void update_window_cursor (struct window *w, int on);
-
- @implementation EmacsWindow
-
-+-(NSWindow *)toggleFullscreen {
-+ BOOL isFullscreen = [[self className] isEqualToString:@"EmacsFullWindow"];
-+ NSWindow *win;
-+
-+ if (isFullscreen) {
-+ EmacsFullWindow *f = (EmacsFullWindow *)self;
-+ EmacsWindow *w = [f getNormalWindow];
-+
-+ [w setContentView:[f contentView]];
-+ [w makeKeyAndOrderFront:nil];
-+
-+ [f close];
-+
-+ win = w;
-+
-+ if ([[self screen] isEqual:[[NSScreen screens] objectAtIndex:0]]) {
-+ if ([NSApp respondsToSelector:@selector(setPresentationOptions:)]) {
-+ [NSApp setPresentationOptions:NSApplicationPresentationDefault];
-+ }
-+ else {
-+ [NSMenu setMenuBarVisible:YES];
-+ }
-+ }
-+ }
-+ else {
-+ [self deminiaturize:nil];
-+
-+ if ([[self screen] isEqual:[[NSScreen screens] objectAtIndex:0]]) {
-+ if ([NSApp respondsToSelector:@selector(setPresentationOptions:)]) {
-+ [NSApp setPresentationOptions:NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar];
-+ }
-+ else {
-+ [NSMenu setMenuBarVisible:NO];
-+ }
-+ }
-+
-+ [self orderOut:nil];
-+
-+ EmacsFullWindow *f = [[EmacsFullWindow alloc] initWithNormalWindow:self];
-+ EmacsView *view = (EmacsView *)[self delegate];
-+ [f setDelegate:view];
-+ [f makeFirstResponder:view];
-+ [f setContentView:[self contentView]];
-+ [f setContentSize:[[self screen] frame].size];
-+ [f setTitle:[self title]];
-+ [f makeKeyAndOrderFront:nil];
-+
-+ win = f;
-+ }
-+
-+ return win;
-+}
-+
- /* called only on resize clicks by special case in EmacsApp-sendEvent */
- - (void)mouseDown: (NSEvent *)theEvent
- {
-@@ -5667,6 +5733,32 @@ extern void update_window_cursor (struct window *w, int on);
-
- @end /* EmacsWindow */
-
-+ at implementation EmacsFullWindow
-+
-+-(BOOL)canBecomeKeyWindow {
-+ return YES;
-+}
-+
-+-(id)initWithNormalWindow:(EmacsWindow *)window {
-+ self = [super initWithContentRect:[window contentRectForFrameRect:[[window screen] frame]]
-+ styleMask:NSBorderlessWindowMask
-+ backing:NSBackingStoreBuffered
-+ defer:YES];
-+ if (self) {
-+ normalWindow = window;
-+ [self setAcceptsMouseMovedEvents: YES];
-+ [self useOptimizedDrawing: YES];
-+ }
-+
-+ return self;
-+}
-+
-+-(EmacsWindow *)getNormalWindow {
-+ return normalWindow;
-+}
-+
-+ at end /* EmacsFullWindow */
-+
-
- /* ==========================================================================
-
\ No newline at end of file
Deleted: trunk/dports/aqua/emacs-app/files/patch-lion-fullscreen.diff
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-lion-fullscreen.diff 2013-03-12 10:36:05 UTC (rev 103993)
+++ trunk/dports/aqua/emacs-app/files/patch-lion-fullscreen.diff 2013-03-12 13:04:37 UTC (rev 103994)
@@ -1,222 +0,0 @@
-=== modified file 'lisp/term/ns-win.el'
---- lisp/term/ns-win.el 2011-10-01 20:32:01 +0000
-+++ lisp/term/ns-win.el 2011-11-10 16:22:51 +0000
-@@ -928,6 +928,10 @@
- (add-to-list 'frame-creation-function-alist '(ns . x-create-frame-with-faces))
- (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system))
-
-+(declare-function ns-toggle-fullscreen-internal "nsfns.m" ())
-+(defun ns-toggle-fullscreen ()
-+ (interactive)
-+ (ns-toggle-fullscreen-internal))
-
- (provide 'ns-win)
-
-
-=== modified file 'src/nsfns.m'
---- src/nsfns.m 2011-11-05 12:25:01 +0000
-+++ src/nsfns.m 2011-11-10 18:54:31 +0000
-@@ -2567,6 +2567,22 @@
- }
-
-
-+DEFUN ("ns-toggle-fullscreen-internal", Fns_toggle_fullscreen_internal, Sns_toggle_fullscreen_internal,
-+ 0, 0, 0,
-+ doc: /* Toggle fulscreen mode */)
-+()
-+{
-+ struct frame *f = SELECTED_FRAME();
-+ EmacsWindow *window = ns_get_window(f);
-+
-+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
-+ [window toggleFullScreen:nil];
-+#endif
-+
-+ return Qnil;
-+}
-+
-+
- /* ==========================================================================
-
- Class implementations
-@@ -2724,6 +2740,8 @@
- defsubr (&Sx_show_tip);
- defsubr (&Sx_hide_tip);
-
-+ defsubr (&Sns_toggle_fullscreen_internal);
-+
- /* used only in fontset.c */
- check_window_system_func = check_ns;
-
-
-=== modified file 'src/nsmenu.m'
---- src/nsmenu.m 2011-07-29 05:31:12 +0000
-+++ src/nsmenu.m 2011-11-10 16:22:51 +0000
-@@ -986,7 +986,7 @@
- -------------------------------------------------------------------------- */
- {
- BLOCK_INPUT;
-- [[FRAME_NS_VIEW (f) toolbar] setVisible: NO];
-+ [[FRAME_NS_VIEW (f) window] setToolbar: nil];
- FRAME_TOOLBAR_HEIGHT (f) = 0;
- UNBLOCK_INPUT;
- }
-@@ -1003,6 +1003,8 @@
- EmacsToolbar *toolbar = [view toolbar];
-
- BLOCK_INPUT;
-+ [window setToolbar: toolbar];
-+
- [toolbar clearActive];
-
- /* update EmacsToolbar as in GtkUtils, build items list */
-
-=== modified file 'src/nsterm.h'
---- src/nsterm.h 2011-09-09 01:06:52 +0000
-+++ src/nsterm.h 2011-11-10 18:39:22 +0000
-@@ -38,6 +38,9 @@
- #ifndef MAC_OS_X_VERSION_10_6
- #define MAC_OS_X_VERSION_10_6 1060
- #endif
-+#ifndef MAC_OS_X_VERSION_10_7
-+#define MAC_OS_X_VERSION_10_7 1070
-+#endif
- #endif /* NS_IMPL_COCOA */
-
- #ifdef __OBJC__
-
-=== modified file 'src/nsterm.m'
---- src/nsterm.m 2011-11-05 12:25:01 +0000
-+++ src/nsterm.m 2011-11-10 18:54:02 +0000
-@@ -5299,39 +5299,7 @@
- #endif
- if (rows < MINHEIGHT)
- rows = MINHEIGHT;
--#ifdef NS_IMPL_COCOA
-- {
-- /* this sets window title to have size in it; the wm does this under GS */
-- NSRect r = [[self window] frame];
-- if (r.size.height == frameSize.height && r.size.width == frameSize.width)
-- {
-- if (old_title != 0)
-- {
-- xfree (old_title);
-- old_title = 0;
-- }
-- }
-- else
-- {
-- char *size_title;
-- NSWindow *window = [self window];
-- if (old_title == 0)
-- {
-- const char *t = [[[self window] title] UTF8String];
-- char *pos = strstr (t, " — ");
-- if (pos)
-- *pos = '\0';
-- old_title = (char *) xmalloc (strlen (t) + 1);
-- strcpy (old_title, t);
-- }
-- size_title = xmalloc (strlen (old_title) + 40);
-- esprintf (size_title, "%s — (%d x %d)", old_title, cols, rows);
-- [window setTitle: [NSString stringWithUTF8String: size_title]];
-- [window display];
-- xfree (size_title);
-- }
-- }
--#endif /* NS_IMPL_COCOA */
-+
- /*fprintf (stderr," ...size became %.0f x %.0f (%d x %d)\n",frameSize.width,frameSize.height,cols,rows); */
-
- return frameSize;
-@@ -5353,14 +5321,6 @@
- NSTRACE (windowDidResize);
- /*fprintf (stderr,"windowDidResize: %.0f\n",[theWindow frame].size.height); */
-
--#ifdef NS_IMPL_COCOA
-- if (old_title != 0)
-- {
-- xfree (old_title);
-- old_title = 0;
-- }
--#endif /* NS_IMPL_COCOA */
--
- /* Avoid loop under GNUstep due to call at beginning of this function.
- (x_set_window_size causes a resize which causes
- a "windowDidResize" which calls x_set_window_size). */
-@@ -5388,6 +5348,60 @@
- ns_send_appdefined (-1);
- }
-
-+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
-+- (void)windowDidEnterFullScreen:(NSNotification *)notification
-+{
-+ NSTRACE (windowDidEnterFullScreen);
-+ /* NSLog(@"Calling windowDidEnterFullScreen"); */
-+
-+ NSWindow *window = [self window];
-+ NSRect wr = [window frame];
-+ int w = (int)wr.size.width - emacsframe->border_width;
-+ int h = (int)wr.size.height;
-+ cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS(emacsframe, w);
-+ rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES(emacsframe, h);
-+ /* NSLog(@"window_size=%dx%d (%dx%d)", w, h, cols, rows); */
-+ FRAME_PIXEL_WIDTH (emacsframe) = w;
-+ FRAME_PIXEL_HEIGHT (emacsframe) = h;
-+ change_frame_size (emacsframe, rows, cols, 0, 1, 0);
-+ SET_FRAME_GARBAGED (emacsframe);
-+ cancel_mouse_face (emacsframe);
-+ ns_send_appdefined (-1);
-+}
-+#endif
-+
-+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
-+- (void)windowDidExitFullScreen:(NSNotification *)notification
-+{
-+ NSTRACE (windowDidExitFullScreen);
-+ /* NSLog(@"Calling windowDidExitFullScreen"); */
-+
-+ NSWindow *window = [self window];
-+ NSRect wr = [window frame];
-+ int w = (int)wr.size.width - emacsframe->border_width;
-+ int h = (int)wr.size.height
-+ - FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
-+ - FRAME_TOOLBAR_HEIGHT (emacsframe);
-+ cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS(emacsframe, w);
-+ rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES(emacsframe, h);
-+ /* NSLog(@"window_size=%dx%d (%dx%d)", w, h, cols, rows); */
-+ FRAME_PIXEL_WIDTH (emacsframe) = w;
-+ FRAME_PIXEL_HEIGHT (emacsframe) = h;
-+ change_frame_size (emacsframe, rows, cols, 0, 1, 0);
-+ SET_FRAME_GARBAGED (emacsframe);
-+ cancel_mouse_face (emacsframe);
-+ ns_send_appdefined (-1);
-+}
-+#endif
-+
-+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
-+- (NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
-+{
-+ /* NSLog(@"Calling window:willUseFullScreenPresentationOptions: %d", proposedOptions); */
-+ return proposedOptions | NSApplicationPresentationAutoHideToolbar;
-+}
-+#endif
-+
-
- - (void)windowDidBecomeKey: (NSNotification *)notification
- /* cf. x_detect_focus_change(), x_focus_changed(), x_new_focus_frame() */
-@@ -5559,6 +5573,14 @@
- [NSApp registerServicesMenuSendTypes: ns_send_types
- returnTypes: nil];
-
-+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
-+ if (NSApp != nil)
-+ {
-+ [NSApp setPresentationOptions: NSApplicationPresentationFullScreen | [NSApp presentationOptions] ];
-+ [win setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary | [win collectionBehavior] ];
-+ }
-+#endif
-+
- ns_window_num++;
- return self;
- }
Modified: trunk/dports/aqua/emacs-app/files/patch-macemacsjp-inline.diff
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-macemacsjp-inline.diff 2013-03-12 10:36:05 UTC (rev 103993)
+++ trunk/dports/aqua/emacs-app/files/patch-macemacsjp-inline.diff 2013-03-12 13:04:37 UTC (rev 103994)
@@ -1,40 +1,43 @@
-diff -N -p ../emacs-24.0.97/configure.in ./configure.in
-*** ../emacs-24.0.97/configure.in 2012-05-17 11:19:50.000000000 +0900
---- ./configure.in 2012-05-20 17:01:19.000000000 +0900
-*************** if test "${HAVE_NS}" = yes; then
-*** 1582,1588 ****
- fi
- ns_frag=$srcdir/src/ns.mk
- NS_OBJ="fontset.o fringe.o image.o"
-! NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o"
- fi
- CFLAGS="$tmp_CFLAGS"
- CPPFLAGS="$tmp_CPPFLAGS"
---- 1582,1588 ----
- fi
- ns_frag=$srcdir/src/ns.mk
- NS_OBJ="fontset.o fringe.o image.o"
-! NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macim.o"
- fi
- CFLAGS="$tmp_CFLAGS"
- CPPFLAGS="$tmp_CPPFLAGS"
-*************** case "$opsys" in
-*** 3416,3422 ****
- ## 0x690 is the total size of 30 segment load commands (at 56
- ## each); under Cocoa 31 commands are required.
- if test "$HAVE_NS" = "yes"; then
-! libs_nsgui="-framework AppKit"
- headerpad_extra=6C8
- else
- libs_nsgui=
---- 3416,3422 ----
- ## 0x690 is the total size of 30 segment load commands (at 56
- ## each); under Cocoa 31 commands are required.
- if test "$HAVE_NS" = "yes"; then
-! libs_nsgui="-framework AppKit -framework Carbon"
- headerpad_extra=6C8
- else
- libs_nsgui=
+--- configure.orig 2013-03-08 17:13:36.000000000 +0900
++++ configure 2013-03-12 00:01:16.000000000 +0900
+@@ -9650,7 +9650,7 @@
+ leimdir="\${ns_appresdir}/leim"
+ INSTALL_ARCH_INDEP_EXTRA=
+ fi
+- NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o"
++ NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macim.o"
+ fi
+ CFLAGS="$tmp_CFLAGS"
+ CPPFLAGS="$tmp_CPPFLAGS"
+@@ -24618,7 +24618,7 @@
+ ## 0x690 is the total size of 30 segment load commands (at 56
+ ## each); under Cocoa 31 commands are required.
+ if test "$HAVE_NS" = "yes"; then
+- libs_nsgui="-framework AppKit"
++ libs_nsgui="-framework AppKit -framework Carbon"
+ headerpad_extra=6C8
+ else
+ libs_nsgui=
+--- configure.ac.orig 2013-03-05 17:24:59.000000000 +0900
++++ configure.ac 2013-03-12 00:01:01.000000000 +0900
+@@ -1571,7 +1571,7 @@
+ leimdir="\${ns_appresdir}/leim"
+ INSTALL_ARCH_INDEP_EXTRA=
+ fi
+- NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o"
++ NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macim.o"
+ fi
+ CFLAGS="$tmp_CFLAGS"
+ CPPFLAGS="$tmp_CPPFLAGS"
+@@ -4322,7 +4322,7 @@
+ ## 0x690 is the total size of 30 segment load commands (at 56
+ ## each); under Cocoa 31 commands are required.
+ if test "$HAVE_NS" = "yes"; then
+- libs_nsgui="-framework AppKit"
++ libs_nsgui="-framework AppKit -framework Carbon"
+ headerpad_extra=6C8
+ else
+ libs_nsgui=
diff -r -N -p ../emacs-24.0.96/src/Makefile.in src/Makefile.in
*** ../emacs-24.0.96/src/Makefile.in 2012-04-08 12:03:02.000000000 +0900
--- src/Makefile.in 2012-05-03 22:23:59.000000000 +0900
@@ -42,7 +45,7 @@
*** 350,356 ****
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
- fontset.o dbusbind.o \
+ fontset.o dbusbind.o cygw32.o \
! nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
@@ -50,7 +53,7 @@
--- 350,356 ----
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
- fontset.o dbusbind.o \
+ fontset.o dbusbind.o cygw32.o \
! nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macim.o\
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130312/7b5aa491/attachment-0001.html>
More information about the macports-changes
mailing list