[OGo-GNUstep-Port] SOPE changes

Filip Van Raemdonck gnustep-port@opengroupware.org
Thu, 17 Jul 2003 21:16:33 +0200 

--uAKRQypu60I7Lcqm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

Attached are two patches - one for SOPE/skyrix-core and one for
SOPE/skyrix-xml.

Comments for the skyrix-sope patch are contained within; I tried grouping
chunks by functionality as much as I could.
The skyrix-xml patch are mostly just compiler warning fixes, except for
the last chunk. That one makes it use a different codepath when building
with GNUstep-base. (although I think it may even affect builds with the
contained ThirdParty/ libs; See also my comment in an earlier message
about definition if GNUSTEP)

Feedback welcome. If this looks good, please someone apply them. They make
skyrix-xml and skyrix-core build with almost no really relevant compiler
warnings anymore when building with GNUstep-base.

Regards,

Filip

-- 
"The most beautiful thing we can experience is the mysterious. It is the
 source of all true art and science."
	-- Albert Einstein

--uAKRQypu60I7Lcqm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff-skyrix-core

#
# zlib.h contains all we need to build on all systems, not just OS X. I think
# the outer ifdef should be removed entirely, and zutil.h get rid of.
#
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGExtensions/FdExt.subproj/NSData+gzip.m
+++ opengroupware.org-core-0.9.0cvs20030717/NGExtensions/FdExt.subproj/NSData+gzip.m
@@ -26,7 +26,7 @@
 #ifdef Assert
 #undef Assert
 #endif
-#ifdef __APPLE__
+//#ifdef __APPLE__
 #  include <zlib.h>
 #  ifndef DEF_MEM_LEVEL /* zutil.h */
 #    if MAX_MEM_LEVEL >= 8
@@ -36,9 +36,9 @@
 #    endif
 #    define OS_CODE  0x07
 #  endif
-#else
-#  include "zutil.h"
-#endif
+//#else
+//#  include "zutil.h"
+//#endif
 #undef Assert
 
 @implementation NSData(gzip)
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGStreams/NGGZipStream.m
+++ opengroupware.org-core-0.9.0cvs20030717/NGStreams/NGGZipStream.m
@@ -28,7 +28,7 @@
 #ifdef Assert
 #undef Assert
 #endif
-#ifdef __APPLE__
+//#ifdef __APPLE__
 #  include <zlib.h>
 #  ifndef DEF_MEM_LEVEL /* zutil.h */
 #    if MAX_MEM_LEVEL >= 8
@@ -38,9 +38,9 @@
 #    endif
 #    define OS_CODE  0x07
 #  endif
-#else
-#  include "zutil.h"
-#endif
+//#else
+//#  include "zutil.h"
+//#endif
 #undef Assert
 
 @implementation NGGZipStream
#
# NSMethodSignature+misc.m needs some work to properly build with GNUstep-base;
# however it isn't used anywhere in the OGo source tree - rather remove it
#
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGExtensions/GNUmakefile
+++ opengroupware.org-core-0.9.0cvs20030717/NGExtensions/GNUmakefile
@@ -83,7 +83,6 @@
 	NSEnumerator+misc.h		\
 	NSException+misc.h		\
 	NSFileManager+Extensions.h	\
-	NSMethodSignature+misc.h	\
 	NSNull+misc.h			\
 	NSObject+Logs.h			\
 	NSObject+Values.h		\
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGExtensions/NGExtensions.m
+++ opengroupware.org-core-0.9.0cvs20030717/NGExtensions/NGExtensions.m
@@ -33,7 +33,6 @@
 #include "NSArray+enumerator.h"
 #include "NSData+misc.h"
 #include "NSException+misc.h"
-#include "NSMethodSignature+misc.h"
 #include "NSObject+Values.h"
 #include "NSSet+enumerator.h"
 #include "NSString+Formatting.h"
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGExtensions/FdExt.subproj/GNUmakefile
+++ opengroupware.org-core-0.9.0cvs20030717/NGExtensions/FdExt.subproj/GNUmakefile
@@ -14,7 +14,6 @@
 	NSEnumerator+misc.m		\
 	NSException+misc.m		\
 	NSFileManager+Extensions.m	\
-	NSMethodSignature+misc.m	\
 	NSNull+misc.m			\
 	NSObject+Logs.m			\
 	NSObject+Values.m		\
--- opengroupware.org-core-0.9.0cvs20030717.orig/SxCore.pbproj/project.pbxproj
+++ opengroupware.org-core-0.9.0cvs20030717/SxCore.pbproj/project.pbxproj
@@ -878,7 +878,6 @@
 				E80E559F04811A4000A865E9,
 				E80E55A004811A4000A865E9,
 				E80E55A104811A4000A865E9,
-				E80E55A204811A4000A865E9,
 				E80E55A304811A4000A865E9,
 				E80E55A404811A4000A865E9,
 				E80E55A504811A4000A865E9,
@@ -5109,7 +5108,6 @@
 				E80E55DC04811A4000A865E9,
 				E80E55DD04811A4000A865E9,
 				E80E55DE04811A4000A865E9,
-				E80E55DF04811A4000A865E9,
 				E80E55E004811A4000A865E9,
 				E80E55E104811A4000A865E9,
 				E80E55E204811A4000A865E9,
@@ -5173,7 +5171,6 @@
 				E80E561C04811A8300A865E9,
 				E80E561D04811A8300A865E9,
 				E80E561E04811A8300A865E9,
-				E80E561F04811A8300A865E9,
 				E80E562004811A8300A865E9,
 				E80E562104811A8300A865E9,
 				E80E562204811A8300A865E9,
@@ -7173,7 +7170,6 @@
 				E80E560804811A8300A865E9,
 				E80E560904811A8300A865E9,
 				E80E560A04811A8300A865E9,
-				E80E560B04811A8300A865E9,
 				E80E560C04811A8300A865E9,
 				E80E560D04811A8300A865E9,
 				E80E560E04811A8300A865E9,
@@ -7551,13 +7547,6 @@
 			path = "NGExtensions/NGExtensions/NSFileManager+Extensions.h";
 			refType = 4;
 		};
-		E80E55A204811A4000A865E9 = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			name = "NSMethodSignature+misc.h";
-			path = "NGExtensions/NGExtensions/NSMethodSignature+misc.h";
-			refType = 4;
-		};
 		E80E55A304811A4000A865E9 = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -8078,15 +8067,6 @@
 				);
 			};
 		};
-		E80E55DF04811A4000A865E9 = {
-			fileRef = E80E55A204811A4000A865E9;
-			isa = PBXBuildFile;
-			settings = {
-				ATTRIBUTES = (
-					Public,
-				);
-			};
-		};
 		E80E55E004811A4000A865E9 = {
 			fileRef = E80E55A304811A4000A865E9;
 			isa = PBXBuildFile;
@@ -8396,13 +8376,6 @@
 			path = "NGExtensions/FdExt.subproj/NSFileManager+Extensions.m";
 			refType = 4;
 		};
-		E80E560B04811A8300A865E9 = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			name = "NSMethodSignature+misc.m";
-			path = "NGExtensions/FdExt.subproj/NSMethodSignature+misc.m";
-			refType = 4;
-		};
 		E80E560C04811A8300A865E9 = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -8527,12 +8500,6 @@
 			settings = {
 			};
 		};
-		E80E561F04811A8300A865E9 = {
-			fileRef = E80E560B04811A8300A865E9;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		E80E562004811A8300A865E9 = {
 			fileRef = E80E560C04811A8300A865E9;
 			isa = PBXBuildFile;
#
# The tests whether to link with libFoundationExt tell to do so even when
# trying to build with GNUstep-base. Can someone with better knowledge of
# GNUstep come up with failproof tests?
# About the sasl thing: it (and with the right soname) should get pulled in
# by libldap* if the latter is linked properly.
#
--- opengroupware.org-core-0.9.0cvs20030717.orig/EOControl/GNUmakefile.preamble
+++ opengroupware.org-core-0.9.0cvs20030717/EOControl/GNUmakefile.preamble
@@ -8,7 +8,7 @@
 libEOControl_LIBRARIES_DEPEND_UPON += -lFoundation
 endif
 ifeq ($(FOUNDATION_LIB),nx)
-libEOControl_LIBRARIES_DEPEND_UPON += -lFoundationExt
+#libEOControl_LIBRARIES_DEPEND_UPON += -lFoundationExt
 endif
 ifeq ($(FOUNDATION_LIB),gnu)
 libEOControl_LIBRARIES_DEPEND_UPON += -lgnustep-base
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGExtensions/GNUmakefile.preamble
+++ opengroupware.org-core-0.9.0cvs20030717/NGExtensions/GNUmakefile.preamble
@@ -8,7 +8,7 @@
 libNGExtensions_LIBRARIES_DEPEND_UPON += -lEOControl -lDOM -lz
 
 ifneq ($(FOUNDATION_LIB),fd)
-libNGExtensions_LIBRARIES_DEPEND_UPON += -lFoundationExt
+#libNGExtensions_LIBRARIES_DEPEND_UPON += -lFoundationExt
 endif
 
 ifeq ($(GNUSTEP_TARGET_OS),mingw32)
@@ -19,10 +19,10 @@
 endif
 
 ifeq ($(GNUSTEP_HOST_OS),rhapsody5.5)
-libNGExtensions_LIBRARIES_DEPEND_UPON += -lFoundationExt
+#libNGExtensions_LIBRARIES_DEPEND_UPON += -lFoundationExt
 endif
 
 ifeq ($(FOUNDATION_LIB),nx)
-libNGExtensions_LIBRARIES_DEPEND_UPON += -lFoundationExt
+#libNGExtensions_LIBRARIES_DEPEND_UPON += -lFoundationExt
 ADDITIONAL_LDFLAGS += -framework Foundation
 endif
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGLdap/GNUmakefile.preamble
+++ opengroupware.org-core-0.9.0cvs20030717/NGLdap/GNUmakefile.preamble
@@ -12,7 +12,8 @@
 ifneq ($(FOUNDATION_LIB),nx)
 
 ifneq ($(nosasl),yes)
-libNGLdap_LIBRARIES_DEPEND_UPON += -lsasl
+# libsasl2 is pulled in by libldap; libsasl not found
+#libNGLdap_LIBRARIES_DEPEND_UPON += -lsasl
 endif
 ifneq ($(nossl),yes)
 libNGLdap_LIBRARIES_DEPEND_UPON += -lssl
@@ -20,9 +21,9 @@
 
 else
 
-libNGLdap_LIBRARIES_DEPEND_UPON += -lFoundationExt
+#libNGLdap_LIBRARIES_DEPEND_UPON += -lFoundationExt
 ADDITIONAL_LDFLAGS += -framework Foundation
-ADDITIONAL_TOOL_LIBS += -lFoundationExt
+#ADDITIONAL_TOOL_LIBS += -lFoundationExt
 
 endif
 
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGMime/GNUmakefile.preamble
+++ opengroupware.org-core-0.9.0cvs20030717/NGMime/GNUmakefile.preamble
@@ -11,7 +11,7 @@
 endif
 
 ifeq ($(GNUSTEP_TARGET_OS),darwin1.2)
-libNGMime_LIBRARIES_DEPEND_UPON += -lFoundationExt
+#libNGMime_LIBRARIES_DEPEND_UPON += -lFoundationExt
 endif
 
 libNGMime_LIB_DIRS += \
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGStreams/GNUmakefile.preamble
+++ opengroupware.org-core-0.9.0cvs20030717/NGStreams/GNUmakefile.preamble
@@ -10,7 +10,7 @@
 endif
 
 ifeq ($(FOUNDATION_LIB),nx)
-libNGStreams_LIBRARIES_DEPEND_UPON += -lFoundationExt
+#libNGStreams_LIBRARIES_DEPEND_UPON += -lFoundationExt
 endif
 
 ifeq ($(reentrant),yes)
#
# Fixes to not include extensions headers when using GNUstep-base.
# I'm not sure how these affect building with Skyrix foundation libraries.
#
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGExtensions/NGHashMap.m
+++ opengroupware.org-core-0.9.0cvs20030717/NGExtensions/NGHashMap.m
@@ -20,14 +20,14 @@
 */
 // $Id: NGHashMap.m,v 1.3 2003/07/11 17:12:46 jan Exp $
 
-#import "common.h"
-#import "NGHashMap.h"
-#import "NGMemoryAllocation.h"
+#include "common.h"
+#include "NGHashMap.h"
+#include "NGMemoryAllocation.h"
 
 #if LIB_FOUNDATION_LIBRARY
 #  import <extensions/exceptions/GeneralExceptions.h>
 #elif GNUSTEP_BASE_LIBRARY
-#  import <extensions/exceptions/GeneralExceptions.h>
+//#  import <extensions/exceptions/GeneralExceptions.h>
 #else
 #  import <FoundationExt/NSException.h>
 #  import <FoundationExt/GeneralExceptions.h>
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGExtensions/FdExt.subproj/NSNull+misc.m
+++ opengroupware.org-core-0.9.0cvs20030717/NGExtensions/FdExt.subproj/NSNull+misc.m
@@ -24,10 +24,12 @@
 #include "common.h"
 
 #if LIB_FOUNDATION_LIBRARY || GNUSTEP_BASE_LIBRARY
-#  import <objc/objc-api.h>
-#  import <objc/objc.h>
-#  import <objc/encoding.h>
+#  include <objc/objc-api.h>
+#  include <objc/objc.h>
+#  include <objc/encoding.h>
+#ifndef GNUSTEP
 #  import <extensions/objc-runtime.h>
+#endif
 #else
 #  import <FoundationExt/objc-api.h>
 #  import <FoundationExt/objc-runtime.h>
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGExtensions/FdExt.subproj/NSString+misc.m
+++ opengroupware.org-core-0.9.0cvs20030717/NGExtensions/FdExt.subproj/NSString+misc.m
@@ -20,9 +20,9 @@
 */
 // $Id: NSString+misc.m,v 1.3 2003/07/11 17:12:49 jan Exp $
 
-#import "common.h"
-#import "NGMemoryAllocation.h"
-#import "NSString+misc.h"
+#include "common.h"
+#include "NGMemoryAllocation.h"
+#include "NSString+misc.h"
 
 #if !LIB_FOUNDATION_LIBRARY && !GNUSTEP_BASE_LIBRARY
 #  import <FoundationExt/objc-api.h>
@@ -66,7 +66,7 @@
   }
   buffer[pos] = '\0';
 
-#if NeXT_Foundation_LIBRARY
+#if NeXT_Foundation_LIBRARY || GNUSTEP
   {
     NSString *s;
 
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGMime/NGMail/common.h
+++ opengroupware.org-core-0.9.0cvs20030717/NGMime/NGMail/common.h
@@ -23,7 +23,7 @@
 #ifndef __NGMail_common_H__
 #define __NGMail_common_H__
 
-#import <Foundation/Foundation.h>
+#include <Foundation/Foundation.h>
 
 #if LIB_FOUNDATION_LIBRARY
 #  import <Foundation/exceptions/GeneralExceptions.h>
@@ -32,8 +32,10 @@
 #    import <FoundationExt/GeneralExceptions.h>
 #    import <FoundationExt/NSException.h>
 #  else
+#    ifndef GNUSTEP
 #    import <extensions/NSException.h>
 #    import <extensions/exceptions/GeneralExceptions.h>
+#    endif
 #  endif
 #endif
 
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGStreams/common.h
+++ opengroupware.org-core-0.9.0cvs20030717/NGStreams/common.h
@@ -25,7 +25,7 @@
 
 // common include files
 
-#import  <Foundation/Foundation.h>
+#include  <Foundation/Foundation.h>
 
 // configuration
 
@@ -55,8 +55,10 @@
 #  import <FoundationExt/NSException.h>
 #  import <FoundationExt/NSObjectMacros.h>
 #else
+#ifndef GNUSTEP
 #  include <extensions/exceptions/GeneralExceptions.h>
 #endif
+#endif
 
 #if !LIB_FOUNDATION_LIBRARY && !NeXT_Foundation_LIBRARY
 #  define NSWillBecomeMultiThreadedNotification NSBecomingMultiThreaded
--- opengroupware.org-core-0.9.0cvs20030717.orig/samples/common.h
+++ opengroupware.org-core-0.9.0cvs20030717/samples/common.h
@@ -20,12 +20,12 @@
 */
 // $Id: common.h,v 1.2 2003/07/11 17:12:50 jan Exp $
 
-#import <Foundation/Foundation.h>
+#include <Foundation/Foundation.h>
 
 #if LIB_FOUNDATION_LIBRARY
 #  import <Foundation/exceptions/GeneralExceptions.h>
 #elif GNUSTEP_BASE_LIBRARY
-#  import <extensions/exceptions/GeneralExceptions.h>
+//#  import <extensions/exceptions/GeneralExceptions.h>
 #else
 #  import <FoundationExt/NSObjectMacros.h>
 #  import <FoundationExt/NSString+Ext.h>
#
# Fixes to use GNUstep (and OS X Foundation too AFAICT) classes & methods,
# or extend them to get needed functionality.
#
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGLdap/NGLdapConnection.m
+++ opengroupware.org-core-0.9.0cvs20030717/NGLdap/NGLdapConnection.m
@@ -722,7 +722,8 @@
     while ((value = [values nextObject])) {
       unsigned idx;
 
-      if ((idx = [value indexOfString:@":"]) == NSNotFound)
+      //if ((idx = [value indexOfString:@":"]) == NSNotFound)
+      if ((idx = [value rangeOfString:@":"].location) == NSNotFound)
         /* couldn't parse value */
         continue;
 
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGMime/NGImap4/NGImap4Client.m
+++ opengroupware.org-core-0.9.0cvs20030717/NGMime/NGImap4/NGImap4Client.m
@@ -40,6 +40,14 @@
 
 @end /* NGImap4Client(ConnectionRegistration); */
 
+/* FIXME: move someplace better */
+@implementation NSException (setUserInfo)
+- (id) setUserInfo: (NSDictionary*) _userInfo {
+	ASSIGN (self->_e_info, _userInfo);
+	return self;
+}
+@end
+
 @interface NGImap4Client(Private)
 
 - (NGHashMap *)processCommand:(NSString *)_command;
@@ -1615,7 +1623,7 @@
         NSString *pref;
 
         pref  = [VersionPrefixDict objectForKey:key];
-        index = [lowServer indexOfString:pref];
+        index = [lowServer rangeOfString:pref].location;
 
         if (index != NSNotFound) {
           /* cyrus server */
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGMime/NGImap4/common.h
+++ opengroupware.org-core-0.9.0cvs20030717/NGMime/NGImap4/common.h
@@ -23,10 +23,12 @@
 #ifndef __NGImap4_common_H__
 #define __NGImap4_common_H__
 
-#import <Foundation/Foundation.h>
+#include <Foundation/Foundation.h>
 
 #if LIB_FOUNDATION_LIBRARY || GNUSTEP_BASE_LIBRARY
+#ifndef GNUSTEP
 #  include <extensions/exceptions/GeneralExceptions.h>
+#endif
 #else
 #  import <FoundationExt/NSObjectMacros.h>
 #  import <FoundationExt/NSString+Ext.h>
@@ -35,11 +37,15 @@
 #  import <FoundationExt/MissingMethods.h>
 #endif
 
-#import <EOControl/EOControl.h>
+#include <EOControl/EOControl.h>
 #include <NGExtensions/NGExtensions.h>
 #include <NGStreams/NGStreams.h>
 #include <NGStreams/NGNet.h>
 #include <NGMime/NGMime.h>
 #include <NGMail/NGMail.h>
 
+@interface NSException (setUserInfo)
+- (id) setUserInfo: (NSDictionary*) _userInfo;
+@end
+
 #endif /* __NGImap4_common_H__ */
--- opengroupware.org-core-0.9.0cvs20030717.orig/NGiCal/iCalDateHolder.m
+++ opengroupware.org-core-0.9.0cvs20030717/NGiCal/iCalDateHolder.m
@@ -85,7 +85,6 @@
 - (id)awakeAfterUsingSaxDecoder:(id)_decoder {
   NSString   *s;
   NSTimeZone *tz;
-  unsigned   idx;
 
   s = self->string;
   if ([s length] < 5) {
@@ -104,7 +103,8 @@
   else
     tz = [self timeZone];
   
-  if ((idx = [s indexOfString:@"T"]) != NSNotFound) {
+  //if ((idx = [s indexOfString:@"T"]) != NSNotFound) {
+  if ([s rangeOfString:@"T"].location != NSNotFound) {
     /* 
        012345678901234
        20021009T094500 - 15 chars 
#
# Just compiler warning fixes (about missing declarations or other things).
#
--- opengroupware.org-core-0.9.0cvs20030717.orig/samples/EOQualTool.h
+++ opengroupware.org-core-0.9.0cvs20030717/samples/EOQualTool.h
@@ -20,7 +20,10 @@
 */
 // $Id: EOQualTool.h,v 1.2 2003/07/11 17:12:50 jan Exp $
 
-#import <Foundation/NSObject.h>
+#ifndef __OGo_EOQualTool_H__
+#define __OGo_EOQualTool_H__
+
+#include <Foundation/NSObject.h>
 
 @class NSArray, EOQualifier;
 
@@ -39,3 +42,4 @@
 - (int)runWithArguments:(NSArray *)_args;
 
 @end
+#endif
--- opengroupware.org-core-0.9.0cvs20030717.orig/samples/EOQualTool.m
+++ opengroupware.org-core-0.9.0cvs20030717/samples/EOQualTool.m
@@ -20,10 +20,11 @@
 */
 // $Id: EOQualTool.m,v 1.2 2003/07/11 17:12:50 jan Exp $
 
-#import "EOQualTool.h"
-#import "common.h"
+#include "EOQualTool.h"
+#include "common.h"
 #include <EOControl/EOControl.h>
 #include <EOControl/EOSQLParser.h>
+#include <NGExtensions/NSString+Ext.h>
 
 @interface dateTime : NSDate
 @end
--- opengroupware.org-core-0.9.0cvs20030717.orig/samples/EncodingTool.h
+++ opengroupware.org-core-0.9.0cvs20030717/samples/EncodingTool.h
@@ -20,8 +20,11 @@
 */
 // $Id: EncodingTool.h,v 1.2 2003/07/11 17:12:50 jan Exp $
 
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
+#ifndef __OGo_EncodingTool_H__
+#define __OGo_EncodingTool_H__
+
+#include <Foundation/NSObject.h>
+#include <Foundation/NSString.h>
 
 @class NSString;
 
@@ -41,3 +44,4 @@
 - (int)runWithArguments:(NSArray *)_args;
 
 @end
+#endif
--- opengroupware.org-core-0.9.0cvs20030717.orig/samples/ImapListTool.h
+++ opengroupware.org-core-0.9.0cvs20030717/samples/ImapListTool.h
@@ -20,7 +20,10 @@
 */
 // $Id: ImapListTool.h,v 1.2 2003/07/11 17:12:50 jan Exp $
 
-#import "ImapTool.h"
+#ifndef __OGo_ImapListTool_H__
+#define __OGo_ImapListTool_H__
+
+#include "ImapTool.h"
 
 @class NSArray;
 
@@ -41,3 +44,4 @@
 - (int)runWithArguments:(NSArray *)_args;
 
 @end
+#endif
--- opengroupware.org-core-0.9.0cvs20030717.orig/samples/Mime2XmlTool.h
+++ opengroupware.org-core-0.9.0cvs20030717/samples/Mime2XmlTool.h
@@ -20,7 +20,10 @@
 */
 // $Id: Mime2XmlTool.h,v 1.2 2003/07/11 17:12:50 jan Exp $
 
-#import <Foundation/NSObject.h>
+#ifndef __OGo_Mime2XMLTool_H__
+#define __OGo_Mime2XMLTool_H__
+
+#include <Foundation/NSObject.h>
 
 @class NSArray;
 
@@ -45,3 +48,4 @@
 - (int)runWithArguments:(NSArray *)_args;
 
 @end
+#endif
--- opengroupware.org-core-0.9.0cvs20030717.orig/samples/test_qpdecode.m
+++ opengroupware.org-core-0.9.0cvs20030717/samples/test_qpdecode.m
@@ -25,6 +25,7 @@
 */
 
 #include "common.h"
+#include <NGMail/NGMimeMessageParser.h>
 
 static void test(void) {
   static unsigned char *fields[] = {

--uAKRQypu60I7Lcqm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff-skyrix-xml

--- OpenGroupware.org/SOPE/skyrix-xml/DOM/DOMNode.m
+++ skyrix-xml/opengroupware.org-xml-0.9.0cvs20030717/DOM/DOMNode.m
@@ -172,7 +172,7 @@
 - (id)previousSibling {
   DOMNode *parent;
   
-  if ((parent = [self parentNode]) == nil) return nil;
+  if ((parent = (DOMNode*) [self parentNode]) == nil) return nil;
   if (parent == nil) return nil;
   if (![parent respondsToSelector:@selector(_domNodeBeforeNode:)]) return nil;
   return [parent _domNodeBeforeNode:self];
@@ -180,7 +180,7 @@
 - (id)nextSibling {
   DOMNode *parent;
   
-  if ((parent = [self parentNode]) == nil) return nil;
+  if ((parent = (DOMNode*) [self parentNode]) == nil) return nil;
   if (parent == nil) return nil;
   if (![parent respondsToSelector:@selector(_domNodeBeforeNode:)]) return nil;
   return [parent _domNodeAfterNode:self];
--- OpenGroupware.org/SOPE/skyrix-xml/DOM/DOMXMLOutputter.m
+++ skyrix-xml/opengroupware.org-xml-0.9.0cvs20030717/DOM/DOMXMLOutputter.m
@@ -182,7 +182,7 @@
   unsigned i, count;
   
   // getting new attributes prefixes and namespaces
-  list = [self newAttributePrefixesAndNamespaces:[_node attributes]];
+  list = [self newAttributePrefixesAndNamespaces: (NSArray*) [_node attributes]];
 
   // push new attribute prefixes and namespaces to stack
   for (i = 0, count = [list count]; i < count; i = i + 2) {
--- OpenGroupware.org/SOPE/skyrix-xml/SaxObjC/SaxXMLReaderFactory.m
+++ skyrix-xml/opengroupware.org-xml-0.9.0cvs20030717/SaxObjC/SaxXMLReaderFactory.m
@@ -28,6 +28,7 @@
 - (id)copyWithZone:(NSZone *)_zone {
   return [self retain];
 }
+@end
 #endif
 
 @implementation SaxXMLReaderFactory
--- OpenGroupware.org/SOPE/skyrix-xml/XmlRpc/NSNotification+XmlRpcCoding.m
+++ skyrix-xml/opengroupware.org-xml-0.9.0cvs20030717/XmlRpc/NSNotification+XmlRpcCoding.m
@@ -41,7 +41,7 @@
 - (void)encodeWithXmlRpcCoder:(XmlRpcEncoder *)_coder {
   NSString *n;
 
-#if APPLE_Foundation_LIBRARY || NeXT_Foundation_LIBRARY
+#if APPLE_Foundation_LIBRARY || NeXT_Foundation_LIBRARY || GNUSTEP
   n = [self name];
 #else
   n = [self notificationName];

--uAKRQypu60I7Lcqm--