[70898] trunk/dports/aqua/CocoaDialog

25 Aug 2010

Revision: 70898
          http://trac.macports.org/changeset/70898
Author:   snc@macports.org
Date:     2010-08-25 06:59:03 -0700 (Wed, 25 Aug 2010)
Log Message:
-----------
patch for 64-bits by maintainer, #23047

Modified Paths:
--------------
    trunk/dports/aqua/CocoaDialog/Portfile

Added Paths:
-----------
    trunk/dports/aqua/CocoaDialog/files/
    trunk/dports/aqua/CocoaDialog/files/patch-AppController.h
    trunk/dports/aqua/CocoaDialog/files/patch-AppController.m
    trunk/dports/aqua/CocoaDialog/files/patch-CDControl.h
    trunk/dports/aqua/CocoaDialog/files/patch-CDControl.m
    trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindow.m
    trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindowView.h
    trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindowView.m

Modified: trunk/dports/aqua/CocoaDialog/Portfile
===================================================================

--- trunk/dports/aqua/CocoaDialog/Portfile	2010-08-25 13:25:27 UTC (rev 70897)
+++ trunk/dports/aqua/CocoaDialog/Portfile	2010-08-25 13:59:03 UTC (rev 70898)
@@ -4,6 +4,7 @@
 PortGroup	xcode 1.0
 
 name		CocoaDialog
+revision    1
 version		2.1.1
 categories	aqua sysutils
 maintainers	me.com:tsupplis
@@ -23,6 +24,11 @@
 				sha1 d04fd9bf821cfdf85b8a6cbcce5872290a4a14b3 \
 				rmd160 326929352d81807ab3362cc806972ee4e1de9e47
 
+patchfiles      patch-CDControl.h patch-CDControl.m \
+                patch-AppController.h patch-AppController.m \
+                patch-KABubbleWindow.m patch-KABubbleWindowView.h \
+                patch-KABubbleWindowView.m
+
 worksrcdir		cocoadialog
 
 xcode.target	${name}

Added: trunk/dports/aqua/CocoaDialog/files/patch-AppController.h
===================================================================
--- trunk/dports/aqua/CocoaDialog/files/patch-AppController.h	                        (rev 0)
+++ trunk/dports/aqua/CocoaDialog/files/patch-AppController.h	2010-08-25 13:59:03 UTC (rev 70898)
@@ -0,0 +1,10 @@
+--- src/AppController.h.orig	2006-01-01 10:15:08.000000000 +0000
++++ src/AppController.h	2009-12-28 11:04:34.000000000 +0000
+@@ -24,6 +24,6 @@
+ 
+ @interface AppController : NSObject {
+ }
+-- (CDControl *) chooseControl:(NSString *)runMode useOptions:options addExtraOptionsTo:(NSMutableDictionary *)extraOptions;
++- (CDControl *) chooseControl:(NSString *)runMode useOptions:(CDOptions *)options addExtraOptionsTo:(NSMutableDictionary *)extraOptions;
+ 
+ @end

Added: trunk/dports/aqua/CocoaDialog/files/patch-AppController.m
===================================================================
--- trunk/dports/aqua/CocoaDialog/files/patch-AppController.m	                        (rev 0)
+++ trunk/dports/aqua/CocoaDialog/files/patch-AppController.m	2010-08-25 13:59:03 UTC (rev 70898)
@@ -0,0 +1,59 @@
+--- src/AppController.m.orig	2006-02-26 00:12:44.000000000 +0000
++++ src/AppController.m	2009-12-28 11:07:40.000000000 +0000
+@@ -111,41 +111,41 @@
+ 	[NSApp terminate:self];
+ }
+ 
+-- (CDControl *) chooseControl:(NSString *)runMode useOptions:options addExtraOptionsTo:(NSMutableDictionary *)extraOptions
++- (CDControl *) chooseControl:(NSString *)runMode useOptions:(CDOptions *)options addExtraOptionsTo:(NSMutableDictionary *)extraOptions
+ {
+ 	if (runMode == nil || [runMode isEqualToString:@"--help"]) {
+ 		[CDControl printHelp];
+ 		return nil;
+ 	} else if ([runMode isEqualToString:@"fileselect"]) {
+-		return [[[CDFileSelectControl alloc] initWithOptions:options] autorelease];
++		return [[[CDFileSelectControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"filesave"]) {
+-		return [[[CDFileSaveControl alloc] initWithOptions:options] autorelease];
++		return [[[CDFileSaveControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"msgbox"]) {
+-		return [[[CDMsgboxControl alloc] initWithOptions:options] autorelease];
++		return [[[CDMsgboxControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"yesno-msgbox"]) {
+-		return [[[CDYesNoMsgboxControl alloc] initWithOptions:options] autorelease];
++		return [[[CDYesNoMsgboxControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"ok-msgbox"]) {
+-		return [[[CDOkMsgboxControl alloc] initWithOptions:options] autorelease];
++		return [[[CDOkMsgboxControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"textbox"]) {
+-		return [[[CDTextboxControl alloc] initWithOptions:options] autorelease];
++		return [[[CDTextboxControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"progressbar"]) {
+-		return [[[CDProgressbarControl alloc] initWithOptions:options] autorelease];
++		return [[[CDProgressbarControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"inputbox"]) {
+-		return [[[CDInputboxControl alloc] initWithOptions:options] autorelease];
++		return [[[CDInputboxControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"standard-inputbox"]) {
+-		return [[[CDStandardInputboxControl alloc] initWithOptions:options] autorelease];
++		return [[[CDStandardInputboxControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"secure-standard-inputbox"]) {
+ 		[extraOptions setObject:[NSNumber numberWithBool:NO] forKey:@"no-show"];
+-		return [[[CDStandardInputboxControl alloc] initWithOptions:options] autorelease];
++		return [[[CDStandardInputboxControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"secure-inputbox"]) {
+ 		[extraOptions setObject:[NSNumber numberWithBool:NO] forKey:@"no-show"];
+-		return [[[CDInputboxControl alloc] initWithOptions:options] autorelease];
++		return [[[CDInputboxControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"dropdown"]) {
+-		return [[[CDPopUpButtonControl alloc] initWithOptions:options] autorelease];
++		return [[[CDPopUpButtonControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"standard-dropdown"]) {
+-		return [[[CDStandardPopUpButtonControl alloc] initWithOptions:options] autorelease];
++		return [[[CDStandardPopUpButtonControl alloc] initWithOptionList:options] autorelease];
+ 	} else if ([runMode isEqualToString:@"bubble"]) {
+-		return [[[CDBubbleControl alloc] initWithOptions:options] autorelease];
++		return [[[CDBubbleControl alloc] initWithOptionList:options] autorelease];
+ 	} else {
+ 		NSFileHandle *fh = [NSFileHandle fileHandleWithStandardOutput];
+ 		NSString *output = [NSString stringWithFormat:@"Unknown dialog type: %@\n", runMode]; 

Added: trunk/dports/aqua/CocoaDialog/files/patch-CDControl.h
===================================================================
--- trunk/dports/aqua/CocoaDialog/files/patch-CDControl.h	                        (rev 0)
+++ trunk/dports/aqua/CocoaDialog/files/patch-CDControl.h	2010-08-25 13:59:03 UTC (rev 70898)
@@ -0,0 +1,11 @@
+--- src/CDControl.h.orig	2006-01-01 11:31:16.000000000 +0000
++++ src/CDControl.h	2009-12-28 11:07:49.000000000 +0000
+@@ -39,7 +39,7 @@
+ @interface CDControl : NSObject <CDControlProtocol> {
+ 	CDOptions *_options;
+ }
+-- initWithOptions:(CDOptions *)options;
++- initWithOptionList:(CDOptions *)options;
+ 
+ // You should override availableKeys if you want options local to your control
+ - (NSDictionary *) availableKeys;

Added: trunk/dports/aqua/CocoaDialog/files/patch-CDControl.m
===================================================================
--- trunk/dports/aqua/CocoaDialog/files/patch-CDControl.m	                        (rev 0)
+++ trunk/dports/aqua/CocoaDialog/files/patch-CDControl.m	2010-08-25 13:59:03 UTC (rev 70898)
@@ -0,0 +1,20 @@
+--- src/CDControl.m.orig	2006-02-26 00:13:04.000000000 +0000
++++ src/CDControl.m	2009-12-28 11:07:58.000000000 +0000
+@@ -23,7 +23,7 @@
+ 
+ @implementation CDControl
+ 
+-- initWithOptions:(CDOptions *)options
++- initWithOptionList:(CDOptions *)options
+ {
+ 	self = [super init];
+ 	[self setOptions:options];
+@@ -31,7 +31,7 @@
+ }
+ - init
+ {
+-	return [self initWithOptions:nil];
++	return [self initWithOptionList:nil];
+ }
+ 
+ - (CDOptions *) options

Added: trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindow.m
===================================================================
--- trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindow.m	                        (rev 0)
+++ trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindow.m	2010-08-25 13:59:03 UTC (rev 70898)
@@ -0,0 +1,11 @@
+--- src/KABubbleWindow.m.orig	2005-12-30 10:50:44.000000000 +0000
++++ src/KABubbleWindow.m	2009-12-28 12:07:12.000000000 +0000
+@@ -6,7 +6,7 @@
+ @implementation KABubbleWindow
+ 
+ - (id)initWithContentRect:(NSRect)contentRect
+-				styleMask:(unsigned int)aStyle
++				styleMask:(NSUInteger)aStyle
+ 				  backing:(NSBackingStoreType)bufferingType
+ 					defer:(BOOL)flag {
+ 	

Added: trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindowView.h
===================================================================
--- trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindowView.h	                        (rev 0)
+++ trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindowView.h	2010-08-25 13:59:03 UTC (rev 70898)
@@ -0,0 +1,24 @@
+--- src/KABubbleWindowView.h.orig	2005-12-30 17:12:11.000000000 +0000
++++ src/KABubbleWindowView.h	2009-12-28 12:05:32.000000000 +0000
+@@ -8,8 +8,8 @@
+ 	NSAttributedString *_text;
+ 	SEL _action;
+ 	id _target;
+-	float _darkColorFloat[4];   // Cache these rather than
+-	float _lightColorFloat[4];  // calculating over and over.
++	CGFloat _darkColorFloat[4];   // Cache these rather than
++	CGFloat _lightColorFloat[4];  // calculating over and over.
+ 	NSColor *_darkColor;
+ 	NSColor *_lightColor;
+ 	NSColor *_textColor;
+@@ -24,8 +24,8 @@
+ - (void) setLightColor:(NSColor *)color;
+ - (void) setTextColor:(NSColor *)color;
+ - (void) setBorderColor:(NSColor *)color;
+-- (const float *) darkColorFloat; // returns { r, g, b, a }
+-- (const float *) lightColorFloat; // returns { r, g, b, a }
++- (const CGFloat *) darkColorFloat; // returns { r, g, b, a }
++- (const CGFloat *) lightColorFloat; // returns { r, g, b, a }
+ - (NSColor *) darkColor;
+ - (NSColor *) lightColor;
+ - (NSColor *) textColor;

Added: trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindowView.m
===================================================================
--- trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindowView.m	                        (rev 0)
+++ trunk/dports/aqua/CocoaDialog/files/patch-KABubbleWindowView.m	2010-08-25 13:59:03 UTC (rev 70898)
@@ -0,0 +1,54 @@
+--- src/KABubbleWindowView.m.orig	2005-12-30 17:24:27.000000000 +0000
++++ src/KABubbleWindowView.m	2009-12-28 12:04:45.000000000 +0000
+@@ -5,11 +5,11 @@
+ #import "KABubbleWindowView.h"
+ 
+ // info needs to be a KABubbleWindowView with rgb+alpha set.
+-void KABubbleShadeInterpolate( void *info, float const *inData, float *outData ) {
++void KABubbleShadeInterpolate( void *info, CGFloat const *inData, CGFloat *outData ) {
+ 	// These 2 will always return an array of 4 floats
+-	const float *dark = [(KABubbleWindowView *)info darkColorFloat];
+-	const float *light = [(KABubbleWindowView *)info lightColorFloat];
+-	float a = inData[0];
++	const CGFloat *dark = [(KABubbleWindowView *)info darkColorFloat];
++	const CGFloat *light = [(KABubbleWindowView *)info lightColorFloat];
++	CGFloat a = inData[0];
+ 	int i = 0;
+ 
+ 	for( i = 0; i < 4; i++ )
+@@ -151,7 +151,7 @@
+ 	[_darkColor release];
+ 	_darkColor = color;
+ 
+-	float r, g, b, alpha;
++	CGFloat r, g, b, alpha;
+ 	NSColor *rgb = [_darkColor colorUsingColorSpaceName:@"NSCalibratedRGBColorSpace"];
+ 	[rgb getRed:&r green:&g blue:&b alpha:&alpha];
+ 	_darkColorFloat[0] = r;
+@@ -163,7 +163,7 @@
+ {
+ 	return _darkColor;
+ }
+-- (const float *) darkColorFloat
++- (const CGFloat *) darkColorFloat
+ {
+ 	return _darkColorFloat;
+ }
+@@ -173,7 +173,7 @@
+ 	[_lightColor release];
+ 	_lightColor = color;
+ 
+-	float r, g, b, alpha;
++	CGFloat r, g, b, alpha;
+ 	NSColor *rgb = [_lightColor colorUsingColorSpaceName:@"NSCalibratedRGBColorSpace"];
+ 	[rgb getRed:&r green:&g blue:&b alpha:&alpha];
+ 	_lightColorFloat[0] = r;
+@@ -185,7 +185,7 @@
+ {
+ 	return _lightColor;
+ }
+-- (const float *) lightColorFloat
++- (const CGFloat *) lightColorFloat
+ {
+ 	return _lightColorFloat;
+ }

    

[70898] trunk/dports/aqua/CocoaDialog

snc＠macports.org