From: znek Date: Tue, 16 May 2006 17:56:11 +0000 (+0000) Subject: changed #includes into #imports - does compile against MulleEOF out of the box now X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09fc0e3b4633d51e47ba622b051e85d6fe19befd;p=sope changed #includes into #imports - does compile against MulleEOF out of the box now git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1263 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/SOPE.xcodeproj/project.pbxproj b/SOPE.xcodeproj/project.pbxproj index 054a60b0..36eefed9 100644 --- a/SOPE.xcodeproj/project.pbxproj +++ b/SOPE.xcodeproj/project.pbxproj @@ -20,9 +20,9 @@ AD8BF0DB07018E6900EC239A /* PBXTargetDependency */, AD8BF0DF07018E6900EC239A /* PBXTargetDependency */, AD8BF0DD07018E6900EC239A /* PBXTargetDependency */, - AD8BF8680701AE0600EC239A /* PBXTargetDependency */, - AD8BF27B070199B000EC239A /* PBXTargetDependency */, AD8BF1BD070197B000EC239A /* PBXTargetDependency */, + AD8BF27B070199B000EC239A /* PBXTargetDependency */, + AD8BF8680701AE0600EC239A /* PBXTargetDependency */, ); name = "Wrapper Contents"; productName = "Wrapper Contents"; @@ -40,9 +40,9 @@ AD8BF0D307018E5200EC239A /* PBXTargetDependency */, AD8BF0D707018E5200EC239A /* PBXTargetDependency */, AD8BF0D507018E5200EC239A /* PBXTargetDependency */, - AD8BF8660701ADF800EC239A /* PBXTargetDependency */, - AD8BF279070199A200EC239A /* PBXTargetDependency */, AD8BF1BB0701978A00EC239A /* PBXTargetDependency */, + AD8BF279070199A200EC239A /* PBXTargetDependency */, + AD8BF8660701ADF800EC239A /* PBXTargetDependency */, ); name = all; productName = all; @@ -502,9 +502,9 @@ AD8BF0C907018E0300EC239A /* sope-core.xcodeproj */, AD8BF0CD07018E3400EC239A /* sope-mime.xcodeproj */, AD8BF0CB07018E0C00EC239A /* sope-appserver.xcodeproj */, - AD8BF8620701ADE800EC239A /* sope-gdl1.xcodeproj */, AD8BF2750701999500EC239A /* sope-ldap.xcodeproj */, AD8BF1B70701977800EC239A /* sope-ical.xcodeproj */, + AD8BF8620701ADE800EC239A /* sope-gdl1.xcodeproj */, ); name = Projects; sourceTree = ""; diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 2a19499b..6cfe02b1 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2006-05-16 Marcus Mueller + + * *m: changed EOControl related includes into imports + to enable compilation against MulleEOF (v4.5.233) + 2006-05-05 Helge Hess * WebDAV/SoWebDAVRenderer.m: deliver more lockinfo fields when a lock diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj index 02ec1406..d2be7ed7 100644 --- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj @@ -410,7 +410,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -596,7 +596,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -637,7 +637,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -680,7 +680,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj index 6cd5ca36..c68709d2 100644 --- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj @@ -1984,7 +1984,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1998,7 +1998,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=228", + "-DSOPE_SUBMINOR_VERSION=233", ); OTHER_LDFLAGS = ( "-seg1addr", @@ -2506,7 +2506,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -2530,7 +2530,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=228", + "-DSOPE_SUBMINOR_VERSION=233", ); OTHER_LDFLAGS = ( "-seg1addr", @@ -2552,7 +2552,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -2577,7 +2577,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=228", + "-DSOPE_SUBMINOR_VERSION=233", ); OTHER_LDFLAGS = ( "-seg1addr", @@ -2600,7 +2600,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2614,7 +2614,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=228", + "-DSOPE_SUBMINOR_VERSION=233", ); OTHER_LDFLAGS = ( "-seg1addr", diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObject.m b/sope-appserver/NGObjWeb/SoObjects/SoObject.m index 04ad8eae..0bcc4abf 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoObject.m +++ b/sope-appserver/NGObjWeb/SoObjects/SoObject.m @@ -24,7 +24,7 @@ #include "SoClass.h" #include "SoSecurityManager.h" #include "WOContext+SoObjects.h" -#include +// #import #include #include #include "common.h" diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj index 7b2a4c37..d2e2c07f 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj @@ -305,7 +305,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -404,7 +404,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -444,7 +444,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -486,7 +486,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index c1996c31..9ae0437d 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=232 +SUBMINOR_VERSION:=233 # v4.5.214 requires libNGExtensions v4.5.179 # v4.5.122 requires libNGExtensions v4.5.153 diff --git a/sope-appserver/NGObjWeb/WOApplication.m b/sope-appserver/NGObjWeb/WOApplication.m index a79b5871..1e4bca65 100644 --- a/sope-appserver/NGObjWeb/WOApplication.m +++ b/sope-appserver/NGObjWeb/WOApplication.m @@ -34,7 +34,7 @@ #include #include #include -#include +#import #include "common.h" #include diff --git a/sope-appserver/NGObjWeb/WOComponent.m b/sope-appserver/NGObjWeb/WOComponent.m index 649e1386..7145ed0f 100644 --- a/sope-appserver/NGObjWeb/WOComponent.m +++ b/sope-appserver/NGObjWeb/WOComponent.m @@ -32,7 +32,10 @@ #include "WOComponentFault.h" #include "common.h" #include -#include +#import +#ifdef MULLE_EO_CONTROL +#import +#endif #include @interface WOContext(ComponentStackCount) diff --git a/sope-appserver/NGObjWeb/WOComponentDefinition.m b/sope-appserver/NGObjWeb/WOComponentDefinition.m index 765470bf..75be04dc 100644 --- a/sope-appserver/NGObjWeb/WOComponentDefinition.m +++ b/sope-appserver/NGObjWeb/WOComponentDefinition.m @@ -29,7 +29,10 @@ #include #include #include "common.h" -#include +#import +#ifdef MULLE_EO_CONTROL +#import +#endif #include diff --git a/sope-appserver/NGObjWeb/WOCoreApplication.m b/sope-appserver/NGObjWeb/WOCoreApplication.m index 7db7e352..0cf07811 100644 --- a/sope-appserver/NGObjWeb/WOCoreApplication.m +++ b/sope-appserver/NGObjWeb/WOCoreApplication.m @@ -25,7 +25,7 @@ #include #include #include -#include +#import #include #include #include diff --git a/sope-appserver/NGObjWeb/WODisplayGroup.m b/sope-appserver/NGObjWeb/WODisplayGroup.m index ae3e58ef..6badbd14 100644 --- a/sope-appserver/NGObjWeb/WODisplayGroup.m +++ b/sope-appserver/NGObjWeb/WODisplayGroup.m @@ -21,6 +21,7 @@ #include #import +#import #import #import #include "common.h" diff --git a/sope-appserver/NGObjWeb/WOResponse.m b/sope-appserver/NGObjWeb/WOResponse.m index f78997e6..60878883 100644 --- a/sope-appserver/NGObjWeb/WOResponse.m +++ b/sope-appserver/NGObjWeb/WOResponse.m @@ -23,7 +23,7 @@ #include #include #include -#include +#import #include "common.h" @implementation WOResponse diff --git a/sope-appserver/NGObjWeb/WOSession.m b/sope-appserver/NGObjWeb/WOSession.m index 4a957203..c965de88 100644 --- a/sope-appserver/NGObjWeb/WOSession.m +++ b/sope-appserver/NGObjWeb/WOSession.m @@ -28,7 +28,7 @@ #include #include #include -#include +#import #include "common.h" #include diff --git a/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m b/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m index 26248a1c..ba99f607 100644 --- a/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m +++ b/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m @@ -21,7 +21,7 @@ #include "EOFetchSpecification+SoDAV.h" #include "SoDAVSQLParser.h" -#include +#import #include "common.h" @implementation EOFetchSpecification(SoDAV) diff --git a/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m b/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m index 4adece3c..63f16045 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m +++ b/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m @@ -22,7 +22,7 @@ #include "SaxDAVHandler.h" #include "EOFetchSpecification+SoDAV.h" #include -#include +#import #include "common.h" /* diff --git a/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m b/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m index 4644b1fa..4697d79f 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m @@ -20,10 +20,10 @@ */ #include "SoDAVSQLParser.h" -#include -#include -#include -#include +#import +#import +#import +#import #include "common.h" #include diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m b/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m index f4f846e1..8d36a2a6 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#import +#import #include "common.h" @implementation NSObject(SoObjectDAVQueries) diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m index 3938c6d0..8b9453f9 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m @@ -26,8 +26,8 @@ #include "EOFetchSpecification+SoDAV.h" #include #include -#include -#include +#import +#import #include "common.h" @implementation SoObjectDataSource diff --git a/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m b/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m index 15fd8859..612a1ab6 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m @@ -22,7 +22,7 @@ #include "SoSubscriptionManager.h" #include "SoSubscription.h" #include "SoObject.h" -#include +#import #include "common.h" @implementation SoSubscriptionManager diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj index 87bae51c..119d942f 100644 --- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj @@ -234,7 +234,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -332,7 +332,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -372,7 +372,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -414,7 +414,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.228; + DYLIB_CURRENT_VERSION = 4.5.233; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog index 877abb23..42ab4e62 100644 --- a/sope-appserver/NGXmlRpc/ChangeLog +++ b/sope-appserver/NGXmlRpc/ChangeLog @@ -1,3 +1,8 @@ +2006-05-16 Marcus Mueller + + * *m: changed EOControl related includes into imports + to enable compilation against MulleEOF (v4.5.14) + 2005-09-18 Helge Hess * GNUmakefile.preamble: added dependency to NGMail (v4.5.13) diff --git a/sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m index f934d94f..15766109 100644 --- a/sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m +++ b/sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m @@ -19,11 +19,11 @@ 02111-1307, USA. */ -#include -#include +#import +#import #include "common.h" #include -#include +#import @implementation EOFetchSpecification(XmlRpcCoding) diff --git a/sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m index 22414cd7..a9155f71 100644 --- a/sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m +++ b/sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include +#import #include "common.h" #include diff --git a/sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m index 4301555a..091f834f 100644 --- a/sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m +++ b/sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include +#import #include "common.h" #include diff --git a/sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m index e68267c2..88383e31 100644 --- a/sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m +++ b/sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include +#import #include "common.h" #include @@ -125,6 +125,9 @@ @end /* EOKeyComparisonQualifier(XmlRpcCoding) */ +#ifdef MULLE_EO_CONTROL +#warning !! EOQualifierVariable still private? +#else @implementation EOQualifierVariable(XmlRpcCoding) - (id)initWithXmlRpcCoder:(XmlRpcDecoder *)_coder { @@ -136,3 +139,4 @@ } @end /* EOQualifierVariable(XmlRpcCoding) */ +#endif /* MULLE_EO_CONTROL */ diff --git a/sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m index ff497d6c..e7f634ca 100644 --- a/sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m +++ b/sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include +#import #include "common.h" #include diff --git a/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj b/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj index 7411a94f..cd8fbeee 100644 --- a/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj +++ b/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj @@ -368,7 +368,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.13; + DYLIB_CURRENT_VERSION = 4.5.14; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -485,7 +485,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.13; + DYLIB_CURRENT_VERSION = 4.5.14; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -526,7 +526,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.13; + DYLIB_CURRENT_VERSION = 4.5.14; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -569,7 +569,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.13; + DYLIB_CURRENT_VERSION = 4.5.14; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version index 36c1074d..a6180019 100644 --- a/sope-appserver/NGXmlRpc/Version +++ b/sope-appserver/NGXmlRpc/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=13 +SUBMINOR_VERSION:=14 diff --git a/sope-appserver/sope-appserver.xcodeproj/project.pbxproj b/sope-appserver/sope-appserver.xcodeproj/project.pbxproj index f6513144..5fbb831e 100644 --- a/sope-appserver/sope-appserver.xcodeproj/project.pbxproj +++ b/sope-appserver/sope-appserver.xcodeproj/project.pbxproj @@ -257,7 +257,6 @@ ADDF477106DA575700C4E7F8 /* COPYRIGHT */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = COPYRIGHT; sourceTree = ""; }; ADDF477306DA575700C4E7F8 /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = ""; tabWidth = 8; }; ADDF477406DA575700C4E7F8 /* PROJECTLEAD */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = PROJECTLEAD; sourceTree = ""; }; - ADDF477506DA575700C4E7F8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; ADDF477606DA575700C4E7F8 /* README-OSX.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "README-OSX.txt"; sourceTree = ""; }; ADDF477706DA575700C4E7F8 /* Version */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = Version; sourceTree = ""; tabWidth = 8; }; ADEAC65B078A325700097697 /* SoOFS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SoOFS.xcodeproj; path = SoOFS/SoOFS.xcodeproj; sourceTree = ""; }; @@ -332,7 +331,6 @@ ADDF476606DA572500C4E7F8 = { isa = PBXGroup; children = ( - ADDF477506DA575700C4E7F8 /* README */, ADDF477606DA575700C4E7F8 /* README-OSX.txt */, ADDF477006DA575700C4E7F8 /* COPYING */, ADDF477106DA575700C4E7F8 /* COPYRIGHT */, diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog index 2ad1beab..d952a4b6 100644 --- a/sope-core/NGExtensions/ChangeLog +++ b/sope-core/NGExtensions/ChangeLog @@ -1,3 +1,8 @@ +2006-05-16 Marcus Mueller + + * *.h, *m: changed EOControl related includes into imports + to enable compilation against MulleEOF (v4.5.183) + 2006-02-20 Helge Hess * NGBundleManager.m: minor code cleanups (v4.5.182) diff --git a/sope-core/NGExtensions/EOExt.subproj/EODataSource+NGExtensions.m b/sope-core/NGExtensions/EOExt.subproj/EODataSource+NGExtensions.m index 7a696cad..7cd0e663 100644 --- a/sope-core/NGExtensions/EOExt.subproj/EODataSource+NGExtensions.m +++ b/sope-core/NGExtensions/EOExt.subproj/EODataSource+NGExtensions.m @@ -20,7 +20,7 @@ */ #include "EODataSource+NGExtensions.h" -#include +#import #include "common.h" NGExtensions_DECLARE NSString *EODataSourceDidChangeNotification = diff --git a/sope-core/NGExtensions/EOExt.subproj/EOFetchSpecification+plist.m b/sope-core/NGExtensions/EOExt.subproj/EOFetchSpecification+plist.m index 48d5a59d..32b6c291 100644 --- a/sope-core/NGExtensions/EOExt.subproj/EOFetchSpecification+plist.m +++ b/sope-core/NGExtensions/EOExt.subproj/EOFetchSpecification+plist.m @@ -20,7 +20,7 @@ */ #include -#include +#import #include "common.h" @implementation EOFetchSpecification(plist) @@ -83,10 +83,10 @@ NSLog(@"%s: invalid hints key !", __PRETTY_FUNCTION__); } - if ([self->hints objectForKey:@"addDocumentsAsObserver"] == nil) { + if ([[self hints] objectForKey:@"addDocumentsAsObserver"] == nil) { NSMutableDictionary *hnts; - hnts = [[NSMutableDictionary alloc] initWithDictionary:self->hints]; + hnts = [[NSMutableDictionary alloc] initWithDictionary:[self hints]]; [hnts setObject:[NSNumber numberWithBool:NO] forKey:@"addDocumentsAsObserver"]; [self setHints:hnts]; diff --git a/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m b/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m index d47b4d76..f4d29381 100644 --- a/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m +++ b/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m @@ -22,7 +22,7 @@ #include "EOFilterDataSource.h" #include "EODataSource+NGExtensions.h" #include "EOGrouping.h" -#include +#import #include "common.h" @interface NSDictionary(EOFilterDataSource) diff --git a/sope-core/NGExtensions/EOExt.subproj/EOQualifierGrouping.m b/sope-core/NGExtensions/EOExt.subproj/EOQualifierGrouping.m index c9ee8b2d..443cc3f4 100644 --- a/sope-core/NGExtensions/EOExt.subproj/EOQualifierGrouping.m +++ b/sope-core/NGExtensions/EOExt.subproj/EOQualifierGrouping.m @@ -20,7 +20,7 @@ */ #include "EOGrouping.h" -#include +#import #include "common.h" @implementation EOQualifierGrouping diff --git a/sope-core/NGExtensions/EOExt.subproj/NSArray+EOGrouping.m b/sope-core/NGExtensions/EOExt.subproj/NSArray+EOGrouping.m index 10f69f22..8a3bc20e 100644 --- a/sope-core/NGExtensions/EOExt.subproj/NSArray+EOGrouping.m +++ b/sope-core/NGExtensions/EOExt.subproj/NSArray+EOGrouping.m @@ -20,7 +20,7 @@ */ #include "EOGrouping.h" -#include +#import #include "common.h" @implementation NSArray(EOGrouping) diff --git a/sope-core/NGExtensions/FdExt.subproj/NSFileManager+Extensions.m b/sope-core/NGExtensions/FdExt.subproj/NSFileManager+Extensions.m index 7af58b89..9e95d8f0 100644 --- a/sope-core/NGExtensions/FdExt.subproj/NSFileManager+Extensions.m +++ b/sope-core/NGExtensions/FdExt.subproj/NSFileManager+Extensions.m @@ -21,7 +21,7 @@ #include "NSFileManager+Extensions.h" #include "NGFileFolderInfoDataSource.h" -#include +#import #include "common.h" @interface NSFileManagerGlobalID : EOGlobalID < NSCopying > diff --git a/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj b/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj index 53510129..16544f09 100644 --- a/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj +++ b/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj @@ -972,7 +972,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.182; + DYLIB_CURRENT_VERSION = 4.5.183; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1173,7 +1173,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.182; + DYLIB_CURRENT_VERSION = 4.5.183; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1218,7 +1218,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.182; + DYLIB_CURRENT_VERSION = 4.5.183; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -1265,7 +1265,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.182; + DYLIB_CURRENT_VERSION = 4.5.183; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h b/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h index 47c03da6..f8dc9fa6 100644 --- a/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h +++ b/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h @@ -22,7 +22,7 @@ #ifndef __NGExtensions_EODataSource_NGExtensions_H__ #define __NGExtensions_EODataSource_NGExtensions_H__ -#include +#import #include @class EOFetchSpecification; diff --git a/sope-core/NGExtensions/NGExtensions/EOFetchSpecification+plist.h b/sope-core/NGExtensions/NGExtensions/EOFetchSpecification+plist.h index fc5c5d9c..d054095d 100644 --- a/sope-core/NGExtensions/NGExtensions/EOFetchSpecification+plist.h +++ b/sope-core/NGExtensions/NGExtensions/EOFetchSpecification+plist.h @@ -22,7 +22,7 @@ #ifndef __EOFetchSpecification_plist_h__ #define __EOFetchSpecification_plist_h__ -#include +#import @class NSDictionary, NSString; diff --git a/sope-core/NGExtensions/NGExtensions/EOQualifier+plist.h b/sope-core/NGExtensions/NGExtensions/EOQualifier+plist.h index 6b803ca0..aaedd16b 100644 --- a/sope-core/NGExtensions/NGExtensions/EOQualifier+plist.h +++ b/sope-core/NGExtensions/NGExtensions/EOQualifier+plist.h @@ -22,7 +22,7 @@ #ifndef __EOQualifier_plist_h__ #define __EOQualifier_plist_h__ -#include +#import @class NSDictionary, NSString; diff --git a/sope-core/NGExtensions/NGExtensions/EOSortOrdering+plist.h b/sope-core/NGExtensions/NGExtensions/EOSortOrdering+plist.h index 63536230..f3a245d9 100644 --- a/sope-core/NGExtensions/NGExtensions/EOSortOrdering+plist.h +++ b/sope-core/NGExtensions/NGExtensions/EOSortOrdering+plist.h @@ -22,7 +22,7 @@ #ifndef __EOSortOrdering_plist_h__ #define __EOSortOrdering_plist_h__ -#include +#import @class NSDictionary, NSString; diff --git a/sope-core/NGExtensions/NGExtensions/EOTrueQualifier.h b/sope-core/NGExtensions/NGExtensions/EOTrueQualifier.h index 1222f86c..38f3602f 100644 --- a/sope-core/NGExtensions/NGExtensions/EOTrueQualifier.h +++ b/sope-core/NGExtensions/NGExtensions/EOTrueQualifier.h @@ -22,7 +22,7 @@ #ifndef __EOExt_EOTrueQualifier_H__ #define __EOExt_EOTrueQualifier_H__ -#include +#import /* EOTrueQualifier diff --git a/sope-core/NGExtensions/NGExtensions/NGRule.h b/sope-core/NGExtensions/NGExtensions/NGRule.h index 6ab33b7a..0e7670de 100644 --- a/sope-core/NGExtensions/NGExtensions/NGRule.h +++ b/sope-core/NGExtensions/NGExtensions/NGRule.h @@ -23,7 +23,7 @@ #define __NGRuleEngine_NGRule_H__ #import -#include +#import /* NGRule diff --git a/sope-core/NGExtensions/NGExtensions/NGRuleAssignment.h b/sope-core/NGExtensions/NGExtensions/NGRuleAssignment.h index b3c2d712..88c74142 100644 --- a/sope-core/NGExtensions/NGExtensions/NGRuleAssignment.h +++ b/sope-core/NGExtensions/NGExtensions/NGRuleAssignment.h @@ -23,7 +23,7 @@ #define __NGRuleEngine_NGRuleAssignment_H__ #import -#include +#import /* NGRuleAssignment diff --git a/sope-core/NGExtensions/NGExtensions/NGRuleModel.h b/sope-core/NGExtensions/NGExtensions/NGRuleModel.h index cefd1ce8..8bcd7770 100644 --- a/sope-core/NGExtensions/NGExtensions/NGRuleModel.h +++ b/sope-core/NGExtensions/NGExtensions/NGRuleModel.h @@ -23,7 +23,7 @@ #define __NGRuleEngine_NGRuleModel_H__ #import -#include +#import /* NGRuleModel diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRule.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRule.m index be742032..c76178a6 100644 --- a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRule.m +++ b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRule.m @@ -23,7 +23,7 @@ #include "NGRuleAssignment.h" #include "NGRuleParser.h" #include "common.h" -#include +#import @implementation NGRule diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m index 9d39fffb..ae780483 100644 --- a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m +++ b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m @@ -24,7 +24,7 @@ #include "NGRuleModel.h" #include "NSObject+Logs.h" #include "common.h" -#include +#import @implementation NGRuleContext diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleModel.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleModel.m index 39e4e3ff..b0cec3de 100644 --- a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleModel.m +++ b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleModel.m @@ -24,7 +24,7 @@ #include "NGRuleParser.h" #include "EOTrueQualifier.h" #include -#include +#import #include "common.h" // TODO: add a candidate cache diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleParser.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleParser.m index e7968464..c2667489 100644 --- a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleParser.m +++ b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleParser.m @@ -27,7 +27,7 @@ #include "NSString+misc.h" #include "NSString+Ext.h" #include "EOTrueQualifier.h" -#include +#import #include "common.h" // TODO: proper reports errors in last-exception ! diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version index a642b68b..629cbb0c 100644 --- a/sope-core/NGExtensions/Version +++ b/sope-core/NGExtensions/Version @@ -1,6 +1,6 @@ # version -SUBMINOR_VERSION:=182 +SUBMINOR_VERSION:=183 # v4.3.115 requires libFoundation v1.0.59 # v4.2.72 requires libEOControl v4.2.39 diff --git a/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m b/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m index aaaf1226..4c652b0d 100644 --- a/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m +++ b/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m @@ -20,7 +20,7 @@ */ #include "DOMNode+EOQualifier.h" -#include +#import #include "common.h" @interface NSObject(DOMNodeEOQualifier) diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog index 16b1c34b..66d7e3bb 100644 --- a/sope-ical/NGiCal/ChangeLog +++ b/sope-ical/NGiCal/ChangeLog @@ -1,3 +1,8 @@ +2006-05-16 Marcus Mueller + + * iCalDataSource.h, common.h: changed EOControl related includes into + imports to enable compilation against MulleEOF (v4.5.74) + 2006-04-07 Marcus Mueller * iCalEntityObject.h: added missing forward declaration for diff --git a/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj b/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj index e0fa5de5..dbac0373 100644 --- a/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj +++ b/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj @@ -582,7 +582,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.73; + DYLIB_CURRENT_VERSION = 4.5.74; FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\""; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -645,7 +645,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.73; + DYLIB_CURRENT_VERSION = 4.5.74; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -821,7 +821,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.73; + DYLIB_CURRENT_VERSION = 4.5.74; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -864,7 +864,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.73; + DYLIB_CURRENT_VERSION = 4.5.74; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -909,7 +909,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.73; + DYLIB_CURRENT_VERSION = 4.5.74; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -939,7 +939,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.73; + DYLIB_CURRENT_VERSION = 4.5.74; FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\""; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -975,7 +975,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.73; + DYLIB_CURRENT_VERSION = 4.5.74; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -1013,7 +1013,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.73; + DYLIB_CURRENT_VERSION = 4.5.74; FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\""; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version index cbb19f99..b9d4ae75 100644 --- a/sope-ical/NGiCal/Version +++ b/sope-ical/NGiCal/Version @@ -2,7 +2,7 @@ MAJOR_VERSION=4 MINOR_VERSION=5 -SUBMINOR_VERSION:=73 +SUBMINOR_VERSION:=74 # v4.5.40 requires NGExtensions v4.5.145 # v4.5.37 requires NGExtensions v4.5.140 diff --git a/sope-ical/NGiCal/common.h b/sope-ical/NGiCal/common.h index 3fb8eb01..0ffdb574 100644 --- a/sope-ical/NGiCal/common.h +++ b/sope-ical/NGiCal/common.h @@ -23,7 +23,7 @@ #define __ICal_common_H__ #import -#include +#import #include #define IS_EQUAL(a, b, sel) \ diff --git a/sope-ical/NGiCal/iCalDataSource.h b/sope-ical/NGiCal/iCalDataSource.h index e41f4e2a..770987bb 100644 --- a/sope-ical/NGiCal/iCalDataSource.h +++ b/sope-ical/NGiCal/iCalDataSource.h @@ -22,7 +22,7 @@ #ifndef __NGiCal_iCalDataSource_H__ #define __NGiCal_iCalDataSource_H__ -#include +#import @class NSString, NSURL; @class EOFetchSpecification; diff --git a/sope-ldap/NGLdap/ChangeLog b/sope-ldap/NGLdap/ChangeLog index 5f653129..26c8eb28 100644 --- a/sope-ldap/NGLdap/ChangeLog +++ b/sope-ldap/NGLdap/ChangeLog @@ -1,3 +1,8 @@ +2006-05-16 Marcus Mueller + + * EOQualifier+LDAP.h: changed EOControl related includes into imports + to enable compilation against MulleEOF (v4.5.29) + 2006-01-30 Helge Hess * NGLdapConnection.m: set LDAP options prior performing a bind. Default diff --git a/sope-ldap/NGLdap/EOQualifier+LDAP.h b/sope-ldap/NGLdap/EOQualifier+LDAP.h index 841f5817..c87a38d1 100644 --- a/sope-ldap/NGLdap/EOQualifier+LDAP.h +++ b/sope-ldap/NGLdap/EOQualifier+LDAP.h @@ -22,7 +22,7 @@ #ifndef __EOQualifier_LDAP_H__ #define __EOQualifier_LDAP_H__ -#include +#import @class NSString; diff --git a/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj b/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj index e75bc59f..416b0022 100644 --- a/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj +++ b/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj @@ -306,7 +306,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.28; + DYLIB_CURRENT_VERSION = 4.5.29; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -417,7 +417,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.28; + DYLIB_CURRENT_VERSION = 4.5.29; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -458,7 +458,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.28; + DYLIB_CURRENT_VERSION = 4.5.29; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -501,7 +501,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.28; + DYLIB_CURRENT_VERSION = 4.5.29; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/sope-ldap/NGLdap/Version b/sope-ldap/NGLdap/Version index fdf3cd94..2aec4a55 100644 --- a/sope-ldap/NGLdap/Version +++ b/sope-ldap/NGLdap/Version @@ -2,4 +2,4 @@ MAJOR_VERSION=4 MINOR_VERSION=5 -SUBMINOR_VERSION:=28 +SUBMINOR_VERSION:=29