Attachment #162267 for bug #203909

Lines 3-8 Link Here

(-)sope/Makefile (+8 lines)
3		3
4	PORTNAME= sope	4	PORTNAME= sope
5	PORTVERSION= 2.3.2	5	PORTVERSION= 2.3.2
		6	PORTREVISION= 1
6	CATEGORIES= devel gnustep	7	CATEGORIES= devel gnustep
7	MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/	8	MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
8	DISTNAME= SOPE-${PORTVERSION}	9	DISTNAME= SOPE-${PORTVERSION}
Lines 33-38 Link Here
33	SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \	34	SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
34	GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}	35	GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
35		36
		37	# For checking compiler warnings:
		38	#CFLAGS+= -Werror
		39	#CFLAGS+= -Wno-objc-protocol-method-implementation
		40	#CFLAGS+= -Wno-unused-function
		41	#CFLAGS+= -Wno-comment
		42	#CFLAGS+= -Wno-unused-variable
		43
36	CONFIGURE_ARGS= --with-gnustep --disable-debug --enable-strip	44	CONFIGURE_ARGS= --with-gnustep --disable-debug --enable-strip
37		45
38	.include <bsd.port.options.mk>	46	.include <bsd.port.options.mk>

Line 0 Link Here

(-)sope/files/patch-sope-appserver_NGObjWeb_DynamicElements_WOHyperlinkInfo.m (+11 lines)
	1	--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m.orig 2015-10-08 05:14:48.391259215 +0800
	2	+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m 2015-10-08 05:40:26.693157878 +0800
	3	@@ -27,7 +27,7 @@
	4	@implementation WOHyperlinkInfo
	5
	6	- (id)initWithConfig:(NSMutableDictionary *)_config {
	7	- unsigned count;
	8	+ unsigned count = (unsigned)[_config count];
	9
	10	self->sidInUrl = YES;
	11




--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m.orig	2015-10-07 04:27:29.705409511 +0800
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m	2015-10-07 04:28:30.761407410 +0800
@@ -1021,9 +1021,9 @@
   [buf appendString:@"\" "];
   [buf appendFormat:@"%i %i",  
          [_response status],
-         [[_response content] length]];
+         (int)[[_response content] length]];
   if (doExtLog)
-    [buf appendFormat:@"/%i", [[_request content] length]];
+    [buf appendFormat:@"/%i", (int)[[_request content] length]];
   
   /* append duration */
   if (lstartDate != nil)

Line 0 Link Here

(-)sope/files/patch-sope-appserver_NGObjWeb_WebDAV_SoObjectDataSource.m (+11 lines)
	1	--- sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m.orig 2015-09-17 02:26:49.000000000 +0800
	2	+++ sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m 2015-10-08 07:03:45.997807380 +0800
	3	@@ -137,7 +137,7 @@
	4	pool = [[NSAutoreleasePool alloc] init];
	5	i=0;
	6	while ((childKey = [[childKeys nextObject] stringValue]) != nil) {
	7	- NSDictionary *rec;
	8	+ id rec;
	9	NSException *e;
	10	NSString *childHref;
	11	id child = nil;

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Associations__WOScriptAssociation.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/Associations/WOScriptAssociation.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/Associations/WOScriptAssociation.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -125,7 +125,7 @@
	4	v = [v substringToIndex:9];
	5	v = [v stringByApplyingCEscaping];
	6	[str appendString:v];
	7	- [str appendFormat:@"...[len=%i]", [self->script length]];
	8	+ [str appendFormat:@"...[len=%i]", (int)[self->script length]];
	9	}
	10	else {
	11	v = [v stringByApplyingCEscaping];

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Associations__WOValueAssociation.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/Associations/WOValueAssociation.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/Associations/WOValueAssociation.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -161,7 +161,7 @@
	4	v = [v substringToIndex:9];
	5	v = [v stringByApplyingCEscaping];
	6	[str appendString:v];
	7	- [str appendFormat:@"...[len=%i]", [self->value length]];
	8	+ [str appendFormat:@"...[len=%i]", (int)[self->value length]];
	9	}
	10	else {
	11	v = [v stringByApplyingCEscaping];




--- ./sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m	2013-10-09 17:03:32.000000000 +0100
@@ -77,10 +77,9 @@
   [children autorelease];
   
   /* construct self ... */
-  self = [(WODynamicElement *)self initWithName:name 
+  return (WOGenericElement*)[(WODynamicElement *)self initWithName:name 
                                    associations:assocs 
                                    contentElements:children];
-  return self;
 }
 
 - (BOOL)_isASCIIString:(NSString *)_s {

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__DynamicElements__WOHyperlink.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -75,7 +75,7 @@
	4	temporaryHyperlink = [_WOTemporaryHyperlink allocWithZone:zone];
	5
	6	if (self == WOHyperlinkClass)
	7	- return temporaryHyperlink;
	8	+ return (id)temporaryHyperlink;
	9	else {
	10	#if PROFILE_CLUSTERS
	11	static unsigned totalCount = 0;

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__NGHttp__NGHttpHeaderFieldParser.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/NGHttp/NGHttpHeaderFieldParser.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/NGHttp/NGHttpHeaderFieldParser.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -31,7 +31,7 @@
	4	- (id)parseValue:(id)_data ofHeaderField:(NSString *)_field {
	5	unsigned len = 0;
	6	const unsigned char *src = NULL;
	7	- NGHttpHostHeaderField *value = nil;
	8	+ id value = nil;
	9	NSString *str = nil;
	10
	11	if ([_data isKindOfClass:[NSData class]]) {

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__NGHttp__NGHttpResponse.h (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/NGHttp/NGHttpResponse.h.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/NGHttp/NGHttpResponse.h 2013-10-09 17:03:32.000000000 +0100
	3	@@ -122,7 +122,7 @@
	4	return ((_code >= 400) && (_code < 500)) ? YES : NO;
	5	}
	6	static inline BOOL NGIsServerErrorHttpStatusCode(NGHttpStatusCode _code) {
	7	- return ((_code >= 500) && (_code < 600)) ? YES : NO;
	8	+ return ((_code >= 500) && ((int)_code < 600)) ? YES : NO;
	9	}
	10
	11	#endif /* __NGHttp_NGHttpResponse_H__ */




--- ./sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m	2013-10-09 17:03:32.000000000 +0100
@@ -93,7 +93,7 @@
                             encoding:NSUTF8StringEncoding];
   if (debugDecoding) {
     NSLog(@"decoded data len %d value (len=%d): %@", 
-	  len, [value length], value);
+	  len, (int)[value length], value);
   }
   return value;
 #if 0
@@ -177,7 +177,7 @@
 - (NSString *)stringByApplyingURLEncoding {
   /* NGExtensions/NSString+misc.h */
   NSLog(@"Note: Called deprecated -stringByApplyingURLEncoding method "
-	@"(use -stringByEscapingURL instead)", __PRETTY_FUNCTION__);
+	@"(use -stringByEscapingURL instead)");
   return [self stringByEscapingURL];
 }
 

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__SoObjects__SoClassSecurityInfo.h (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/SoObjects/SoClassSecurityInfo.h.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/SoObjects/SoClassSecurityInfo.h 2013-10-09 17:03:32.000000000 +0100
	3	@@ -101,7 +101,7 @@
	4	- (BOOL)hasDefaultAccessDeclaration;
	5	- (void)declarePublic:(NSString *)_firstName, ...;
	6	- (void)declarePrivate:(NSString *)_firstName, ...;
	7	-- (void)declareProtected:(NSString )_perm:(NSString )_firstName, ...;
	8	+- (void)declareProtected:(NSString )_perm :(NSString )_firstName, ...;
	9
	10	/* object security */
	11

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__SoObjects__SoClassSecurityInfo.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/SoObjects/SoClassSecurityInfo.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/SoObjects/SoClassSecurityInfo.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -111,7 +111,7 @@
	4	va_end(va);
	5	}
	6
	7	-- (void)declareProtected:(NSString )_perm:(NSString )_firstName, ... {
	8	+- (void)declareProtected:(NSString )_perm :(NSString )_firstName, ... {
	9	va_list va;
	10	NSString *aname;
	11




--- ./sope-appserver/NGObjWeb/SoObjects/SoComponent.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/SoObjects/SoComponent.m	2013-10-09 17:03:32.000000000 +0100
@@ -59,13 +59,13 @@
 }
 
 - (void)setResourceManager:(WOResourceManager *)_rm {
-  ASSIGN(self->soResourceManager, _rm);
+  ASSIGN(self->soResourceManager, (SoProductResourceManager*)_rm);
 }
 - (WOResourceManager *)resourceManager {
   if (self->soResourceManager != nil)
     return self->soResourceManager;
   
-  self->soResourceManager = [[[self componentProduct] resourceManager] retain];
+  self->soResourceManager = (SoProductResourceManager*)[[[self componentProduct] resourceManager] retain];
   if (self->soResourceManager)
     return self->soResourceManager;
   

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__SoObjects__SoDefaultRenderer.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/SoObjects/SoDefaultRenderer.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/SoObjects/SoDefaultRenderer.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -154,7 +154,7 @@
	4
	5	[r setStatus:200];
	6	[r setHeader:@"application/octet-stream" forKey:@"content-type"];
	7	- [r setHeader:[NSString stringWithFormat:@"%i", [_data length]]
	8	+ [r setHeader:[NSString stringWithFormat:@"%i", (int)[_data length]]
	9	forKey:@"content-length"];
	10	[r setContent:_data];
	11	return nil;

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WOComponentScriptPart.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/Templates/WOComponentScriptPart.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/Templates/WOComponentScriptPart.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -112,7 +112,7 @@
	4	[ms appendFormat:@":%i", self->startLine];
	5	}
	6	else if (self->startLine > 0)
	7	- [ms appendFormat:@" line=%@", self->startLine];
	8	+ [ms appendFormat:@" line=%u", self->startLine];
	9
	10	if ([self->script length] == 0)
	11	[ms appendString:@" no script"];

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WODParser.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/Templates/WODParser.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/Templates/WODParser.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -271,7 +271,7 @@
	4	[ui setObject:[NumberClass numberWithInt:_idx] forKey:@"position"];
	5
	6	if (!atEof && (_idx > 0)) {
	7	- register unsigned pos;
	8	+ NSInteger pos;
	9	const unichar startPos, endPos;
	10
	11	for (pos = _idx; (pos >= 0) && (_buffer[pos] != '\n'); pos--)

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WOHTMLParser.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/Templates/WOHTMLParser.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/Templates/WOHTMLParser.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -246,7 +246,7 @@
	4	[ui setObject:self forKey:@"handler"];
	5
	6	if (!atEof && (_idx > 0)) {
	7	- register unsigned pos;
	8	+ NSInteger pos;
	9	const unichar startPos, endPos;
	10
	11	for (pos = _idx; (pos >= 0) && (_buffer[pos] != '\n'); pos--)

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WOTemplate.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/Templates/WOTemplate.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/Templates/WOTemplate.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -133,7 +133,7 @@
	4	[ms appendFormat:@" url=%@", [self->url absoluteString]];
	5	}
	6	if (self->subcomponentInfos)
	7	- [ms appendFormat:@" #subcomponents=%i", [self->subcomponentInfos count]];
	8	+ [ms appendFormat:@" #subcomponents=%i", (int)[self->subcomponentInfos count]];
	9
	10	[ms appendString:@">"];
	11	return ms;

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WOxElemBuilder.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -191,7 +191,7 @@
	4	}
	5	}
	6	else {
	7	- NSLog(@"%s: couldn't allocate builder (class=%@)", cn);
	8	+ NSLog(@"couldn't allocate builder (class=%@)", cn);
	9	continue;
	10	}
	11	}




--- ./sope-appserver/NGObjWeb/WOComponent+Sync.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/WOComponent+Sync.m	2013-10-09 17:03:32.000000000 +0100
@@ -87,7 +87,7 @@
 #if NeXT_RUNTIME
   takeValue = (void *)[self methodForSelector:@selector(takeValue:forKey:)];
 #elif GNUSTEP_BASE_LIBRARY
-  takeValue = (void*)method_get_imp(class_get_instance_method(self->isa,
+  takeValue = (void*)method_get_imp(class_get_instance_method(object_getClass(self),
                 @selector(setValue:forKey:)));
 #else  
   takeValue = (void*)method_get_imp(class_get_instance_method(self->isa,
@@ -148,7 +148,7 @@
 #if NeXT_RUNTIME
   getValue = (void *)[self methodForSelector:@selector(valueForKey:)];
 #else
-  getValue = (void*)method_get_imp(class_get_instance_method(self->isa,
+  getValue = (void*)method_get_imp(class_get_instance_method(object_getClass(self),
                 @selector(valueForKey:)));
 #endif
   




--- ./sope-appserver/NGObjWeb/WOComponent.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/WOComponent.m	2013-10-09 17:03:32.000000000 +0100
@@ -1037,7 +1037,7 @@
 
 - (BOOL)logComponentVariableCreations {
   /* only if we have a subclass, we can store values in ivars ... */
-  return (self->isa != WOComponentClass) ? YES : NO;
+  return (object_getClass(self) != WOComponentClass) ? YES : NO;
 }
 
 #if !NG_USE_KVC_FALLBACK /* only override on libFoundation */
@@ -1124,7 +1124,7 @@
     /* only if we have a subclass, we can store values in ivars ... */
     if (![[self->wocVariables objectForKey:_key] isNotNull]) {
       [self debugWithFormat:@"Created component variable (class=%@): '%@'.", 
-	            NSStringFromClass(self->isa), _key];
+	            NSStringFromClass(object_getClass(self)), _key];
     }
   }
 #endif
@@ -1219,7 +1219,7 @@
   if (self->parentComponent)
     [str appendFormat:@" parent=%@", [self->parentComponent name]];
   if (self->subcomponents)
-    [str appendFormat:@" #subs=%i", [self->subcomponents count]];
+    [str appendFormat:@" #subs=%i", (int)[self->subcomponents count]];
   
   if (self->componentFlags.isAwake)
     [str appendFormat:@" awake=0x%p", self->context];

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOHTTPConnection.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/WOHTTPConnection.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WOHTTPConnection.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -352,7 +352,7 @@
	4	/* set content-length header */
	5
	6	if ([content length] > 0) {
	7	- [_request setHeader:[NSString stringWithFormat:@"%d", [content length]]
	8	+ [_request setHeader:[NSString stringWithFormat:@"%d", (int)[content length]]
	9	forKey:@"content-length"];
	10	}
	11




--- ./sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m	2013-10-09 17:03:32.000000000 +0100
@@ -427,7 +427,7 @@
 }
 
 - (NGActiveSocket *)_accept {
-  NGActiveSocket *connection;
+  id<NGActiveSocket>  connection;
   id<NGSocketAddress> remote;
 
   NS_DURING {
@@ -450,7 +450,7 @@
   }
   NS_ENDHANDLER;
 
-  return connection;
+  return (NGActiveSocket*)connection;
 }
 
 - (void)_handleConnection:(NGActiveSocket *)connection {

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOHttpAdaptor__WORequest+Adaptor.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/WOHttpAdaptor/WORequest+Adaptor.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WOHttpAdaptor/WORequest+Adaptor.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -35,7 +35,7 @@
	4	if (pi == nil) pi = [[NSProcessInfo processInfo] retain];
	5
	6	tmp = [pi procStatDictionary];
	7	- ASSIGN(self->startDate, _startDate);
	8	+ ASSIGN(self->startDate, (NSCalendarDate*)_startDate);
	9	ASSIGN(self->startStatistics, tmp);
	10	}
	11




--- ./sope-appserver/NGObjWeb/WOMailDelivery.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/WOMailDelivery.m	2013-10-09 17:03:32.000000000 +0100
@@ -180,7 +180,8 @@
       NSData *body;
       
       body = [(NSDictionary *)_email objectForKey:@"body"];
-      if (fwrite([body bytes], [body length], 1, toMail) < 0)
+      NSUInteger bytes = [body length];
+      if (fwrite([body bytes], bytes, 1, toMail) < bytes)
         goto failed;
     }
     fprintf(toMail, "\r\n");

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOResponse.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/WOResponse.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WOResponse.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -305,7 +305,7 @@
	4	if ([data length] == 0)
	5	[ms appendString:@" empty-content"];
	6	else
	7	- [ms appendFormat:@" content-size=%i", [data length]];
	8	+ [ms appendFormat:@" content-size=%i", (int)[data length]];
	9	}
	10	else
	11	[ms appendString:@" no-content"];




--- ./sope-appserver/NGObjWeb/WOSessionStore.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/WOSessionStore.m	2013-10-09 17:03:32.000000000 +0100
@@ -49,7 +49,7 @@
   WOSession *session;
   *(&session) = nil;
   
-  SYNCHRONIZED(self) { // this must become a condition lock !!!
+  SYNCHRONIZED((id)self) { // this must become a condition lock !!!
     if (![self->checkedOutSessions containsObject:_sid]) {
       if ((session = [self restoreSessionWithID:_sid]))
         [self->checkedOutSessions addObject:_sid];
@@ -66,7 +66,7 @@
   NSString *sid;
   *(&sid) = [[_context session] sessionID];
   
-  SYNCHRONIZED(self) { // this must become a condition lock !!!
+  SYNCHRONIZED((id)self) { // this must become a condition lock !!!
     [self saveSessionForContext:_context];
     
     if ([self->checkedOutSessions containsObject:sid])

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOSimpleHTTPParser.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/WOSimpleHTTPParser.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WOSimpleHTTPParser.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -449,7 +449,7 @@
	4
	5	while ((e = [self readNextLine]) == nil) {
	6	unsigned char p, v;
	7	- unsigned int idx;
	8	+ int idx;
	9	NSString *headerName;
	10	NSString *headerValue;
	11




--- ./sope-appserver/NGObjWeb/WOStatisticsStore.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/WOStatisticsStore.m	2013-10-09 17:03:32.000000000 +0100
@@ -35,7 +35,7 @@
   unsigned       zippedResponsesCount;
   unsigned       totalZippedSize;
   unsigned       largestResponseSize;
-  unsigned       smallestResponseSize;
+  NSInteger      smallestResponseSize;
   NSTimeInterval minimumDuration;
   NSTimeInterval maximumDuration;
   NSTimeInterval totalDuration;
@@ -420,7 +420,7 @@
   /* response */
   
   [result appendFormat:@"%i %i",
-            [_response status], [[_response content] length]];
+            [_response status], (int)[[_response content] length]];
   
   if ((startDate = [request startDate]) != nil) {
     NSTimeInterval duration;

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WebDAV__SoDAVSQLParser.h (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.h.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.h 2013-10-09 17:03:32.000000000 +0100
	3	@@ -64,7 +64,7 @@
	4	consume:(BOOL)consume;
	5	- (BOOL)parseQualifier:(EOQualifier **)result
	6	from:(unichar *)pos length:(unsigned )len;
	7	-- (BOOL)parseScope:(NSString )_scope:(NSString )_entity
	8	+- (BOOL)parseScope:(NSString )_scope :(NSString )_entity
	9	from:(unichar *)pos length:(unsigned )len;
	10
	11	- (BOOL)parseColumnName:(NSString **)result




--- ./sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m	2013-10-09 17:03:32.000000000 +0100
@@ -396,7 +396,7 @@
   return YES;
 }
 
-- (BOOL)parseScope:(NSString **)_scope:(NSString **)_entity
+- (BOOL)parseScope:(NSString **)_scope :(NSString **)_entity
   from:(unichar **)pos length:(unsigned *)len
 {
   /* 
@@ -749,7 +749,7 @@
     }
     else if ([[(EOAndQualifier *)q qualifiers] count] != 3) {
       NSLog(@"  INVALID: expected 3 subqualifiers, got %i !",
-	    [[(EOAndQualifier *)q qualifiers] count]);
+	    (int)[[(EOAndQualifier *)q qualifiers] count]);
     }
 
     /* check sortordering */
@@ -767,7 +767,7 @@
     }
     else if ([props count] != 14) {
       NSLog(@"  INVALID: invalid attribute count, expected 14, got %i.",
-	    [props count]);
+	    (int)[props count]);
     }
   }
   

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WebDAV__SoWebDAVRenderer.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -1311,7 +1311,7 @@
	4	[r appendContentString:@"204 No Content"];
	5	else {
	6	NSString *s;
	7	- s = [NSString stringWithFormat:@"%i code%i"];
	8	+ s = [NSString stringWithFormat:@"%i code", _code];
	9	[r appendContentString:s];
	10	}
	11	[r appendContentString:@"</D:status>"];

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WebDAV__SoWebDAVValue.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/WebDAV/SoWebDAVValue.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WebDAV/SoWebDAVValue.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -78,7 +78,7 @@
	4
	5	if ((p = [encNS objectForKey:ns]) == nil) {
	6	if ((p = [_prefixes objectForKey:ns]) == nil) {
	7	- p = [NSString stringWithFormat:@"a%i", [encNS count]];
	8	+ p = [NSString stringWithFormat:@"a%i", (int)[encNS count]];
	9	[encNS setObject:p forKey:ns];
	10	[ms appendString:@" xmlns:"];
	11	[ms appendString:p];

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb___WOStringTable.m (+11 lines)
	1	--- ./sope-appserver/NGObjWeb/_WOStringTable.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/_WOStringTable.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -162,7 +162,7 @@
	4	[ms appendFormat:@"<0x%p[%@]: ", self, NSStringFromClass([self class])];
	5
	6	if (self->path) [ms appendFormat:@" path='%@'", self->path];
	7	- if (self->data) [ms appendFormat:@" strings=#%d", [self->data count]];
	8	+ if (self->data) [ms appendFormat:@" strings=#%d", (int)[self->data count]];
	9	if (self->lastRead) [ms appendFormat:@" loaddate=%@", self->lastRead];
	10
	11	[ms appendString:@">"];

Line 0 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__JSStringTable.m (+11 lines)
	1	--- ./sope-appserver/WEExtensions/JSStringTable.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/WEExtensions/JSStringTable.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -177,7 +177,7 @@
	4	}
	5	else {
	6	/* generate link to table file */
	7	- NSMutableDictionary *qd;
	8	+ NSDictionary *qd;
	9	NSString *url;
	10	id product = nil;
	11

Line 0 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WEMonthOverview.m (+11 lines)
	1	--- ./sope-appserver/WEExtensions/WEMonthOverview.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/WEExtensions/WEMonthOverview.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -510,7 +510,7 @@
	4	/* fill up remaining slots with empty arrays */
	5	for (i = 0; i < MatrixSize; i++) {
	6	if (self->matrix[i] == nil)
	7	- self->matrix[i] = [[NSArray alloc] init];
	8	+ self->matrix[i] = (id)[[NSArray alloc] init];
	9	}
	10	}
	11

Line 0 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WEResourceKey.m (+11 lines)
	1	--- ./sope-appserver/WEExtensions/WEResourceKey.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/WEExtensions/WEResourceKey.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -65,7 +65,7 @@
	4
	5	/* equality */
	6
	7	-- (unsigned)hash {
	8	+- (NSUInteger)hash {
	9	if (self->hashValue == 0) {
	10	/* don't know whether this is smart, Nat! needs to comment ;-) */
	11	self->hashValue = [self->name hash];

Line 0 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WEResourceManager.m (+11 lines)
	1	--- ./sope-appserver/WEExtensions/WEResourceManager.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/WEExtensions/WEResourceManager.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -620,7 +620,7 @@
	4	}
	5	[ms appendString:_name];
	6	[ms appendFormat: @"?lm=%u",
	7	- (NSUInteger) [lastModified timeIntervalSince1970]];
	8	+ (unsigned) [lastModified timeIntervalSince1970]];
	9
	10	url = ms;
	11	if (debugOn) [self debugWithFormat:@"FOUND: '%@'", url];




--- ./sope-appserver/WEExtensions/WETableCalcMatrix.h.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/WEExtensions/WETableCalcMatrix.h	2013-10-09 17:03:32.000000000 +0100
@@ -66,7 +66,7 @@
   BOOL           rowCheck;
 }
 
-- (id)initWithSize:(unsigned)_width:(unsigned)_height;
+- (id)initWithSize:(unsigned)_width :(unsigned)_height;
 
 /* static accessors */
 
@@ -111,7 +111,7 @@
 
 - (BOOL)tableCalcMatrix:(WETableCalcMatrix *)_matrix
   shouldPlaceObject:(id)_object
-  atPosition:(unsigned)_x:(unsigned)_y;
+  atPosition:(unsigned)_x :(unsigned)_y;
 
 /* define if you want to create own span objects */
 




--- ./sope-appserver/WEExtensions/WETableCalcMatrix.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/WEExtensions/WETableCalcMatrix.m	2013-10-09 17:03:32.000000000 +0100
@@ -89,8 +89,8 @@
                      @"<0x%p[%@]: object=0x%p start=%d len=%d>",
                      self, NSStringFromClass([self class]),
                      [self object],
-                     self->range.location,
-                     self->range.length];
+                     (int)self->range.location,
+                     (int)self->range.length];
 }
 
 @end /* WETableCalcMatrixSpan */
@@ -356,7 +356,7 @@
   MatrixCoord *positions;
 }
 
-- (void)addPosition:(unsigned)_x:(unsigned)_y;
+- (void)addPosition:(unsigned)_x :(unsigned)_y;
 - (void)checkForDuplicates;
 
 /* narrow set to row or column */
@@ -387,7 +387,7 @@
   }
 }
 
-- (void)addPosition:(unsigned)_x:(unsigned)_y {
+- (void)addPosition:(unsigned)_x :(unsigned)_y {
   if (self->positions == NULL) {
     self->positions = calloc(1, sizeof(MatrixCoord));
     self->positions[0].x = _x;
@@ -468,7 +468,7 @@
          (y * sizeof(MatrixEntry));
 }
 
-- (id)initWithSize:(unsigned)_width:(unsigned)_height {
+- (id)initWithSize:(unsigned)_width :(unsigned)_height {
   if (_width == 0 || _height == 0) {
     [self logWithFormat:@"ERROR: specified invalid matrix dimensions: %ix%i",
             _width, _height];
@@ -572,7 +572,7 @@
   return YES;
 }
 
-- (BOOL)object:(id)_obj matchesCellAt:(unsigned)_x:(unsigned)_y {
+- (BOOL)object:(id)_obj matchesCellAt:(unsigned)_x :(unsigned)_y {
   return [self->delegate tableCalcMatrix:self
                          shouldPlaceObject:_obj
                          atPosition:_x:_y];
@@ -580,7 +580,7 @@
 
 /* adding object to structure */
 
-- (void)addObject:(id)_obj toCellAt:(unsigned)_x:(unsigned)_y {
+- (void)addObject:(id)_obj toCellAt:(unsigned)_x :(unsigned)_y {
   WETableCalcMatrixPositionArray *positions;
   MatrixEntry *e;
   

Line 0 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WETableMatrix.m (+11 lines)
	1	--- ./sope-appserver/WEExtensions/WETableMatrix.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/WEExtensions/WETableMatrix.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -139,7 +139,7 @@
	4
	5	- (BOOL)tableCalcMatrix:(WETableCalcMatrix *)_matrix
	6	shouldPlaceObject:(id)_object
	7	- atPosition:(unsigned)_x:(unsigned)_y
	8	+ atPosition:(unsigned)_x :(unsigned)_y
	9	{
	10	id _row, _col;
	11	BOOL doPlace;




--- ./sope-appserver/WEExtensions/WETableView/WETableView.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-appserver/WEExtensions/WETableView/WETableView.m	2013-10-09 17:03:32.000000000 +0100
@@ -1525,9 +1525,9 @@
         result = [self decreaseBatchSizeInContext:_ctx];
       else {
         if (self->identifier == nil) {
-          unsigned idx;
+          NSInteger idx;
       
-          idx   = [idxId unsignedIntValue];
+          idx   = [idxId integerValue];
           if (idx < [self->allObjects count] && idx >= 0) {
             _applyItems_(self, cmp, idx);
           }

Line 0 Link Here

(-)sope/files/patch-sope-appserver__WOExtensions__WOTabPanel.m (+11 lines)
	1	--- ./sope-appserver/WOExtensions/WOTabPanel.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/WOExtensions/WOTabPanel.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -259,7 +259,7 @@
	4	inComponent:sComponent];
	5
	6	[_response appendContentString:@"</tr><tr><td colspan=\""];
	7	- s = [[NSString alloc] initWithFormat:@"%d",[ttabs count]];
	8	+ s = [[NSString alloc] initWithFormat:@"%d",(int)[ttabs count]];
	9	[_response appendContentString:s];
	10	[s release];
	11	[_response appendContentString:@"\" bgcolor=\""];




--- ./sope-core/EOControl/EOSortOrdering.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/EOControl/EOSortOrdering.m	2013-10-09 17:03:32.000000000 +0100
@@ -29,7 +29,9 @@
 #  include <objc/objc.h>
 #endif
 
 #ifndef SEL_EQ
-#  if GNU_RUNTIME
+#  if defined(__GNUSTEP_RUNTIME__)
+#    define SEL_EQ(sel1,sel2) sel_isEqual(sel1, sel2)
+#  elif GNU_RUNTIME
 #    define SEL_EQ(sel1,sel2) sel_eq(sel1,sel2)
 #  else
 #    define SEL_EQ(sel1,sel2) (sel1 == sel2)
 @implementation EOSortOrdering
 /*"
   This class specifies a sort-ordering as used with
@@ -83,7 +75,7 @@
 /* equality */
 
 - (BOOL)isEqualToSortOrdering:(EOSortOrdering *)_sortOrdering {
-  if (!SEL_EQ([_sortOrdering selector], [self selector]))
+  if (!sel_eq([_sortOrdering selector], [self selector]))
     return NO;
   if (![[_sortOrdering key] isEqualToString:[self key]])
     return NO;




--- ./sope-core/EOControl/EOValidation.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/EOControl/EOValidation.m	2013-10-09 17:03:32.000000000 +0100
@@ -153,7 +153,7 @@
 #if NeXT_RUNTIME
     sel = sel_getUid(buf);
 #else
-    sel = sel_get_any_uid(buf);
+    sel = sel_registerName(buf);
 #endif
     if (sel) {
       if ([self respondsToSelector:sel]) {
 
 @interface NSException(UsedSetUI) /* does Jaguar allow -setUserInfo: ? */

Line 0 Link Here

(-)sope/files/patch-sope-core_NGExtensions_EOExt.subproj_EOQualifier+CtxEval (+11 lines)
	1	--- sope-core/NGExtensions/EOExt.subproj/EOQualifier+CtxEval.m.orig 2015-09-16 18:26:49 UTC
	2	+++ sope-core/NGExtensions/EOExt.subproj/EOQualifier+CtxEval.m
	3	@@ -29,7 +29,7 @@
	4	# import <objc/objc.h>
	5	# import <extensions/objc-runtime.h>
	6	#elif GNUSTEP_BASE_LIBRARY
	7	-#if __GNU_LIBOBJC__ >= 20100911
	8	+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) \|\| defined(__GNUSTEP_RUNTIME__)
	9	# define sel_get_name sel_getName
	10	# import <objc/runtime.h>
	11	#else

Lines 1-11 Link Here

(-)sope/files/patch-sope-core_NGExtensions_EOExt.subproj_EOQualifier+CtxEval.m (-11 lines)
1	--- sope-core/NGExtensions/EOExt.subproj/EOQualifier+CtxEval.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/EOExt.subproj/EOQualifier+CtxEval.m
3	@@ -29,7 +29,7 @@
4	# import <objc/objc.h>
5	# import <extensions/objc-runtime.h>
6	#elif GNUSTEP_BASE_LIBRARY
7	-#if __GNU_LIBOBJC__ >= 20100911
8	+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) \|\| defined(__GNUSTEP_RUNTIME__)
9	# define sel_get_name sel_getName
10	# import <objc/runtime.h>
11	#else

Line 0 Link Here

(-)sope/files/patch-sope-core_NGExtensions_FdExt.subproj_NSString+Encoding (+11 lines)
	1	--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m.orig 2015-10-07 08:04:38.136511581 +0800
	2	+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m 2015-10-07 08:08:49.915493258 +0800
	3	@@ -209,7 +209,7 @@
	4	tm = outbuf;
	5	outbytesleft = outlen;
	6
	7	- write = iconv(type, &inbuf, &inbytesleft, &tm, &outbytesleft);
	8	+ write = iconv(type, (void*)&inbuf, &inbytesleft, &tm, &outbytesleft);
	9
	10	if (write == (size_t)-1) {
	11	if (errno == EILSEQ) {




--- sope-core/NGExtensions/NGCalendarDateRange.m.orig	2015-10-07 08:15:42.214465876 +0800
+++ sope-core/NGExtensions/NGCalendarDateRange.m	2015-10-07 08:19:18.227449713 +0800
@@ -164,7 +164,7 @@
   if (other == self)
     return YES;
   
-  if ([other isKindOfClass:self->isa] == NO)
+  if ([other isKindOfClass: object_getClass(self)] == NO)
     return NO;
   
   return ([self->startDate isEqual:[other startDate]] && 
@@ -194,7 +194,7 @@
   description = [NSMutableString stringWithCapacity:64];
 
   [description appendFormat:@"<%@[0x%p]: startDate:%@ endDate: ", 
-	         NSStringFromClass(self->isa), self, self->startDate];
+	         NSStringFromClass(object_getClass(self)), self, self->startDate];
   
   if ([self->startDate isEqual:self->endDate])
     [description appendString:@"== startDate"];




 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
@@ -410,7 +410,7 @@
   if ([self isConnected]) {
     [[[NGSocketAlreadyConnectedException alloc]
               initWithReason:@"Could not connected: socket is already connected"
-              socket:self address:self->remoteAddress] raise];
+              socket:self] raise];
     return NO;
   }

@@ -748,10 +748,7 @@
     if ((readResult < 0) && (errno == EINVAL)) {
       NSLog(@"%s: invalid argument in NGDescriptorRecv(%i, 0x%p, %i, %i)",
             __PRETTY_FUNCTION__,
-            self->fd, _buf, _len, 0,
-            (self->receiveTimeout == 0.0)
-            ? -1 // block until data
-            : (int)(self->receiveTimeout * 1000.0));
+            self->fd, _buf, _len, 0);
     }
 #endif

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EOFetchSpecification.m (+11 lines)
	1	--- ./sope-core/EOControl/EOFetchSpecification.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EOFetchSpecification.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -291,7 +291,7 @@
	4	[ma release];
	5	}
	6	else
	7	- lHints = [self->hints retain];
	8	+ lHints = (id)[self->hints retain];
	9	}
	10	else
	11	lHints = nil;

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EOGlobalID.m (+11 lines)
	1	--- ./sope-core/EOControl/EOGlobalID.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EOGlobalID.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -95,7 +95,7 @@
	4	}
	5
	6	- (id)init {
	7	- [self->isa assignGloballyUniqueBytes:&(self->idbuffer[0])];
	8	+ [object_getClass(self) assignGloballyUniqueBytes:&(self->idbuffer[0])];
	9	return self;
	10	}
	11

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EOKeyComparisonQualifier.m (+11 lines)
	1	--- ./sope-core/EOControl/EOKeyComparisonQualifier.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EOKeyComparisonQualifier.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -200,7 +200,7 @@
	4	return NO;
	5	if (![self->rightKey isEqual:[(EOKeyComparisonQualifier *)_qual rightKey]])
	6	return NO;
	7	- if (sel_eq(self->operator, [(EOKeyComparisonQualifier *)_qual selector]))
	8	+ if (sel_isEqual(self->operator, [(EOKeyComparisonQualifier *)_qual selector]))
	9	return YES;
	10	return NO;
	11	}

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EOKeyGlobalID.m (+11 lines)
	1	--- ./sope-core/EOControl/EOKeyGlobalID.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EOKeyGlobalID.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -96,7 +96,7 @@
	4	if (_other == nil) return NO;
	5	if (_other == self) return YES;
	6	otherKey = _other;
	7	- if (otherKey->isa != self->isa) return NO;
	8	+ if (object_getClass(otherKey) != object_getClass(self)) return NO;
	9	if (otherKey->count != self->count) return NO;
	10	if (![otherKey->entityName isEqualToString:self->entityName]) return NO;
	11

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EOKeyValueQualifier.m (+11 lines)
	1	--- ./sope-core/EOControl/EOKeyValueQualifier.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EOKeyValueQualifier.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -227,7 +227,7 @@
	4	return NO;
	5	if (![self->value isEqual:[(EOKeyValueQualifier *)_qual value]])
	6	return NO;
	7	- if (sel_eq(self->operator, [(EOKeyValueQualifier *)_qual selector]))
	8	+ if (sel_isEqual(self->operator, [(EOKeyValueQualifier *)_qual selector]))
	9	return YES;
	10	return NO;
	11	}




--- ./sope-core/EOControl/EONull.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/EOControl/EONull.m	2013-10-09 17:03:32.000000000 +0100
@@ -32,15 +32,15 @@
 @implementation EONull
 
 + (id)allocWithZone:(NSZone *)_zone {
-  return [NSNull allocWithZone:_zone];
+  return (EONull*)[NSNull allocWithZone:_zone];
 }
 
 + (NSNull *)null {
-  return [NSNull null];
+  return (EONull*)[NSNull null];
 }
 
 - (id)self {
-  return [NSNull null];
+  return (EONull*)[NSNull null];
 }
 
 @end




--- ./sope-core/EOControl/EOObserver.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/EOControl/EOObserver.m	2013-10-09 17:03:32.000000000 +0100
@@ -21,6 +21,10 @@
 
 #include "EOObserver.h"
 #include "common.h"
+#ifdef __GNUSTEP_RUNTIME__
+#define objc_malloc(x) malloc(x)
+#define objc_free(x) free(x)
+#endif
 
 // THREAD, MT
 




--- ./sope-core/EOControl/EOOrQualifier.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/EOControl/EOOrQualifier.m	2013-10-09 17:03:32.000000000 +0100
@@ -22,6 +22,12 @@
 #include <EOControl/EOQualifier.h>
 #include "common.h"
 
+#ifdef __GNUSTEP_RUNTIME__
+#define objc_calloc(x,y) calloc(x,y)
+#define objc_free(x) free(x)
+#endif
+
+
 @interface EOQualifier(EvalContext)
 - (BOOL)evaluateWithObject:(id)_object inEvalContext:(id)_ctx;
 @end

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EOSQLParser.h (+11 lines)
	1	--- ./sope-core/EOControl/EOSQLParser.h.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EOSQLParser.h 2013-10-09 17:03:32.000000000 +0100
	3	@@ -64,7 +64,7 @@
	4	consume:(BOOL)consume;
	5	- (BOOL)parseQualifier:(EOQualifier **)result
	6	from:(unichar *)pos length:(unsigned )len;
	7	-- (BOOL)parseScope:(NSString )_scope:(NSString )_entity
	8	+- (BOOL)parseScope:(NSString )_scope :(NSString )_entity
	9	from:(unichar *)pos length:(unsigned )len;
	10
	11	- (BOOL)parseColumnName:(NSString **)result

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EOSQLParser.m (+11 lines)
	1	--- ./sope-core/EOControl/EOSQLParser.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EOSQLParser.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -404,7 +404,7 @@
	4	return YES;
	5	}
	6
	7	-- (BOOL)parseScope:(NSString )_scope:(NSString )_entity
	8	+- (BOOL)parseScope:(NSString )_scope :(NSString )_entity
	9	from:(unichar *)pos length:(unsigned )len
	10	{
	11	/*

Line 0 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NGPropertyListParser (+11 lines)
	1	--- ./sope-core/NGExtensions/FdExt.subproj/NGPropertyListParser.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGExtensions/FdExt.subproj/NGPropertyListParser.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -453,7 +453,7 @@
	4	}
	5	*/
	6	if (!atEof && (_idx > 0)) {
	7	- register unsigned pos;
	8	+ NSInteger pos;
	9	const unsigned char startPos, endPos;
	10
	11	for (pos = _idx; (pos >= 0) && (_buffer[pos] != '\n'); pos--)

Line 0 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NSException+misc (+11 lines)
	1	--- ./sope-core/NGExtensions/FdExt.subproj/NSException+misc.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGExtensions/FdExt.subproj/NSException+misc.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -85,7 +86,7 @@
	4
	5	- (id)copyWithZone:(NSZone *)_zone {
	6	// TODO: should make a real copy?
	7	- return [self retain];
	8	+ return (id)[self retain];
	9	}
	10
	11	@end /* NSException(NGMiscellaneous) */




--- ./sope-core/NGExtensions/FdExt.subproj/NSObject+Logs.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/NGExtensions/FdExt.subproj/NSObject+Logs.m	2013-10-09 17:03:32.000000000 +0100
@@ -52,10 +52,10 @@
                                          200);
     lm = [NGLoggerManager defaultLoggerManager];
   }
-  logger = NSMapGet(loggerForClassMap, self->isa);
+  logger = NSMapGet(loggerForClassMap, object_getClass(self));
   if (!logger) {
-    logger = [lm loggerForClass:self->isa];
-    NSMapInsert(loggerForClassMap, self->isa, logger);
+    logger = [lm loggerForClass: object_getClass(self)];
+    NSMapInsert(loggerForClassMap, object_getClass(self), logger);
   }
 
   return logger;

Line 0 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NSObject+Values (+11 lines)
	1	--- ./sope-core/NGExtensions/FdExt.subproj/NSObject+Values.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGExtensions/FdExt.subproj/NSObject+Values.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -82,7 +82,7 @@
	4
	5	+ (NSString *) stringWithUnsignedLongLong: (unsigned long long)value
	6	{
	7	- return [NSString stringWithFormat: @"0x%.16"PRIx64, value];
	8	+ return [NSString stringWithFormat: @"0x%.16llx", value];
	9	}
	10
	11	- (BOOL)boolValue {

Line 0 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NSSet+enumerator (+10 lines)
	1	--- ./sope-core/NGExtensions/FdExt.subproj/NSSet+enumerator.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGExtensions/FdExt.subproj/NSSet+enumerator.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -21,6 +21,7 @@
	4	*/
	5
	6	#include "NSSet+enumerator.h"
	7	+#include "NSArray+enumerator.h"
	8	#include "common.h"
	9
	10	@implementation NSSet(enumerator)

Line 0 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NSString+misc (+10 lines)
	1	--- ./sope-core/NGExtensions/FdExt.subproj/NSString+misc.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGExtensions/FdExt.subproj/NSString+misc.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -21,6 +21,7 @@
	4	*/
	5
	6	#include "NSString+misc.h"
	7	+#include "NSException+misc.h"
	8	#include "common.h"
	9
	10	@interface NSStringVariableBindingException : NSException

Line 0 Link Here

(-)sope/files/patch-sope-core__NGExtensions__NGDirectoryEnumerator.m (+11 lines)
	1	--- ./sope-core/NGExtensions/NGDirectoryEnumerator.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGExtensions/NGDirectoryEnumerator.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -54,7 +54,7 @@
	4	{
	5	self->fileManager = _fm
	6	? [_fm retain]
	7	- : [[NSFileManager defaultManager] retain];
	8	+ : (id)[[NSFileManager defaultManager] retain];
	9
	10	self->pathStack = [[NSMutableArray alloc] init];
	11	self->enumStack = [[NSMutableArray alloc] init];




--- ./sope-core/NGStreams/NGBufferedStream.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/NGStreams/NGBufferedStream.m	2013-10-09 17:03:32.000000000 +0100
@@ -66,7 +66,7 @@
   }
   if (*(Class *)_source == DataStreamClass) {
     [self release];
-    return [_source retain];
+    return (id)[_source retain];
   }
 
   if ((self = [super initWithSource:_source])) {
@@ -90,7 +90,7 @@
   }
   if (*(Class *)_source == DataStreamClass) {
     [self release];
-    return [_source retain];
+    return (id)[_source retain];
   }
 
   if ((self = [super initWithInputSource:_source])) {
@@ -109,7 +109,7 @@
   }
   if (*(Class *)_src == DataStreamClass) {
     [self release];
-    return [_src retain];
+    return (id)[_src retain];
   }
 
   if ((self = [super initWithOutputSource:_src])) {




--- ./sope-core/NGStreams/NGByteBuffer.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/NGStreams/NGByteBuffer.m	2013-10-09 17:03:32.000000000 +0100
@@ -44,7 +44,7 @@
   DataStreamClass   = NSClassFromString(@"NGDataStream");
 }
 
-+ (int)version {

--- ./sope-core/NGStreams/NGByteCountStream.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/NGStreams/NGByteCountStream.m	2013-10-09 17:03:32.000000000 +0100
@@ -87,7 +87,7 @@
   {
     register unsigned char *byteBuffer = _buf;
 
-    for (_len = result - 1; _len >= 0; _len--, byteBuffer++) {
+    for (NSInteger len = result - 1; len >= 0; len--, byteBuffer++) {
       if (*byteBuffer == byteToCount)
         byteReadCount++;
     }
@@ -106,7 +106,7 @@
   {
     register unsigned char *byteBuffer = (unsigned char *)_buf;
 
-    for (_len = result - 1; _len >= 0; _len--, byteBuffer++) {
+    for (NSInteger len = result - 1; len >= 0; len--, byteBuffer++) {
       if (*byteBuffer == byteToCount)
         byteWriteCount++;
     }

Line 0 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGCTextStream.m (+11 lines)
	1	--- ./sope-core/NGStreams/NGCTextStream.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGStreams/NGCTextStream.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -265,7 +265,7 @@
	4	format:
	5	@"called writeCharacter: with character code (0x%X)"
	6	@" exceeding the maximum system character code (0x%X)",
	7	- _character, ((sizeof(unsigned char) * 256) - 1)];
	8	+ _character, (int)((sizeof(unsigned char) * 256) - 1)];
	9	}
	10
	11	c = _character;

Line 0 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGConcreteStreamFileHandle.m (+11 lines)
	1	--- ./sope-core/NGStreams/NGConcreteStreamFileHandle.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGStreams/NGConcreteStreamFileHandle.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -118,7 +118,7 @@
	4
	5	*(&data) = [NSMutableData dataWithCapacity:2048];
	6	*(&bs) = [self->stream isKindOfClass:[NGBufferedStream class]]
	7	- ? [self->stream retain]
	8	+ ? (id)[self->stream retain]
	9	: [(NGBufferedStream *)[NGBufferedStream alloc]
	10	initWithSource:self->stream];
	11




--- ./sope-core/NGStreams/NGLocalSocketAddress.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-core/NGStreams/NGLocalSocketAddress.m	2013-10-09 17:03:32.000000000 +0100
@@ -77,8 +77,8 @@
         sizeof(((struct sockaddr_un *)self->address)->sun_path)) {
       
       NSLog(@"LocalDomain name too long: maxlen=%i, len=%i, path=%@",
-            sizeof(((struct sockaddr_un *)self->address)->sun_path),
-            [_path cStringLength],
+            (int)sizeof(((struct sockaddr_un *)self->address)->sun_path),
+            (int)[_path cStringLength],
             _path);
       [NSException raise:NSInvalidArgumentException
                    format:@"path to long as local domain socket address !"];
@@ -100,8 +100,8 @@
   int      addressCounter = 0;
   NSString *newPath;
   
-  newPath = [NSString stringWithFormat:@"_ngsocket_%p_%p_%03d",
-                        getpid(), [NSThread currentThread], addressCounter];
+  newPath = [NSString stringWithFormat:@"_ngsocket_%d_%p_%03d",
+                        (int)getpid(), [NSThread currentThread], addressCounter];
   newPath = [socketDirectoryPath stringByAppendingPathComponent:newPath];
 
   return [self initWithPath:newPath];

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOAdaptor.m (+10 lines)
	1	--- ./sope-gdl1/GDLAccess/EOAdaptor.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOAdaptor.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -31,6 +31,7 @@
	4	#include "EOFExceptions.h"
	5	#include "EOModel.h"
	6	#include "EOSQLExpression.h"
	7	+#include "NGExtensions/NSException+misc.h"
	8	#include "common.h"
	9
	10	@implementation EOAdaptor




--- ./sope-gdl1/GDLAccess/EOAttribute.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EOAttribute.m	2013-10-09 17:03:32.000000000 +0100
@@ -84,7 +84,7 @@
 }
 
 // Is equal only if same name; used to make aliasing ordering stable
-- (unsigned)hash {
+- (NSUInteger)hash {
   return [self->name hash];
 }
 
@@ -535,7 +535,7 @@
     return @"";
 
   clen = [self cStringLength];
-#if GNU_RUNTIME
+#if GNU_RUNTIME && !defined(__GNUSTEP_RUNTIME__)
   s = objc_atomic_malloc(clen + 4);
 #else
   s = malloc(clen + 4);




--- ./sope-gdl1/GDLAccess/EODatabase.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EODatabase.m	2013-10-09 17:03:32.000000000 +0100
@@ -185,7 +185,7 @@
   if ([self hasOpenChannels]) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabase:%x: All channels must be closed when changing "
+              @"EODatabase:%@: All channels must be closed when changing "
               @"uniquing mode in the EODatabase, "
               @"in [EODatabase setUniquesObjects:]",
 		 self];
@@ -203,7 +203,7 @@
   if ([self hasOpenChannels]) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabase:%x: All channels must be closed when changing "
+              @"EODatabase:%@: All channels must be closed when changing "
               @"snapshoting mode in the EODatabase, "
               @"in [EODatabase setKeepsSnapshots:]",
 		 self];
@@ -328,14 +328,14 @@
   if (_object == nil) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-		   @"EODatabase:%x: Cannot record null object, "
+		   @"EODatabase:%@: Cannot record null object, "
   		   @"in [EODatabase recordObject:primaryKey:entity:snapshot:]",
 		   self];
   }
   if ((_entity == nil) && self->flags.isUniquingObjects) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabase:%x: Cannot record object with null entity "
+              @"EODatabase:%@: Cannot record object with null entity "
               @"when the database is uniquing objects, "
               @"in [EODatabase recordObject:primaryKey:entity:snapshot:]",
 		 self];
@@ -344,7 +344,7 @@
   if ((_key == nil) && self->flags.isUniquingObjects) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabase:%x: Cannot record object with null key "
+              @"EODatabase:%@: Cannot record object with null key "
               @"when the database is uniquing objects, "
               @"in [EODatabase recordObject:primaryKey:entity:snapshot:]",
 		 self];
@@ -352,7 +352,7 @@
   if ((_snapshot == nil) && self->flags.isKeepingSnapshots) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabase:%x: Cannot record object with null snapshot "
+              @"EODatabase:%@: Cannot record object with null snapshot "
               @"when the database is keeping snapshots, "
               @"in [EODatabase recordObject:primaryKey:entity:snapshot:]",
 		 self];
@@ -408,7 +408,7 @@
 
 - (void)reportError:(NSString*)error {
   if (self->flags.isLoggingWarnings)
-    NSLog(@"EODatabase:%x:%@", self, error);
+    NSLog(@"EODatabase:%@:%@", self, error);
 }
 
 @end /* EODatabase */




--- ./sope-gdl1/GDLAccess/EODatabaseChannel.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EODatabaseChannel.m	2013-10-09 17:03:32.000000000 +0100
@@ -81,7 +81,7 @@
 - (Class)privateClassForEntity:(EOEntity *)anEntity;
 - (void)privateUpdateCurrentEntityInfo;
 - (void)privateClearCurrentEntityInfo;
-- (void)privateReportError:(SEL)method:(NSString *)format, ...;
+- (void)privateReportError:(SEL)method :(NSString *)format, ...;
 @end
 
 /*
@@ -593,7 +593,7 @@
   }
   // Record object in database context
   if (![new_pkey isEqual:old_pkey]) {
-    NSLog(@"WARNING: (%@) primary key changed from %@ to %@",
+    NSLog(@"WARNING: (%s) primary key changed from %@ to %@",
           __PRETTY_FUNCTION__, old_pkey, new_pkey);
     [databaseContext forgetObject:anObj];
   }




--- ./sope-gdl1/GDLAccess/EODatabaseContext.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EODatabaseContext.m	2013-10-09 17:03:32.000000000 +0100
@@ -118,7 +118,7 @@
   if (self->transactionNestingLevel == 0) {
     [NSException raise:NSInternalInconsistencyException
 		 format:
-              @"EODatabaseContext:%x: No transaction in progress "
+              @"EODatabaseContext:%@: No transaction in progress "
               @"in %s", self, _function];
   }
 }
@@ -264,7 +264,7 @@
       (unsigned)transactionNestingLevel) {
     [NSException raise:NSInternalInconsistencyException
 		 format:
-              @"EODatabaseContext:%x:transaction nesting levels do not match: "
+              @"EODatabaseContext:%@:transaction nesting levels do not match: "
               @"database has %d, adaptor has %d, "
               @"in [EODatabaseContext beginTransaction]",
               self, transactionNestingLevel, 
@@ -295,7 +295,7 @@
       (unsigned)self->transactionNestingLevel) {
     [NSException raise:NSInternalInconsistencyException
 		 format:
-              @"EODatabaseContext:%x:transaction nesting levels do not match: "
+              @"EODatabaseContext:%@:transaction nesting levels do not match: "
               @"database has %d, adaptor has %d, "
               @"in [EODatabaseContext commitTransaction]",
               self, transactionNestingLevel, 
@@ -325,7 +325,7 @@
       (unsigned)self->transactionNestingLevel) {
     [NSException raise:NSInternalInconsistencyException
 		 format:
-              @"EODatabaseContext:%x:transaction nesting levels do not match: "
+              @"EODatabaseContext:%@:transaction nesting levels do not match: "
               @"database has %d, adaptor has %d, "
               @"in [EODatabaseContext rollbackTransaction]",
               self, transactionNestingLevel, 
@@ -385,7 +385,7 @@
   if ([self transactionNestingLevel]) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-        @"EODatabaseContext:%x: Cannot change update strategy "
+        @"EODatabaseContext:%@: Cannot change update strategy "
         @"when context has a transaction open, "
         @"in [EODatabaseContext setUpdateStrategy]",
         self];
@@ -483,14 +483,14 @@
   if (_object == nil) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabaseContext:%x: Cannot forget null object, "
+              @"EODatabaseContext:%@: Cannot forget null object, "
               @"in [EODatabaseContext forgetObject]",
               self];
   }
   if ([EOFault isFault:_object]) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabaseContext:%x: Cannot forget forget a fault object, "
+              @"EODatabaseContext:%@: Cannot forget forget a fault object, "
               @"in [EODatabaseContext forgetObject]",
               self];
   }
@@ -532,14 +532,14 @@
   if (_object == nil) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabaseContext:%x: Cannot record null object, "
+              @"EODatabaseContext:%@: Cannot record null object, "
               @"in [EODatabaseContext recordObject:primaryKey:entity:snapshot:]",
               self];
   }
   if ((_entity == nil) && self->isUniquingObjects) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabaseContext:%x: Cannot record object with null entity "
+              @"EODatabaseContext:%@: Cannot record object with null entity "
               @"when uniquing objects, "
               @"in [EODatabaseContext recordObject:primaryKey:entity:snapshot:]",
               self];
@@ -550,7 +550,7 @@
   if ((_key == nil) && self->isUniquingObjects) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabaseContext:%x: Cannot record object with null key "
+              @"EODatabaseContext:%@: Cannot record object with null key "
               @"when uniquing objects, "
               @"in [EODatabaseContext recordObject:primaryKey:entity:snapshot:]",
               self];
@@ -558,7 +558,7 @@
   if ((snapshot == nil) && isKeepingSnapshots && ![EOFault isFault:_object]) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabaseContext:%x: Cannot record object with null snapshot "
+              @"EODatabaseContext:%@: Cannot record object with null snapshot "
               @"when keeping snapshots, "
               @"in [EODatabaseContext recordObject:primaryKey:entity:snapshot:]"
               @": snapshot=%s keepsSnapshots=%s isFault=%s",
@@ -665,14 +665,14 @@
   if (_object == nil) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabaseContext:%x: Cannot record null object as locked, "
+              @"EODatabaseContext:%@: Cannot record null object as locked, "
               @"in [EODatabaseContext recordLockedObject:]",
               self];
   }
   if ([EOFault isFault:_object]) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-              @"EODatabaseContext:%x: Cannot record a fault object as locked, "
+              @"EODatabaseContext:%@: Cannot record a fault object as locked, "
               @"in [EODatabaseContext recordLockedObject:]",
               self];
   }
@@ -695,14 +695,14 @@
   if (_object == nil) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-               @"EODatabaseContext:%x: Cannot record null object as updatetd, "
+               @"EODatabaseContext:%@: Cannot record null object as updatetd, "
                @"in [EODatabaseContext recordUpdatedObject:]",
                self];
   }
   if ([EOFault isFault:_object]) {
     [NSException raise:NSInvalidArgumentException
 		 format:
-               @"EODatabaseContext:%x: Cannot record fault object as updated, "
+               @"EODatabaseContext:%@: Cannot record fault object as updated, "
                @"in [EODatabaseContext recordUpdatedObject:]",
                self];
   }
@@ -728,7 +728,7 @@
   return [NSString stringWithFormat:
 		     @"<%@[0x%p]: #channels=%i tx-nesting=%i>",
                      NSStringFromClass([self class]), self,
-                     [self->channels count],
+                     (int)[self->channels count],
                      [self transactionNestingLevel]];
 }
 




--- ./sope-gdl1/GDLAccess/EODatabaseFault.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EODatabaseFault.m	2013-10-09 17:03:32.000000000 +0100
@@ -35,6 +35,7 @@
 #import "EODatabaseFaultResolver.h"
 #import "EOArrayProxy.h"
 #import "common.h"
+#import "NGExtensions/NSException+misc.h"
 
 #if NeXT_RUNTIME || APPLE_RUNTIME
 #  include <objc/objc-class.h>
@@ -78,15 +79,15 @@
 		       @"to fault",
 		       NSStringFromClass([fault class]),
 #if defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__) || (__GNU_LIBOBJC__ >= 20100911)
-		       class_getInstanceSize([self class])];
+		       (int)class_getInstanceSize([self class])];
 #else
 			   ((Class)self)->instance_size];
 #endif
     }
     fault->faultResolver = [[EOObjectFault alloc] initWithPrimaryKey:key
         entity:entity databaseChannel:channel zone:zone 
-        targetClass:fault->isa];
-    fault->isa = self;
+        targetClass:object_getClass(fault)];
+    object_setClass(fault, self);
     
     return (EODatabaseFault *)AUTORELEASE(fault);
 }
@@ -130,7 +131,7 @@
 {
   EODatabaseFault *fault;
     
-  fault = [NSMutableArray allocWithZone:zone];
+  fault = (EODatabaseFault*)[NSMutableArray allocWithZone:zone];
 
 #if defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__) || (__GNU_LIBOBJC__ >= 20100911)
   if (class_getInstanceSize([fault class]) < class_getInstanceSize([self class])) {
@@ -140,19 +141,19 @@
         (void)[fault autorelease];
 	[NSException raise:NSInvalidArgumentException
 		     format:
-                    @"Instances from class %s must be at least %d "
+                    @"Instances from class %@ must be at least %d "
                     @"in size to fault",
                     NSStringFromClass([fault class]),
 #if defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__) || (__GNU_LIBOBJC__ >= 20100911)
-                    class_getInstanceSize([self class])];
+                    (int)class_getInstanceSize([self class])];
 #else
 					((Class)self)->instance_size];
 #endif
   }
   fault->faultResolver = [[EOArrayFault alloc] initWithQualifier:qualifier
         fetchOrder:fetchOrder databaseChannel:channel zone:zone 
-        targetClass:fault->isa];
-  fault->isa = self;
+        targetClass:object_getClass(fault)];
+  object_setClass(fault, self);
 
   return (NSArray *)AUTORELEASE(fault);
 }
@@ -161,7 +162,7 @@
   EODatabaseFault *aFault = (EODatabaseFault *)fault;
 
   // Check that argument is fault
-  if (aFault->isa != self)
+  if (object_getClass(aFault) != self)
     return nil;
     
   return [(EODatabaseFaultResolver *)aFault->faultResolver primaryKey];
@@ -171,7 +172,7 @@
   EODatabaseFault *aFault = (EODatabaseFault *)fault;
 
   // Check that argument is fault
-  if (aFault->isa != self)
+  if (object_getClass(aFault) != self)
     return nil;
 
   return [(EODatabaseFaultResolver *)aFault->faultResolver entity];
@@ -181,7 +182,7 @@
   EODatabaseFault *aFault = (EODatabaseFault *)fault;
 
   // Check that argument is fault
-  if (aFault->isa != self)
+  if (object_getClass(aFault) != self)
     return nil;
     
   return [(EODatabaseFaultResolver *)aFault->faultResolver qualifier];
@@ -191,7 +192,7 @@
   EODatabaseFault *aFault = (EODatabaseFault *)fault;
 
   // Check that argument is fault
-  if (aFault->isa != self)
+  if (object_getClass(aFault) != self)
     return nil;
     
   return [(EODatabaseFaultResolver *)aFault->faultResolver fetchOrder];
@@ -201,7 +202,7 @@
   EODatabaseFault *aFault = (EODatabaseFault *)fault;
 
   // Check that argument is fault
-  if (aFault->isa != self)
+  if (object_getClass(aFault) != self)
     return nil;
     
   return [(EODatabaseFaultResolver *)aFault->faultResolver databaseChannel];




--- ./sope-gdl1/GDLAccess/EODatabaseFaultResolver.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EODatabaseFaultResolver.m	2013-10-09 17:03:32.000000000 +0100
@@ -191,7 +191,7 @@
 
 - (NSString *)descriptionForObject:(id)_fault {
   return [NSString stringWithFormat:
-                   @"<Array fault 0x%x (qualifier=%@, order=%@, channel=%@)>",
+                   @"<Array fault %p (qualifier=%@, order=%@, channel=%@)>",
                    _fault, qualifier, fetchOrder, channel];
 }
 
@@ -302,7 +302,7 @@
 
 - (NSString *)descriptionForObject:(id)_fault {
   return [NSString stringWithFormat:
-                     @"<Object fault 0x%X "
+                     @"<Object fault %p "
                      @"(class=%@, entity=%@, key=%@, channel=%@)>",
                      _fault,
                      NSStringFromClass(targetClass), 




--- ./sope-gdl1/GDLAccess/EOEntity.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EOEntity.m	2013-10-09 17:03:32.000000000 +0100
@@ -106,7 +106,7 @@
 }
 
 // Is equal only if same name; used to make aliasing ordering stable
-- (unsigned)hash {
+- (NSUInteger)hash {
   return [name hash];
 }
 
@@ -1100,7 +1100,7 @@
     unsigned cnt, cnt2;
 
     clen = [self cStringLength];
-#if GNU_RUNTIME
+#if GNU_RUNTIME && !defined(__GNUSTEP_RUNTIME__)
     s = objc_atomic_malloc(clen + 4);
 #else
     s = malloc(clen + 4);




--- ./sope-gdl1/GDLAccess/EOFExceptions.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EOFExceptions.m	2013-10-09 17:03:32.000000000 +0100
@@ -63,7 +63,7 @@
                             [destinationEntity name],
                             definition,
                             [relationship name]];
-    [self initWithName:NSStringFromClass(isa)
+    [self initWithName:NSStringFromClass(object_getClass(self))
             reason:_reason userInfo:nil];
     return self;
 }
@@ -74,7 +74,7 @@
 - initWithName:(NSString*)_name
 {
     id _reason = [NSString stringWithFormat:@"invalid name: '%@'", _name];
-    [self initWithName:NSStringFromClass(isa) reason:_reason userInfo:nil];
+    [self initWithName:NSStringFromClass(object_getClass(self)) reason:_reason userInfo:nil];
     return self;
 }
 @end /* InvalidNameException */
@@ -86,7 +86,7 @@
     id _reason = [NSString stringWithFormat:@"property '%@' does not exist in "
                             @"entity '%@'", propertyName,
                             [(EOEntity*)currentEntity name]];
-    [self initWithName:NSStringFromClass(isa)
+    [self initWithName:NSStringFromClass(object_getClass(self))
             reason:_reason userInfo:nil];
     return self;
 }
@@ -99,7 +99,7 @@
     id _reason = [NSString stringWithFormat:@"property '%@' must be to one in "
                     @"entity '%@' to allow flattened attribute",
                     propertyName, [(EOEntity*)currentEntity name]];
-    [self initWithName:NSStringFromClass(isa)
+    [self initWithName:NSStringFromClass(object_getClass(self))
             reason:_reason userInfo:nil];
     return self;
 }




--- ./sope-gdl1/GDLAccess/EOFault.h.orig	2013-10-09 17:08:09.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EOFault.h	2013-10-09 17:08:30.000000000 +0100
@@ -9,6 +9,9 @@
 
 @class EOFaultHandler;
 
+#ifdef __clang__
+__attribute__((objc_root_class))
+#endif
 @interface EOFault
 {
   Class          isa;




--- ./sope-gdl1/GDLAccess/EOFault.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EOFault.m	2013-10-09 17:08:55.000000000 +0100
@@ -67,7 +67,7 @@
 + (void)makeObjectIntoFault:(id)_object withHandler:(EOFaultHandler *)_handler{
   [_handler setTargetClass:[_object class] extraData:((id *)_object)[1]];
 
-  ((EOFault *)_object)->isa           = self;
+  object_setClass(_object, self);
   ((EOFault *)_object)->faultResolver = [_handler retain];
 }
 
@@ -85,14 +85,14 @@
   int refs;
 
   /* check if fault */
-  if (aFault->isa != self)
+  if (object_getClass(aFault) != self)
     return;
     
   /* get fault instance reference count + 1 set in creation methods */
   refs = aFault->faultResolver->faultReferences;
 
   /* make clear instance */
-  aFault->isa           = [aFault->faultResolver targetClass];
+  object_setClass(aFault, [aFault->faultResolver targetClass]);
   aFault->faultResolver = [aFault->faultResolver autorelease];
   aFault->faultResolver = [aFault->faultResolver extraData];
   
@@ -112,7 +112,7 @@
   if (EOFaultClass == Nil) EOFaultClass = [EOFault class];
 
 #if defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__) || (__GNU_LIBOBJC__ >= 20100911)
-  for (clazz = ((EOFault *)fault)->isa; clazz; clazz = class_getSuperclass(clazz)) {
+  for (clazz = object_getClass(fault); clazz; clazz = class_getSuperclass(clazz)) {
 #else
   for (clazz = ((EOFault *)fault)->isa; clazz; clazz = clazz->super_class) {
 #endif
@@ -132,7 +132,7 @@
   EOFault *aFault = (EOFault*)_fault;
 
   // Check that argument is fault
-  if (aFault->isa != self)
+  if (object_getClass(aFault) != self)
     return nil;
     
   return [aFault->faultResolver targetClass];
@@ -182,7 +182,7 @@
 #if GNU_RUNTIME
   return (object_is_instance(self))
     ? [self->faultResolver respondsToSelector:_selector forFault:self]
-    : class_get_class_method(self->isa, _selector) != METHOD_NULL;
+    : class_get_class_method(object_getClass(self), _selector) != METHOD_NULL;
 #else
 #  warning TODO: add complete implementation for Apple/NeXT runtime!
   return [self->faultResolver respondsToSelector:_selector forFault:self];
@@ -239,7 +239,7 @@
   NSLog(@"WARNING: tried to deallocate EOFault class ..");
 }
 - (void)dealloc {
-  [self->isa clearFault:self];
+  [object_getClass(self) clearFault:self];
   [self dealloc];
 }
 
@@ -285,7 +285,7 @@
   handler = self->faultResolver;
   [handler completeInitializationOfObject:self];
   
-  if (self->isa == [EOFault class]) {
+  if (object_getClass(self) == [EOFault class]) {
     [NSException raise:@"NSInvalidArgumentException" 
 		 format:
 		   @"fault error: %@ was not cleared during fault fetching",
@@ -294,7 +294,7 @@
 }
 
 + (id)self {
-  _resolveFault(self);
+  _resolveFault((id)self);
   return self;
 }
 




--- ./sope-gdl1/GDLAccess/EOModel.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EOModel.m	2013-10-09 17:03:32.000000000 +0100
@@ -255,7 +255,7 @@
   NSMutableDictionary *model = [NSMutableDictionary dictionaryWithCapacity:64];
   int i, count;
     
-  [model setObject:[[NSNumber numberWithInt:[isa version]] stringValue]
+  [model setObject:[[NSNumber numberWithInt:[object_getClass(self) version]] stringValue]
 	 forKey:@"EOModelVersion"];
   if (name)
         [model setObject:name forKey:@"name"];
@@ -416,7 +416,7 @@
   if ((s = [self adaptorName]))      [ms appendFormat:@" adaptor=%@", s];
   if ((s = [self adaptorClassName])) [ms appendFormat:@" adaptor-class=%@", s];
   
-  [ms appendFormat:@" #entities=%d", [self->entities count]];
+  [ms appendFormat:@" #entities=%d", (int)[self->entities count]];
   
   [ms appendString:@">"];
   return ms;

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOObjectUniquer.m (+11 lines)
	1	--- ./sope-gdl1/GDLAccess/EOObjectUniquer.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOObjectUniquer.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -49,7 +49,7 @@
	4
	5	static NSString* uniqDescription(NSMapTable t, EOUniquerRecord rec) {
	6	return [NSString stringWithFormat:
	7	- @"<<pkey:%08x entity:%08x object:%08x snapshot:%08x>>",
	8	+ @"<<pkey:%p entity:%p object:%p snapshot:%p>>",
	9	rec->pkey, rec->entity, rec->object, rec->snapshot];
	10	}
	11




--- ./sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.m	2013-10-09 17:03:32.000000000 +0100
@@ -130,7 +130,7 @@
 - (BOOL)isEqualToDictionary:(NSDictionary *)other {
     if (self == (EOSinglePrimaryKeyDictionary*)other)
         return YES;
-    if (self->isa == ((EOSinglePrimaryKeyDictionary*)other)->isa) {
+    if (object_getClass(self) == object_getClass(other)) {
         if (fastHash == ((EOSinglePrimaryKeyDictionary*)other)->fastHash &&
             [key isEqual:((EOSinglePrimaryKeyDictionary*)other)->key] &&
             [value isEqual:((EOSinglePrimaryKeyDictionary*)other)->value])
@@ -157,7 +157,7 @@
 - (BOOL)fastIsEqual:(id)other {
     if (self == other)
         return YES;
-    if (self->isa == ((EOSinglePrimaryKeyDictionary*)other)->isa) {
+    if (object_getClass(self) == object_getClass(other)) {
         if (fastHash == ((EOSinglePrimaryKeyDictionary*)other)->fastHash &&
             key == ((EOSinglePrimaryKeyDictionary*)other)->key &&
             [value isEqual:((EOSinglePrimaryKeyDictionary*)other)->value])
@@ -263,14 +263,14 @@
     return nil;
 }
 
-- (unsigned int)count {
+- (NSUInteger)count {
     return self->count;
 }
 - (BOOL)isNotEmpty {
   return self->count > 0 ? YES : NO;
 }
 
-- (unsigned int)hash {
+- (NSUInteger)hash {
     return self->count;
 }
 
@@ -316,7 +316,7 @@
 - (BOOL)fastIsEqual:(id)aDict {
     int i;
     
-    if (self->isa != ((EOMultiplePrimaryKeyDictionary*)aDict)->isa) {
+    if (object_getClass(self) == object_getClass(aDict)) {
       [NSException raise:NSInvalidArgumentException
 		   format:@"fastIsEqual: can compare only "
                            @"EOPrimaryKeyDictionary instances"];




--- ./sope-gdl1/GDLAccess/EORecordDictionary.m.orig	2013-10-09 17:06:13.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EORecordDictionary.m	2013-10-09 17:08:07.000000000 +0100
@@ -55,7 +55,7 @@
 - (id)init  {
   RELEASE(self);
   if (emptyDict == nil) emptyDict = [[NSDictionary alloc] init];
-  return [emptyDict retain];
+  return (id)[emptyDict retain];
 }
 
 - (id)initWithObjects:(id *)_objects forKeys:(id *)_keys 
@@ -64,12 +64,12 @@
   if (_count == 0) {
         RELEASE(self);
 	if (emptyDict == nil) emptyDict = [[NSDictionary alloc] init];
-	return [emptyDict retain];
+	return (id)[emptyDict retain];
   }
   
   if (_count == 1) {
         RELEASE(self);
-        return [[NSDictionary alloc]
+        return (id)[[NSDictionary alloc]
                               initWithObjects:_objects forKeys:_keys
                               count:_count];
   }




--- ./sope-gdl1/GDLAccess/EORelationship.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EORelationship.m	2013-10-09 17:03:32.000000000 +0100
@@ -84,7 +84,7 @@
 }
 
 // Is equal only if same name; used to make aliasing ordering stable
-- (unsigned)hash {
+- (NSUInteger)hash {
   return [self->name hash];
 }
 
@@ -405,7 +405,7 @@
     NS_DURING
       [self setDefinition:self->definition];
     NS_HANDLER {
-      NSLog([localException reason]);
+      NSLog(@"%@", [localException reason]);
       [[self->entity model] errorInReading];
     }
     NS_ENDHANDLER;

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOSQLExpression.m (+10 lines)
	1	--- ./sope-gdl1/GDLAccess/EOSQLExpression.m.orig 2013-10-09 17:09:54.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOSQLExpression.m 2013-10-09 17:10:11.000000000 +0100
	3	@@ -39,6 +39,7 @@
	4	#include <EOControl/EONull.h>
	5	#include <EOControl/EOQualifier.h>
	6	#include <EOControl/EOSortOrdering.h>
	7	+#import "NGExtensions/NSException+misc.h"
	8
	9	#if LIB_FOUNDATION_LIBRARY
	10	# include <extensions/DefaultScannerHandler.h>




--- ./sope-gdl1/GDLAccess/EOSQLQualifier.m.orig	2013-10-09 17:08:56.000000000 +0100
+++ ./sope-gdl1/GDLAccess/EOSQLQualifier.m	2013-10-09 17:09:36.000000000 +0100
@@ -39,6 +39,7 @@
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EONull.h>
 #import "EOQualifierScanner.h"
+#import "NGExtensions/NSException+misc.h"
 
 #if LIB_FOUNDATION_LIBRARY
 #  include <extensions/DefaultScannerHandler.h>
@@ -468,7 +469,7 @@
 - (id)copyWithZone:(NSZone*)zone {
   EOSQLQualifier* copy = nil;
 
-  copy                    = [[self->isa allocWithZone:zone] init];
+  copy                    = [[object_getClass(self) allocWithZone:zone] init];
   copy->entity            = RETAIN(self->entity);
   copy->content           = [self->content           mutableCopyWithZone:zone];
   copy->relationshipPaths = [self->relationshipPaths mutableCopyWithZone:zone];




--- ./sope-gdl1/PostgreSQL/NSData+PGVal.m.orig	2013-10-09 17:13:52.000000000 +0100
+++ ./sope-gdl1/PostgreSQL/NSData+PGVal.m	2013-10-09 17:14:16.000000000 +0100
@@ -84,7 +84,7 @@
 
   if (doDebug) {
     NSLog(@"Note: made string (len=%i) for data (len=%i), type %@",
-	  [str length], [self length], _type);
+	  (int)[str length], (int)[self length], _type);
   }
   
   if ((len = [_type length]) == 0) {
@@ -108,7 +108,7 @@
       t = [[str stringValueForPostgreSQLType:_type 
 		attribute:_attribute] copy];
       [str release];
-      if (doDebug) NSLog(@"  result len %i", [t length]);
+      if (doDebug) NSLog(@"  result len %i", (int)[t length]);
       return [t autorelease];
     }
   }




--- ./sope-gdl1/PostgreSQL/NSString+PostgreSQL72.m.orig	2013-10-09 17:10:33.000000000 +0100
+++ ./sope-gdl1/PostgreSQL/NSString+PostgreSQL72.m	2013-10-09 17:13:45.000000000 +0100
@@ -145,13 +145,15 @@
   range.length = 0;
 
   for (range.location = ([self length] - 1);
-         range.location >= 0;
-         range.location++, range.length++) {
+         ;
+         range.location--, range.length++) {
       unichar c;
       
       c = charAtIndex(self, @selector(characterAtIndex:), range.location);
       if (![spaceSet characterIsMember:c])
         break;
+      if (range.location == 0)
+        break;
   }
     
   if (range.length > 0) {

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__PostgreSQL__PostgreSQL72Channel.m (+11 lines)
	1	--- ./sope-gdl1/PostgreSQL/PostgreSQL72Channel.m.orig 2013-10-09 17:10:13.000000000 +0100
	2	+++ ./sope-gdl1/PostgreSQL/PostgreSQL72Channel.m 2013-10-09 17:10:22.000000000 +0100
	3	@@ -203,7 +203,7 @@
	4	/* set client encoding */
	5	#if NG_SET_CLIENT_ENCODING
	6	if (![self->connection setClientEncoding:PGClientEncoding]) {
	7	- NSLog(@"WARNING: could not set client encoding to: '%s'",
	8	+ NSLog(@"WARNING: could not set client encoding to: '%@'",
	9	PGClientEncoding);
	10	}
	11	#endif

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__PostgreSQL__PostgreSQL72DataTypeMappingException.m (+11 lines)
	1	--- ./sope-gdl1/PostgreSQL/PostgreSQL72DataTypeMappingException.m.orig 2013-10-09 17:14:18.000000000 +0100
	2	+++ ./sope-gdl1/PostgreSQL/PostgreSQL72DataTypeMappingException.m 2013-10-09 17:14:28.000000000 +0100
	3	@@ -46,7 +46,7 @@
	4	typeName = _dt;
	5
	6	if (typeName == nil)
	7	- typeName = [NSString stringWithFormat:@"Oid[%i]", _dt];
	8	+ typeName = [NSString stringWithFormat:@"Oid[%i]", (int)_dt];
	9
	10	// TODO: fix for Cocoa/gstep Foundation?
	11	[self setName:@"DataTypeMappingNotSupported"];

Line 0 Link Here

(-)sope/files/patch-sope-ldap_NGLdap_NGLdapConnection.m (+11 lines)
	1	--- sope-ldap/NGLdap/NGLdapConnection.m.orig 2015-10-08 07:27:02.048712065 +0800
	2	+++ sope-ldap/NGLdap/NGLdapConnection.m 2015-10-08 07:27:54.118710202 +0800
	3	@@ -1223,7 +1223,7 @@
	4
	5	if ([self doesUseCache]) {
	6	[s appendFormat:@" cache[to=%.2fs,mem=%i]",
	7	- [self cacheTimeout], [self cacheMaxMemoryUsage]];
	8	+ [self cacheTimeout], (int)[self cacheMaxMemoryUsage]];
	9	}
	10
	11	[s appendString:@">"];




--- sope-ldap/NGLdap/NGLdapFileManager.m.orig	2015-10-08 07:57:03.797588319 +0800
+++ sope-ldap/NGLdap/NGLdapFileManager.m	2015-10-08 07:59:45.636578548 +0800
@@ -317,7 +317,7 @@
   short count;
   
   if ((dn = [self dnForPath:_path]) == nil)
-    return NO;
+    return nil;
   
   entry = [self->connection entryAtDN:dn attributes:fileInfoAttrs];
   if (entry == nil)
@@ -432,7 +432,7 @@
   NGLdapEntry     *entry;
   
   if ((dn = [self dnForPath:_path]) == nil)
-    return NO;
+    return nil;
   
   entry = [self->connection entryAtDN:dn attributes:nil];
   if (entry == nil)

Line 0 Link Here

(-)sope/files/patch-sope-ldap_NGLdap_NGLdapGlobalID.m (+11 lines)
	1	--- sope-ldap/NGLdap/NGLdapGlobalID.m.orig 2015-10-08 07:30:33.455696497 +0800
	2	+++ sope-ldap/NGLdap/NGLdapGlobalID.m 2015-10-08 07:34:45.512679456 +0800
	3	@@ -53,7 +53,7 @@
	4
	5	/* equality */
	6
	7	-- (unsigned)hash {
	8	+- (NSUInteger)hash {
	9	return [self->dn hash] + [self->host hash];
	10	}
	11




--- sope-mime/NGImap4/NGImap4Client.h.orig	2015-10-14 02:06:21.530314638 +0800
+++ sope-mime/NGImap4/NGImap4Client.h	2015-10-14 02:06:37.040306987 +0800
@@ -195,6 +195,14 @@
   qualifierString:(NSString *)_qualString
   encoding:(NSString *)_encoding;
 
+/* Previously in Private category, but required by SoObjects/Mailer/SOGoMailBaseObject.m */
+
+- (NGHashMap *)processCommand:(NSString *)_command;
+- (NGHashMap *)processCommand:(NSString *)_command withTag:(BOOL)_tag;
+- (NGHashMap *)processCommand:(NSString *)_command withTag:(BOOL)_tag
+  withNotification:(BOOL)_notification;
+- (NGHashMap *)processCommand:(NSString *)_command logText:(NSString *)_txt;
+
 @end
 
 #endif /* __SOPE_NGImap4_NGImap4Client_H__ */




--- sope-mime/NGImap4/NGImap4Client.m.orig	2015-09-17 02:26:50.000000000 +0800
+++ sope-mime/NGImap4/NGImap4Client.m	2015-10-14 02:01:38.155331609 +0800
@@ -77,12 +77,6 @@
 
 - (NSString *)_folder2ImapFolder:(NSString *)_folder;
 
-- (NGHashMap *)processCommand:(NSString *)_command;
-- (NGHashMap *)processCommand:(NSString *)_command withTag:(BOOL)_tag;
-- (NGHashMap *)processCommand:(NSString *)_command withTag:(BOOL)_tag
-  withNotification:(BOOL)_notification;
-- (NGHashMap *)processCommand:(NSString *)_command logText:(NSString *)_txt;
-
 - (void)sendCommand:(NSString *)_command;
 - (void)sendCommand:(NSString *)_command withTag:(BOOL)_tag;
 - (void)sendCommand:(NSString *)_command withTag:(BOOL)_tag
@@ -646,7 +640,7 @@
 
   if (![self passwordIsSimple])
     s = [NSString stringWithFormat:@"login \"%@\" {%d}",
-		  self->login, plength];
+		  self->login, (int)plength];
   else
     s = [NSString stringWithFormat:@"login \"%@\" \"%@\"",
           self->login, self->password];
@@ -962,9 +956,9 @@
 
   if (_folder == nil)
     return nil;
-  if ((_entry == nil))
+  if (_entry == nil)
     return nil;
-  if ((_attribute == nil))
+  if (_attribute == nil)
     return nil;
   if ((_folder = [self _folder2ImapFolder:_folder]) == nil)
     return nil;
@@ -994,11 +988,11 @@
   
   if (_folder == nil)
     return nil;
-  if ((_entry == nil))
+  if (_entry == nil)
     return nil;
-  if ((_attribute == nil))
+  if (_attribute == nil)
     return nil;
-  if ((_value == nil))
+  if (_value == nil)
     return nil;
   if ((_folder = [self _folder2ImapFolder:_folder]) == nil)
     return nil;
@@ -1186,7 +1180,7 @@
 
   cmd  = [NSString stringWithFormat:
                      @"UID FETCH %llu:%llu (UID) (CHANGEDSINCE 1)",
-                   _uid, _uid];
+                   (unsigned long long)_uid, (unsigned long long)_uid];
   fetchres = [self processCommand:cmd];
   result   = [self->normer normalizeFetchResponse:fetchres];
   return result;
@@ -1203,7 +1197,7 @@
   
   cmd  = [NSString stringWithFormat:
                      @"UID FETCH 1:* (UID) (CHANGEDSINCE %llu VANISHED)",
-                   _modseq];
+                   (unsigned long long)_modseq];
   fetchres = [self processCommand:cmd];
   result   = [[self->normer normalizeFetchResponse:fetchres] retain];
   [pool release];
@@ -1329,7 +1323,7 @@
   
   icmd = [NSString stringWithFormat:@"append \"%@\" (%@) {%d}",
                    _folder, [flags componentsJoinedByString:@" "],
-                   [rfc822Data length]];
+                   (int)[rfc822Data length]];
   result = [self processCommand:icmd
                  withTag:YES withNotification:NO];
   

Line 0 Link Here

(-)sope/files/patch-sope-mime_NGImap4_NGImap4Functions.m (+11 lines)
	1	--- sope-mime/NGImap4/NGImap4Functions.m.orig 2015-10-08 07:53:03.356603708 +0800
	2	+++ sope-mime/NGImap4/NGImap4Functions.m 2015-10-08 07:48:01.460627308 +0800
	3	@@ -129,7 +129,7 @@
	4	if (debugFolderLookup) {
	5	NSLog(@" FAILED: %@", [[_parent context] lastException]);
	6	}
	7	- return NO;
	8	+ return nil;
	9	}
	10	}
	11	if (debugFolderLookup) NSLog(@" NOT FOUND.");




--- sope-mime/NGImap4/NGImap4ResponseParser.m.orig	2015-09-17 02:26:50.000000000 +0800
+++ sope-mime/NGImap4/NGImap4ResponseParser.m	2015-10-08 07:18:19.172752790 +0800
@@ -1463,7 +1463,7 @@
   NSString            *name  = nil;
   NSString            *entry  = nil;
   NSMutableDictionary *attributes = nil;
-  NSDictionary *d, *f;
+  NSMutableDictionary *d, *f;
 
   if (!_matchesString(self, "ANNOTATION "))
     return NO;
@@ -1511,7 +1511,7 @@
     [attributes setObject:value
            forKey:[key lowercaseString]];
 
-    [d setObject:[NSDictionary dictionaryWithDictionary:attributes]
+    [d setObject:[NSMutableDictionary dictionaryWithDictionary:attributes]
        forKey:entry];
   }
   _consumeIfMatch(self, ')');
@@ -2484,7 +2484,7 @@
 static BOOL _parseNoOrOkArguments(NGImap4ResponseParser *self,
                                   NGMutableHashMap *result_, NSString *_key) 
 {
-  NSString *obj;
+  id obj;
 
   obj = nil;
   




--- ./sope-mime/NGImap4/NGImap4Connection.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-mime/NGImap4/NGImap4Connection.m	2013-10-09 17:03:32.000000000 +0100
@@ -1174,10 +1174,10 @@
   [ms appendFormat:@" created=%@", self->creationTime];
   
   if (self->subfolders != nil)
-    [ms appendFormat:@" #cached-folders=%d", [self->subfolders count]];
+    [ms appendFormat:@" #cached-folders=%d", (int)[self->subfolders count]];
   
   if (self->cachedUIDs != nil)
-    [ms appendFormat:@" #cached-uids=%d", [self->cachedUIDs count]];
+    [ms appendFormat:@" #cached-uids=%d", (int)[self->cachedUIDs count]];
   
   [ms appendString:@">"];
   return ms;




--- ./sope-mime/NGImap4/NGImap4Context.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-mime/NGImap4/NGImap4Context.m	2013-10-09 17:03:32.000000000 +0100
@@ -944,8 +944,7 @@
         [self serverName],
         [self serverKind],
         [self serverVersion],
-        [self serverSubVersion],
-        [self serverTag]];
+        [self serverSubVersion]];
   
   if (self->syncMode)
     [ms appendString:@" syncmode"];

Line 0 Link Here

(-)sope/files/patch-sope-mime__NGImap4__NGImap4FileManager.m (+11 lines)
	1	--- ./sope-mime/NGImap4/NGImap4FileManager.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-mime/NGImap4/NGImap4FileManager.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -225,7 +225,7 @@
	4	if ((folder = [self _lookupFolderAtPathString:_path]) == nil)
	5	return NO;
	6
	7	- ASSIGN(self->currentFolder, folder);
	8	+ ASSIGN(self->currentFolder, (id)folder);
	9
	10	return YES;
	11	}




--- ./sope-mime/NGImap4/NGImap4Folder.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-mime/NGImap4/NGImap4Folder.m	2013-10-09 17:03:32.000000000 +0100
@@ -646,11 +646,11 @@
       [m release];
     }
   }
-  m = [mes copy];
+  NSArray *a = [mes copy];
   [mes release]; mes = nil;
   [pool release];
   
-  return [m autorelease];;
+  return [a autorelease];;
 }
 
 - (NSArray *)_buildMessagesFromFetch:(NSDictionary *)_fetch {

Line 0 Link Here

(-)sope/files/patch-sope-mime__NGImap4__NGImap4FolderGlobalID.m (+11 lines)
	1	--- ./sope-mime/NGImap4/NGImap4FolderGlobalID.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-mime/NGImap4/NGImap4FolderGlobalID.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -62,7 +62,7 @@
	4
	5	/* comparison */
	6
	7	-- (unsigned)hash {
	8	+- (NSUInteger)hash {
	9	return [self->absoluteName hash];
	10	}
	11




--- ./sope-mime/NGImap4/NGImap4Message.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-mime/NGImap4/NGImap4Message.m	2013-10-09 17:03:32.000000000 +0100
@@ -243,8 +243,8 @@
 }
 
 - (void)markUnread {
-  if ([self isRead]);
-  [self removeFlag:@"seen"];
+  if ([self isRead])
+    [self removeFlag:@"seen"];
 }
 
 - (BOOL)isFlagged {
@@ -345,7 +345,7 @@
   return YES;
 }
 
-- (unsigned)hash {
+- (NSUInteger)hash {
   return self->uid;
 }
 

Line 0 Link Here

(-)sope/files/patch-sope-mime__NGImap4__NGImap4ServerGlobalID.m (+11 lines)
	1	--- ./sope-mime/NGImap4/NGImap4ServerGlobalID.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-mime/NGImap4/NGImap4ServerGlobalID.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -65,7 +65,7 @@
	4
	5	/* comparison */
	6
	7	-- (unsigned)hash {
	8	+- (NSUInteger)hash {
	9	return [self->login hash];
	10	}
	11




--- ./sope-mime/NGImap4/NGSieveClient.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-mime/NGImap4/NGSieveClient.m	2013-10-09 17:03:32.000000000 +0100
@@ -444,14 +444,14 @@
     NSString *s;
     
     s = [NSString stringWithFormat:@"AUTHENTICATE \"PLAIN\" {%d+}\r\n%s",
-                  [auth length], [auth bytes]];
+                  (int)[auth length], [auth bytes]];
     map = [self processCommand:s];
   }
   else {
     NSString *s;
     
     s = [NSString stringWithFormat:@"AUTHENTICATE \"PLAIN\" {%d+}\r\n%s",
-                  [auth length], [auth bytes]];
+                  (int)[auth length], [auth bytes]];
     map = [self processCommand:s
                 logText:@"AUTHENTICATE \"PLAIN\" {%d+}\r\nLOGIN:PASSWORD\r\n"];
   }
@@ -548,7 +548,7 @@
   s = [s stringByAppendingString:_name];
   s = [s stringByAppendingString:@"\" "];
   s = [s stringByAppendingFormat:@"{%d+}\r\n%@",
-         [_script lengthOfBytesUsingEncoding: NSUTF8StringEncoding],
+         (int)[_script lengthOfBytesUsingEncoding: NSUTF8StringEncoding],
          _script];
   map = [self processCommand:s];
   return [self normalizeResponse:map];

Line 0 Link Here

(-)sope/files/patch-sope-mime__NGMail__NGMailAddress.m (+11 lines)
	1	--- ./sope-mime/NGMail/NGMailAddress.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-mime/NGMail/NGMailAddress.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -66,7 +66,7 @@
	4	return NO;
	5	}
	6
	7	-- (unsigned)hash {
	8	+- (NSUInteger)hash {
	9	return [self->address hash];
	10	}
	11




--- ./sope-mime/NGMail/NGMailAddressParser.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-mime/NGMail/NGMailAddressParser.m	2013-10-09 17:03:32.000000000 +0100
@@ -349,15 +349,15 @@
   uniString = [NSString stringWithCharacters:(unichar *)[_data bytes]
 			length:([_data length] / sizeof(unichar))];
 
-  return [(NGMailAddressParser *)self mailAddressParserWithString:uniString];
+  return [(id)self mailAddressParserWithString:uniString];
 }
 
-+ (id)mailAddressParserWithCString:(char *)_cString {

--- ./sope-mime/NGMail/NGMimeMessage.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-mime/NGMail/NGMimeMessage.m	2013-10-09 17:03:32.000000000 +0100
@@ -230,7 +230,7 @@
     if ([b length] < 512)
       [d appendFormat:@" body=%@", b];
     else
-      [d appendFormat:@" body[len=%i]", [b length]];
+      [d appendFormat:@" body[len=%i]", (int)[b length]];
   }
   else
     [d appendFormat:@" body=%@", b];




--- ./sope-mime/NGMime/NGMimeBodyPart.m.orig	2013-07-22 14:03:07.000000000 +0100
+++ ./sope-mime/NGMime/NGMimeBodyPart.m	2013-10-09 17:03:32.000000000 +0100
@@ -206,10 +206,10 @@
   else if ([b isKindOfClass:[NSString class]] ||
            [b isKindOfClass:[NSData class]]) {
     if ([b length] < 512) {
-      [d appendFormat:@" bodyLen=%i body=%@", [b length], b];
+      [d appendFormat:@" bodyLen=%i body=%@", (int)[b length], b];
     }
     else
-      [d appendFormat:@" body[len=%i]", [b length]];
+      [d appendFormat:@" body[len=%i]", (int)[b length]];
   }
   else
     [d appendFormat:@" body=%@", b];

Line 0 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimeJoinedData.m (+11 lines)
	1	--- ./sope-mime/NGMime/NGMimeJoinedData.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-mime/NGMime/NGMimeJoinedData.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -168,7 +168,7 @@
	4	ms = [NSMutableString stringWithCapacity:128];
	5	[ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
	6	[ms appendFormat:@" joinedDataObjects=%d>",
	7	- [self->joinedDataObjects count]];
	8	+ (int)[self->joinedDataObjects count]];
	9	[ms appendString:@">"];
	10	return ms;
	11	}

Line 0 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimePartGenerator.h (+11 lines)
	1	--- ./sope-mime/NGMime/NGMimePartGenerator.h.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-mime/NGMime/NGMimePartGenerator.h 2013-10-09 17:03:32.000000000 +0100
	3	@@ -149,7 +149,7 @@
	4	The delegate can select which NGMimeBodyGenerator should de used
	5	for generate the given part.
	6	*/
	7	-- (id<NGMimePartGenerator>)multipartBodyGenerator:(id<NGMimeBodyGenerator>)
	8	+- (id<NGMimePartGenerator>)multipartBodyGenerator:(id<NGMimeBodyGenerator>)aGenerator
	9	generatorForPart:(id<NGMimePart>)_part;
	10
	11	- (BOOL)useMimeData;

Line 0 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimePartGenerator.m (+11 lines)
	1	--- ./sope-mime/NGMime/NGMimePartGenerator.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-mime/NGMime/NGMimePartGenerator.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -92,7 +92,7 @@
	4	self->result = nil;
	5	}
	6	self->result = (self->useMimeData)
	7	- ? [[NGMimeJoinedData alloc] init]
	8	+ ? (NSMutableData*)[[NGMimeJoinedData alloc] init]
	9	: [[NSMutableData alloc] initWithCapacity:4096];
	10
	11	if ([self->result respondsToSelector:@selector(methodForSelector:)]) {

Line 0 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimePartParser.m (+11 lines)
	1	--- ./sope-mime/NGMime/NGMimePartParser.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-mime/NGMime/NGMimePartParser.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -1025,7 +1025,7 @@
	4	NSMakeRange(self->dataIdx, self->byteLen - self->dataIdx)];
	5	if ([data length] != _len) {
	6	NSLog(@"%s[%i]: got wrong data %d _len %d", __PRETTY_FUNCTION__, __LINE__,
	7	- [data length], _len);
	8	+ (int)[data length], _len);
	9	return nil;
	10	}
	11	return data;

Line 0 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimeRFC822DateHeaderFieldParser.m (+11 lines)
	1	--- ./sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -161,7 +161,7 @@
	4	hours += 10 * ((s + pos) - 48) + (s + pos + 1) - 48;
	5	break;
	6	default:
	7	- NSLog (@"parseTimeZone: cannot parse time notation '%.*s'", len, s);
	8	+ NSLog (@"parseTimeZone: cannot parse time notation '%.*s'", (int)len, s);
	9	}
	10
	11	seconds += sign * (3600 * hours + 60 * minutes);

Line 0 Link Here

(-)sope/files/patch-sope-xml_SaxObjC_SaxObjectDecoder.m (+11 lines)
	1	--- sope-xml/SaxObjC/SaxObjectDecoder.m.orig 2015-10-07 07:52:27.160563662 +0800
	2	+++ sope-xml/SaxObjC/SaxObjectDecoder.m 2015-10-07 07:57:28.207547127 +0800
	3	@@ -172,7 +172,7 @@
	4	reason:_ns
	5	userInfo:nil];
	6	}
	7	-- (NSException )missingElementMapping:(NSString )_ns:(NSString *)_tag {
	8	+- (NSException )missingElementMapping:(NSString )_ns :(NSString *)_tag {
	9	return [NSException exceptionWithName:@"MissingElementMapping"
	10	reason:_tag
	11	userInfo:nil];

Line 0 Link Here

(-)sope/files/patch-sope-xml__DOM__DOMQueryPathExpression.m (+11 lines)
	1	--- ./sope-xml/DOM/DOMQueryPathExpression.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-xml/DOM/DOMQueryPathExpression.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -318,7 +318,7 @@
	4	qpexpr = [DOMQueryPathExpression queryPathWithString:_expr];
	5	//NSLog(@"Expr: %@", qpexpr);
	6
	7	- pred =
	8	+ pred = (_DOMQPPredicateExpression*)
	9	[[_DOMQPPredicateQPExpression alloc] initWithQueryPathExpression:qpexpr];
	10
	11	return [pred autorelease];

Line 0 Link Here

(-)sope/files/patch-sope-xml__XmlRpc__NSNotification+XmlRpcCoding.m (+11 lines)
	1	--- ./sope-xml/XmlRpc/NSNotification+XmlRpcCoding.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-xml/XmlRpc/NSNotification+XmlRpcCoding.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -30,7 +30,7 @@
	4	}
	5
	6	+ (id)decodeObjectWithXmlRpcCoder:(XmlRpcDecoder *)_coder {
	7	- self = [NSNotification notificationWithName:
	8	+ self = (id)[NSNotification notificationWithName:
	9	[_coder decodeStringForKey:@"name"]
	10	object:[_coder decodeObjectForKey:@"object"]
	11	userInfo:[_coder decodeStructForKey:@"userInfo"]];

Return to bug 203909

Line 0 Link Here

(-)sope/files/patch-sope-appserver_NGObjWeb_WOHttpAdaptor_WOHttpTransaction.m (+14 lines)
	1	--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m.orig 2015-10-07 04:27:29.705409511 +0800
	2	+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m 2015-10-07 04:28:30.761407410 +0800
	3	@@ -1021,9 +1021,9 @@
	4	[buf appendString:@"\" "];
	5	[buf appendFormat:@"%i %i",
	6	[_response status],
	7	- [[_response content] length]];
	8	+ (int)[[_response content] length]];
	9	if (doExtLog)
	10	- [buf appendFormat:@"/%i", [[_request content] length]];
	11	+ [buf appendFormat:@"/%i", (int)[[_request content] length]];
	12
	13	/* append duration */
	14	if (lstartDate != nil)

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__NGHttp__NGUrlFormCoder.m (+20 lines)
	1	--- ./sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -93,7 +93,7 @@
	4	encoding:NSUTF8StringEncoding];
	5	if (debugDecoding) {
	6	NSLog(@"decoded data len %d value (len=%d): %@",
	7	- len, [value length], value);
	8	+ len, (int)[value length], value);
	9	}
	10	return value;
	11	#if 0
	12	@@ -177,7 +177,7 @@
	13	- (NSString *)stringByApplyingURLEncoding {
	14	/* NGExtensions/NSString+misc.h */
	15	NSLog(@"Note: Called deprecated -stringByApplyingURLEncoding method "
	16	- @"(use -stringByEscapingURL instead)", __PRETTY_FUNCTION__);
	17	+ @"(use -stringByEscapingURL instead)");
	18	return [self stringByEscapingURL];
	19	}
	20

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOComponent+Sync.m (+20 lines)
	1	--- ./sope-appserver/NGObjWeb/WOComponent+Sync.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WOComponent+Sync.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -87,7 +87,7 @@
	4	#if NeXT_RUNTIME
	5	takeValue = (void *)[self methodForSelector:@selector(takeValue:forKey:)];
	6	#elif GNUSTEP_BASE_LIBRARY
	7	- takeValue = (void*)method_get_imp(class_get_instance_method(self->isa,
	8	+ takeValue = (void*)method_get_imp(class_get_instance_method(object_getClass(self),
	9	@selector(setValue:forKey:)));
	10	#else
	11	takeValue = (void*)method_get_imp(class_get_instance_method(self->isa,
	12	@@ -148,7 +148,7 @@
	13	#if NeXT_RUNTIME
	14	getValue = (void *)[self methodForSelector:@selector(valueForKey:)];
	15	#else
	16	- getValue = (void*)method_get_imp(class_get_instance_method(self->isa,
	17	+ getValue = (void*)method_get_imp(class_get_instance_method(object_getClass(self),
	18	@selector(valueForKey:)));
	19	#endif
	20

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOMailDelivery.m (+12 lines)
	1	--- ./sope-appserver/NGObjWeb/WOMailDelivery.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WOMailDelivery.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -180,7 +180,8 @@
	4	NSData *body;
	5
	6	body = [(NSDictionary *)_email objectForKey:@"body"];
	7	- if (fwrite([body bytes], [body length], 1, toMail) < 0)
	8	+ NSUInteger bytes = [body length];
	9	+ if (fwrite([body bytes], bytes, 1, toMail) < bytes)
	10	goto failed;
	11	}
	12	fprintf(toMail, "\r\n");

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOSessionStore.m (+20 lines)
	1	--- ./sope-appserver/NGObjWeb/WOSessionStore.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WOSessionStore.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -49,7 +49,7 @@
	4	WOSession *session;
	5	*(&session) = nil;
	6
	7	- SYNCHRONIZED(self) { // this must become a condition lock !!!
	8	+ SYNCHRONIZED((id)self) { // this must become a condition lock !!!
	9	if (![self->checkedOutSessions containsObject:_sid]) {
	10	if ((session = [self restoreSessionWithID:_sid]))
	11	[self->checkedOutSessions addObject:_sid];
	12	@@ -66,7 +66,7 @@
	13	NSString *sid;
	14	*(&sid) = [[_context session] sessionID];
	15
	16	- SYNCHRONIZED(self) { // this must become a condition lock !!!
	17	+ SYNCHRONIZED((id)self) { // this must become a condition lock !!!
	18	[self saveSessionForContext:_context];
	19
	20	if ([self->checkedOutSessions containsObject:sid])

Line 0 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOStatisticsStore.m (+20 lines)
	1	--- ./sope-appserver/NGObjWeb/WOStatisticsStore.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-appserver/NGObjWeb/WOStatisticsStore.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -35,7 +35,7 @@
	4	unsigned zippedResponsesCount;
	5	unsigned totalZippedSize;
	6	unsigned largestResponseSize;
	7	- unsigned smallestResponseSize;
	8	+ NSInteger smallestResponseSize;
	9	NSTimeInterval minimumDuration;
	10	NSTimeInterval maximumDuration;
	11	NSTimeInterval totalDuration;
	12	@@ -420,7 +420,7 @@
	13	/* response */
	14
	15	[result appendFormat:@"%i %i",
	16	- [_response status], [[_response content] length]];
	17	+ [_response status], (int)[[_response content] length]];
	18
	19	if ((startDate = [request startDate]) != nil) {
	20	NSTimeInterval duration;

Lines 1-26 Link Here

(-)sope/files/patch-sope-core_EOControl_EOSortOrdering.m (-23 / +10 lines)
1	--- sope-core/EOControl/EOSortOrdering.m.orig 2015-09-16 18:26:49 UTC	1	--- ./sope-core/EOControl/EOSortOrdering.m.orig 2013-07-22 14:03:07.000000000 +0100
2	+++ sope-core/EOControl/EOSortOrdering.m	2	+++ ./sope-core/EOControl/EOSortOrdering.m 2013-10-09 17:03:32.000000000 +0100
3	@@ -28,14 +28,6 @@	3	@@ -29,7 +29,9 @@
4	# include <objc/objc.h>
5	#endif	4	#endif
6		5
7	-#ifndef SEL_EQ	6	#ifndef SEL_EQ
8	-# if GNU_RUNTIME	7	-# if GNU_RUNTIME
9	-# define SEL_EQ(sel1,sel2) sel_eq(sel1,sel2)	8	+# if defined(__GNUSTEP_RUNTIME__)
10	-# else	9	+# define SEL_EQ(sel1,sel2) sel_isEqual(sel1, sel2)
11	-# define SEL_EQ(sel1,sel2) (sel1 == sel2)	10	+# elif GNU_RUNTIME
12	-# endif	11	# define SEL_EQ(sel1,sel2) sel_eq(sel1,sel2)
13	-#endif	12	# else
14	-	13	# define SEL_EQ(sel1,sel2) (sel1 == sel2)
15	@implementation EOSortOrdering
16	/*"
17	This class specifies a sort-ordering as used with
18	@@ -83,7 +75,7 @@
19	/* equality */
20
21	- (BOOL)isEqualToSortOrdering:(EOSortOrdering *)_sortOrdering {
22	- if (!SEL_EQ([_sortOrdering selector], [self selector]))
23	+ if (!sel_eq([_sortOrdering selector], [self selector]))
24	return NO;
25	if (![[_sortOrdering key] isEqualToString:[self key]])
26	return NO;

Lines 1-13 Link Here

(-)sope/files/patch-sope-core_EOControl_EOValidation.m (-13 / +11 lines)
1	--- sope-core/EOControl/EOValidation.m.orig 2015-09-16 18:26:49 UTC	1	--- ./sope-core/EOControl/EOValidation.m.orig 2013-07-22 14:03:07.000000000 +0100
2	+++ sope-core/EOControl/EOValidation.m	2	+++ ./sope-core/EOControl/EOValidation.m 2013-10-09 17:03:32.000000000 +0100
3	@@ -24,10 +24,6 @@	3	@@ -153,7 +153,7 @@
4	#include "EONull.h"	4	#if NeXT_RUNTIME
5	#include "common.h"	5	sel = sel_getUid(buf);
6		6	#else
7	-#if __GNU_LIBOBJC__ >= 20100911	7	- sel = sel_get_any_uid(buf);
8	-# define sel_get_any_uid sel_getUid	8	+ sel = sel_registerName(buf);
9	-#endif	9	#endif
10	-	10	if (sel) {
11	#if !LIB_FOUNDATION_LIBRARY	11	if ([self respondsToSelector:sel]) {
12
13	@interface NSException(UsedSetUI) /* does Jaguar allow -setUserInfo: ? */

Line 0 Link Here

(-)sope/files/patch-sope-core_NGExtensions_NGCalendarDateRange.m (+20 lines)
	1	--- sope-core/NGExtensions/NGCalendarDateRange.m.orig 2015-10-07 08:15:42.214465876 +0800
	2	+++ sope-core/NGExtensions/NGCalendarDateRange.m 2015-10-07 08:19:18.227449713 +0800
	3	@@ -164,7 +164,7 @@
	4	if (other == self)
	5	return YES;
	6
	7	- if ([other isKindOfClass:self->isa] == NO)
	8	+ if ([other isKindOfClass: object_getClass(self)] == NO)
	9	return NO;
	10
	11	return ([self->startDate isEqual:[other startDate]] &&
	12	@@ -194,7 +194,7 @@
	13	description = [NSMutableString stringWithCapacity:64];
	14
	15	[description appendFormat:@"<%@[0x%p]: startDate:%@ endDate: ",
	16	- NSStringFromClass(self->isa), self, self->startDate];
	17	+ NSStringFromClass(object_getClass(self)), self, self->startDate];
	18
	19	if ([self->startDate isEqual:self->endDate])
	20	[description appendString:@"== startDate"];

Lines 8-10 Link Here

(-)sope/files/patch-sope-core_NGStreams_NGActiveSocket.m (+20 lines)
8	#include <netinet/in.h>	8	#include <netinet/in.h>
9	#include <netinet/tcp.h>	9	#include <netinet/tcp.h>
10		10
		11	@@ -410,7 +410,7 @@
		12	if ([self isConnected]) {
		13	[[[NGSocketAlreadyConnectedException alloc]
		14	initWithReason:@"Could not connected: socket is already connected"
		15	- socket:self address:self->remoteAddress] raise];
		16	+ socket:self] raise];
		17	return NO;
		18	}
		19
		20	@@ -748,10 +748,7 @@
		21	if ((readResult < 0) && (errno == EINVAL)) {
		22	NSLog(@"%s: invalid argument in NGDescriptorRecv(%i, 0x%p, %i, %i)",
		23	__PRETTY_FUNCTION__,
		24	- self->fd, _buf, _len, 0,
		25	- (self->receiveTimeout == 0.0)
		26	- ? -1 // block until data
		27	- : (int)(self->receiveTimeout * 1000.0));
		28	+ self->fd, _buf, _len, 0);
		29	}
		30	#endif

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EONull.m (+21 lines)
	1	--- ./sope-core/EOControl/EONull.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EONull.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -32,15 +32,15 @@
	4	@implementation EONull
	5
	6	+ (id)allocWithZone:(NSZone *)_zone {
	7	- return [NSNull allocWithZone:_zone];
	8	+ return (EONull*)[NSNull allocWithZone:_zone];
	9	}
	10
	11	+ (NSNull *)null {
	12	- return [NSNull null];
	13	+ return (EONull*)[NSNull null];
	14	}
	15
	16	- (id)self {
	17	- return [NSNull null];
	18	+ return (EONull*)[NSNull null];
	19	}
	20
	21	@end

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EOObserver.m (+13 lines)
	1	--- ./sope-core/EOControl/EOObserver.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EOObserver.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -21,6 +21,10 @@
	4
	5	#include "EOObserver.h"
	6	#include "common.h"
	7	+#ifdef __GNUSTEP_RUNTIME__
	8	+#define objc_malloc(x) malloc(x)
	9	+#define objc_free(x) free(x)
	10	+#endif
	11
	12	// THREAD, MT
	13

Line 0 Link Here

(-)sope/files/patch-sope-core__EOControl__EOOrQualifier.m (+15 lines)
	1	--- ./sope-core/EOControl/EOOrQualifier.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/EOControl/EOOrQualifier.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -22,6 +22,12 @@
	4	#include <EOControl/EOQualifier.h>
	5	#include "common.h"
	6
	7	+#ifdef __GNUSTEP_RUNTIME__
	8	+#define objc_calloc(x,y) calloc(x,y)
	9	+#define objc_free(x) free(x)
	10	+#endif
	11	+
	12	+
	13	@interface EOQualifier(EvalContext)
	14	- (BOOL)evaluateWithObject:(id)_object inEvalContext:(id)_ctx;
	15	@end

Line 0 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGBufferedStream.m (+29 lines)
	1	--- ./sope-core/NGStreams/NGBufferedStream.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGStreams/NGBufferedStream.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -66,7 +66,7 @@
	4	}
	5	if ((Class )_source == DataStreamClass) {
	6	[self release];
	7	- return [_source retain];
	8	+ return (id)[_source retain];
	9	}
	10
	11	if ((self = [super initWithSource:_source])) {
	12	@@ -90,7 +90,7 @@
	13	}
	14	if ((Class )_source == DataStreamClass) {
	15	[self release];
	16	- return [_source retain];
	17	+ return (id)[_source retain];
	18	}
	19
	20	if ((self = [super initWithInputSource:_source])) {
	21	@@ -109,7 +109,7 @@
	22	}
	23	if ((Class )_src == DataStreamClass) {
	24	[self release];
	25	- return [_src retain];
	26	+ return (id)[_src retain];
	27	}
	28
	29	if ((self = [super initWithOutputSource:_src])) {

Line 0 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGByteCountStream.m (+27 lines)
	1	--- ./sope-core/NGStreams/NGByteBuffer.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGStreams/NGByteBuffer.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -44,7 +44,7 @@
	4	DataStreamClass = NSClassFromString(@"NGDataStream");
	5	}
	6
	7	-+ (int)version {
Line 0 Link Here
	1	--- ./sope-core/NGStreams/NGByteCountStream.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGStreams/NGByteCountStream.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -87,7 +87,7 @@
	4	{
	5	register unsigned char *byteBuffer = _buf;
	6
	7	- for (_len = result - 1; _len >= 0; _len--, byteBuffer++) {
	8	+ for (NSInteger len = result - 1; len >= 0; len--, byteBuffer++) {
	9	if (*byteBuffer == byteToCount)
	10	byteReadCount++;
	11	}
	12	@@ -106,7 +106,7 @@
	13	{
	14	register unsigned char byteBuffer = (unsigned char )_buf;
	15
	16	- for (_len = result - 1; _len >= 0; _len--, byteBuffer++) {
	17	+ for (NSInteger len = result - 1; len >= 0; len--, byteBuffer++) {
	18	if (*byteBuffer == byteToCount)
	19	byteWriteCount++;
	20	}

Line 0 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGLocalSocketAddress.m (+24 lines)
	1	--- ./sope-core/NGStreams/NGLocalSocketAddress.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-core/NGStreams/NGLocalSocketAddress.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -77,8 +77,8 @@
	4	sizeof(((struct sockaddr_un *)self->address)->sun_path)) {
	5
	6	NSLog(@"LocalDomain name too long: maxlen=%i, len=%i, path=%@",
	7	- sizeof(((struct sockaddr_un *)self->address)->sun_path),
	8	- [_path cStringLength],
	9	+ (int)sizeof(((struct sockaddr_un *)self->address)->sun_path),
	10	+ (int)[_path cStringLength],
	11	_path);
	12	[NSException raise:NSInvalidArgumentException
	13	format:@"path to long as local domain socket address !"];
	14	@@ -100,8 +100,8 @@
	15	int addressCounter = 0;
	16	NSString *newPath;
	17
	18	- newPath = [NSString stringWithFormat:@"_ngsocket_%p_%p_%03d",
	19	- getpid(), [NSThread currentThread], addressCounter];
	20	+ newPath = [NSString stringWithFormat:@"_ngsocket_%d_%p_%03d",
	21	+ (int)getpid(), [NSThread currentThread], addressCounter];
	22	newPath = [socketDirectoryPath stringByAppendingPathComponent:newPath];
	23
	24	return [self initWithPath:newPath];

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOAttribute.m (+20 lines)
	1	--- ./sope-gdl1/GDLAccess/EOAttribute.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOAttribute.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -84,7 +84,7 @@
	4	}
	5
	6	// Is equal only if same name; used to make aliasing ordering stable
	7	-- (unsigned)hash {
	8	+- (NSUInteger)hash {
	9	return [self->name hash];
	10	}
	11
	12	@@ -535,7 +535,7 @@
	13	return @"";
	14
	15	clen = [self cStringLength];
	16	-#if GNU_RUNTIME
	17	+#if GNU_RUNTIME && !defined(__GNUSTEP_RUNTIME__)
	18	s = objc_atomic_malloc(clen + 4);
	19	#else
	20	s = malloc(clen + 4);

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EODatabase.m (+64 lines)
	1	--- ./sope-gdl1/GDLAccess/EODatabase.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EODatabase.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -185,7 +185,7 @@
	4	if ([self hasOpenChannels]) {
	5	[NSException raise:NSInvalidArgumentException
	6	format:
	7	- @"EODatabase:%x: All channels must be closed when changing "
	8	+ @"EODatabase:%@: All channels must be closed when changing "
	9	@"uniquing mode in the EODatabase, "
	10	@"in [EODatabase setUniquesObjects:]",
	11	self];
	12	@@ -203,7 +203,7 @@
	13	if ([self hasOpenChannels]) {
	14	[NSException raise:NSInvalidArgumentException
	15	format:
	16	- @"EODatabase:%x: All channels must be closed when changing "
	17	+ @"EODatabase:%@: All channels must be closed when changing "
	18	@"snapshoting mode in the EODatabase, "
	19	@"in [EODatabase setKeepsSnapshots:]",
	20	self];
	21	@@ -328,14 +328,14 @@
	22	if (_object == nil) {
	23	[NSException raise:NSInvalidArgumentException
	24	format:
	25	- @"EODatabase:%x: Cannot record null object, "
	26	+ @"EODatabase:%@: Cannot record null object, "
	27	@"in [EODatabase recordObject:primaryKey:entity:snapshot:]",
	28	self];
	29	}
	30	if ((_entity == nil) && self->flags.isUniquingObjects) {
	31	[NSException raise:NSInvalidArgumentException
	32	format:
	33	- @"EODatabase:%x: Cannot record object with null entity "
	34	+ @"EODatabase:%@: Cannot record object with null entity "
	35	@"when the database is uniquing objects, "
	36	@"in [EODatabase recordObject:primaryKey:entity:snapshot:]",
	37	self];
	38	@@ -344,7 +344,7 @@
	39	if ((_key == nil) && self->flags.isUniquingObjects) {
	40	[NSException raise:NSInvalidArgumentException
	41	format:
	42	- @"EODatabase:%x: Cannot record object with null key "
	43	+ @"EODatabase:%@: Cannot record object with null key "
	44	@"when the database is uniquing objects, "
	45	@"in [EODatabase recordObject:primaryKey:entity:snapshot:]",
	46	self];
	47	@@ -352,7 +352,7 @@
	48	if ((_snapshot == nil) && self->flags.isKeepingSnapshots) {
	49	[NSException raise:NSInvalidArgumentException
	50	format:
	51	- @"EODatabase:%x: Cannot record object with null snapshot "
	52	+ @"EODatabase:%@: Cannot record object with null snapshot "
	53	@"when the database is keeping snapshots, "
	54	@"in [EODatabase recordObject:primaryKey:entity:snapshot:]",
	55	self];
	56	@@ -408,7 +408,7 @@
	57
	58	- (void)reportError:(NSString*)error {
	59	if (self->flags.isLoggingWarnings)
	60	- NSLog(@"EODatabase:%x:%@", self, error);
	61	+ NSLog(@"EODatabase:%@:%@", self, error);
	62	}
	63
	64	@end /* EODatabase */

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EODatabaseChannel.m (+20 lines)
	1	--- ./sope-gdl1/GDLAccess/EODatabaseChannel.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EODatabaseChannel.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -81,7 +81,7 @@
	4	- (Class)privateClassForEntity:(EOEntity *)anEntity;
	5	- (void)privateUpdateCurrentEntityInfo;
	6	- (void)privateClearCurrentEntityInfo;
	7	-- (void)privateReportError:(SEL)method:(NSString *)format, ...;
	8	+- (void)privateReportError:(SEL)method :(NSString *)format, ...;
	9	@end
	10
	11	/*
	12	@@ -593,7 +593,7 @@
	13	}
	14	// Record object in database context
	15	if (![new_pkey isEqual:old_pkey]) {
	16	- NSLog(@"WARNING: (%@) primary key changed from %@ to %@",
	17	+ NSLog(@"WARNING: (%s) primary key changed from %@ to %@",
	18	__PRETTY_FUNCTION__, old_pkey, new_pkey);
	19	[databaseContext forgetObject:anObj];
	20	}

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EODatabaseContext.m (+142 lines)
		1	--- ./sope-gdl1/GDLAccess/EODatabaseContext.m.orig 2013-07-22 14:03:07.000000000 +0100
		2	+++ ./sope-gdl1/GDLAccess/EODatabaseContext.m 2013-10-09 17:03:32.000000000 +0100
		3	@@ -118,7 +118,7 @@
		4	if (self->transactionNestingLevel == 0) {
		5	[NSException raise:NSInternalInconsistencyException
		6	format:
		7	- @"EODatabaseContext:%x: No transaction in progress "
		8	+ @"EODatabaseContext:%@: No transaction in progress "
		9	@"in %s", self, _function];
		10	}
		11	}
		12	@@ -264,7 +264,7 @@
		13	(unsigned)transactionNestingLevel) {
		14	[NSException raise:NSInternalInconsistencyException
		15	format:
		16	- @"EODatabaseContext:%x:transaction nesting levels do not match: "
		17	+ @"EODatabaseContext:%@:transaction nesting levels do not match: "
		18	@"database has %d, adaptor has %d, "
		19	@"in [EODatabaseContext beginTransaction]",
		20	self, transactionNestingLevel,
		21	@@ -295,7 +295,7 @@
		22	(unsigned)self->transactionNestingLevel) {
		23	[NSException raise:NSInternalInconsistencyException
		24	format:
		25	- @"EODatabaseContext:%x:transaction nesting levels do not match: "
		26	+ @"EODatabaseContext:%@:transaction nesting levels do not match: "
		27	@"database has %d, adaptor has %d, "
		28	@"in [EODatabaseContext commitTransaction]",
		29	self, transactionNestingLevel,
		30	@@ -325,7 +325,7 @@
		31	(unsigned)self->transactionNestingLevel) {
		32	[NSException raise:NSInternalInconsistencyException
		33	format:
		34	- @"EODatabaseContext:%x:transaction nesting levels do not match: "
		35	+ @"EODatabaseContext:%@:transaction nesting levels do not match: "
		36	@"database has %d, adaptor has %d, "
		37	@"in [EODatabaseContext rollbackTransaction]",
		38	self, transactionNestingLevel,
		39	@@ -385,7 +385,7 @@
		40	if ([self transactionNestingLevel]) {
		41	[NSException raise:NSInvalidArgumentException
		42	format:
		43	- @"EODatabaseContext:%x: Cannot change update strategy "
		44	+ @"EODatabaseContext:%@: Cannot change update strategy "
		45	@"when context has a transaction open, "
		46	@"in [EODatabaseContext setUpdateStrategy]",
		47	self];
		48	@@ -483,14 +483,14 @@
		49	if (_object == nil) {
		50	[NSException raise:NSInvalidArgumentException
		51	format:
		52	- @"EODatabaseContext:%x: Cannot forget null object, "
		53	+ @"EODatabaseContext:%@: Cannot forget null object, "
		54	@"in [EODatabaseContext forgetObject]",
		55	self];
		56	}
		57	if ([EOFault isFault:_object]) {
		58	[NSException raise:NSInvalidArgumentException
		59	format:
		60	- @"EODatabaseContext:%x: Cannot forget forget a fault object, "
		61	+ @"EODatabaseContext:%@: Cannot forget forget a fault object, "
		62	@"in [EODatabaseContext forgetObject]",
		63	self];
		64	}
65	@@ -532,14 +532,14 @@
66	if (_object == nil) {
67	[NSException raise:NSInvalidArgumentException
68	format:
69	- @"EODatabaseContext:%x: Cannot record null object, "
70	+ @"EODatabaseContext:%@: Cannot record null object, "
71	@"in [EODatabaseContext recordObject:primaryKey:entity:snapshot:]",
72	self];
73	}
74	if ((_entity == nil) && self->isUniquingObjects) {
75	[NSException raise:NSInvalidArgumentException
76	format:
77	- @"EODatabaseContext:%x: Cannot record object with null entity "
78	+ @"EODatabaseContext:%@: Cannot record object with null entity "
79	@"when uniquing objects, "
80	@"in [EODatabaseContext recordObject:primaryKey:entity:snapshot:]",
81	self];
82	@@ -550,7 +550,7 @@
83	if ((_key == nil) && self->isUniquingObjects) {
84	[NSException raise:NSInvalidArgumentException
85	format:
86	- @"EODatabaseContext:%x: Cannot record object with null key "
87	+ @"EODatabaseContext:%@: Cannot record object with null key "
88	@"when uniquing objects, "
89	@"in [EODatabaseContext recordObject:primaryKey:entity:snapshot:]",
90	self];
91	@@ -558,7 +558,7 @@
92	if ((snapshot == nil) && isKeepingSnapshots && ![EOFault isFault:_object]) {
93	[NSException raise:NSInvalidArgumentException
94	format:
95	- @"EODatabaseContext:%x: Cannot record object with null snapshot "
96	+ @"EODatabaseContext:%@: Cannot record object with null snapshot "
97	@"when keeping snapshots, "
98	@"in [EODatabaseContext recordObject:primaryKey:entity:snapshot:]"
99	@": snapshot=%s keepsSnapshots=%s isFault=%s",
100	@@ -665,14 +665,14 @@
101	if (_object == nil) {
102	[NSException raise:NSInvalidArgumentException
103	format:
104	- @"EODatabaseContext:%x: Cannot record null object as locked, "
105	+ @"EODatabaseContext:%@: Cannot record null object as locked, "
106	@"in [EODatabaseContext recordLockedObject:]",
107	self];
108	}
109	if ([EOFault isFault:_object]) {
110	[NSException raise:NSInvalidArgumentException
111	format:
112	- @"EODatabaseContext:%x: Cannot record a fault object as locked, "
113	+ @"EODatabaseContext:%@: Cannot record a fault object as locked, "
114	@"in [EODatabaseContext recordLockedObject:]",
115	self];
116	}
117	@@ -695,14 +695,14 @@
118	if (_object == nil) {
119	[NSException raise:NSInvalidArgumentException
120	format:
121	- @"EODatabaseContext:%x: Cannot record null object as updatetd, "
122	+ @"EODatabaseContext:%@: Cannot record null object as updatetd, "
123	@"in [EODatabaseContext recordUpdatedObject:]",
124	self];
125	}
126	if ([EOFault isFault:_object]) {
127	[NSException raise:NSInvalidArgumentException
128	format:
129	- @"EODatabaseContext:%x: Cannot record fault object as updated, "
130	+ @"EODatabaseContext:%@: Cannot record fault object as updated, "
131	@"in [EODatabaseContext recordUpdatedObject:]",
132	self];
133	}
134	@@ -728,7 +728,7 @@
135	return [NSString stringWithFormat:
136	@"<%@[0x%p]: #channels=%i tx-nesting=%i>",
137	NSStringFromClass([self class]), self,
138	- [self->channels count],
139	+ (int)[self->channels count],
140	[self transactionNestingLevel]];
141	}
142

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EODatabaseFault.m (+107 lines)
		1	--- ./sope-gdl1/GDLAccess/EODatabaseFault.m.orig 2013-07-22 14:03:07.000000000 +0100
		2	+++ ./sope-gdl1/GDLAccess/EODatabaseFault.m 2013-10-09 17:03:32.000000000 +0100
		3	@@ -35,6 +35,7 @@
		4	#import "EODatabaseFaultResolver.h"
		5	#import "EOArrayProxy.h"
		6	#import "common.h"
		7	+#import "NGExtensions/NSException+misc.h"
		8
		9	#if NeXT_RUNTIME \|\| APPLE_RUNTIME
		10	# include <objc/objc-class.h>
		11	@@ -78,15 +79,15 @@
		12	@"to fault",
		13	NSStringFromClass([fault class]),
		14	#if defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__) \|\| (__GNU_LIBOBJC__ >= 20100911)
		15	- class_getInstanceSize([self class])];
		16	+ (int)class_getInstanceSize([self class])];
		17	#else
		18	((Class)self)->instance_size];
		19	#endif
		20	}
		21	fault->faultResolver = [[EOObjectFault alloc] initWithPrimaryKey:key
		22	entity:entity databaseChannel:channel zone:zone
		23	- targetClass:fault->isa];
		24	- fault->isa = self;
		25	+ targetClass:object_getClass(fault)];
		26	+ object_setClass(fault, self);
		27
		28	return (EODatabaseFault *)AUTORELEASE(fault);
		29	}
		30	@@ -130,7 +131,7 @@
		31	{
		32	EODatabaseFault *fault;
		33
		34	- fault = [NSMutableArray allocWithZone:zone];
		35	+ fault = (EODatabaseFault*)[NSMutableArray allocWithZone:zone];
		36
		37	#if defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__) \|\| (__GNU_LIBOBJC__ >= 20100911)
		38	if (class_getInstanceSize([fault class]) < class_getInstanceSize([self class])) {
		39	@@ -140,19 +141,19 @@
		40	(void)[fault autorelease];
		41	[NSException raise:NSInvalidArgumentException
		42	format:
		43	- @"Instances from class %s must be at least %d "
		44	+ @"Instances from class %@ must be at least %d "
		45	@"in size to fault",
		46	NSStringFromClass([fault class]),
		47	#if defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__) \|\| (__GNU_LIBOBJC__ >= 20100911)
		48	- class_getInstanceSize([self class])];
		49	+ (int)class_getInstanceSize([self class])];
		50	#else
		51	((Class)self)->instance_size];
		52	#endif
		53	}
		54	fault->faultResolver = [[EOArrayFault alloc] initWithQualifier:qualifier
		55	fetchOrder:fetchOrder databaseChannel:channel zone:zone
		56	- targetClass:fault->isa];
		57	- fault->isa = self;
		58	+ targetClass:object_getClass(fault)];
		59	+ object_setClass(fault, self);
		60
		61	return (NSArray *)AUTORELEASE(fault);
		62	}
		63	@@ -161,7 +162,7 @@
		64	EODatabaseFault aFault = (EODatabaseFault )fault;
65
66	// Check that argument is fault
67	- if (aFault->isa != self)
68	+ if (object_getClass(aFault) != self)
69	return nil;
70
71	return [(EODatabaseFaultResolver *)aFault->faultResolver primaryKey];
72	@@ -171,7 +172,7 @@
73	EODatabaseFault aFault = (EODatabaseFault )fault;
74
75	// Check that argument is fault
76	- if (aFault->isa != self)
77	+ if (object_getClass(aFault) != self)
78	return nil;
79
80	return [(EODatabaseFaultResolver *)aFault->faultResolver entity];
81	@@ -181,7 +182,7 @@
82	EODatabaseFault aFault = (EODatabaseFault )fault;
83
84	// Check that argument is fault
85	- if (aFault->isa != self)
86	+ if (object_getClass(aFault) != self)
87	return nil;
88
89	return [(EODatabaseFaultResolver *)aFault->faultResolver qualifier];
90	@@ -191,7 +192,7 @@
91	EODatabaseFault aFault = (EODatabaseFault )fault;
92
93	// Check that argument is fault
94	- if (aFault->isa != self)
95	+ if (object_getClass(aFault) != self)
96	return nil;
97
98	return [(EODatabaseFaultResolver *)aFault->faultResolver fetchOrder];
99	@@ -201,7 +202,7 @@
100	EODatabaseFault aFault = (EODatabaseFault )fault;
101
102	// Check that argument is fault
103	- if (aFault->isa != self)
104	+ if (object_getClass(aFault) != self)
105	return nil;
106
107	return [(EODatabaseFaultResolver *)aFault->faultResolver databaseChannel];

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOEntity.m (+20 lines)
	1	--- ./sope-gdl1/GDLAccess/EOEntity.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOEntity.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -106,7 +106,7 @@
	4	}
	5
	6	// Is equal only if same name; used to make aliasing ordering stable
	7	-- (unsigned)hash {
	8	+- (NSUInteger)hash {
	9	return [name hash];
	10	}
	11
	12	@@ -1100,7 +1100,7 @@
	13	unsigned cnt, cnt2;
	14
	15	clen = [self cStringLength];
	16	-#if GNU_RUNTIME
	17	+#if GNU_RUNTIME && !defined(__GNUSTEP_RUNTIME__)
	18	s = objc_atomic_malloc(clen + 4);
	19	#else
	20	s = malloc(clen + 4);

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOFExceptions.m (+38 lines)
	1	--- ./sope-gdl1/GDLAccess/EOFExceptions.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOFExceptions.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -63,7 +63,7 @@
	4	[destinationEntity name],
	5	definition,
	6	[relationship name]];
	7	- [self initWithName:NSStringFromClass(isa)
	8	+ [self initWithName:NSStringFromClass(object_getClass(self))
	9	reason:_reason userInfo:nil];
	10	return self;
	11	}
	12	@@ -74,7 +74,7 @@
	13	- initWithName:(NSString*)_name
	14	{
	15	id _reason = [NSString stringWithFormat:@"invalid name: '%@'", _name];
	16	- [self initWithName:NSStringFromClass(isa) reason:_reason userInfo:nil];
	17	+ [self initWithName:NSStringFromClass(object_getClass(self)) reason:_reason userInfo:nil];
	18	return self;
	19	}
	20	@end /* InvalidNameException */
	21	@@ -86,7 +86,7 @@
	22	id _reason = [NSString stringWithFormat:@"property '%@' does not exist in "
	23	@"entity '%@'", propertyName,
	24	[(EOEntity*)currentEntity name]];
	25	- [self initWithName:NSStringFromClass(isa)
	26	+ [self initWithName:NSStringFromClass(object_getClass(self))
	27	reason:_reason userInfo:nil];
	28	return self;
	29	}
	30	@@ -99,7 +99,7 @@
	31	id _reason = [NSString stringWithFormat:@"property '%@' must be to one in "
	32	@"entity '%@' to allow flattened attribute",
	33	propertyName, [(EOEntity*)currentEntity name]];
	34	- [self initWithName:NSStringFromClass(isa)
	35	+ [self initWithName:NSStringFromClass(object_getClass(self))
	36	reason:_reason userInfo:nil];
	37	return self;
	38	}

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOFault.h (+12 lines)
	1	--- ./sope-gdl1/GDLAccess/EOFault.h.orig 2013-10-09 17:08:09.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOFault.h 2013-10-09 17:08:30.000000000 +0100
	3	@@ -9,6 +9,9 @@
	4
	5	@class EOFaultHandler;
	6
	7	+#ifdef __clang__
	8	+__attribute__((objc_root_class))
	9	+#endif
	10	@interface EOFault
	11	{
	12	Class isa;

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOFault.m (+82 lines)
		1	--- ./sope-gdl1/GDLAccess/EOFault.m.orig 2013-07-22 14:03:07.000000000 +0100
		2	+++ ./sope-gdl1/GDLAccess/EOFault.m 2013-10-09 17:08:55.000000000 +0100
		3	@@ -67,7 +67,7 @@
		4	+ (void)makeObjectIntoFault:(id)_object withHandler:(EOFaultHandler *)_handler{
		5	[_handler setTargetClass:[_object class] extraData:((id *)_object)[1]];
		6
		7	- ((EOFault *)_object)->isa = self;
		8	+ object_setClass(_object, self);
		9	((EOFault *)_object)->faultResolver = [_handler retain];
		10	}
		11
		12	@@ -85,14 +85,14 @@
		13	int refs;
		14
		15	/* check if fault */
		16	- if (aFault->isa != self)
		17	+ if (object_getClass(aFault) != self)
		18	return;
		19
		20	/* get fault instance reference count + 1 set in creation methods */
		21	refs = aFault->faultResolver->faultReferences;
		22
		23	/* make clear instance */
		24	- aFault->isa = [aFault->faultResolver targetClass];
		25	+ object_setClass(aFault, [aFault->faultResolver targetClass]);
		26	aFault->faultResolver = [aFault->faultResolver autorelease];
		27	aFault->faultResolver = [aFault->faultResolver extraData];
		28
		29	@@ -112,7 +112,7 @@
		30	if (EOFaultClass == Nil) EOFaultClass = [EOFault class];
		31
		32	#if defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__) \|\| (__GNU_LIBOBJC__ >= 20100911)
		33	- for (clazz = ((EOFault *)fault)->isa; clazz; clazz = class_getSuperclass(clazz)) {
		34	+ for (clazz = object_getClass(fault); clazz; clazz = class_getSuperclass(clazz)) {
		35	#else
		36	for (clazz = ((EOFault *)fault)->isa; clazz; clazz = clazz->super_class) {
		37	#endif
		38	@@ -132,7 +132,7 @@
		39	EOFault aFault = (EOFault)_fault;
		40
		41	// Check that argument is fault
		42	- if (aFault->isa != self)
		43	+ if (object_getClass(aFault) != self)
		44	return nil;
		45
		46	return [aFault->faultResolver targetClass];
		47	@@ -182,7 +182,7 @@
		48	#if GNU_RUNTIME
		49	return (object_is_instance(self))
		50	? [self->faultResolver respondsToSelector:_selector forFault:self]
		51	- : class_get_class_method(self->isa, _selector) != METHOD_NULL;
		52	+ : class_get_class_method(object_getClass(self), _selector) != METHOD_NULL;
		53	#else
		54	# warning TODO: add complete implementation for Apple/NeXT runtime!
		55	return [self->faultResolver respondsToSelector:_selector forFault:self];
		56	@@ -239,7 +239,7 @@
		57	NSLog(@"WARNING: tried to deallocate EOFault class ..");
		58	}
		59	- (void)dealloc {
		60	- [self->isa clearFault:self];
		61	+ [object_getClass(self) clearFault:self];
		62	[self dealloc];
		63	}
		64
65	@@ -285,7 +285,7 @@
66	handler = self->faultResolver;
67	[handler completeInitializationOfObject:self];
68
69	- if (self->isa == [EOFault class]) {
70	+ if (object_getClass(self) == [EOFault class]) {
71	[NSException raise:@"NSInvalidArgumentException"
72	format:
73	@"fault error: %@ was not cleared during fault fetching",
74	@@ -294,7 +294,7 @@
75	}
76
77	+ (id)self {
78	- _resolveFault(self);
79	+ _resolveFault((id)self);
80	return self;
81	}
82

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOModel.m (+20 lines)
	1	--- ./sope-gdl1/GDLAccess/EOModel.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOModel.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -255,7 +255,7 @@
	4	NSMutableDictionary *model = [NSMutableDictionary dictionaryWithCapacity:64];
	5	int i, count;
	6
	7	- [model setObject:[[NSNumber numberWithInt:[isa version]] stringValue]
	8	+ [model setObject:[[NSNumber numberWithInt:[object_getClass(self) version]] stringValue]
	9	forKey:@"EOModelVersion"];
	10	if (name)
	11	[model setObject:name forKey:@"name"];
	12	@@ -416,7 +416,7 @@
	13	if ((s = [self adaptorName])) [ms appendFormat:@" adaptor=%@", s];
	14	if ((s = [self adaptorClassName])) [ms appendFormat:@" adaptor-class=%@", s];
	15
	16	- [ms appendFormat:@" #entities=%d", [self->entities count]];
	17	+ [ms appendFormat:@" #entities=%d", (int)[self->entities count]];
	18
	19	[ms appendString:@">"];
	20	return ms;

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOPrimaryKeyDictionary.m (+46 lines)
	1	--- ./sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -130,7 +130,7 @@
	4	- (BOOL)isEqualToDictionary:(NSDictionary *)other {
	5	if (self == (EOSinglePrimaryKeyDictionary*)other)
	6	return YES;
	7	- if (self->isa == ((EOSinglePrimaryKeyDictionary*)other)->isa) {
	8	+ if (object_getClass(self) == object_getClass(other)) {
	9	if (fastHash == ((EOSinglePrimaryKeyDictionary*)other)->fastHash &&
	10	[key isEqual:((EOSinglePrimaryKeyDictionary*)other)->key] &&
	11	[value isEqual:((EOSinglePrimaryKeyDictionary*)other)->value])
	12	@@ -157,7 +157,7 @@
	13	- (BOOL)fastIsEqual:(id)other {
	14	if (self == other)
	15	return YES;
	16	- if (self->isa == ((EOSinglePrimaryKeyDictionary*)other)->isa) {
	17	+ if (object_getClass(self) == object_getClass(other)) {
	18	if (fastHash == ((EOSinglePrimaryKeyDictionary*)other)->fastHash &&
	19	key == ((EOSinglePrimaryKeyDictionary*)other)->key &&
	20	[value isEqual:((EOSinglePrimaryKeyDictionary*)other)->value])
	21	@@ -263,14 +263,14 @@
	22	return nil;
	23	}
	24
	25	-- (unsigned int)count {
	26	+- (NSUInteger)count {
	27	return self->count;
	28	}
	29	- (BOOL)isNotEmpty {
	30	return self->count > 0 ? YES : NO;
	31	}
	32
	33	-- (unsigned int)hash {
	34	+- (NSUInteger)hash {
	35	return self->count;
	36	}
	37
	38	@@ -316,7 +316,7 @@
	39	- (BOOL)fastIsEqual:(id)aDict {
	40	int i;
	41
	42	- if (self->isa != ((EOMultiplePrimaryKeyDictionary*)aDict)->isa) {
	43	+ if (object_getClass(self) == object_getClass(aDict)) {
	44	[NSException raise:NSInvalidArgumentException
	45	format:@"fastIsEqual: can compare only "
	46	@"EOPrimaryKeyDictionary instances"];

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EORecordDictionary.m (+26 lines)
	1	--- ./sope-gdl1/GDLAccess/EORecordDictionary.m.orig 2013-10-09 17:06:13.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EORecordDictionary.m 2013-10-09 17:08:07.000000000 +0100
	3	@@ -55,7 +55,7 @@
	4	- (id)init {
	5	RELEASE(self);
	6	if (emptyDict == nil) emptyDict = [[NSDictionary alloc] init];
	7	- return [emptyDict retain];
	8	+ return (id)[emptyDict retain];
	9	}
	10
	11	- (id)initWithObjects:(id )_objects forKeys:(id )_keys
	12	@@ -64,12 +64,12 @@
	13	if (_count == 0) {
	14	RELEASE(self);
	15	if (emptyDict == nil) emptyDict = [[NSDictionary alloc] init];
	16	- return [emptyDict retain];
	17	+ return (id)[emptyDict retain];
	18	}
	19
	20	if (_count == 1) {
	21	RELEASE(self);
	22	- return [[NSDictionary alloc]
	23	+ return (id)[[NSDictionary alloc]
	24	initWithObjects:_objects forKeys:_keys
	25	count:_count];
	26	}

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EORelationship.m (+20 lines)
	1	--- ./sope-gdl1/GDLAccess/EORelationship.m.orig 2013-07-22 14:03:07.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EORelationship.m 2013-10-09 17:03:32.000000000 +0100
	3	@@ -84,7 +84,7 @@
	4	}
	5
	6	// Is equal only if same name; used to make aliasing ordering stable
	7	-- (unsigned)hash {
	8	+- (NSUInteger)hash {
	9	return [self->name hash];
	10	}
	11
	12	@@ -405,7 +405,7 @@
	13	NS_DURING
	14	[self setDefinition:self->definition];
	15	NS_HANDLER {
	16	- NSLog([localException reason]);
	17	+ NSLog(@"%@", [localException reason]);
	18	[[self->entity model] errorInReading];
	19	}
	20	NS_ENDHANDLER;

Line 0 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOSQLQualifier.m (+19 lines)
	1	--- ./sope-gdl1/GDLAccess/EOSQLQualifier.m.orig 2013-10-09 17:08:56.000000000 +0100
	2	+++ ./sope-gdl1/GDLAccess/EOSQLQualifier.m 2013-10-09 17:09:36.000000000 +0100
	3	@@ -39,6 +39,7 @@
	4	#include <EOControl/EOKeyValueCoding.h>
	5	#include <EOControl/EONull.h>
	6	#import "EOQualifierScanner.h"
	7	+#import "NGExtensions/NSException+misc.h"
	8
	9	#if LIB_FOUNDATION_LIBRARY
	10	# include <extensions/DefaultScannerHandler.h>
	11	@@ -468,7 +469,7 @@
	12	- (id)copyWithZone:(NSZone*)zone {
	13	EOSQLQualifier* copy = nil;
	14
	15	- copy = [[self->isa allocWithZone:zone] init];
	16	+ copy = [[object_getClass(self) allocWithZone:zone] init];
	17	copy->entity = RETAIN(self->entity);
	18	copy->content = [self->content mutableCopyWithZone:zone];
	19	copy->relationshipPaths = [self->relationshipPaths mutableCopyWithZone:zone];