[85139] trunk/dports/aqua/emacs-app

[css at macports.org]

Revision: 85139
          http://trac.macports.org/changeset/85139
Author:   css at macports.org
Date:     2011-10-10 03:48:26 -0700 (Mon, 10 Oct 2011)
Log Message:
-----------
emacs-app: clang support for XCode 4.2 and Lion. refs #31508

Modified Paths:
--------------
    trunk/dports/aqua/emacs-app/Portfile

Added Paths:
-----------
    trunk/dports/aqua/emacs-app/files/patch-clang.diff

Modified: trunk/dports/aqua/emacs-app/Portfile
===================================================================
--- trunk/dports/aqua/emacs-app/Portfile	2011-10-10 10:37:22 UTC (rev 85138)
+++ trunk/dports/aqua/emacs-app/Portfile	2011-10-10 10:48:26 UTC (rev 85139)
@@ -5,7 +5,7 @@
 
 name		emacs-app
 version		23.3
-revision	2
+revision	3
 categories	aqua editors
 maintainers	css
 description	The GNU Emacs text editor (Cocoa version)
@@ -38,6 +38,10 @@
 patchfiles      patch-src_emacs.c.diff \
                 patch-src_unexmacosx.c.diff
 
+if {${configure.compiler} == "clang"} {
+    patchfiles-append   patch-clang.diff
+}
+
 variant fullscreen description {Add fullscreen patch from http://gist.github.com/291150 as mentioned in http://www.sanityinc.com/full-screen-support-for-cocoa-emacs-on-osx} {
     patchfiles-append patch-fullscreen.diff
 }

Added: trunk/dports/aqua/emacs-app/files/patch-clang.diff
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-clang.diff	                        (rev 0)
+++ trunk/dports/aqua/emacs-app/files/patch-clang.diff	2011-10-10 10:48:26 UTC (rev 85139)
@@ -0,0 +1,33 @@
+--- src/nsfont.m~	2011-10-05 22:55:46.000000000 +0900
++++ src/nsfont.m	2011-10-05 23:03:53.000000000 +0900
+@@ -1286,7 +1286,7 @@
+       }
+ 
+     CGContextRestoreGState (gcontext);
+-    return;
++    return 0;
+   }
+ #endif  /* NS_IMPL_COCOA */
+ 
+--- src/nsimage.m~	2011-01-09 02:45:14.000000000 +0900
++++ src/nsimage.m	2011-10-05 23:14:17.000000000 +0900
+@@ -325,7 +325,7 @@
+ 
+ /* Set color for a bitmap image (see initFromSkipXBM).  Note that the alpha
+    is used as a mask, so we just memset the entire array. */
+-- setXBMColor: (NSColor *)color
++- (void) setXBMColor: (NSColor *)color
+ {
+   NSSize s = [self size];
+   int len = (int) s.width * s.height;
+--- src/nsterm.m~	2011-10-05 22:55:46.000000000 +0900
++++ src/nsterm.m	2011-10-05 22:59:43.000000000 +0900
+@@ -5494,7 +5494,7 @@
+   NSTRACE (performDragOperation);
+ 
+   if (!emacs_event)
+-    return;
++    return NO;
+ 
+   position = [self convertPoint: [sender draggingLocation] fromView: nil];
+   x = lrint (position.x);  y = lrint (position.y);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111010/e8fa0a80/attachment.html>