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 7b1601adce056bd7680bd284e6909d0a646939e3..1abf745a44d863b17e243ad1a6a636e5413ea257 100644 (file)
--- 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 deaf71e52c93203eb63254858e2f8843a3d1b6d2..5c953fa6d808005abd0c255bc6b4cf6a3bc81f23 100644 (file)
--- 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 2242b25ff965d0894e8035e72adc9c8f8391b864..78ed7918507cf96d3506df1e70d5a0073a35c0f8 100644 (file)
--- 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 053584a7c0532dbab489bdd2b114a35a14726a89..9dfb272db616ff266f13aefb671fe21be4fe5cf0 100644 (file)
--- 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 704134f77ae9cafe1de22bdd9a642c427bb50a64..e675c154aa516e3e3d793b3e6dfb05f7d4bf85a8 100644 (file)
--- 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 c9339b69288679d74c4a2f8265d768bee8bb97b2..23a2dd824ca4e2b85418106d58ccfc8f519d3cad 100644 (file)
--- 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 f5dd203b50e0b9b0873a770975fef55ad52142ab..cbb9c17f76480905234cb3be2dc0ba95a4ffbb59 100644 (file)
--- 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 a3bcbced17279a90edb52ad1429b494db2683c14..4fb39a909a872e91ce8ddd85db4daf1fb0cf2ce4 100644 (file)
--- 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 7d7ccdc19beb197f8ee90bd44d706e446a64d10b..98aa60ebd8c929758a56dde2a1997e731573a785 100644 (file)
--- 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 eba6f15377aeb1d25ea59b620e5a29ec6d6b8993..f44ca3dc9584544589b34b0811d65d92575f72d5 100644 (file)
--- 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