Attachment #163225 for bug #204617

Lines 2-9 Link Here

(-)sope/Makefile (-2 / +1 lines)
2	# $FreeBSD: head/devel/sope/Makefile 400145 2015-10-25 06:47:26Z pi $	2	# $FreeBSD: head/devel/sope/Makefile 400145 2015-10-25 06:47:26Z pi $
3		3
4	PORTNAME= sope	4	PORTNAME= sope
5	PORTVERSION= 2.3.2	5	PORTVERSION= 2.3.3
6	PORTREVISION= 1
7	CATEGORIES= devel gnustep	6	CATEGORIES= devel gnustep
8	MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/	7	MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
9	DISTNAME= SOPE-${PORTVERSION}	8	DISTNAME= SOPE-${PORTVERSION}

Lines 1-2 Link Here

(-)sope/distinfo (-2 / +2 lines)
1	SHA256 (SOPE-2.3.2.tar.gz) = 9d2072c6ee2b864d57d30f43079ff7c0921f8a94de066f32753337aef74e85d8	1	SHA256 (SOPE-2.3.3.tar.gz) = da94b25eff35346c9ed6d80378f593b813d5eeb1d946d1f8db979c10b69d83c8
2	SIZE (SOPE-2.3.2.tar.gz) = 2269903	2	SIZE (SOPE-2.3.3.tar.gz) = 2272440




--- sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m.orig	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m
@@ -75,11 +75,7 @@ static Class NSDateClass = Nil;
         printf("  ");
       printf("content: [%s %s]: %0.3fs\n",
              [[component name] cString], 
-#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
-	     sel_getName(_cmd), 
-#else
 	     sel_get_name(_cmd), 
-#endif
 	     diff);
     }
     

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver_NGObjWeb_DynamicElements_WOComponentReference.m (-11 lines)
1	--- sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m
3	@@ -172,7 +172,7 @@ _updateComponent(WOComponentReference *s
4	printf(" ");
5	printf("[%s %s]: %0.3fs\n",
6	[[child name] cString],
7	-#if APPLE_RUNTIME \|\| NeXT_RUNTIME \|\| (__GNU_LIBOBJC__ >= 20100911)
8	+#if APPLE_RUNTIME \|\| NeXT_RUNTIME \|\| (__GNU_LIBOBJC__ >= 20100911) \|\| defined(__GNUSTEP_RUNTIME__)
9	sel_getName(_cmd),
10	#else
11	sel_get_name(_cmd),

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver_NGObjWeb_DynamicElements_WOHyperlinkInfo.m (-11 lines)
1	--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
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/DynamicElements/decommon.h.orig	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/DynamicElements/decommon.h
@@ -35,6 +35,10 @@
 @end
 #endif
 
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
+#  define sel_get_name(__XXX__) sel_getName(__XXX__)
+#endif
+
 #include <NGExtensions/NGExtensions.h>
 #include "WOResponse+private.h"
 #include <NGObjWeb/WOContext.h>




--- sope-appserver/NGObjWeb/NSObject+WO.m.orig	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/NSObject+WO.m
@@ -259,7 +259,7 @@ IMP WOGetKVCGetMethod(id object, NSStrin
   if (object == nil) return NULL;
   if (_key   == nil) return NULL;
 
-#if GNU_RUNTIME && !(defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911))
+#if GNU_RUNTIME && !(defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) && !defined(__GNUSTEP_RUNTIME__)
   {
     unsigned keyLen;
     char     *buf;
@@ -317,7 +317,9 @@ id WOGetKVCValueUsingMethod(id object, N
       return nil;
     free(buf); buf = NULL;
   }
-#if GNUSTEP_BASE_LIBRARY
+// This appears to be a work around for an old version of GNUstep-base not
+// correctly handling the case where there is no method.
+#if GNUSTEP_BASE_LIBRARY && !defined(__GNUSTEP_RUNTIME__)
   if (!__objc_responds_to(object, getSel))
     return nil;
 #endif




--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m.orig	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
@@ -1021,9 +1021,9 @@ static __inline__ const char *monthAbbr(
   [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)




--- sope-appserver/NGObjWeb/WOSession.m.orig	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/WOSession.m
@@ -33,10 +33,6 @@
 #include "common.h"
 #include <string.h>
 
-#if !defined(sel_get_name) && ((defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__))
-#  define sel_get_name sel_getName
-#endif
-
 #if APPLE_FOUNDATION_LIBRARY || NeXT_Foundation_LIBRARY
 @interface NSObject(Miss)
 - (id)notImplemented:(SEL)cmd;

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver_NGObjWeb_WebDAV_SoObjectDataSource.m (-11 lines)
1	--- sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
3	@@ -137,7 +137,7 @@ static BOOL debugOn = NO;
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;




--- sope-appserver/NGObjWeb/common.h.orig	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/common.h
@@ -51,13 +51,17 @@
 #include <NGExtensions/NGLogging.h>
 #include <NGStreams/NGStreams.h>
 
-#if NeXT_RUNTIME || APPLE_RUNTIME || (__GNU_LIBOBJC__ >= 20100911)
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
 #  ifndef sel_get_name
 #    define sel_get_name(__XXX__)    sel_getName(__XXX__)
 #    define sel_get_any_uid(__XXX__) sel_getUid(__XXX__)
 #  endif
 #endif
 
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
+#    define sel_get_uid(__XXX__)   sel_getUid(__XXX__);
+#endif
+
 #define IS_DEPRECATED \
   [self warnWithFormat:@"used deprecated method: %s:%i.", \
           __PRETTY_FUNCTION__, __LINE__];

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Associations__WOScriptAssociation.m (-11 lines)
1	--- sope-appserver/NGObjWeb/Associations/WOScriptAssociation.m.orig 2015-09-16 18:26:48 UTC
2	+++ sope-appserver/NGObjWeb/Associations/WOScriptAssociation.m
3	@@ -125,7 +125,7 @@ static BOOL doDebug = NO;
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];

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Associations__WOValueAssociation.m (-11 lines)
1	--- sope-appserver/NGObjWeb/Associations/WOValueAssociation.m.orig 2015-09-16 18:26:48 UTC
2	+++ sope-appserver/NGObjWeb/Associations/WOValueAssociation.m
3	@@ -161,7 +161,7 @@ static Class StrClass = Nil;
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	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m
@@ -77,10 +77,9 @@ typedef struct {
   [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 {

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__DynamicElements__WOHyperlink.m (-11 lines)
1	--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m
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;

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__NGHttp__NGHttpHeaderFieldParser.m (-11 lines)
1	--- sope-appserver/NGObjWeb/NGHttp/NGHttpHeaderFieldParser.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/NGHttp/NGHttpHeaderFieldParser.m
3	@@ -31,7 +31,7 @@ static Class NSArrayClass = Nil;
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]]) {

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__NGHttp__NGHttpResponse.h (-11 lines)
1	--- sope-appserver/NGObjWeb/NGHttp/NGHttpResponse.h.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/NGHttp/NGHttpResponse.h
3	@@ -122,7 +122,7 @@ static inline BOOL NGIsClientErrorHttpSt
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	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m
@@ -93,7 +93,7 @@ static __inline__ NSString *urlStringFro
                             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 @@ NGHashMap *NGDecodeUrlFormParameters(con
 - (NSString *)stringByApplyingURLEncoding {
   /* NGExtensions/NSString+misc.h */
   NSLog(@"Note: Called deprecated -stringByApplyingURLEncoding method "
-	@"(use -stringByEscapingURL instead)", __PRETTY_FUNCTION__);
+	@"(use -stringByEscapingURL instead)");
   return [self stringByEscapingURL];
 }
 

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__SoObjects__SoClassSecurityInfo.h (-6 lines)
1	--- sope-appserver/NGObjWeb/SoObjects/SoClassSecurityInfo.h.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/SoObjects/SoClassSecurityInfo.h
3	@@ -101,7 +101,7 @@
4	- (BOOL)hasDefaultAccessDeclaration;
5	- (void)declarePublic:(NSString *)_firstName, ...;
6	- (void)declarePrivate:(NSString *)_firstName, ...;

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__SoObjects__SoClassSecurityInfo.m (-6 lines)
1	--- sope-appserver/NGObjWeb/SoObjects/SoClassSecurityInfo.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/SoObjects/SoClassSecurityInfo.m
3	@@ -111,7 +111,7 @@
4	va_end(va);
5	}
6




--- sope-appserver/NGObjWeb/SoObjects/SoComponent.m.orig	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/SoObjects/SoComponent.m
@@ -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;
   

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__SoObjects__SoDefaultRenderer.m (-11 lines)
1	--- sope-appserver/NGObjWeb/SoObjects/SoDefaultRenderer.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/SoObjects/SoDefaultRenderer.m
3	@@ -154,7 +154,7 @@ static int debugOn = 0;
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;

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WOComponentScriptPart.m (-11 lines)
1	--- sope-appserver/NGObjWeb/Templates/WOComponentScriptPart.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/Templates/WOComponentScriptPart.m
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"];

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WODParser.m (-11 lines)
1	--- sope-appserver/NGObjWeb/Templates/WODParser.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/Templates/WODParser.m
3	@@ -271,7 +271,7 @@ static NSException *_makeException(NSExc
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--)

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WOHTMLParser.m (-11 lines)
1	--- sope-appserver/NGObjWeb/Templates/WOHTMLParser.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/Templates/WOHTMLParser.m
3	@@ -246,7 +246,7 @@ static NSException *_makeHtmlException(N
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--)

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WOTemplate.m (-11 lines)
1	--- sope-appserver/NGObjWeb/Templates/WOTemplate.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/Templates/WOTemplate.m
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;

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__Templates__WOxElemBuilder.m (-11 lines)
1	--- sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m
3	@@ -191,7 +191,7 @@ static WOAssociation *yesAssoc = nil;
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	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/WOComponent+Sync.m
@@ -87,7 +87,7 @@ void WOComponent_syncFromParent(WOCompon
 #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 @@ void WOComponent_syncToParent(WOComponen
 #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	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/WOComponent.m
@@ -1037,7 +1037,7 @@ static inline id _getExtraVar(WOComponen
 
 - (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 @@ static inline id _getExtraVar(WOComponen
     /* 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 @@ static inline id _getExtraVar(WOComponen
   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];

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOHTTPConnection.m (-11 lines)
1	--- sope-appserver/NGObjWeb/WOHTTPConnection.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOHTTPConnection.m
3	@@ -352,7 +352,7 @@ static BOOL logStream = NO;
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	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m
@@ -427,7 +427,7 @@ static BOOL     debugOn                 
 }
 
 - (NGActiveSocket *)_accept {
-  NGActiveSocket *connection;
+  id<NGActiveSocket>  connection;
   id<NGSocketAddress> remote;
 
   NS_DURING {
@@ -450,7 +450,7 @@ static BOOL     debugOn                 
   }
   NS_ENDHANDLER;
 
-  return connection;
+  return (NGActiveSocket*)connection;
 }
 
 - (void)_handleConnection:(NGActiveSocket *)connection {

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOHttpAdaptor__WORequest+Adaptor.m (-11 lines)
1	--- sope-appserver/NGObjWeb/WOHttpAdaptor/WORequest+Adaptor.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WORequest+Adaptor.m
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	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/WOMailDelivery.m
@@ -180,7 +180,8 @@ WOMailDelivery *sharedInstance = nil;
       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");

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOResponse.m (-11 lines)
1	--- sope-appserver/NGObjWeb/WOResponse.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOResponse.m
3	@@ -305,7 +305,7 @@ static __inline__ char *monthName(int m)
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	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/WOSessionStore.m
@@ -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])

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOSimpleHTTPParser.m (-11 lines)
1	--- sope-appserver/NGObjWeb/WOSimpleHTTPParser.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOSimpleHTTPParser.m
3	@@ -449,7 +449,7 @@ static NSString *stringForHeaderName(cha
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	2015-09-16 18:26:49 UTC
+++ sope-appserver/NGObjWeb/WOStatisticsStore.m
@@ -35,7 +35,7 @@
   unsigned       zippedResponsesCount;
   unsigned       totalZippedSize;
   unsigned       largestResponseSize;
-  unsigned       smallestResponseSize;
+  NSInteger      smallestResponseSize;
   NSTimeInterval minimumDuration;
   NSTimeInterval maximumDuration;
   NSTimeInterval totalDuration;
@@ -420,7 +420,7 @@ static id mkdbl(double d) {
   /* response */
   
   [result appendFormat:@"%i %i",
-            [_response status], [[_response content] length]];
+            [_response status], (int)[[_response content] length]];
   
   if ((startDate = [request startDate]) != nil) {
     NSTimeInterval duration;

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WebDAV__SoDAVSQLParser.h (-6 lines)
1	--- sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.h.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.h
3	@@ -64,7 +64,7 @@
4	consume:(BOOL)consume;
5	- (BOOL)parseQualifier:(EOQualifier **)result
6	from:(unichar *)pos length:(unsigned )len;

Lines 1-29 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WebDAV__SoDAVSQLParser.m (-6 lines)
1	--- sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m
3	@@ -396,7 +396,7 @@ static inline BOOL isTokStopChar(unichar
4	return YES;
5	}
6

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WebDAV__SoWebDAVRenderer.m (-11 lines)
1	--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
3	@@ -1311,7 +1311,7 @@ static BOOL useRelativeURLs = YE
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>"];

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WebDAV__SoWebDAVValue.m (-11 lines)
1	--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVValue.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVValue.m
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];

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb___WOStringTable.m (-11 lines)
1	--- sope-appserver/NGObjWeb/_WOStringTable.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/_WOStringTable.m
3	@@ -162,7 +162,7 @@ static NSStringEncoding stringFilesEncod
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:@">"];

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__JSStringTable.m (-11 lines)
1	--- sope-appserver/WEExtensions/JSStringTable.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/WEExtensions/JSStringTable.m
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

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WEMonthOverview.m (-11 lines)
1	--- sope-appserver/WEExtensions/WEMonthOverview.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/WEExtensions/WEMonthOverview.m
3	@@ -510,7 +510,7 @@ _takeValuesInCell(WEMonthOverview *self,
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

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WEResourceKey.m (-6 lines)
1	--- sope-appserver/WEExtensions/WEResourceKey.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/WEExtensions/WEResourceKey.m
3	@@ -65,7 +65,7 @@
4
5	/* equality */
6

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WEResourceManager.m (-11 lines)
1	--- sope-appserver/WEExtensions/WEResourceManager.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/WEExtensions/WEResourceManager.m
3	@@ -620,7 +620,7 @@ checkCache(NSDictionary *_cache, WEResou
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];

Lines 1-20 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WETableCalcMatrix.h (-6 lines)
1	--- sope-appserver/WEExtensions/WETableCalcMatrix.h.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/WEExtensions/WETableCalcMatrix.h
3	@@ -66,7 +66,7 @@
4	BOOL rowCheck;
5	}
6




--- sope-appserver/WEExtensions/WETableCalcMatrix.m.orig	2015-09-16 18:26:49 UTC
+++ sope-appserver/WEExtensions/WETableCalcMatrix.m
@@ -89,8 +89,8 @@ static NSNull *null = nil;
                      @"<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 @@ static NSNull *null = nil;
   MatrixCoord *positions;
 }
 

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WETableMatrix.m (-11 lines)
1	--- sope-appserver/WEExtensions/WETableMatrix.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/WEExtensions/WETableMatrix.m
3	@@ -139,7 +139,7 @@ static NSNumber *numForUInt(unsigned int
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	2015-09-16 18:26:49 UTC
+++ sope-appserver/WEExtensions/WETableView/WETableView.m
@@ -1525,9 +1525,9 @@ static inline void _applyState_(WETableV
         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);
           }

Lines 1-11 Link Here

(-)sope/files/patch-sope-appserver__WOExtensions__WOTabPanel.m (-11 lines)
1	--- sope-appserver/WOExtensions/WOTabPanel.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/WOExtensions/WOTabPanel.m
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=\""];

Lines 1-10 Link Here

(-)sope/files/patch-sope-core_EOControl_EOKeyValueCoding.m (-10 lines)
1	--- sope-core/EOControl/EOKeyValueCoding.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOKeyValueCoding.m
3	@@ -26,7 +26,6 @@
4	#if GNU_RUNTIME
5
6	#if __GNU_LIBOBJC__ >= 20100911
7	-# define sel_get_any_uid sel_getUid
8	# include <objc/runtime.h>
9	#else
10	# include <objc/encoding.h>




--- sope-core/EOControl/EOSortOrdering.m.orig	2015-09-16 18:26:49 UTC
+++ sope-core/EOControl/EOSortOrdering.m
@@ -29,7 +29,9 @@
 #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)

Lines 1-11 Link Here

(-)sope/files/patch-sope-core_EOControl_EOValidation.m (-11 lines)
1	--- sope-core/EOControl/EOValidation.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOValidation.m
3	@@ -153,7 +153,7 @@
4	#if NeXT_RUNTIME
5	sel = sel_getUid(buf);
6	#else
7	- sel = sel_get_any_uid(buf);
8	+ sel = sel_registerName(buf);
9	#endif
10	if (sel) {
11	if ([self respondsToSelector:sel]) {




--- sope-core/EOControl/common.h.orig	2015-09-16 18:26:49 UTC
+++ sope-core/EOControl/common.h
@@ -40,10 +40,11 @@
 #  endif
 #endif
 
-#if __GNU_LIBOBJC__ >= 20100911
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
 #  ifndef sel_eq
 #    define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
 #  endif
+#  define sel_get_any_uid(__XXX__) sel_getUid(__XXX__)
 #endif
 
 #ifndef ASSIGN

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

Lines 1-11 Link Here

(-)sope/files/patch-sope-core_NGExtensions_FdExt.subproj_NSString+Encoding.m (-11 lines)
1	--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
3	@@ -209,7 +209,7 @@ static char *iconv_wrapper(id self, char
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-09-16 18:26:49 UTC
+++ sope-core/NGExtensions/NGCalendarDateRange.m
@@ -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"];

Lines 1-10 Link Here

(-)sope/files/patch-sope-core_NGExtensions_NGExtensions_NGBundleManager.h (-10 lines)
1	--- sope-core/NGExtensions/NGExtensions/NGBundleManager.h.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/NGExtensions/NGBundleManager.h
3	@@ -23,6 +23,7 @@
4	#define __NGExtensions_NGBundleManager_H__
5
6	#import <Foundation/NSObject.h>
7	+#define EXPOSE_NSBundle_IVARS
8	#import <Foundation/NSBundle.h>
9	#import <Foundation/NSMapTable.h>
10	#include <NGExtensions/NGExtensionsDecls.h>

Lines 1-10 Link Here

(-)sope/files/patch-sope-core_NGExtensions_NGExtensions_NSException+misc.h (-10 lines)
1	--- sope-core/NGExtensions/NGExtensions/NSException+misc.h.orig 2015-09-16 18:26:50 UTC
2	+++ sope-core/NGExtensions/NGExtensions/NSException+misc.h
3	@@ -22,6 +22,7 @@
4	#ifndef __NGExtensions_NSException_misc_H__
5	#define __NGExtensions_NSException_misc_H__
6
7	+#define EXPOSE_NSException_IVARS
8	#import <Foundation/NSException.h>
9	#import <Foundation/NSLock.h>
10




--- sope-core/NGStreams/NGActiveSocket.m.orig	2015-09-16 18:26:50 UTC
+++ sope-core/NGStreams/NGActiveSocket.m
@@ -19,6 +19,7 @@
   02111-1307, USA.
 */
 
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
@@ -410,7 +411,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 +749,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
     




--- sope-core/NGStreams/NGStreamCoder.m.orig	2015-09-16 18:26:50 UTC
+++ sope-core/NGStreams/NGStreamCoder.m
@@ -28,6 +28,10 @@
 #  include <objc/objc-class.h>
 #endif
 
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
+#  define sel_get_name(__XXX__) sel_getName(__XXX__)
+#endif
+
 #define FINAL static inline
 
 extern id nil_method(id, SEL, ...);

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__EOControl__EOFetchSpecification.m (-11 lines)
1	--- sope-core/EOControl/EOFetchSpecification.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOFetchSpecification.m
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;

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__EOControl__EOGlobalID.m (-11 lines)
1	--- sope-core/EOControl/EOGlobalID.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOGlobalID.m
3	@@ -95,7 +95,7 @@ static unsigned int ip;
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

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__EOControl__EOKeyComparisonQualifier.m (-11 lines)
1	--- sope-core/EOControl/EOKeyComparisonQualifier.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOKeyComparisonQualifier.m
3	@@ -200,7 +200,7 @@ static EONull *null = nil;
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	}

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__EOControl__EOKeyGlobalID.m (-11 lines)
1	--- sope-core/EOControl/EOKeyGlobalID.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOKeyGlobalID.m
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

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__EOControl__EOKeyValueQualifier.m (-11 lines)
1	--- sope-core/EOControl/EOKeyValueQualifier.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOKeyValueQualifier.m
3	@@ -227,7 +227,7 @@ static EONull *null = nil;
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	2015-09-16 18:26:49 UTC
+++ sope-core/EOControl/EONull.m
@@ -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	2015-09-16 18:26:49 UTC
+++ sope-core/EOControl/EOObserver.m
@@ -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	2015-09-16 18:26:49 UTC
+++ sope-core/EOControl/EOOrQualifier.m
@@ -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

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__EOControl__EOSQLParser.h (-6 lines)
1	--- sope-core/EOControl/EOSQLParser.h.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOSQLParser.h
3	@@ -64,7 +64,7 @@
4	consume:(BOOL)consume;
5	- (BOOL)parseQualifier:(EOQualifier **)result
6	from:(unichar *)pos length:(unsigned )len;

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__EOControl__EOSQLParser.m (-6 lines)
1	--- sope-core/EOControl/EOSQLParser.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOSQLParser.m
3	@@ -404,7 +404,7 @@ static inline BOOL isTokStopChar(unichar
4	return YES;
5	}
6

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NGPropertyListParser.m (-11 lines)
1	--- sope-core/NGExtensions/FdExt.subproj/NGPropertyListParser.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/FdExt.subproj/NGPropertyListParser.m
3	@@ -453,7 +453,7 @@ static NSException *_makeException(NSExc
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--)

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NSException+misc.m (-11 lines)
1	--- sope-core/NGExtensions/FdExt.subproj/NSException+misc.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/FdExt.subproj/NSException+misc.m
3	@@ -85,7 +85,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	2015-09-16 18:26:49 UTC
+++ sope-core/NGExtensions/FdExt.subproj/NSObject+Logs.m
@@ -52,10 +52,10 @@ static inline Class NSStringClass(void) 
                                          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;

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NSObject+Values.m (-11 lines)
1	--- sope-core/NGExtensions/FdExt.subproj/NSObject+Values.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/FdExt.subproj/NSObject+Values.m
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 {

Lines 1-10 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NSSet+enumerator.m (-10 lines)
1	--- sope-core/NGExtensions/FdExt.subproj/NSSet+enumerator.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/FdExt.subproj/NSSet+enumerator.m
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)

Lines 1-10 Link Here

(-)sope/files/patch-sope-core__NGExtensions__FdExt.subproj__NSString+misc.m (-10 lines)
1	--- sope-core/NGExtensions/FdExt.subproj/NSString+misc.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/FdExt.subproj/NSString+misc.m
3	@@ -21,6 +21,7 @@
4	*/
5
6	#include "NSString+misc.h"
7	+#include "NSException+misc.h"
8	#include "common.h"
9
10	@implementation NSObject(StringBindings)

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__NGExtensions__NGDirectoryEnumerator.m (-11 lines)
1	--- sope-core/NGExtensions/NGDirectoryEnumerator.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/NGDirectoryEnumerator.m
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	2015-09-16 18:26:50 UTC
+++ sope-core/NGStreams/NGBufferedStream.m
@@ -66,7 +66,7 @@ static Class DataStreamClass = Nil;
   }
   if (*(Class *)_source == DataStreamClass) {
     [self release];
-    return [_source retain];
+    return (id)[_source retain];
   }
 
   if ((self = [super initWithSource:_source])) {
@@ -90,7 +90,7 @@ static Class DataStreamClass = Nil;
   }
   if (*(Class *)_source == DataStreamClass) {
     [self release];
-    return [_source retain];
+    return (id)[_source retain];
   }
 
   if ((self = [super initWithInputSource:_source])) {
@@ -109,7 +109,7 @@ static Class DataStreamClass = Nil;
   }
   if (*(Class *)_src == DataStreamClass) {
     [self release];
-    return [_src retain];
+    return (id)[_src retain];
   }
 
   if ((self = [super initWithOutputSource:_src])) {




--- sope-core/NGStreams/NGByteBuffer.m.orig	2015-09-16 18:26:50 UTC
+++ sope-core/NGStreams/NGByteBuffer.m
@@ -44,7 +44,7 @@ static Class DataStreamClass = Nil;
   DataStreamClass   = NSClassFromString(@"NGDataStream");
 }
 
-+ (int)version {
++ (NSInteger)version {
   return [super version] + 1;
 }
 
@@ -61,7 +61,7 @@ static Class DataStreamClass = Nil;
   }
   if (*(Class *)_source == DataStreamClass) {
     [self release];
-    return [_source retain];
+    return (id)[_source retain];
   }
   if ((self = [super initWithSource:_source])) {
     unsigned size = 0;




--- sope-core/NGStreams/NGByteCountStream.m.orig	2015-09-16 18:26:50 UTC
+++ sope-core/NGStreams/NGByteCountStream.m
@@ -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++;
     }

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGCTextStream.m (-11 lines)
1	--- sope-core/NGStreams/NGCTextStream.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-core/NGStreams/NGCTextStream.m
3	@@ -265,7 +265,7 @@ static void _flushAtExit(void) {
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;

Lines 1-11 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGConcreteStreamFileHandle.m (-11 lines)
1	--- sope-core/NGStreams/NGConcreteStreamFileHandle.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-core/NGStreams/NGConcreteStreamFileHandle.m
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	2015-09-16 18:26:50 UTC
+++ sope-core/NGStreams/NGLocalSocketAddress.m
@@ -77,8 +77,8 @@ static NSString *socketDirectoryPath = @
         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 @@ static NSString *socketDirectoryPath = @
   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];

Lines 1-11 Link Here

(-)sope/files/patch-sope-gdl1_GDLAccess_common.h (-11 lines)
1	--- sope-gdl1/GDLAccess/common.h.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/common.h
3	@@ -55,7 +55,7 @@
4	# endif
5	#endif
6
7	-#if __GNU_LIBOBJC__ >= 20100911
8	+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) \|\| defined(__GNUSTEP_RUNTIME__)
9	# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
10	# ifndef SEL_EQ
11	# define SEL_EQ(__A__,__B__) sel_isEqual(__A__,__B__)

Lines 1-10 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOAdaptor.m (-10 lines)
1	--- sope-gdl1/GDLAccess/EOAdaptor.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EOAdaptor.m
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

Lines 1-20 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOAttribute.m (-6 lines)
1	--- sope-gdl1/GDLAccess/EOAttribute.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EOAttribute.m
3	@@ -84,7 +84,7 @@ static EONull *null = nil;
4	}
5
6	// Is equal only if same name; used to make aliasing ordering stable




--- sope-gdl1/GDLAccess/EODatabase.m.orig	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EODatabase.m
@@ -185,7 +185,7 @@ static inline void _removeDatabaseInstan
   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 @@ static inline void _removeDatabaseInstan
   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 @@ static inline void _removeDatabaseInstan
   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 @@ static inline void _removeDatabaseInstan
   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 @@ static inline void _removeDatabaseInstan
   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 @@ static inline void _removeDatabaseInstan
 
 - (void)reportError:(NSString*)error {
   if (self->flags.isLoggingWarnings)
-    NSLog(@"EODatabase:%x:%@", self, error);
+    NSLog(@"EODatabase:%@:%@", self, error);
 }
 
 @end /* EODatabase */

Lines 1-20 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EODatabaseChannel.m (-6 lines)
1	--- sope-gdl1/GDLAccess/EODatabaseChannel.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EODatabaseChannel.m
3	@@ -81,7 +81,7 @@ NSString *EODatabaseChannelDidLockObject
4	- (Class)privateClassForEntity:(EOEntity *)anEntity;
5	- (void)privateUpdateCurrentEntityInfo;
6	- (void)privateClearCurrentEntityInfo;




--- sope-gdl1/GDLAccess/EODatabaseContext.m.orig	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EODatabaseContext.m
@@ -118,7 +118,7 @@ static inline void _checkTxInProgress(EO
   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 @@ static inline void _checkTxInProgress(EO
       (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 @@ static inline void _checkTxInProgress(EO
       (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 @@ static inline void _checkTxInProgress(EO
       (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 @@ static inline void _checkTxInProgress(EO
   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 @@ static inline void _checkTxInProgress(EO
   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 @@ static inline void _checkTxInProgress(EO
   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 @@ static inline void _checkTxInProgress(EO
   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 @@ static inline void _checkTxInProgress(EO
   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 @@ static inline void _checkTxInProgress(EO
   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 @@ static inline void _checkTxInProgress(EO
   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 @@ static inline void _checkTxInProgress(EO
   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	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EODatabaseFault.m
@@ -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 @@ typedef struct {
 		       @"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 @@ typedef struct {
 {
   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 @@ typedef struct {
         (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 @@ typedef struct {
   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 @@ typedef struct {
   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 @@ typedef struct {
   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 @@ typedef struct {
   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 @@ typedef struct {
   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	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EODatabaseFaultResolver.m
@@ -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), 

Lines 1-20 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOEntity.m (-6 lines)
1	--- sope-gdl1/GDLAccess/EOEntity.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EOEntity.m
3	@@ -106,7 +106,7 @@ static int _compareByName(id obj1, id ob
4	}
5
6	// Is equal only if same name; used to make aliasing ordering stable




--- sope-gdl1/GDLAccess/EOFExceptions.m.orig	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EOFExceptions.m
@@ -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	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EOFault.h
@@ -9,6 +9,9 @@
 
 @class EOFaultHandler;
 
+#ifdef __clang__
+__attribute__((objc_root_class))
+#endif
 @interface EOFault
 {
   Class          isa;




--- sope-gdl1/GDLAccess/EOFault.m.orig	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EOFault.m
@@ -67,7 +67,7 @@ typedef struct objc_method      *Method_
 + (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 @@ typedef struct objc_method      *Method_
   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 @@ typedef struct objc_method      *Method_
   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 @@ typedef struct objc_method      *Method_
   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 @@ typedef struct objc_method      *Method_
 #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 @@ typedef struct objc_method      *Method_
   NSLog(@"WARNING: tried to deallocate EOFault class ..");
 }
 - (void)dealloc {
-  [self->isa clearFault:self];
+  [object_getClass(self) clearFault:self];
   [self dealloc];
 }
 
@@ -285,7 +285,7 @@ static inline void _resolveFault(EOFault
   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 @@ static inline void _resolveFault(EOFault
 }
 
 + (id)self {
-  _resolveFault(self);
+  _resolveFault((id)self);
   return self;
 }
 




--- sope-gdl1/GDLAccess/EOModel.m.orig	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EOModel.m
@@ -255,7 +255,7 @@ void EOModel_linkCategories(void) {
   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 @@ void EOModel_linkCategories(void) {
   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;

Lines 1-11 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOObjectUniquer.m (-11 lines)
1	--- sope-gdl1/GDLAccess/EOObjectUniquer.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EOObjectUniquer.m
3	@@ -49,7 +49,7 @@ static BOOL uniquerCompare(NSMapTable *t
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	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.m
@@ -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;
 }
 




--- sope-gdl1/GDLAccess/EORecordDictionary.m.orig	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EORecordDictionary.m
@@ -55,7 +55,7 @@ static NSDictionary *emptyDict = nil;
 - (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 @@ static NSDictionary *emptyDict = nil;
   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];
   }

Lines 1-20 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EORelationship.m (-6 lines)
1	--- sope-gdl1/GDLAccess/EORelationship.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EORelationship.m
3	@@ -84,7 +84,7 @@ static EONull *null = nil;
4	}
5
6	// Is equal only if same name; used to make aliasing ordering stable

Lines 1-10 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOSQLExpression.m (-10 lines)
1	--- sope-gdl1/GDLAccess/EOSQLExpression.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EOSQLExpression.m
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	2015-09-16 18:26:50 UTC
+++ sope-gdl1/GDLAccess/EOSQLQualifier.m
@@ -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 @@ handle_attribute(EOSQLQualifier *self, i
 - (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	2015-09-16 18:26:50 UTC
+++ sope-gdl1/PostgreSQL/NSData+PGVal.m
@@ -84,7 +84,7 @@ static NSData *EmptyData = nil;
 
   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 @@ static NSData *EmptyData = nil;
       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	2015-09-16 18:26:50 UTC
+++ sope-gdl1/PostgreSQL/NSString+PostgreSQL72.m
@@ -145,13 +145,15 @@ static NSCharacterSet *spaceSet = nil;
   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) {

Lines 1-11 Link Here

(-)sope/files/patch-sope-gdl1__PostgreSQL__PostgreSQL72Channel.m (-11 lines)
1	--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
3	@@ -203,7 +203,7 @@ static int openConnectionCount = 0;
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

Lines 1-11 Link Here

(-)sope/files/patch-sope-gdl1__PostgreSQL__PostgreSQL72DataTypeMappingException.m (-11 lines)
1	--- sope-gdl1/PostgreSQL/PostgreSQL72DataTypeMappingException.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/PostgreSQL/PostgreSQL72DataTypeMappingException.m
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"];

Lines 1-11 Link Here

(-)sope/files/patch-sope-ldap_NGLdap_EOQualifier+LDAP.m (-11 lines)
1	--- sope-ldap/NGLdap/EOQualifier+LDAP.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-ldap/NGLdap/EOQualifier+LDAP.m
3	@@ -26,7 +26,7 @@
4	#define sel_eq(sel1, sel2) ((sel1)) == ((sel2))
5	#endif
6
7	-#if __GNU_LIBOBJC__ >= 20100911
8	+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) \|\| defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__)
9	# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
10	#endif
11

Lines 1-11 Link Here

(-)sope/files/patch-sope-ldap_NGLdap_NGLdapConnection.m (-11 lines)
1	--- sope-ldap/NGLdap/NGLdapConnection.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-ldap/NGLdap/NGLdapConnection.m
3	@@ -1223,7 +1223,7 @@ static void freeMods(LDAPMod **mods) {
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-09-16 18:26:50 UTC
+++ sope-ldap/NGLdap/NGLdapFileManager.m
@@ -317,7 +317,7 @@ static NSArray  *fileInfoAttrs    = nil;
   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 @@ static NSArray  *fileInfoAttrs    = nil;
   NGLdapEntry     *entry;
   
   if ((dn = [self dnForPath:_path]) == nil)
-    return NO;
+    return nil;
   
   entry = [self->connection entryAtDN:dn attributes:nil];
   if (entry == nil)

Lines 1-11 Link Here

(-)sope/files/patch-sope-ldap_NGLdap_NGLdapGlobalID.m (-6 lines)
1	--- sope-ldap/NGLdap/NGLdapGlobalID.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-ldap/NGLdap/NGLdapGlobalID.m
3	@@ -53,7 +53,7 @@
4
5	/* equality */
6




--- sope-mime/NGImap4/NGImap4Client.h.orig	2015-09-16 18:26:50 UTC
+++ sope-mime/NGImap4/NGImap4Client.h
@@ -195,6 +195,14 @@ typedef enum {
   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__ */

Lines 1-78 Link Here

(-)sope/files/patch-sope-mime_NGImap4_NGImap4Client.m (-6 lines)
1	--- sope-mime/NGImap4/NGImap4Client.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGImap4/NGImap4Client.m
3	@@ -77,12 +77,6 @@
4
5	- (NSString )_folder2ImapFolder:(NSString )_folder;
6

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime_NGImap4_NGImap4Functions.m (-11 lines)
1	--- sope-mime/NGImap4/NGImap4Functions.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGImap4/NGImap4Functions.m
3	@@ -129,7 +129,7 @@ NGImap4Folder *_subFolderWithName
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-16 18:26:50 UTC
+++ sope-mime/NGImap4/NGImap4ResponseParser.m
@@ -1463,7 +1463,7 @@ _purifyQuotedString(NSMutableString *quo
   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 @@ _purifyQuotedString(NSMutableString *quo
     [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 _parseBadUntaggedResponse(NG
 static BOOL _parseNoOrOkArguments(NGImap4ResponseParser *self,
                                   NGMutableHashMap *result_, NSString *_key) 
 {
-  NSString *obj;
+  id obj;
 
   obj = nil;
   




--- sope-mime/NGImap4/imCommon.h.orig	2015-09-16 18:26:50 UTC
+++ sope-mime/NGImap4/imCommon.h
@@ -37,13 +37,13 @@
 #include <NGMime/NGMime.h>
 #include <NGMail/NGMail.h>
 
-#if NeXT_RUNTIME || APPLE_RUNTIME
+#if NeXT_RUNTIME
 #  ifndef sel_eq
 #    define sel_eq(__A__,__B__) (__A__==__B__)
 #  endif
 #endif
 
-#if __GNU_LIBOBJC__ >= 20100911
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
 #  ifndef sel_eq
 #    define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
 #  endif




--- sope-mime/NGMime/common.h.orig	2015-09-16 18:26:50 UTC
+++ sope-mime/NGMime/common.h
@@ -37,7 +37,9 @@
 #include "NGMimeType.h"
 
 #if !GNU_RUNTIME
-#  ifndef sel_eq
+#  if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
+#    define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
+#  else ifndef sel_eq
 #    define sel_eq(__A__, __B__) (__A__==__B__)
 #  endif
 #endif




--- sope-mime/NGImap4/NGImap4Connection.m.orig	2015-09-16 18:26:50 UTC
+++ sope-mime/NGImap4/NGImap4Connection.m
@@ -1174,10 +1174,10 @@ NSArray *SOGoMailGetDirectChildren(NSArr
   [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	2015-09-16 18:26:50 UTC
+++ sope-mime/NGImap4/NGImap4Context.m
@@ -944,8 +944,7 @@ static int ImapLogEnabled               
         [self serverName],
         [self serverKind],
         [self serverVersion],
-        [self serverSubVersion],
-        [self serverTag]];
+        [self serverSubVersion]];
   
   if (self->syncMode)
     [ms appendString:@" syncmode"];

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGImap4__NGImap4FileManager.m (-11 lines)
1	--- sope-mime/NGImap4/NGImap4FileManager.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGImap4/NGImap4FileManager.m
3	@@ -225,7 +225,7 @@ static BOOL debugOn = NO;
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	2015-09-16 18:26:50 UTC
+++ sope-mime/NGImap4/NGImap4Folder.m
@@ -646,11 +646,11 @@ static int FetchNewUnseenMessagesInSubFo
       [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 {

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGImap4__NGImap4FolderGlobalID.m (-6 lines)
1	--- sope-mime/NGImap4/NGImap4FolderGlobalID.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGImap4/NGImap4FolderGlobalID.m
3	@@ -62,7 +62,7 @@
4
5	/* comparison */
6




--- sope-mime/NGImap4/NGImap4Message.m.orig	2015-09-16 18:26:50 UTC
+++ sope-mime/NGImap4/NGImap4Message.m
@@ -243,8 +243,8 @@ static BOOL              ImapDebugEnable
 }
 
 - (void)markUnread {
-  if ([self isRead]);
-  [self removeFlag:@"seen"];
+  if ([self isRead])
+    [self removeFlag:@"seen"];
 }
 
 - (BOOL)isFlagged {
@@ -345,7 +345,7 @@ static BOOL              ImapDebugEnable
   return YES;
 }
 

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGImap4__NGImap4ServerGlobalID.m (-6 lines)
1	--- sope-mime/NGImap4/NGImap4ServerGlobalID.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGImap4/NGImap4ServerGlobalID.m
3	@@ -65,7 +65,7 @@
4
5	/* comparison */
6




--- sope-mime/NGImap4/NGSieveClient.m.orig	2015-09-16 18:26:50 UTC
+++ sope-mime/NGImap4/NGSieveClient.m
@@ -444,14 +444,14 @@ static BOOL     debugImap4         = NO;
     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 @@ static BOOL     debugImap4         = NO;
   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];

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGMail__NGMailAddress.m (-6 lines)
1	--- sope-mime/NGMail/NGMailAddress.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGMail/NGMailAddress.m
3	@@ -66,7 +66,7 @@
4	return NO;
5	}
6




--- sope-mime/NGMail/NGMailAddressParser.m.orig	2015-09-16 18:26:50 UTC
+++ sope-mime/NGMail/NGMailAddressParser.m
@@ -349,15 +349,15 @@ static inline id parseDomainLiteral(NGMa
   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 {
++ (id)mailAddressParserWithCString:(const char *)_cString {
   NSString *nsCString;
 
   nsCString = [NSString stringWithCString:_cString];
 
-  return [(NGMailAddressParser *)self mailAddressParserWithString:nsCString];
+  return [(id)self mailAddressParserWithString:nsCString];
 }
 
 + (id)mailAddressParserWithString:(NSString *)_string {

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGMail__NGMimeMessage.m (-11 lines)
1	--- sope-mime/NGMail/NGMimeMessage.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGMail/NGMimeMessage.m
3	@@ -230,7 +230,7 @@ static NGMimeType *defaultDataType = nil
4	if ([b length] < 512)
5	[d appendFormat:@" body=%@", b];
6	else
7	- [d appendFormat:@" body[len=%i]", [b length]];
8	+ [d appendFormat:@" body[len=%i]", (int)[b length]];
9	}
10	else
11	[d appendFormat:@" body=%@", b];




--- sope-mime/NGMime/NGMimeBodyPart.m.orig	2015-09-16 18:26:50 UTC
+++ sope-mime/NGMime/NGMimeBodyPart.m
@@ -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];

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimeJoinedData.m (-11 lines)
1	--- sope-mime/NGMime/NGMimeJoinedData.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGMime/NGMimeJoinedData.m
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	}

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimePartGenerator.h (-6 lines)
1	--- sope-mime/NGMime/NGMimePartGenerator.h.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGMime/NGMimePartGenerator.h
3	@@ -149,7 +149,7 @@
4	The delegate can select which NGMimeBodyGenerator should de used
5	for generate the given part.
6	*/

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimePartGenerator.m (-11 lines)
1	--- sope-mime/NGMime/NGMimePartGenerator.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGMime/NGMimePartGenerator.m
3	@@ -92,7 +92,7 @@ static BOOL debugOn = NO;
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:)]) {

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimePartParser.m (-11 lines)
1	--- sope-mime/NGMime/NGMimePartParser.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGMime/NGMimePartParser.m
3	@@ -1025,7 +1025,7 @@ static NSString *fieldNameForCString(id
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;

Lines 1-11 Link Here

(-)sope/files/patch-sope-mime__NGMime__NGMimeRFC822DateHeaderFieldParser.m (-11 lines)
1	--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
3	@@ -161,7 +161,7 @@ static NSTimeZone *parseTimeZone(const c
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);

Lines 1-11 Link Here

(-)sope/files/patch-sope-xml_SaxObjC_SaxObjectDecoder.m (-6 lines)
1	--- sope-xml/SaxObjC/SaxObjectDecoder.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-xml/SaxObjC/SaxObjectDecoder.m
3	@@ -172,7 +172,7 @@ static NSNull *null = nil;
4	reason:_ns
5	userInfo:nil];
6	}

Lines 1-11 Link Here

(-)sope/files/patch-sope-xml__DOM__DOMQueryPathExpression.m (-11 lines)
1	--- sope-xml/DOM/DOMQueryPathExpression.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-xml/DOM/DOMQueryPathExpression.m
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];

Lines 1-11 Link Here

(-)sope/files/patch-sope-xml__XmlRpc__NSNotification+XmlRpcCoding.m (-11 lines)
1	--- sope-xml/XmlRpc/NSNotification+XmlRpcCoding.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-xml/XmlRpc/NSNotification+XmlRpcCoding.m
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 204617

Lines 1-22 Link Here

(-)sope/files/patch-sope-appserver_NGObjWeb_NSObject+WO.m (-22 lines)
1	--- sope-appserver/NGObjWeb/NSObject+WO.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/NSObject+WO.m
3	@@ -259,7 +259,7 @@ IMP WOGetKVCGetMethod(id object, NSStrin
4	if (object == nil) return NULL;
5	if (_key == nil) return NULL;
6
7	-#if GNU_RUNTIME && !(defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911))
8	+#if GNU_RUNTIME && !(defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) && !defined(__GNUSTEP_RUNTIME__)
9	{
10	unsigned keyLen;
11	char *buf;
12	@@ -317,7 +317,9 @@ id WOGetKVCValueUsingMethod(id object, N
13	return nil;
14	free(buf); buf = NULL;
15	}
16	-#if GNUSTEP_BASE_LIBRARY
17	+// This appears to be a work around for an old version of GNUstep-base not
18	+// correctly handling the case where there is no method.
19	+#if GNUSTEP_BASE_LIBRARY && !defined(__GNUSTEP_RUNTIME__)
20	if (!__objc_responds_to(object, getSel))
21	return nil;
22	#endif

Lines 1-13 Link Here

(-)sope/files/patch-sope-appserver_NGObjWeb_WOSession.m (-13 lines)
1	--- sope-appserver/NGObjWeb/WOSession.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOSession.m
3	@@ -33,10 +33,6 @@
4	#include "common.h"
5	#include <string.h>
6
7	-#if !defined(sel_get_name) && ((defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) \|\| defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__))
8	-# define sel_get_name sel_getName
9	-#endif
10	-
11	#if APPLE_FOUNDATION_LIBRARY \|\| NeXT_Foundation_LIBRARY
12	@interface NSObject(Miss)
13	- (id)notImplemented:(SEL)cmd;

Lines 1-21 Link Here

(-)sope/files/patch-sope-appserver_NGObjWeb_common.h (-21 lines)
1	--- sope-appserver/NGObjWeb/common.h.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/common.h
3	@@ -51,13 +51,17 @@
4	#include <NGExtensions/NGLogging.h>
5	#include <NGStreams/NGStreams.h>
6
7	-#if NeXT_RUNTIME \|\| APPLE_RUNTIME \|\| (__GNU_LIBOBJC__ >= 20100911)
8	+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) \|\| defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__)
9	# ifndef sel_get_name
10	# define sel_get_name(__XXX__) sel_getName(__XXX__)
11	# define sel_get_any_uid(__XXX__) sel_getUid(__XXX__)
12	# endif
13	#endif
14
15	+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) \|\| defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__)
16	+# define sel_get_uid(__XXX__) sel_getUid(__XXX__);
17	+#endif
18	+
19	#define IS_DEPRECATED \
20	[self warnWithFormat:@"used deprecated method: %s:%i.", \
21	__PRETTY_FUNCTION__, __LINE__];

Lines 1-20 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__NGHttp__NGUrlFormCoder.m (-20 lines)
1	--- sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m
3	@@ -93,7 +93,7 @@ static __inline__ NSString *urlStringFro
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 @@ NGHashMap *NGDecodeUrlFormParameters(con
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

Lines 1-20 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOComponent+Sync.m (-20 lines)
1	--- sope-appserver/NGObjWeb/WOComponent+Sync.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOComponent+Sync.m
3	@@ -87,7 +87,7 @@ void WOComponent_syncFromParent(WOCompon
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 @@ void WOComponent_syncToParent(WOComponen
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

Lines 1-29 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOComponent.m (-29 lines)
1	--- sope-appserver/NGObjWeb/WOComponent.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOComponent.m
3	@@ -1037,7 +1037,7 @@ static inline id _getExtraVar(WOComponen
4
5	- (BOOL)logComponentVariableCreations {
6	/* only if we have a subclass, we can store values in ivars ... */
7	- return (self->isa != WOComponentClass) ? YES : NO;
8	+ return (object_getClass(self) != WOComponentClass) ? YES : NO;
9	}
10
11	#if !NG_USE_KVC_FALLBACK /* only override on libFoundation */
12	@@ -1124,7 +1124,7 @@ static inline id _getExtraVar(WOComponen
13	/* only if we have a subclass, we can store values in ivars ... */
14	if (![[self->wocVariables objectForKey:_key] isNotNull]) {
15	[self debugWithFormat:@"Created component variable (class=%@): '%@'.",
16	- NSStringFromClass(self->isa), _key];
17	+ NSStringFromClass(object_getClass(self)), _key];
18	}
19	}
20	#endif
21	@@ -1219,7 +1219,7 @@ static inline id _getExtraVar(WOComponen
22	if (self->parentComponent)
23	[str appendFormat:@" parent=%@", [self->parentComponent name]];
24	if (self->subcomponents)
25	- [str appendFormat:@" #subs=%i", [self->subcomponents count]];
26	+ [str appendFormat:@" #subs=%i", (int)[self->subcomponents count]];
27
28	if (self->componentFlags.isAwake)
29	[str appendFormat:@" awake=0x%p", self->context];

Lines 1-12 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOMailDelivery.m (-12 lines)
1	--- sope-appserver/NGObjWeb/WOMailDelivery.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOMailDelivery.m
3	@@ -180,7 +180,8 @@ WOMailDelivery *sharedInstance = nil;
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");

Lines 1-20 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOSessionStore.m (-20 lines)
1	--- sope-appserver/NGObjWeb/WOSessionStore.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOSessionStore.m
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])

Lines 1-20 Link Here

(-)sope/files/patch-sope-appserver__NGObjWeb__WOStatisticsStore.m (-20 lines)
1	--- sope-appserver/NGObjWeb/WOStatisticsStore.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/NGObjWeb/WOStatisticsStore.m
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 @@ static id mkdbl(double d) {
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-14 Link Here

(-)sope/files/patch-sope-appserver__WEExtensions__WETableView__WETableView.m (-14 lines)
1	--- sope-appserver/WEExtensions/WETableView/WETableView.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-appserver/WEExtensions/WETableView/WETableView.m
3	@@ -1525,9 +1525,9 @@ static inline void _applyState_(WETableV
4	result = [self decreaseBatchSizeInContext:_ctx];
5	else {
6	if (self->identifier == nil) {
7	- unsigned idx;
8	+ NSInteger idx;
9
10	- idx = [idxId unsignedIntValue];
11	+ idx = [idxId integerValue];
12	if (idx < [self->allObjects count] && idx >= 0) {
13	_applyItems_(self, cmp, idx);
14	}

Lines 1-13 Link Here

(-)sope/files/patch-sope-core_EOControl_EOSortOrdering.m (-13 lines)
1	--- sope-core/EOControl/EOSortOrdering.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOSortOrdering.m
3	@@ -29,7 +29,9 @@
4	#endif
5
6	#ifndef SEL_EQ
7	-# if GNU_RUNTIME
8	+# if defined(__GNUSTEP_RUNTIME__)
9	+# define SEL_EQ(sel1,sel2) sel_isEqual(sel1, sel2)
10	+# elif GNU_RUNTIME
11	# define SEL_EQ(sel1,sel2) sel_eq(sel1,sel2)
12	# else
13	# define SEL_EQ(sel1,sel2) (sel1 == sel2)

Lines 1-15 Link Here

(-)sope/files/patch-sope-core_EOControl_common.h (-15 lines)
1	--- sope-core/EOControl/common.h.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/common.h
3	@@ -40,10 +40,11 @@
4	# endif
5	#endif
6
7	-#if __GNU_LIBOBJC__ >= 20100911
8	+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) \|\| defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__)
9	# ifndef sel_eq
10	# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
11	# endif
12	+# define sel_get_any_uid(__XXX__) sel_getUid(__XXX__)
13	#endif
14
15	#ifndef ASSIGN

Lines 1-20 Link Here

(-)sope/files/patch-sope-core_NGExtensions_NGCalendarDateRange.m (-20 lines)
1	--- sope-core/NGExtensions/NGCalendarDateRange.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/NGExtensions/NGCalendarDateRange.m
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 1-31 Link Here

(-)sope/files/patch-sope-core_NGStreams_NGActiveSocket.m (-31 lines)
1	--- sope-core/NGStreams/NGActiveSocket.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-core/NGStreams/NGActiveSocket.m
3	@@ -19,6 +19,7 @@
4	02111-1307, USA.
5	*/
6
7	+#include <sys/types.h>
8	#include <netinet/in.h>
9	#include <netinet/tcp.h>
10
11	@@ -410,7 +411,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 +749,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
31

Lines 1-13 Link Here

(-)sope/files/patch-sope-core_NGStreams_NGStreamCoder.m (-13 lines)
1	--- sope-core/NGStreams/NGStreamCoder.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-core/NGStreams/NGStreamCoder.m
3	@@ -28,6 +28,10 @@
4	# include <objc/objc-class.h>
5	#endif
6
7	+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) \|\| defined(APPLE_RUNTIME) \|\| defined(__GNUSTEP_RUNTIME__)
8	+# define sel_get_name(__XXX__) sel_getName(__XXX__)
9	+#endif
10	+
11	#define FINAL static inline
12
13	extern id nil_method(id, SEL, ...);

Lines 1-21 Link Here

(-)sope/files/patch-sope-core__EOControl__EONull.m (-21 lines)
1	--- sope-core/EOControl/EONull.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EONull.m
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

Lines 1-13 Link Here

(-)sope/files/patch-sope-core__EOControl__EOObserver.m (-13 lines)
1	--- sope-core/EOControl/EOObserver.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOObserver.m
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

Lines 1-15 Link Here

(-)sope/files/patch-sope-core__EOControl__EOOrQualifier.m (-15 lines)
1	--- sope-core/EOControl/EOOrQualifier.m.orig 2015-09-16 18:26:49 UTC
2	+++ sope-core/EOControl/EOOrQualifier.m
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

Lines 1-29 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGBufferedStream.m (-29 lines)
1	--- sope-core/NGStreams/NGBufferedStream.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-core/NGStreams/NGBufferedStream.m
3	@@ -66,7 +66,7 @@ static Class DataStreamClass = Nil;
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 @@ static Class DataStreamClass = Nil;
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 @@ static Class DataStreamClass = Nil;
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])) {

Lines 1-20 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGByteBuffer.m (-20 lines)
1	--- sope-core/NGStreams/NGByteBuffer.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-core/NGStreams/NGByteBuffer.m
3	@@ -44,7 +44,7 @@ static Class DataStreamClass = Nil;
4	DataStreamClass = NSClassFromString(@"NGDataStream");
5	}
6
7	-+ (int)version {
8	++ (NSInteger)version {
9	return [super version] + 1;
10	}
11
12	@@ -61,7 +61,7 @@ static Class DataStreamClass = Nil;
13	}
14	if ((Class )_source == DataStreamClass) {
15	[self release];
16	- return [_source retain];
17	+ return (id)[_source retain];
18	}
19	if ((self = [super initWithSource:_source])) {
20	unsigned size = 0;

Lines 1-20 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGByteCountStream.m (-20 lines)
1	--- sope-core/NGStreams/NGByteCountStream.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-core/NGStreams/NGByteCountStream.m
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	}

Lines 1-24 Link Here

(-)sope/files/patch-sope-core__NGStreams__NGLocalSocketAddress.m (-24 lines)
1	--- sope-core/NGStreams/NGLocalSocketAddress.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-core/NGStreams/NGLocalSocketAddress.m
3	@@ -77,8 +77,8 @@ static NSString *socketDirectoryPath = @
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 @@ static NSString *socketDirectoryPath = @
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];

Lines 1-64 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EODatabase.m (-64 lines)
1	--- sope-gdl1/GDLAccess/EODatabase.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EODatabase.m
3	@@ -185,7 +185,7 @@ static inline void _removeDatabaseInstan
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 @@ static inline void _removeDatabaseInstan
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 @@ static inline void _removeDatabaseInstan
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 @@ static inline void _removeDatabaseInstan
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 @@ static inline void _removeDatabaseInstan
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 @@ static inline void _removeDatabaseInstan
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 */

Lines 1-142 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EODatabaseContext.m (-142 lines)
1	--- sope-gdl1/GDLAccess/EODatabaseContext.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EODatabaseContext.m
3	@@ -118,7 +118,7 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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 @@ static inline void _checkTxInProgress(EO
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

Lines 1-107 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EODatabaseFault.m (-107 lines)
1	--- sope-gdl1/GDLAccess/EODatabaseFault.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EODatabaseFault.m
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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];

Lines 1-20 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EODatabaseFaultResolver.m (-20 lines)
1	--- sope-gdl1/GDLAccess/EODatabaseFaultResolver.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EODatabaseFaultResolver.m
3	@@ -191,7 +191,7 @@
4
5	- (NSString *)descriptionForObject:(id)_fault {
6	return [NSString stringWithFormat:
7	- @"<Array fault 0x%x (qualifier=%@, order=%@, channel=%@)>",
8	+ @"<Array fault %p (qualifier=%@, order=%@, channel=%@)>",
9	_fault, qualifier, fetchOrder, channel];
10	}
11
12	@@ -302,7 +302,7 @@
13
14	- (NSString *)descriptionForObject:(id)_fault {
15	return [NSString stringWithFormat:
16	- @"<Object fault 0x%X "
17	+ @"<Object fault %p "
18	@"(class=%@, entity=%@, key=%@, channel=%@)>",
19	_fault,
20	NSStringFromClass(targetClass),

Lines 1-38 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOFExceptions.m (-38 lines)
1	--- sope-gdl1/GDLAccess/EOFExceptions.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EOFExceptions.m
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	}

Lines 1-12 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOFault.h (-12 lines)
1	--- sope-gdl1/GDLAccess/EOFault.h.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EOFault.h
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;

Lines 1-82 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOFault.m (-82 lines)
1	--- sope-gdl1/GDLAccess/EOFault.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EOFault.m
3	@@ -67,7 +67,7 @@ typedef struct objc_method *Method_
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 @@ typedef struct objc_method *Method_
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 @@ typedef struct objc_method *Method_
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 @@ typedef struct objc_method *Method_
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 @@ typedef struct objc_method *Method_
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 @@ typedef struct objc_method *Method_
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 @@ static inline void _resolveFault(EOFault
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 @@ static inline void _resolveFault(EOFault
75	}
76
77	+ (id)self {
78	- _resolveFault(self);
79	+ _resolveFault((id)self);
80	return self;
81	}
82

Lines 1-20 Link Here

(-)sope/files/patch-sope-gdl1__GDLAccess__EOModel.m (-20 lines)
1	--- sope-gdl1/GDLAccess/EOModel.m.orig 2015-09-16 18:26:50 UTC
2	+++ sope-gdl1/GDLAccess/EOModel.m
3	@@ -255,7 +255,7 @@ void EOModel_linkCategories(void) {
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 @@ void EOModel_linkCategories(void) {
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;