[55369] trunk/dports/x11/xorg-server

[jeremyhu at macports.org]

Revision: 55369
          http://trac.macports.org/changeset/55369
Author:   jeremyhu at macports.org
Date:     2009-08-09 16:14:08 -0700 (Sun, 09 Aug 2009)
Log Message:
-----------
xorg-server: Buildfix for tiger: #20601

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile

Added Paths:
-----------
    trunk/dports/x11/xorg-server/files/tiger.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2009-08-09 23:12:40 UTC (rev 55368)
+++ trunk/dports/x11/xorg-server/Portfile	2009-08-09 23:14:08 UTC (rev 55369)
@@ -63,7 +63,7 @@
 	port:xorg-libAppleWM \
 	port:xorg-libXfixes
 
-patchfiles nuke-old-extensions.patch xextproto.patch
+patchfiles nuke-old-extensions.patch xextproto.patch tiger.patch
 patch.args -p1
 
 use_autoreconf yes

Added: trunk/dports/x11/xorg-server/files/tiger.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/tiger.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/tiger.patch	2009-08-09 23:14:08 UTC (rev 55369)
@@ -0,0 +1,49 @@
+diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
+index 170bccc..a86b20f 100644
+--- a/hw/xquartz/X11Controller.h
++++ b/hw/xquartz/X11Controller.h
+@@ -45,6 +45,16 @@
+ #undef BOOL
+ #endif
+ 
++#ifndef NSINTEGER_DEFINED
++#if __LP64__ || NS_BUILD_32_LIKE_64
++typedef long NSInteger;
++typedef unsigned long NSUInteger;
++#else
++typedef int NSInteger;
++typedef unsigned int NSUInteger;
++#endif
++#endif
++
+ @interface X11Controller : NSObject
+ {
+     IBOutlet NSPanel *prefs_panel;
+diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
+index 9900537..2a533de 100644
+--- a/hw/xquartz/X11Controller.m
++++ b/hw/xquartz/X11Controller.m
+@@ -164,11 +164,7 @@ BOOL xquartz_resetenv_display = NO;
+ 
+       item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector
+ 				  (item_selected:) keyEquivalent:shortcut];
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+       [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
+-#else
+-      [item setKeyEquivalentModifierMask:windowItemModMask];
+-#endif
+       [item setTarget:self];
+       [item setTag:i];
+       [item setEnabled:YES];
+@@ -177,11 +173,7 @@ BOOL xquartz_resetenv_display = NO;
+ 				       action:@selector
+ 				       (item_selected:) keyEquivalent:shortcut
+ 				       atIndex:i];
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+       [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
+-#else
+-      [item setKeyEquivalentModifierMask:windowItemModMask];
+-#endif
+       [item setTarget:self];
+       [item setTag:i];
+       [item setEnabled:YES];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090809/b9cf79b4/attachment.html>