svn commit: r400146 - in head/www/sogo: . files
Kurt Jaeger
pi at FreeBSD.org
Sun Oct 25 06:49:18 UTC 2015
Author: pi
Date: Sun Oct 25 06:49:11 2015
New Revision: 400146
URL: https://svnweb.freebsd.org/changeset/ports/400146
Log:
www/sogo: fix lots of compiler warnings
PR: 203910
Submitted by: Euan Thoms <euan at potensol.com> (maintainer)
Added:
head/www/sogo/files/patch-ActiveSync_GNUmakefile (contents, props changed)
head/www/sogo/files/patch-Main_SOGo+DAV.m (contents, props changed)
head/www/sogo/files/patch-SOPE_GDLContentStore_GCSChannelManager.m (contents, props changed)
head/www/sogo/files/patch-SOPE_NGCards_CardElement.m (contents, props changed)
head/www/sogo/files/patch-SOPE_NGCards_CardGroup.m (contents, props changed)
head/www/sogo/files/patch-SOPE_NGCards_NSCalendarDate+NGCards.m (contents, props changed)
head/www/sogo/files/patch-SOPE_NGCards_iCalMonthlyRecurrenceCalculator.m (contents, props changed)
head/www/sogo/files/patch-SOPE_NGCards_iCalPerson.m (contents, props changed)
head/www/sogo/files/patch-SOPE_NGCards_iCalRecurrenceRule.m (contents, props changed)
head/www/sogo/files/patch-SOPE_NGCards_versitCardsSaxDriver_VSSaxDriver.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Appointments_MSExchangeFreeBusy.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Appointments_SOGoAppointmentFolder.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Appointments_SOGoAppointmentObject.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Appointments_SOGoCalendarComponent.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Appointments_iCalAlarm+SOGo.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.h (contents, props changed)
head/www/sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Contacts_NGVCard+SOGo.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactEntryPhoto.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactFolders.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactGCSEntry.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactGCSList.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactSourceFolder.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Mailer_NSDictionary+Mail.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Mailer_NSString+Mail.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailAccounts.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailBaseObject.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailBodyPart.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailFolder.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailForward.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailLabel.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailObject.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_BSONCodec.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_LDAPSource.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_NSCalendarDate+SOGo.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_NSDictionary+DAV.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_NSString+Utilities.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoCache.h (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.h (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSObject.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheObject.h (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoContentObject.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoFolder.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoGCSFolder.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoGroup.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoObject.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoParentFolder.h (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SOGoParentFolder.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_SQLSource.m (contents, props changed)
head/www/sogo/files/patch-SoObjects_SOGo_WORequest+SOGo.m (contents, props changed)
head/www/sogo/files/patch-Tests_Unit_SOGoTest.m (contents, props changed)
head/www/sogo/files/patch-Tests_Unit_TestNGMimeAddressHeaderFieldGenerator.m (contents, props changed)
head/www/sogo/files/patch-Tests_Unit_TestNGMimeMessageGenerator.m (contents, props changed)
head/www/sogo/files/patch-Tests_Unit_TestVersit.m (contents, props changed)
head/www/sogo/files/patch-Tests_Unit_TestiCalRecurrenceCalculator.m (contents, props changed)
head/www/sogo/files/patch-Tests_Unit_TestiCalTimeZonePeriod.m (contents, props changed)
head/www/sogo/files/patch-Tools_SOGoEAlarmsNotifier.m (contents, props changed)
head/www/sogo/files/patch-Tools_SOGoSockDOperation.m (contents, props changed)
head/www/sogo/files/patch-Tools_SOGoToolCreateFolder.m (contents, props changed)
head/www/sogo/files/patch-Tools_SOGoToolExpireUserSessions.m (contents, props changed)
head/www/sogo/files/patch-Tools_SOGoToolManageEAS.m (contents, props changed)
head/www/sogo/files/patch-Tools_SOGoToolRemoveDoubles.m (contents, props changed)
head/www/sogo/files/patch-Tools_SOGoToolRenameUser.m (contents, props changed)
head/www/sogo/files/patch-Tools_SOGoToolRestore.m (contents, props changed)
head/www/sogo/files/patch-Tools_SOGoToolUserPreferences.m (contents, props changed)
head/www/sogo/files/patch-Tools_sogo-tool.m (contents, props changed)
head/www/sogo/files/patch-UI_Common_UIxToolbar.m (contents, props changed)
head/www/sogo/files/patch-UI_Contacts_UIxContactActions.m (contents, props changed)
head/www/sogo/files/patch-UI_Contacts_UIxContactFolderActions.m (contents, props changed)
head/www/sogo/files/patch-UI_Contacts_UIxContactFolderProperties.m (contents, props changed)
head/www/sogo/files/patch-UI_Contacts_UIxContactView.m (contents, props changed)
head/www/sogo/files/patch-UI_MailPartViewers_UIxMailPartHTMLViewer.m (contents, props changed)
head/www/sogo/files/patch-UI_MailPartViewers_UIxMailPartViewer.m (contents, props changed)
head/www/sogo/files/patch-UI_MailerUI_UIxMailFolderActions.m (contents, props changed)
head/www/sogo/files/patch-UI_MailerUI_UIxMailListActions.h (contents, props changed)
head/www/sogo/files/patch-UI_MailerUI_UIxMailMainFrame.m (contents, props changed)
head/www/sogo/files/patch-UI_MainUI_SOGoMicrosoftActiveSyncActions.m (contents, props changed)
head/www/sogo/files/patch-UI_PreferencesUI_UIxPreferences.m (contents, props changed)
head/www/sogo/files/patch-UI_SOGoUI_SOGoAptFormatter.m (contents, props changed)
head/www/sogo/files/patch-UI_Scheduler_UIxCalDateSelector.m (contents, props changed)
head/www/sogo/files/patch-UI_Scheduler_UIxCalDayTable.h (contents, props changed)
head/www/sogo/files/patch-UI_Scheduler_UIxCalDayTable.m (contents, props changed)
head/www/sogo/files/patch-UI_Scheduler_UIxCalDayView.m (contents, props changed)
head/www/sogo/files/patch-UI_Scheduler_UIxCalListingActions.m (contents, props changed)
head/www/sogo/files/patch-UI_Scheduler_UIxCalMonthView.m (contents, props changed)
head/www/sogo/files/patch-UI_Scheduler_UIxCalViewPrint.m (contents, props changed)
head/www/sogo/files/patch-UI_Scheduler_UIxComponentEditor.m (contents, props changed)
head/www/sogo/files/patch-UI_Scheduler_UIxRecurrenceEditor.m (contents, props changed)
Modified:
head/www/sogo/Makefile
head/www/sogo/files/patch-SoObjects_SOGo_NSData+Crypto.m
head/www/sogo/files/patch-SoObjects_SOGo_instance-framework.make
head/www/sogo/files/patch-SoObjects_SOGo_master-framework.make
head/www/sogo/pkg-plist
Modified: head/www/sogo/Makefile
==============================================================================
--- head/www/sogo/Makefile Sun Oct 25 06:47:26 2015 (r400145)
+++ head/www/sogo/Makefile Sun Oct 25 06:49:11 2015 (r400146)
@@ -3,7 +3,7 @@
PORTNAME= sogo
PORTVERSION= 2.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnustep
MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
DISTNAME= SOGo-${PORTVERSION}
@@ -13,12 +13,16 @@ COMMENT= Groupware server with a focus
LICENSE= GPLv2
-BUILD_DEPENDS= ${GNUSTEP_LOCAL_LIBRARIES}/libDOM.so:${PORTSDIR}/devel/sope
LIB_DEPENDS= libmemcached.so:${PORTSDIR}/databases/libmemcached \
- libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+ libcurl.so:${PORTSDIR}/ftp/curl \
+ libDOM.so:${PORTSDIR}/devel/sope
-MAKE_JOBS_UNSAFE=yes
+OPTIONS_DEFINE= ACTIVESYNC
+OPTIONS_SUB= yes
+
+ACTIVESYNC_DESC= Enable support for ActiveSync protocol (Experimental)
+
+ACTIVESYNC_LIB_DEPENDS= libwbxml2.so:${PORTSDIR}/textproc/wbxml2
USERS= sogod
GROUPS= sogod
@@ -40,6 +44,10 @@ post-patch:
${GREP} -rlF '/etc/sogo' ${WRKSRC} \
| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
+.if ${PORT_OPTIONS:MACTIVESYNC}
+ @${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
+.endif
+
do-configure:
cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}
Added: head/www/sogo/files/patch-ActiveSync_GNUmakefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-ActiveSync_GNUmakefile Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- ActiveSync/GNUmakefile.orig 2015-09-16 18:41:28 UTC
++++ ActiveSync/GNUmakefile
+@@ -34,7 +34,7 @@ ActiveSync_RESOURCE_FILES += \
+ ADDITIONAL_OBJCFLAGS += -Wno-deprecated-declarations
+ ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -I../SoObjects/
+ ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -L../SOPE/NGCards/obj/
+-ADDITIONAL_INCLUDE_DIRS += -I/usr/include/libwbxml-1.0/
++ADDITIONAL_INCLUDE_DIRS += -I/usr/local/include/libwbxml-1.0/
+ ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lwbxml2
+
+ -include GNUmakefile.preamble
Added: head/www/sogo/files/patch-Main_SOGo+DAV.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-Main_SOGo+DAV.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- Main/SOGo+DAV.m.orig 2015-09-16 18:41:29 UTC
++++ Main/SOGo+DAV.m
+@@ -267,7 +267,7 @@
+ NSObject <DOMNodeList> *list;
+ NSObject <DOMNode> *valueNode;
+ NSArray *elements;
+- NSString *property, *match;
++ NSString *property=nil, *match=nil;
+
+ list = [searchElement getElementsByTagName: @"prop"];
+ if ([list length])
Added: head/www/sogo/files/patch-SOPE_GDLContentStore_GCSChannelManager.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SOPE_GDLContentStore_GCSChannelManager.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SOPE/GDLContentStore/GCSChannelManager.m.orig 2015-09-16 18:41:29 UTC
++++ SOPE/GDLContentStore/GCSChannelManager.m
+@@ -500,7 +500,7 @@ static NSTimeInterval ChannelCollectionT
+ ms = [NSMutableString stringWithCapacity: 256];
+ [ms appendFormat: @"<0x%p[%@]: ", self, NSStringFromClass ([self class])];
+
+- [ms appendFormat: @" #adaptors=%d", [urlToAdaptor count]];
++ [ms appendFormat: @" #adaptors=%d", (int)[urlToAdaptor count]];
+
+ [ms appendString: @">"];
+ return ms;
Added: head/www/sogo/files/patch-SOPE_NGCards_CardElement.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SOPE_NGCards_CardElement.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SOPE/NGCards/CardElement.m.orig 2015-09-16 18:41:29 UTC
++++ SOPE/NGCards/CardElement.m
+@@ -414,7 +414,7 @@
+ if (group)
+ [str appendFormat: @"%@ (group: %@)\n", tag, group];
+ else
+- [str appendFormat: @"%@\n", tag, group];
++ [str appendFormat: @"%@\n", tag];
+
+ [str appendString: [self versitString]];
+
Added: head/www/sogo/files/patch-SOPE_NGCards_CardGroup.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SOPE_NGCards_CardGroup.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SOPE/NGCards/CardGroup.m.orig 2015-09-16 18:41:29 UTC
++++ SOPE/NGCards/CardGroup.m
+@@ -409,7 +409,7 @@ static NGCardsSaxHandler *sax = nil;
+ max = [children count];
+ if (max > 0)
+ {
+- [str appendFormat: @"\n %d children: {\n", [children count]];
++ [str appendFormat: @"\n %d children: {\n", (int)[children count]];
+ for (count = 0; count < max; count++)
+ [str appendFormat: @" %@\n",
+ [[children objectAtIndex: count] description]];
Added: head/www/sogo/files/patch-SOPE_NGCards_NSCalendarDate+NGCards.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SOPE_NGCards_NSCalendarDate+NGCards.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,24 @@
+--- SOPE/NGCards/NSCalendarDate+NGCards.m.orig 2015-09-16 18:41:29 UTC
++++ SOPE/NGCards/NSCalendarDate+NGCards.m
+@@ -32,16 +32,16 @@
+ - (NSString *) iCalFormattedDateTimeString
+ {
+ return [NSString stringWithFormat: @"%.4d%.2d%.2dT%.2d%.2d%.2d",
+- [self yearOfCommonEra], [self monthOfYear],
+- [self dayOfMonth], [self hourOfDay],
+- [self minuteOfHour], [self secondOfMinute]];
++ (int)[self yearOfCommonEra], (int)[self monthOfYear],
++ (int)[self dayOfMonth], (int)[self hourOfDay],
++ (int)[self minuteOfHour], (int)[self secondOfMinute]];
+ }
+
+ - (NSString *) iCalFormattedDateString
+ {
+ return [NSString stringWithFormat: @"%.4d%.2d%.2d",
+- [self yearOfCommonEra], [self monthOfYear],
+- [self dayOfMonth]];
++ (int)[self yearOfCommonEra], (int)[self monthOfYear],
++ (int)[self dayOfMonth]];
+ }
+
+ @end
Added: head/www/sogo/files/patch-SOPE_NGCards_iCalMonthlyRecurrenceCalculator.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SOPE_NGCards_iCalMonthlyRecurrenceCalculator.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,20 @@
+--- SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m.orig 2015-09-16 18:41:29 UTC
++++ SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
+@@ -348,7 +348,7 @@ static inline unsigned iCalDoWForNSDoW (
+ if ([byDayMask occursOnDay: currentWeekDay])
+ {
+ if ([bySetPos containsObject:
+- [NSString stringWithFormat: @"%d", currentPos]])
++ [NSString stringWithFormat: @"%d", (int)currentPos]])
+ monthDays[monthDay+1] = YES;
+ currentPos++;
+ }
+@@ -362,7 +362,7 @@ static inline unsigned iCalDoWForNSDoW (
+ if ([byDayMask occursOnDay: currentWeekDay])
+ {
+ if ([bySetPos containsObject:
+- [NSString stringWithFormat: @"%d", currentPos]])
++ [NSString stringWithFormat: @"%d", (int)currentPos]])
+ monthDays[monthDay] = YES;
+ currentPos--;
+ }
Added: head/www/sogo/files/patch-SOPE_NGCards_iCalPerson.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SOPE_NGCards_iCalPerson.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SOPE/NGCards/iCalPerson.m.orig 2015-09-16 18:41:36 UTC
++++ SOPE/NGCards/iCalPerson.m
+@@ -256,7 +256,7 @@
+ - (BOOL)isEqual:(id)_other {
+ if(_other == nil)
+ return NO;
+- if([_other class] != self->isa)
++ if([_other class] != object_getClass(self))
+ return NO;
+ if([_other hash] != [self hash])
+ return NO;
Added: head/www/sogo/files/patch-SOPE_NGCards_iCalRecurrenceRule.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SOPE_NGCards_iCalRecurrenceRule.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,15 @@
+--- SOPE/NGCards/iCalRecurrenceRule.m.orig 2015-09-16 18:41:29 UTC
++++ SOPE/NGCards/iCalRecurrenceRule.m
+@@ -309,10 +309,10 @@ NSString *iCalWeekDayString[] = { @"SU",
+ else if ([frequency isEqualToString:@"SECONDLY"])
+ freq = iCalRecurrenceFrequenceSecondly;
+ else
+- freq = NSNotFound;
++ freq = (iCalRecurrenceFrequency) NSNotFound;
+ }
+ else
+- freq = NSNotFound;
++ freq = (iCalRecurrenceFrequency) NSNotFound;
+
+ return freq;
+ }
Added: head/www/sogo/files/patch-SOPE_NGCards_versitCardsSaxDriver_VSSaxDriver.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SOPE_NGCards_versitCardsSaxDriver_VSSaxDriver.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,20 @@
+--- SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m.orig 2015-09-16 18:41:29 UTC
++++ SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m
+@@ -1045,7 +1045,7 @@ static NSCharacterSet *whitespaceCharSet
+ if (debugOn)
+ {
+ NSLog(@"%s: trying to decode data (0x%p,len=%d) ...",
+- __PRETTY_FUNCTION__, _data, [_data length]);
++ __PRETTY_FUNCTION__, _data, (int)[_data length]);
+ }
+
+ if ((len = [_data length]) == 0)
+@@ -1164,7 +1164,7 @@ static NSCharacterSet *whitespaceCharSet
+ if (debugOn)
+ {
+ NSLog(@"%s: trying to parse string (0x%p,len=%d) ...",
+- __PRETTY_FUNCTION__, _source, [_source length]);
++ __PRETTY_FUNCTION__, _source, (int)[_source length]);
+ }
+ if (!_sysId) _sysId = @"<string>";
+ [self _parseString: _source];
Added: head/www/sogo/files/patch-SoObjects_Appointments_MSExchangeFreeBusy.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Appointments_MSExchangeFreeBusy.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Appointments/MSExchangeFreeBusy.m.orig 2015-09-16 18:41:29 UTC
++++ SoObjects/Appointments/MSExchangeFreeBusy.m
+@@ -344,7 +344,7 @@ size_t curl_body_function_freebusy(void
+ NSMutableString *s;
+
+ s = [NSMutableString stringWithCapacity: 64];
+- [s appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
++ [s appendFormat:@"<0x%08X[%@]:", (unsigned int)self, NSStringFromClass([self class])];
+ if (freeBusyViewType)
+ [s appendFormat:@" freeBusyViewType='%@'", freeBusyViewType];
+ if (mergedFreeBusy)
Added: head/www/sogo/files/patch-SoObjects_Appointments_SOGoAppointmentFolder.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Appointments_SOGoAppointmentFolder.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Appointments/SOGoAppointmentFolder.m.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/Appointments/SOGoAppointmentFolder.m
+@@ -2387,7 +2387,7 @@ firstInstanceCalendarDateRange: (NGCalen
+ request = [context request];
+ if (!([request isIPhone] || [request isICal4]))
+ {
+- gdRT = [self groupDavResourceType];
++ gdRT = (NSArray *) [self groupDavResourceType];
+ gdVEventCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 0],
+ XMLNS_GROUPDAV, nil];
+ [colType addObject: gdVEventCol];
Added: head/www/sogo/files/patch-SoObjects_Appointments_SOGoAppointmentObject.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Appointments_SOGoAppointmentObject.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,64 @@
+--- SoObjects/Appointments/SOGoAppointmentObject.m.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/Appointments/SOGoAppointmentObject.m
+@@ -45,6 +45,7 @@
+ #import <NGCards/iCalDateTime.h>
+ #import <NGCards/iCalTimeZone.h>
+ #import <NGCards/iCalTimeZonePeriod.h>
++#import <NGCards/iCalToDo.h>
+ #import <NGCards/NSString+NGCards.h>
+
+ #import <SOGo/SOGoConstants.h>
+@@ -747,11 +748,14 @@ inRecurrenceExceptionsForEvent: (iCalEve
+ {
+ e = [events objectAtIndex: i];
+ if ([e recurrenceId])
+- for (j = 0; j < [theAttendees count]; j++)
+- if (shouldAdd)
++ for (j = 0; j < [theAttendees count]; j++) {
++ if (shouldAdd) {
+ [e addToAttendees: [theAttendees objectAtIndex: j]];
+- else
++ }
++ else {
+ [e removeFromAttendees: [theAttendees objectAtIndex: j]];
++ }
++ }
+ }
+ }
+
+@@ -1037,7 +1041,7 @@ inRecurrenceExceptionsForEvent: (iCalEve
+ if ([delegateEmail length])
+ otherDelegate = [event findAttendeeWithEmail: delegateEmail];
+ else
+- otherDelegate = NO;
++ otherDelegate = nil;
+
+ /* we handle the addition/deletion of delegate users */
+ addDelegate = NO;
+@@ -1075,7 +1079,7 @@ inRecurrenceExceptionsForEvent: (iCalEve
+ if ([delegateEmail length])
+ otherDelegate = [event findAttendeeWithEmail: delegateEmail];
+ else
+- otherDelegate = NO;
++ otherDelegate = nil;
+ }
+ }
+ if (addDelegate)
+@@ -1232,7 +1236,7 @@ inRecurrenceExceptionsForEvent: (iCalEve
+ if ([delegateEmail length])
+ otherDelegate = [event findAttendeeWithEmail: delegateEmail];
+ else
+- otherDelegate = NO;
++ otherDelegate = nil;
+ }
+
+ [self sendEMailUsingTemplateNamed: @"Deletion"
+@@ -1990,7 +1994,7 @@ inRecurrenceExceptionsForEvent: (iCalEve
+ if ([container resourceNameForEventUID: eventUID])
+ {
+ return [NSException exceptionWithHTTPStatus: 403
+- reason: [NSString stringWithFormat: @"Event UID already in use. (%s)", eventUID]];
++ reason: [NSString stringWithFormat: @"Event UID already in use. (%s)", (char *)eventUID]];
+ }
+
+ //
Added: head/www/sogo/files/patch-SoObjects_Appointments_SOGoCalendarComponent.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Appointments_SOGoCalendarComponent.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,25 @@
+--- SoObjects/Appointments/SOGoCalendarComponent.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Appointments/SOGoCalendarComponent.m
+@@ -140,6 +140,13 @@
+ return aclManager;
+ }
+
++- (NSException *) changeParticipationStatus: (NSString *) newPartStat
++ withDelegate: (iCalPerson *) delegate
++ alarm: (iCalAlarm *) alarm;
++{
++ return nil;
++}
++
+ - (id) init
+ {
+ if ((self = [super init]))
+@@ -171,7 +178,7 @@
+
+ - (Class *) parsingClass
+ {
+- return [iCalCalendar class];
++ return (Class *) [iCalCalendar class];
+ }
+
+ - (NSString *) davContentType
Added: head/www/sogo/files/patch-SoObjects_Appointments_iCalAlarm+SOGo.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Appointments_iCalAlarm+SOGo.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,14 @@
+--- SoObjects/Appointments/iCalAlarm+SOGo.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Appointments/iCalAlarm+SOGo.m
+@@ -102,9 +102,9 @@
+ }
+
+ if ([reminderReference caseInsensitiveCompare: @"BEFORE"] == NSOrderedSame)
+- aValue = [NSString stringWithString: @"-P"];
++ aValue = (NSString *) @"-P";
+ else
+- aValue = [NSString stringWithString: @"P"];
++ aValue = (NSString *) @"P";
+
+ if ([reminderUnit caseInsensitiveCompare: @"MINUTES"] == NSOrderedSame ||
+ [reminderUnit caseInsensitiveCompare: @"HOURS"] == NSOrderedSame)
Added: head/www/sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.h Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Appointments/iCalEvent+SOGo.h.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/Appointments/iCalEvent+SOGo.h
+@@ -28,7 +28,7 @@
+ @interface iCalEvent (SOGoExtensions)
+
+ - (BOOL) isStillRelevant;
+-- (unsigned int) occurenceInterval;
++- (NSTimeInterval) occurenceInterval;
+ - (void) updateRecurrenceRulesUntilDate: (NSCalendarDate *) previousEndDate;
+
+ @end
Added: head/www/sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Appointments_iCalEvent+SOGo.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Appointments/iCalEvent+SOGo.m.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/Appointments/iCalEvent+SOGo.m
+@@ -259,7 +259,7 @@
+
+ - (NSTimeInterval) occurenceInterval
+ {
+- return [[self endDate] timeIntervalSinceDate: [self startDate]];
++ return (NSTimeInterval) [[self endDate] timeIntervalSinceDate: [self startDate]];
+ }
+
+ /**
Added: head/www/sogo/files/patch-SoObjects_Contacts_NGVCard+SOGo.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Contacts_NGVCard+SOGo.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,26 @@
+--- SoObjects/Contacts/NGVCard+SOGo.m.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/Contacts/NGVCard+SOGo.m
+@@ -297,7 +297,7 @@ convention:
+
+ if (year && month && day)
+ [self setBday: [NSString stringWithFormat: @"%.4d-%.2d-%.2d",
+- year, month, day]];
++ (int)year, (int)month, (int)day]];
+ else
+ [self setBday: @""];
+
+@@ -614,11 +614,11 @@ convention:
+ birthDay = [[self bday] asCalendarDate];
+ if (birthDay)
+ {
+- stringValue = [NSString stringWithFormat: @"%.4d", [birthDay yearOfCommonEra]];
++ stringValue = [NSString stringWithFormat: @"%.4d", (int)[birthDay yearOfCommonEra]];
+ [self _setValue: @"birthyear" to: stringValue inLDIFRecord: ldifRecord];
+- stringValue = [NSString stringWithFormat: @"%.2d", [birthDay monthOfYear]];
++ stringValue = [NSString stringWithFormat: @"%.2d", (int)[birthDay monthOfYear]];
+ [self _setValue: @"birthmonth" to: stringValue inLDIFRecord: ldifRecord];
+- stringValue = [NSString stringWithFormat: @"%.2d", [birthDay dayOfMonth]];
++ stringValue = [NSString stringWithFormat: @"%.2d", (int)[birthDay dayOfMonth]];
+ [self _setValue: @"birthday" to: stringValue inLDIFRecord: ldifRecord];
+ }
+ [self _setValue: @"description" to: [self note] inLDIFRecord: ldifRecord];
Added: head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactEntryPhoto.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactEntryPhoto.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Contacts/SOGoContactEntryPhoto.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Contacts/SOGoContactEntryPhoto.m
+@@ -59,7 +59,7 @@
+
+ [response setHeader: [self davContentType] forKey: @"content-type"];
+ [response setHeader: [NSString stringWithFormat:@" %d",
+- [data length]]
++ (int)[data length]]
+ forKey: @"content-length"];
+ [response setContent: data];
+ }
Added: head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactFolders.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactFolders.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,15 @@
+--- SoObjects/Contacts/SOGoContactFolders.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Contacts/SOGoContactFolders.m
+@@ -268,9 +268,9 @@ Class SOGoContactSourceFolderK;
+ SOGoUser *currentUser;
+ id <SOGoSource> source;
+
+- if ([sourceID isEqualToString: @"personal"])
+- result = [NSException exceptionWithHTTPStatus: 403
+- reason: (@"folder '%@' cannot be deleted", sourceID)];
++ if ([sourceID isEqualToString: @"personal"]){
++ result = [NSException exceptionWithHTTPStatus: 403 reason: [NSString stringWithFormat: (@"folder '%@' cannot be deleted"), sourceID]];
++ }
+ else
+ {
+ result = nil;
Added: head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactGCSEntry.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactGCSEntry.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Contacts/SOGoContactGCSEntry.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Contacts/SOGoContactGCSEntry.m
+@@ -50,7 +50,7 @@
+
+ - (Class *) parsingClass
+ {
+- return [NGVCard class];
++ return (Class *)[NGVCard class];
+ }
+
+ /* content */
Added: head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactGCSList.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactGCSList.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Contacts/SOGoContactGCSList.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Contacts/SOGoContactGCSList.m
+@@ -45,7 +45,7 @@
+
+ - (Class *) parsingClass
+ {
+- return [NGVList class];
++ return (Class *)[NGVList class];
+ }
+
+
Added: head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactSourceFolder.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Contacts_SOGoContactSourceFolder.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,20 @@
+--- SoObjects/Contacts/SOGoContactSourceFolder.m.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/Contacts/SOGoContactSourceFolder.m
+@@ -94,7 +94,7 @@
+ {
+ if (![newDisplayName length])
+ newDisplayName = newName;
+- ASSIGN (displayName, newDisplayName);
++ ASSIGN (displayName, [newDisplayName mutableCopy]);
+ }
+
+ return self;
+@@ -657,7 +657,7 @@
+ BOOL otherIsPersonal;
+
+ otherIsPersonal = ([otherFolder isKindOfClass: [SOGoContactGCSFolder class]]
+- || ([otherFolder isKindOfClass: isa] && [otherFolder isPersonalSource]));
++ || ([otherFolder isKindOfClass: object_getClass(self)] && [otherFolder isPersonalSource]));
+
+ if (isPersonalSource)
+ {
Added: head/www/sogo/files/patch-SoObjects_Mailer_NSDictionary+Mail.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Mailer_NSDictionary+Mail.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,10 @@
+--- SoObjects/Mailer/NSDictionary+Mail.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Mailer/NSDictionary+Mail.m
+@@ -20,6 +20,7 @@
+
+ #import <Foundation/NSDictionary.h>
+ #import <Foundation/NSString.h>
++#import <NGExtensions/NSString+misc.h>
+
+ #import "NSDictionary+Mail.h"
+
Added: head/www/sogo/files/patch-SoObjects_Mailer_NSString+Mail.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Mailer_NSString+Mail.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Mailer/NSString+Mail.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Mailer/NSString+Mail.m
+@@ -533,7 +533,7 @@
+ messageID = [NSMutableString string];
+ [messageID appendFormat: @"<%@", [SOGoObject globallyUniqueObjectId]];
+ pGUID = [[NSProcessInfo processInfo] globallyUniqueString];
+- [messageID appendFormat: @"@%u>", [pGUID hash]];
++ [messageID appendFormat: @"@%u>", (unsigned int)[pGUID hash]];
+
+ return [messageID lowercaseString];
+ }
Added: head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailAccounts.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailAccounts.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,28 @@
+--- SoObjects/Mailer/SOGoMailAccounts.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Mailer/SOGoMailAccounts.m
+@@ -41,6 +41,8 @@
+
+ #define XMLNS_INVERSEDAV @"urn:inverse:params:xml:ns:inverse-dav"
+
++// TODO: prune redundant methods
++
+ @implementation SOGoMailAccounts
+
+ - (NSArray *) mailAccounts
+@@ -206,6 +208,9 @@
+ </D:multistatus>
+
+ */
++
++/* No longer in use, causes objc-method-access warning
++
+ - (NSException *) setDavMailsLabels: (NSString *) newLabels
+ {
+ id <DOMElement> documentElement, labelNode;
+@@ -253,5 +258,6 @@
+
+ return nil;
+ }
++*/
+
+ @end /* SOGoMailAccounts */
Added: head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailBaseObject.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailBaseObject.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,14 @@
+--- SoObjects/Mailer/SOGoMailBaseObject.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Mailer/SOGoMailBaseObject.m
+@@ -32,9 +32,11 @@
+ #import <NGExtensions/NSString+misc.h>
+ #import <NGExtensions/NSURL+misc.h>
+ #import <NGImap4/NGImap4Connection.h>
++#import <NGImap4/NGImap4Client.h>
+
+ #import <SOGo/SOGoCache.h>
+ #import <SOGo/SOGoUser.h>
++#import <SOGo/WORequest+SOGo.h>
+
+ #import "SOGoMailAccount.h"
+ #import "SOGoMailManager.h"
Added: head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailBodyPart.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailBodyPart.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Mailer/SOGoMailBodyPart.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Mailer/SOGoMailBodyPart.m
+@@ -396,7 +396,7 @@ static BOOL debugOn = NO;
+ mimeType = @"application/octet-stream";
+
+ [response setHeader: mimeType forKey: @"content-type"];
+- [response setHeader: [NSString stringWithFormat:@"%d", [data length]]
++ [response setHeader: [NSString stringWithFormat:@"%d", (int)[data length]]
+ forKey: @"content-length"];
+
+ if (asAttachment)
Added: head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailFolder.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailFolder.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Mailer/SOGoMailFolder.m.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/Mailer/SOGoMailFolder.m
+@@ -1645,7 +1645,7 @@ _compareFetchResultsByMODSEQ (id entry1,
+
+ sortOrderings = [NSMutableArray array];
+
+- if ([self _sortElementIsAscending: sortElement])
++ if ([self _sortElementIsAscending: (NGDOMNodeWithChildren <DOMElement> *)sortElement])
+ sortOrderingOrder = EOCompareAscending;
+ else
+ sortOrderingOrder = EOCompareDescending;
Added: head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailForward.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailForward.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,15 @@
+--- SoObjects/Mailer/SOGoMailForward.m.orig 2015-09-16 18:41:30 UTC
++++ SoObjects/Mailer/SOGoMailForward.m
+@@ -73,10 +73,10 @@
+
+ - (NSString *) newLine
+ {
+- NSString *rc = [NSString stringWithString: @" "];
++ NSString *rc = @" ";
+
+ if (htmlComposition)
+- rc = [NSString stringWithString: @"<br/>"];
++ rc = @"<br/>";
+
+ return rc;
+ }
Added: head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailLabel.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailLabel.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/Mailer/SOGoMailLabel.m.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/Mailer/SOGoMailLabel.m
+@@ -74,7 +74,7 @@
+ int i;
+
+ allLabels = [NSMutableArray array];
+- allKeys = [[theDefaults allKeys] sortedArrayUsingSelector: @selector (caseInsensitiveCompare:)];
++ allKeys = [[[theDefaults allKeys] sortedArrayUsingSelector: @selector (caseInsensitiveCompare:)] mutableCopy];
+
+ for (i = 0; i < [allKeys count]; i++)
+ {
Added: head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailObject.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_Mailer_SOGoMailObject.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,46 @@
+--- SoObjects/Mailer/SOGoMailObject.m.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/Mailer/SOGoMailObject.m
+@@ -765,7 +765,7 @@ static BOOL debugSoParts = NO;
+ [part objectForKey: @"type"],
+ [part objectForKey: @"subtype"]];
+
+- if (!filename)
++ if (!filename) {
+ // We might end up here because of MUA that actually strips the
+ // Content-Disposition (and thus, the filename) when mails containing
+ // attachments have been forwarded. Thunderbird (2.x) does just that
+@@ -773,10 +773,14 @@ static BOOL debugSoParts = NO;
+ if ([mimeType hasPrefix: @"application/"] ||
+ [mimeType hasPrefix: @"audio/"] ||
+ [mimeType hasPrefix: @"image/"] ||
+- [mimeType hasPrefix: @"video/"])
++ [mimeType hasPrefix: @"video/"]) {
+ filename = [NSString stringWithFormat: @"unknown_%@", path];
+- else if ([mimeType isEqualToString: @"message/rfc822"])
+- filename = [NSString stringWithFormat: @"email_%@.eml", path];
++ }
++ else {
++ if ([mimeType isEqualToString: @"message/rfc822"])
++ filename = [NSString stringWithFormat: @"email_%@.eml", path];
++ }
++ }
+
+
+ if (filename)
+@@ -820,13 +824,13 @@ static BOOL debugSoParts = NO;
+ {
+ currentPart = [subparts objectAtIndex: i-1];
+ if (path)
+- newPath = [NSString stringWithFormat: @"%@.%d", path, i];
++ newPath = [NSString stringWithFormat: @"%@.%d", path, (int)i];
+ else
+- newPath = [NSString stringWithFormat: @"%d", i];
++ newPath = [NSString stringWithFormat: @"%d", (int)i];
+ [self _fetchFileAttachmentKeysInPart: currentPart
+ intoArray: keys
+ withPath: newPath
+- andPrefix: [NSString stringWithFormat: @"%@/%i", prefix, i]];
++ andPrefix: [NSString stringWithFormat: @"%@/%i", prefix, (int)i]];
+ }
+ }
+ else
Added: head/www/sogo/files/patch-SoObjects_SOGo_BSONCodec.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_BSONCodec.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,20 @@
+--- SoObjects/SOGo/BSONCodec.m.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/BSONCodec.m
+@@ -310,7 +310,7 @@ static NSDictionary *BSONTypes()
+
+ case 'q': return 0x12;
+ default:
+- [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], _cmd, encoding];
++ [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], (char *)NSStringFromSelector(_cmd), encoding];
+ }
+ return 0;
+ }
+@@ -385,7 +385,7 @@ static NSDictionary *BSONTypes()
+ }
+
+
+- [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], _cmd, encoding];
++ [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], (char *)NSStringFromSelector(_cmd), encoding];
+ return nil;
+ }
+
Added: head/www/sogo/files/patch-SoObjects_SOGo_LDAPSource.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_LDAPSource.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/SOGo/LDAPSource.m.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/LDAPSource.m
+@@ -1703,7 +1703,7 @@ _makeLDAPChanges (NGLdapConnection *ldap
+ hostname: hostname
+ port: [NSString stringWithFormat: @"%d", port]
+ encryption: encryption
+- bindAsCurrentUser: NO];
++ bindAsCurrentUser: [NSString stringWithFormat: @"%d", NO]];
+ [ab setBaseDN: [entry dn]
+ IDField: @"cn"
+ CNField: @"displayName"
Added: head/www/sogo/files/patch-SoObjects_SOGo_NSCalendarDate+SOGo.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_NSCalendarDate+SOGo.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,28 @@
+--- SoObjects/SOGo/NSCalendarDate+SOGo.m.orig 2015-09-16 18:41:36 UTC
++++ SoObjects/SOGo/NSCalendarDate+SOGo.m
+@@ -88,9 +88,9 @@ static NSString *rfc822Months[] = {@"",
+ NSString *str;
+
+ str = [NSString stringWithFormat: @"%.4d%.2d%.2d",
+- [self yearOfCommonEra],
+- [self monthOfYear],
+- [self dayOfMonth]];
++ (int)[self yearOfCommonEra],
++ (int)[self monthOfYear],
++ (int)[self dayOfMonth]];
+
+ return str;
+ }
+@@ -107,9 +107,9 @@ static NSString *rfc822Months[] = {@"",
+
+ return
+ [NSString stringWithFormat: @"%@, %.2d %@ %d %.2d:%.2d:%.2d %+.4d",
+- rfc822Days[[self dayOfWeek]], [self dayOfMonth],
+- rfc822Months[[self monthOfYear]], [self yearOfCommonEra],
+- [self hourOfDay], [self minuteOfHour], [self secondOfMinute],
++ rfc822Days[[self dayOfWeek]], (int)[self dayOfMonth],
++ rfc822Months[[self monthOfYear]], (int)[self yearOfCommonEra],
++ (int)[self hourOfDay], (int)[self minuteOfHour], (int)[self secondOfMinute],
+ timeZoneShift];
+ }
+
Modified: head/www/sogo/files/patch-SoObjects_SOGo_NSData+Crypto.m
==============================================================================
--- head/www/sogo/files/patch-SoObjects_SOGo_NSData+Crypto.m Sun Oct 25 06:47:26 2015 (r400145)
+++ head/www/sogo/files/patch-SoObjects_SOGo_NSData+Crypto.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -1,13 +1,11 @@
--- SoObjects/SOGo/NSData+Crypto.m.orig 2015-09-16 18:41:31 UTC
+++ SoObjects/SOGo/NSData+Crypto.m
-@@ -23,10 +23,6 @@
+@@ -23,7 +23,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef __OpenBSD__
--#include <crypt.h>
--#endif
--
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
++#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ #include <crypt.h>
+ #endif
+
Added: head/www/sogo/files/patch-SoObjects_SOGo_NSDictionary+DAV.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_NSDictionary+DAV.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/SOGo/NSDictionary+DAV.m.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/NSDictionary+DAV.m
+@@ -46,7 +46,7 @@
+ {
+ NSString *newTag;
+
+- newTag = [NSString stringWithFormat: @"n%d", [namespaces count]];
++ newTag = [NSString stringWithFormat: @"n%d", (int)[namespaces count]];
+ [namespaces setObject: newTag forKey: newNS];
+
+ return newTag;
Added: head/www/sogo/files/patch-SoObjects_SOGo_NSString+Utilities.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_NSString+Utilities.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/SOGo/NSString+Utilities.m.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/NSString+Utilities.m
+@@ -309,7 +309,7 @@ static int cssEscapingCount;
+ c == 0xD ||
+ (c >= 0x20 && c <= 0xD7FF) ||
+ (c >= 0xE000 && c <= 0xFFFD) ||
+- (c >= 0x10000 && c <= 0x10FFFF))
++ (c >= (unichar)0x10000 && c <= (unichar)0x10FFFF))
+ {
+ *(start+j) = c;
+ j++;
Added: head/www/sogo/files/patch-SoObjects_SOGo_SOGoCache.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_SOGoCache.h Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,10 @@
+--- SoObjects/SOGo/SOGoCache.h.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/SOGoCache.h
+@@ -21,6 +21,7 @@
+ #ifndef SOGOCACHE_H
+ #define SOGOCACHE_H
+
++#import <Foundation/Foundation.h>
+ #import <Foundation/NSObject.h>
+
+ #include <libmemcached/memcached.h>
Added: head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.h Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/SOGo/SOGoCacheGCSFolder.h.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/SOGoCacheGCSFolder.h
+@@ -40,6 +40,8 @@
+
+ - (NSMutableString *) pathForChild: (NSString *) childName;
+
++- (void) addUserInAcls: (NSString *) user;
++
+ - (NSArray *) toOneRelationshipKeys;
+ - (NSArray *) toManyRelationshipKeys;
+
Added: head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSFolder.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/SOGo/SOGoCacheGCSFolder.m.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/SOGoCacheGCSFolder.m
+@@ -364,7 +364,7 @@ Class SOGoCacheGCSObjectK = Nil;
+ if (record)
+ {
+ if ([[record objectForKey: @"c_type"] intValue] == MAPIFolderCacheObject)
+- objectClass = isa;
++ objectClass = object_getClass(self);
+ else
+ objectClass = SOGoCacheGCSObjectK;
+
Added: head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSObject.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheGCSObject.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,68 @@
+--- SoObjects/SOGo/SOGoCacheGCSObject.m.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/SOGoCacheGCSObject.m
+@@ -87,7 +87,7 @@ static EOAttribute *textColumn = nil;
+ {
+ tableUrl = nil;
+ initialized = NO;
+- objectType = -1;
++ objectType = (SOGoCacheObjectType) -1;
+ deleted = NO;
+ version = 0;
+ }
+@@ -383,7 +383,7 @@ static EOAttribute *textColumn = nil;
+ @"SELECT * FROM %@ WHERE c_path = %@",
+ tableName, pathValue];
+ if (startVersion > -1)
+- [sql appendFormat: @" AND c_version > %d", startVersion];
++ [sql appendFormat: @" AND c_version > %d", (int)startVersion];
+
+ /* execution */
+ records = [self performSQLQuery: sql];
+@@ -411,18 +411,16 @@ static EOAttribute *textColumn = nil;
+
+ tableName = [self tableName];
+ adaptor = [self tableChannelAdaptor];
+- pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@", deviceId]
+- forAttribute: textColumn];
+
+ /* query */
+ sql = [NSMutableString stringWithFormat:
+ @"SELECT * FROM %@ WHERE c_type = %d AND c_deleted <> 1", tableName, objectType];
+
+ if (startVersion > -1)
+- [sql appendFormat: @" AND c_version > %d", startVersion];
++ [sql appendFormat: @" AND c_version > %d", (int)startVersion];
+
+ if (deviceId) {
+- pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@%", deviceId]
++ pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@", deviceId]
+ forAttribute: textColumn];
+ [sql appendFormat: @" AND c_path like %@", pathValue];
+ }
+@@ -546,7 +544,7 @@ static EOAttribute *textColumn = nil;
+
+ lastModifiedValue = (NSInteger) [lastModified timeIntervalSince1970];
+
+- if (objectType == -1)
++ if (objectType == (SOGoCacheObjectType) -1)
+ [NSException raise: @"SOGoCacheIOException"
+ format: @"object type has not been set for object '%@'",
+ self];
+@@ -576,7 +574,7 @@ static EOAttribute *textColumn = nil;
+ @")"),
+ tableName,
+ pathValue, parentPathValue, objectType,
+- creationDateValue, lastModifiedValue,
++ (int)creationDateValue, (int)lastModifiedValue,
+ propsValue];
+ isNew = NO;
+ }
+@@ -590,7 +588,7 @@ static EOAttribute *textColumn = nil;
+ @" c_version = %d, c_content = %@"
+ @" WHERE c_path = %@"),
+ tableName,
+- lastModifiedValue, deletedValue, version, propsValue,
++ (int)lastModifiedValue, (int)deletedValue, (int)version, propsValue,
+ pathValue];
+ }
+
Added: head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheObject.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_SOGoCacheObject.h Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/SOGo/SOGoCacheObject.h.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/SOGoCacheObject.h
+@@ -42,8 +42,6 @@
+ - (NSCalendarDate *) creationDate;
+ - (NSCalendarDate *) lastModified;
+
+-- (NSException *) destroy;
+-
+ @end
+
+ #endif /* SOGOCACHEOBJECT_H */
Added: head/www/sogo/files/patch-SoObjects_SOGo_SOGoContentObject.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_SOGoContentObject.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,39 @@
+--- SoObjects/SOGo/SOGoContentObject.m.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/SOGoContentObject.m
+@@ -94,7 +94,7 @@
+ {
+ [self subclassResponsibility: _cmd];
+
+- return nil;
++ return (Class *) nil;
+ }
+
+ - (void) _setRecord: (NSDictionary *) objectRecord
+@@ -254,6 +254,9 @@
+ - (NSException *) moveToFolder: (SOGoGCSFolder *) newFolder
+ {
+ [self subclassResponsibility: _cmd];
++
++ // TODO: Add exception handling code and return it
++ return (NSException *) nil;
+ }
+
+ - (NSException *) delete
+@@ -345,7 +348,7 @@
+
+ /* attempt a save */
+
+- error = [self saveComponent: [[self parsingClass] parseSingleFromSource: [rq contentAsString]]
++ error = [self saveComponent: [(id)[self parsingClass] parseSingleFromSource: [rq contentAsString]]
+ baseVersion: baseVersion];
+ if (error)
+ response = (WOResponse *) error;
+@@ -410,7 +413,7 @@
+ else
+ length = 0;
+
+- return [NSString stringWithFormat: @"%u", length];
++ return [NSString stringWithFormat: @"%u", (unsigned int)length];
+ }
+
+ - (NSException *) davMoveToTargetObject: (id) _target
Added: head/www/sogo/files/patch-SoObjects_SOGo_SOGoFolder.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_SOGoFolder.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,11 @@
+--- SoObjects/SOGo/SOGoFolder.m.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/SOGoFolder.m
+@@ -107,7 +107,7 @@
+
+ - (void) setDisplayName: (NSString *) newDisplayName
+ {
+- ASSIGN (displayName, newDisplayName);
++ ASSIGN (displayName, [newDisplayName mutableCopy]);
+ }
+
+ - (NSString *) displayName
Added: head/www/sogo/files/patch-SoObjects_SOGo_SOGoGCSFolder.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/sogo/files/patch-SoObjects_SOGo_SOGoGCSFolder.m Sun Oct 25 06:49:11 2015 (r400146)
@@ -0,0 +1,27 @@
+--- SoObjects/SOGo/SOGoGCSFolder.m.orig 2015-09-16 18:41:31 UTC
++++ SoObjects/SOGo/SOGoGCSFolder.m
+@@ -376,12 +376,12 @@ static NSArray *childRecordFields = nil;
+ if (!displayName)
+ {
+ if (activeUserIsOwner)
+- displayName = [self _displayNameFromOwner];
++ displayName = [[self _displayNameFromOwner] mutableCopy];
+ else
+ {
+- displayName = [self _displayNameFromSubscriber];
++ displayName = [[self _displayNameFromSubscriber] mutableCopy];
+ if (!displayName)
+- displayName = [self _displayNameFromOwner];
++ displayName = [[self _displayNameFromOwner] mutableCopy];
+ }
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list