From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 10 Feb 2005 16:41:41 +0000 (+0000)
Subject: fixed compilation on MacOSX
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3a2396348351ba5a8120d143c3bbb740f87f191;p=scalable-opengroupware.org

fixed compilation on MacOSX


git-svn-id: http://svn.opengroupware.org/SOGo/trunk@541 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index 7b1601ad..1abf745a 100644
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,5 +1,7 @@
 2005-02-10  Helge Hess  <helge.hess@opengroupware.org>
 
+	* GNUmakefile.preamble: fixed linking on MacOSX (v0.9.22)
+
 	* v0.9.21
 	
 	* SOGoProductLoader.m: perform properly versioned plugin lookups (load
diff --git a/SOGo/Main/GNUmakefile.preamble b/SOGo/Main/GNUmakefile.preamble
index deaf71e5..5c953fa6 100644
--- a/SOGo/Main/GNUmakefile.preamble
+++ b/SOGo/Main/GNUmakefile.preamble
@@ -16,10 +16,14 @@ ADDITIONAL_LIB_DIRS += \
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
-# TODO: check which one we actually need!
-ADDITIONAL_TOOL_LIBS += \
-	-lSOGo			\
-	-lSOGoLogic		\
-	-lOGoContentStore	\
-	-lGDLAccess		\
-	-lNGiCal -lNGLdap
+MainUI_BUNDLE_LIBS += \
+	-lNGObjWeb	\
+	-lNGMime	\
+	-lNGStreams -lNGExtensions -lEOControl \
+	-lDOM -lXmlRpc -lSaxObjC
+
+$(SOGOD)_TOOL_LIBS += \
+	-lNGObjWeb	\
+	-lNGMime	\
+	-lNGStreams -lNGExtensions -lEOControl \
+	-lDOM -lXmlRpc -lSaxObjC
diff --git a/SOGo/Main/SOGo.m b/SOGo/Main/SOGo.m
index 2242b25f..78ed7918 100644
--- a/SOGo/Main/SOGo.m
+++ b/SOGo/Main/SOGo.m
@@ -100,8 +100,8 @@ static BOOL doCrashOnSessionCreate = NO;
 }
 
 - (id)lookupUser:(NSString *)_key inContext:(id)_ctx {
-  return [[[SOGoUserFolder alloc] initWithName:_key inContainer:self]
-	                   autorelease];
+  return [[[NSClassFromString(@"SOGoUserFolder") alloc] 
+	    initWithName:_key inContainer:self] autorelease];
 }
 
 - (void)_setupLocaleInContext:(WOContext *)_ctx {
@@ -242,7 +242,7 @@ static BOOL doCrashOnSessionCreate = NO;
       [self logWithFormat:@"ERROR: did not find MainUIProduct class!"];
   }
   
-  lpath = [MainProduct pathToLocaleForLanguageNamed:_name];
+  lpath = [(id)MainProduct pathToLocaleForLanguageNamed:_name];
   if ([lpath isNotNull])
     return lpath;
   
diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index 053584a7..9dfb272d 100644
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,5 +1,5 @@
 # Version file
 
-SUBMINOR_VERSION:=21
+SUBMINOR_VERSION:=22
 
 # v0.9.16 requires NGExtensions v4.5.136
diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 704134f7..e675c154 100644
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-10  Helge Hess  <helge.hess@opengroupware.org>
+
+	* SOGoObject.m: fixed a warning on MacOSX (v0.9.29)
+
 2005-02-07  Helge Hess  <helge.hess@opengroupware.org>
 
 	* SOGoObject.h: added prototype for GETAction (v0.9.28)
diff --git a/SOGo/SoObjects/SOGo/SOGoObject.m b/SOGo/SoObjects/SOGo/SOGoObject.m
index c9339b69..23a2dd82 100644
--- a/SOGo/SoObjects/SOGo/SOGoObject.m
+++ b/SOGo/SoObjects/SOGo/SOGoObject.m
@@ -144,7 +144,7 @@
   WOResponse *r;
   NSString *uri;
   
-  rq = [_ctx request];
+  rq = [(WOContext *)_ctx request];
   if ([rq isSoWebDAVRequest]) {
     if ([self respondsToSelector:@selector(contentAsString)])
       return [self contentAsString];
@@ -157,7 +157,7 @@
   if (![uri hasSuffix:@"/"]) uri = [uri stringByAppendingString:@"/"];
   uri = [uri stringByAppendingString:@"view"];
   
-  r = [_ctx response];
+  r = [(WOContext *)_ctx response];
   [r setStatus:302 /* moved */];
   [r setHeader:uri forKey:@"location"];
   return r;
diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index f5dd203b..cbb9c17f 100644
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,5 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=28
+SUBMINOR_VERSION:=29
 
 # v0.9.26 requires libOGoContentStore v0.9.13
diff --git a/SOGo/SoObjects/Sieve/ChangeLog b/SOGo/SoObjects/Sieve/ChangeLog
index a3bcbced..4fb39a90 100644
--- a/SOGo/SoObjects/Sieve/ChangeLog
+++ b/SOGo/SoObjects/Sieve/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-10  Helge Hess  <helge.hess@opengroupware.org>
+
+	* SOGoSieveScriptObject.m: fixed a compile warning on MacOSX (v0.9.8)
+
 2005-02-06  Helge Hess  <helge.hess@opengroupware.org>
 
 	* SOGoSieveScriptObject.m, SOGoSieveScriptsFolder.m: assigned
diff --git a/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m b/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m
index 7d7ccdc1..98aa60eb 100644
--- a/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m
+++ b/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m
@@ -120,7 +120,7 @@
   NSException *e;
   NSString *content;
 
-  content = [[_context request] contentAsString];
+  content = [[(WOContext *)_context request] contentAsString];
   
   if ((e = [self writeContent:content]))
     return e;
diff --git a/SOGo/SoObjects/Sieve/Version b/SOGo/SoObjects/Sieve/Version
index eba6f153..f44ca3dc 100644
--- a/SOGo/SoObjects/Sieve/Version
+++ b/SOGo/SoObjects/Sieve/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=7
+SUBMINOR_VERSION:=8
 
 # v0.9.6 requires libNGMime v4.5.207
 # v0.9.1 requires libNGMime v4.3.194