fixed some OSX issues

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

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 8bf517c0b52c4d8ec4cb6059e85fcfff983e8971..02f51e0f23984c3bf56d444266d63d433ca840f4 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v0.9.61
+
+       * SOGoContentObject.m: fixed a Cocoa warning
+
+       * GNUmakefile.preamble: added proper linking flags for OSX
+
 2005-07-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.60

diff --git a/SOGo/SoObjects/SOGo/GNUmakefile.preamble b/SOGo/SoObjects/SOGo/GNUmakefile.preamble
index 1173adf2650ee8174983e06a26737958540fe429..2aaad26449be22324f5ff17366957e344d890e11 100644 (file)
--- a/SOGo/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SOGo/SoObjects/SOGo/GNUmakefile.preamble
@@ -24,4 +24,9 @@ libSOGo_LIBRARIES_DEPEND_UPON += \
        -lXmlRpc -lDOM -lSaxObjC \
        -lNGLdap
 
-ADDITIONAL_TOOL_LIBS += -lGDLContentStore -lNGLdap
+ADDITIONAL_TOOL_LIBS += \
+       -lGDLContentStore -lGDLAccess   \
+       -lNGLdap                        \
+       -lNGExtensions -lEOControl      \
+       -lDOM -lSaxObjC
+

diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.m b/SOGo/SoObjects/SOGo/SOGoContentObject.m
index 57a5871f0d6605bf542ad4142fa7b1580085d90e..10ae9f0c1a4c22ec8e28d864aba4a300e68a3de4 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoContentObject.m
+++ b/SOGo/SoObjects/SOGo/SOGoContentObject.m
@@ -312,7 +312,7 @@ static BOOL kontactGroupDAV = YES;
   if (kontactGroupDAV) {
     WEClientCapabilities *cc;
     
-    cc = [[_ctx request] clientCapabilities];
+    cc = [[(WOContext *)_ctx request] clientCapabilities];
     if ([[cc userAgentType] isEqualToString:@"Konqueror"]) {
       if ([cc majorVersion] == 3 && [cc minorVersion] == 4) {
        [self logWithFormat:

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index b072128a52d698f85aa6ffc9cd5329136555c7c7..55664e75e8793125565a87ba2e39e49086e0ece4 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=60
+SUBMINOR_VERSION:=61
 
 # v0.9.60 requires libNGiCal          v4.5.49
 # v0.9.50 requires libGDLContentStore v4.5.30