From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 14 Jul 2005 23:54:21 +0000 (+0000)
Subject: fixed some OSX issues
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9bebb20155b686a7047d61b5a0501c483e89ea8;p=scalable-opengroupware.org

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 8bf517c0..02f51e0f 100644
--- 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 1173adf2..2aaad264 100644
--- 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 57a5871f..10ae9f0c 100644
--- 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 b072128a..55664e75 100644
--- 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