DELTA 398160 0 37 SVN_,Pmune/_>JnYN2 \ libDOM.so:${PORTSDIR}/devel/sope OPTIONS_DEFINE= ACTIVESYNC OPTIONS_SUB= yes ACTIVESYNC_DESC= Enable support for ActiveSync protocol (Experimental) ACTIVESYNC_LIB_DEPENDS= libwbxml2.so:${PORTSDIR}/textproc/wbxml2.if ${PORT_OPTIONS:MACTIVESYNC} @${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile .endifENDREP DELTA SVN ( x^O0ǟ_q+CT$1alci6bt]5Қw"x@_.s`_MZ8)6E>5Jmw 7MxU9ádxCcEyZdAT.)raHW4M|V`Ak+]xmctwB$`E!~@$O#wMZ9]! RܚVSQ9.%ȶkI֒z>6 *list; NSObject *valueNode; NSArray *elements; - NSString *property, *match; + NSString *property=nil, *match=nil; list = [searchElement getElementsByTagName: @"prop"]; if ([list length]) ENDREP DELTA SVNdfdd--- 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; ENDREP DELTA SVNDFDD--- 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]]; ENDREP DELTA SVNegee--- 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]]; ENDREP DELTA SVN[5[[x^SJ0}6_q 6tkKVhEd!t )Cݬs .7'琓`!%".&^-1 "/ 9%αy=3mk4M r&9 #/`|c`{HI?dm`nYEL `ha~Lv1.6'ne9_ ZOǤnsKMRI.Hu1^J'jwK-Kc%XQt/Fwzt]7=,uc_%UM-:w`ENDREP DELTA SVNa8aax^QO0ǟݧCD1!8bJWGeI[۱QY7{1DlܚDO0|{F)&(9ɉnJųNۻzw8_E߸TMhC E<,6T*| |HjPػ&fleIX=x13]p wpE՗O(.2e!17Kњ8i$vF.^[O y 8@#Tߧqoz}ENDREP DELTA SVNFHFF--- 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; ENDREP DELTA SVNIKII--- 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; } ENDREP DELTA SVNcx^K@_i l퇛l10 !ȸs&wg)mӐݛs1 _{&)#D$OWl9%Yò[16WNv=IӴ< jKv*R#NbQsL}N8fK"/R( ~YL-?5sHp'(ֺ8sk iʺd(=9p0H00)-ڕ- ɸz+D~ ZV k(â-'i9M+[{GDi;؆ t |]#' /f僳o2J@ENDREP DELTA SVN4x^O0ǟ_q!!laH2%> $ Y5[2z hLt>BBTɋۺ攩0XtYAFj-Ά{ rG}xZ ۶3Х>] Fq³6*YD7f`ClNJ*AYrj 3U/Tm)U#o=5@$5aق +?8ۮ3~A2kk!x5/f kKXf$-@:Ǣ9)X5v_ps=m\eWD$9e|iENDREP DELTA SVN<x^PN@|_K֘ЀƜRj];D>kxٹ͘ ` ŵ,rT dJ#KBM8hԭ~kZmv˲maz=0n#*$I4$|@$Fh>;a0* ȿXhf}8*_dO;D;ˤ&+8ۥwQpvLQVpNpUmWYl՗Xqڰ X>:*6j!T~OcmNӁGS$ j JENDREP DELTA SVNlx^mo0_/i4<R(i7QbTx٦4(} '>S,/~qUl9.DASJBj9*VEα:^7ezVEPjYE !5.ھ TkK/Oxٟ%wحd|j^?Se\j[p}*xn8`7Rw/D>Ѣs!ȃI\>S<ӗ<;$b :e0[,Lܜ*'0Si bfl;&U3 [jTzնCQ~ Zު~>3b0>{c&w[<"+(Vz_N֠&;g$m!NF> !D>3aȚegn0`zKxIb{W;pnHfC0y":̀(d,J&8Jx7oګnS{O9nKb6n |BZƤދMUd_0;* '(7JFe"$aA렳zf%loC }QұRx颛ˎeoRr밀Ƞ:\t}$JpDH>ѦT#_>q@Ҋ1D rTP{r/0Me#mIlENDREP DELTA SVNiTiix^O0ǟ_qR!&# u+fk Wb4o>w!R9|b5g3$bV&d":¥{UOj^ /I4h<D~aCq $!`E}cZ YyG-"8 @@>yɘ\ 8 RQՖg\QN-xij5 "_C~?;n׬da}96ŸВꪥCὧt7y"{G: \Ԋ馺;r&6vj|hb$MW~@闡>?+uN)U1 0ENDREP DELTA SVNWWWx^QMO@=b©nKCB%=-zhzX鴮,߭^d{1Uiu]IeJTFB'հVZnF{Ɯ1sN]ālJi_!\gt4B[Wv(0Xh,ZNqUgAH#_1Zh .$%><;(&sxAasnTh>Av!_n&ݹX4o~6?\)ivg +xd>9SENDREP DELTA SVNmomm--- 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 ENDREP DELTA SVNWYWW--- 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]]; } /** ENDREP DELTA SVN4%44x^K@n Q[ !żHw_fDar{ϳ<x'"?HCx ΫAPOZu?ZlkD]%9Y։2btY.x۷m[u`~}pu=1bA 8ጕMP({ 3@ۅ᷶KHhi+}iB)5a`:ם-0%$5Aq$la]ww鍒Se|kا|ɫ:djz('i ;#ENDREP DELTA SVNdfdd--- 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]; } ENDREP DELTA SVN?x^QO0~e PAlC)-]bB]7@Ѿ܏ﾻﮔRtї#) N4`"yJ6-Y7~~xD\= C^92Ebę #import +#import #import "NSDictionary+Mail.h" ENDREP DELTA SVNOQOO--- 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]; } ENDREP DELTA SVNL LLx^Qk0_q^ت [ʠaކbe*$9 F"ss9G&[!{2ISp\ù6rff ^ll_fEXEcŠ2BQ00T/z|j6hT.Ց l2Uމ7uY8{F 0;"BRN8^wU6F=~.<]W'̇wzY_*^=HRVBZ>qѶd-QRa9,R;mZgPW< ?᦬)-:ݎGчJwt=Z\ k_5/X^/Hu^/ 9 ENDREP DELTA SVN1311--- SoObjects/Mailer/SOGoMailBaseObject.m.orig 2015-09-16 18:41:30 UTC +++ SoObjects/Mailer/SOGoMailBaseObject.m @@ -32,9 +32,11 @@ #import #import #import +#import #import #import +#import #import "SOGoMailAccount.h" #import "SOGoMailManager.h" ENDREP DELTA SVN`b``--- 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) ENDREP DELTA SVNHJHH--- 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 *)sortElement]) sortOrderingOrder = EOCompareAscending; else sortOrderingOrder = EOCompareDescending; ENDREP DELTA SVN]_]]--- 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: @"
"]; + rc = @"
"; return rc; } ENDREP DELTA SVN6866--- 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++) { ENDREP DELTA SVN<x^TmO0[%VI[iR;6&AZć !7qCcgCA]҂-lƽ{<4q~*bZj7[^ڃVn8zrޮNၱ  !t:TL[ '/e(qЫػW.ܵq&YDO!,浲`b1,p@@5 Yj8`#f6eEb(iwaeJB!RR0,G\B"1 )tY(F<!>*=g:AFQ*'BPmok(n*56# ;ے/lP[daN5- Βd&|F56*9PD̦^'4tuѴc]L9=6†T^K5[ 6cvsicrD1TNMlwHْ<.~d|_/]ۈS%H8Hi768wf>k!?g)Cl`#E/B)g@kYkH>?ϵeb[AQ J& Jd{HPڳdžB C4j$ ]UyuXxkUF `t崼u]:[lȢIeYsfMLnUL*8T%%(=tORO~:(e2@4 :w`,ANBIЮ7nRd,7z&k9DTTΦT*^^x܇[\ /dOG b=/(x)hJ!k;#B%a {R8M},T+jp&G~ȏ\um+#|qQ,uxP LrqGlk?hffQlmOhY]ٹp+nk sbENDREP DELTA SVNSSSx^R[O0~du"ˆ"{(CeLYt]G`8qI/;߱, 濽ځ`ׄFO Ff6ɲ8WVgh9}pnq/4FayX9C7X$  ]nQ!i& (|ԛI̼4e%bux ۽Hji&3aK01KSFo9i^H&X~uYBoٛ%4cPDl8_JsKS' R3!tH]rݐr2 E f !ah|踫޳}6. (=҄ni)3`4e(c.ItĢyZa> vAEWFIJb9 SCENDREP DELTA 397608 2627 292 SVNj7 +23,7 @@ * Boston, MA 02111-1307, USA. */ -#ifndef __OpenBSD__ +#if !defined(__OpenBSD__) && !defined(__FreeBSD__) #include #endif ENDREP DELTA SVNikii--- 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; ENDREP DELTA SVN)+))--- 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++; ENDREP DELTA SVN--- 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 #import #include ENDREP DELTA SVN=?==--- 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; ENDREP DELTA SVN  --- 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; ENDREP DELTA SVNnBnnx^Vmo0<~ @(dBZQQUjam$G1ݴ> !@VwϝT*~]M1^7s}JÒ~zY՛:ߵ3b- V JV>'rp _x۵QL mg:Sbӟh Ow)WꡰL1܋y:FA22Jho,i4SF+kt:;(mr-xܹ#|, rB%@nx L:] a6'"|^x:ֹ&7E$p=΢9+Ab] 4\..2I}G! xf X]VހE&YtRd #˖1qO@aD\:5R(s]8O"@9=R>^pV=8&^ZykeՄEV1.%C!:멊<-Lܭ|~>.҉.CϻR7/G^h[*sP@S긩wƚ ~GBhbz 5Vng_Q\vK< J۠a" %kcY$Gk!r5:/&zJ>JR=ț]} 꺌a耏\. Z;"/'Z=-)g/N[l 0,dH$gck}uۛ 0(1c,#16aEh&)x6]^?TД66 Ho+˰ʔA@['ENDREP DELTA SVN   --- 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 */ ENDREP DELTA SVNU UUx^S[k0~š0p⸎k.ҧgC0EO [$9[$decӃѹ}߹OןP2;ng / .huv9 pW^QB9"$O[$|w`%~ٮH@L5zh|j@jFEwf<|pw=xXpQgP3":Ex9Wgb14|K>uB4\fY'[g,4<V֔UPA TV_kBYb -Q46ME} JaU@@B?8L3A!whO7>U%BjI0rs@m+hzvbnd6sY\?k"ꨜŧB7'p-gk.jC8Hdj CS( 5JmPg8}ai6s.+i{t3^z+%Pz`ID[`7M?'fUENDREP DELTA SVN-/----- 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 ENDREP DELTA SVNK0KKx^N0E+V !@ HT(uC%B3#*ĿhMe:GcTɦTnۇ~Ё y^FmHbX)2uzx|Tx@0uBk5f:dvAt k9yB {kjGUR[uM#8P2)4 MIfȔc_IB8ETSŦj˟E[A.4oqBC׽u>WR(4'fv,Z E/!P 3'G LR)\GE '(&BmMg"Ke\ey -pK_nURP=3#Z[#Jh/leo.cEChBPENDREP DELTA SVNbrbbx^RMO@=_@)P?Z4!DPCKYvmϻBh/;3o͛]q * 3Q3e:xrvsNq/^{}׻p^[mRkFp܋A vmF# E0&Њ4%m!iH1x́i_ܡ%+ǷmD<i^f"%dFR E"W;1{ðZ EO+j(e.%!#>O PЭ"eK$+IȲ(cCcsPFL"J,Ԃ<=;^¦V ENDREP DELTA SVNo'oox^kk0?G`$kRɷdd #c [VQmu8e~p3! < oE EJ d|u%dAt9IAgׄq*vaiq0k bIըlYpƄ) JX o0 nXK30UdoNF5 7&˜s:Z GɆLq`$?ܒ~ 9E+)yN$&w}*U֦YjPMo6>.[jN#"Lx/隽 e5%ե^]8½=r Turi?p81ENDREP DELTA SVN@B@@--- SoObjects/SOGo/SOGoParentFolder.h.orig 2015-09-16 18:41:31 UTC +++ SoObjects/SOGo/SOGoParentFolder.h @@ -45,6 +45,7 @@ - (NSException *) appendPersonalSources; - (void) removeSubFolder: (NSString *) subfolderName; +- (NSException *) appendCollectedSources; - (void) setBaseOCSPath: (NSString *) newOCSPath; ENDREP DELTA SVN3Z33x^TaO0S%4 C,hRYI٤N(Bsm=v14g;2iݻ糣(TN?1^HA 3-?v?E1tO~7uz6 07E0@?u!t ؈60j)R1xIY^ДJ*% <M0)(PCɹy*KEQ ]L2=Ia^PWcw0Bu&5y;^R]9{,^JZ;t }&)iF3_܂7Y.]3Rbz_2Sk\]y$:*Zn-i]̛ pK@9:kf k[qS 3+bML {V ]A̪% Z;~|KV+KLա'4hn=#sƬAubs-UZ eWu-{ջ$"!/MWȑh|EQxrԼe|rڊ?͢wZ)>'̭"*%AHsi]=vWʡGh 3i9dȐsENDREP DELTA SVN#B##x^Ak0xJmidPF6vCb6#Ï?zi.{I~?B05[|Ě={~bjJU7oH0"(q/חy@(AhާY-57i73ncn&F-qM 2TŜ RK&ZeL+$[|\s2YMix[|-,4HWbpKė{+0Ly& 'So?_%Q]`.*u1 2jպuFZ!]Tb Ee.~AyENDREP DELTA SVNxHxxx^OO0Sr ,@q 1x%NB6R]. IOS1‹^hUnEɻU[WH 029dtNaln L3‽.8 SFaRU1]PTtťLQ9M%Ȑ'Z2m BTġfBn7nBe$ylԉz-RBdl}k8]M*ii hEo%U]3pl~ 5b@SL=*,dFoqO:B~/cOENDREP DELTA 397608 2932 8896 SVNll 5)C10-24 21:25:08ENDREP DELTA 397608 11841 589 SVN))3hA10-24 21:25:08ENDREP DELTA SVN&x^Qk0_q6nP':`iQڴj٠!Kr}`cJ/ǬֽL¶[\qĹ"{d2亀$՚)Ւ.!er dj&IDlיSA9Th=M/mR&#bCgB\M?Ae). \%BER%w-~R9lJ:mw&Z&d9BFcZzWX1:SjyqMf c&e[)|j'ENDREP DELTA SVN3x^͔N0 ))mW6+C|\LBi㍈44:ynЁ6UZQcq`N S>  EuĐcʍ]xeo:olo˶0 Zk] j1@xy1aBPu2;=|ARGLܣJЍWk L̵ij 91b ")RA2zzʫSY&z4wAӬ3[DNezŚU833F¹LE°6җ%JKox {"В#Zw osIG3J4b_Ze|W_:geV68lFIeƌBȔ4^hگ%Ƽ_Rz.W%4gENDREP DELTA SVNZ4ZZx^RN0f͠ˏY>?g_N*չVx=$I@ KYp[YŸ0’d/zя[4V] I?ӝ)< Y&[M\kn RT|7}~%L2zEDN{R$o!?թueR=G [4ijk/@z)ENDREP DELTA SVNqlqqx^RMk@='b%jRHQ =rX]ـ=w4"Ń^\f?7 ʏ" ;l !(Sy؈K8;#|RL?+e& $y<ʻWsN-l"glcBoj<q&0m&IZZ+tb_>Ch!4-$w9bD j+KS]d+UHua+hZ~?ϸk-M~jNuRg3.Oz:'.|O u]>h/QfENDREP DELTA SVNRRRx^]k0_qM!1@`ă hIPd$䡔BƚA qWB$YkE{u4$ŎABDa3F`&>=1uUZlQtϵEЕWBrQuJ59r%Sru grV قt_۔й0 u>FT? ֐ /Q;jjD.gneҥSfl&nIENDREP DELTA SVNG2GGx^[K0ǟ8 mf㵫*N^҇fm Mj*>{PA $s~#`+%ׇJp*Uj.+<|g8ob+ sZ`XE!U W`3af$hI Mi`- UoGLd/ν֫xluQɌj; اPpB8{mhdE'@ZC6p /O̔RUN.3ڋp\Onf;M- \V̅d/.ӖٍЬ4s\Q(;U{~Z_RENDREP DELTA SVNMOMM--- Tools/SOGoSockDOperation.m.orig 2015-09-16 18:41:31 UTC +++ Tools/SOGoSockDOperation.m @@ -145,7 +145,7 @@ Class SOGoContactSourceFolderKlass = Nil [self _appendEntry: [resultEntries objectAtIndex: count] toResult: result]; - [result appendFormat: @"RESULT\ncode: %", resultCode]; + [result appendFormat: @"RESULT\ncode: %d", resultCode]; [responseSocket safeWriteData: [result dataUsingEncoding: NSASCIIStringEncoding]]; } ENDREP DELTA SVNKMKK--- Tools/SOGoToolCreateFolder.m.orig 2015-09-16 18:41:31 UTC +++ Tools/SOGoToolCreateFolder.m @@ -97,7 +97,7 @@ rc = [self createFolder: folder withFM: fm]; if (!rc) { - NSLog (@"Create directory failed at path %s", folder); + NSLog (@"Create directory failed at path %@", folder); return NO; } ENDREP DELTA SVN&(&&--- Tools/SOGoToolExpireUserSessions.m.orig 2015-09-16 18:41:31 UTC +++ Tools/SOGoToolExpireUserSessions.m @@ -143,7 +143,7 @@ else { if (verbose) - NSLog(@"No session to remove", sessionsToDelete); + NSLog(@"No session to remove"); } [cm releaseChannel: channel]; ENDREP DELTA SVN  x^_K0ş6:L;NTXWV"YvV۵oo: _=aQdU/f؎HA7"O}} sn;g6Z2@#tzktt V1`)ǧM4B8Gj%Je'|:QX9 X֜ ~C`ulk)/4i_ZENDREP DELTA SVN.0..--- Tools/SOGoToolRemoveDoubles.m.orig 2015-09-16 18:41:31 UTC +++ Tools/SOGoToolRemoveDoubles.m @@ -175,7 +175,7 @@ now = [NSCalendarDate date]; delSql = [NSString stringWithFormat: @"UPDATE %@" - @" SET c_deleted = 1, c_lastmodified = %d," + @" SET c_deleted = 1, c_lastmodified = %lu," @" c_content = ''" @" WHERE c_name = '%@'", tableName, ENDREP DELTA SVNikii--- Tools/SOGoToolRenameUser.m.orig 2015-09-16 18:41:31 UTC +++ Tools/SOGoToolRenameUser.m @@ -148,7 +148,7 @@ if (sqlError) { [ac rollbackTransaction]; - NSLog([sqlError reason]); + NSLog(@"%@", [sqlError reason]); } else rc = [ac commitTransaction]; @@ -201,7 +201,7 @@ if (sqlError) { [ac rollbackTransaction]; - NSLog([sqlError reason]); + NSLog(@"%@", [sqlError reason]); } else rc = [ac commitTransaction]; ENDREP DELTA SVN --- Tools/SOGoToolRestore.m.orig 2015-09-16 18:41:31 UTC +++ Tools/SOGoToolRestore.m @@ -574,6 +574,7 @@ NSLog (@" %@ (%@)", folderKey, [currentFolder objectForKey: @"displayname"]); } + rc = YES; } else { ENDREP DELTA SVNegee--- Tools/SOGoToolUserPreferences.m.orig 2015-09-16 18:41:31 UTC +++ Tools/SOGoToolUserPreferences.m @@ -115,7 +115,7 @@ typedef enum [theKey caseInsensitiveCompare: @"Vacation"] == NSOrderedSame) { /* credentials file handling */ - NSString *credsFilename, *authname, *authpwd; + NSString *credsFilename=nil, *authname=nil, *authpwd=nil; SOGoCredentialsFile *cf; credsFilename = [[NSUserDefaults standardUserDefaults] stringForKey: @"p"]; ENDREP DELTA SVNuwuu--- Tools/sogo-tool.m.orig 2015-09-16 18:41:31 UTC +++ Tools/sogo-tool.m @@ -149,7 +149,7 @@ command, [currentTool objectAtIndex: 1]]; } - NSLog (helpString); + NSLog (@"%@", helpString); } - (void) registerTools ENDREP DELTA SVN --- UI/Common/UIxToolbar.m.orig 2015-09-16 18:41:36 UTC +++ UI/Common/UIxToolbar.m @@ -166,7 +166,7 @@ [self errorWithFormat: @"not toolbar configuration found on SoObject: %@ (%@)", [self clientObject], [[self clientObject] soClass]]; - toolbarConfig = [[NSNull null] retain]; + toolbarConfig = (NSArray *)[[NSNull null] retain]; return nil; } ENDREP DELTA SVNXZXX--- UI/Contacts/UIxContactActions.m.orig 2015-09-16 18:41:31 UTC +++ UI/Contacts/UIxContactActions.m @@ -141,7 +141,7 @@ content = [NSMutableString string]; response = [context response]; - [content appendFormat: [[self clientObject] contentAsString]]; + [content appendFormat: @"%@", [[self clientObject] contentAsString]]; [response setHeader: @"text/plain; charset=utf-8" forKey: @"content-type"]; [response appendContentString: content]; ENDREP DELTA SVNeeex^K0ş_q)]Տ՗` n}}( dIM2ً y¹B YOb\Μ$cWZr4KVvk#vWL$A8nz6 (r7- _J=3BU<<R֬Y?;@`O}g Rv0_`ЖZqȜ6PJǹl葎A,Q6 +(ióozi7˾I߹-3>Ψ[DmxuWwWxFENDREP DELTA SVN1311--- UI/Contacts/UIxContactFolderProperties.m.orig 2015-09-16 18:41:36 UTC +++ UI/Contacts/UIxContactFolderProperties.m @@ -19,6 +19,8 @@ */ #import +#import +#import #import "UIxContactFolderProperties.h" ENDREP DELTA SVNRRRx^͐K0ş_qa(]vU#J ԗY}(C6YRԏ~{/d1,4Y|7&68y~@[oO!q]ۉ"yEY{/ڲKk*PukXYrmRWXgUa+2f][sI'5]6M.gmrvr9ENDREP DELTA SVNtcttx^Tmo0SU !e&uDѤ!d/xul;-ߙ+49=~0 wPq.GW >e7Ao{N < `<:<ۃˊ";y ^Ph0H4iL4Rh*SaPk8a˞zz>X! 9ϒ𑌑Id!D$7Y!KSX-FR=}Y_Y66D)ݗV~p.q9Amj؉-dF;U}U TO6'=]*׉Yj@LVb DhYs+Yb<ǨRdA$}fBb%B+-R@,E`#)`]Fs_@iujIw*P@U8fl+`(紋sujh致ԜF<{wXp5Bk=WARvG[7 ʭe ]5-Ţ48L?BYU⏺.㘌cwAdm .(+D'7§ENDREP DELTA SVNGIGG--- UI/MailerUI/UIxMailFolderActions.m.orig 2015-09-16 18:41:36 UTC +++ UI/MailerUI/UIxMailFolderActions.m @@ -383,7 +383,7 @@ - (WOResponse *) moveMessagesAction { SOGoMailFolder *co; - SOGoUserSettings *us; + SOGoUserSettings *us=nil; WOResponse *response; NSArray *uids; NSString *value, *destinationFolder; ENDREP DELTA SVN --- UI/MailerUI/UIxMailListActions.h.orig 2015-09-16 18:41:36 UTC +++ UI/MailerUI/UIxMailListActions.h @@ -43,7 +43,6 @@ } - (NSString *) defaultSortKey; -- (NSString *) imap4SortKey; - (NSString *) imap4SortOrdering; - (EOQualifier *) searchQualifier; - (NSString *) msgLabels; ENDREP DELTA SVN  --- UI/MailerUI/UIxMailMainFrame.m.orig 2015-09-16 18:41:36 UTC +++ UI/MailerUI/UIxMailMainFrame.m @@ -627,7 +627,7 @@ - (NSString *) columnsDisplayCount { - return [NSString stringWithFormat: @"%d", [[self columnsDisplayOrder] count]]; + return [NSString stringWithFormat: @"%d", (int)[[self columnsDisplayOrder] count]]; } - (void) setCurrentColumn: (NSDictionary *) newCurrentColumn ENDREP DELTA SVNrVrrx^O0ǟ_q 6~P3'05[mgv&jm۰m#.g|No5V 3J[\Iq3^X=B,4[pJ .yM6dDy IXDi`B*CV\%-\*{" |{9X]KX噝{P @cYc HJIt<زDqG̵7z[<5~L7ImXSU2Aq mM$M)TaLOC%(Zu; ZCwBhENDREP DELTA SVNsbssx^M0ͯqmȒ@Am!(V*6{@9dWXM(Ymٶ*sxyLG2RZ*,~W^Ѓe";=~:Y :^3{pрY9c&)E&TIځ\D,TX"^jh 4@+L`W䣮vKdJ@fRXF36BF"?:&B#]kҮDF՜ՅMl`fP-x]rBM27wAb}RpҊ9?E-^40GduRx25J?T<dZʚZp%p%hi܄~6q꣡2墨~\J)8ig@o 5V%̚%v?C~܇xMtN`9 y#Z`Y|ќFHU Ut*2?OsENDREP DELTA SVN^A^^x^]O0xY"a6 ~^^L. YZ>R1w lu9iC)s?by!)7F^˵7. ^puD9&ajCʏIBdu2SWABݚ$Snf/#Te #|@_Qk|N"PoUYGeO⃍'sUM}') [َgfັ/|)MOb\SK19SkC/n_7 !h@o'<}@dfEENDREP DELTA SVNB BBx^J@E+m:i'V#B UfCŐ4I^`I % Wf;x=D@ȕT+r*GQrg_n7w!~ ,۶FXd vo#$9 \/ G!DޛFRϊ*=׎ &Jպ732ư_^x iv|z񟞿'*UO$.2=AJ Y~b0"oD7#ENDREP DELTA SVNWDWWx^QMS0<_`G2yM&/4o9Ť=[m0b5I$X&ڴRnygȽ>xѝ7ua13uY sa`:{ 8;w΂tI58~kS ݬOiN,E Fp2-H \Ae#6i$DSkU1ɕT\8(ߞL oH/oU |i p[7ЀKGA Le܀ 4eqw/U/taYMnENDREP DELTA SVNhShhx^Ur0}._/p!7Lځii3uh2~wr.AB«sn˲`>95 Ә"&'ƣջn>:}˾9BpV}H0C2.ڛݲS'HN֟!o$a)xE8Ra :nYDņPhJ3CTVS?p`8I@a}} EyWԻKG|DŽ &I$)Kh媯A. oH[~d,;B+JF2 "Xƴy >cB%q$?H 0|c鴯u;=䶗CC[}[&Pp~%O婙.h$&4$ώY(L)ԛdS7eYeCAZP LgҘ<ԗ?/D5 u8+#Qae4fuȪ(4!88_΁a"[VFiT0s#bPGtLJ86`(*6_l)yj=e"M|=OrϲoOENDREP DELTA SVNnpnn--- UI/Scheduler/UIxCalDayView.m.orig 2015-09-16 18:41:32 UTC +++ UI/Scheduler/UIxCalDayView.m @@ -164,7 +164,7 @@ date = [self selectedDate]; hmString = [NSString stringWithFormat:@"%.2d%.2d", - [date hourOfDay], [date minuteOfHour]]; + (int)[date hourOfDay], (int)[date minuteOfHour]]; qp = [[self queryParameters] mutableCopy]; [self setSelectedDateQueryParameter:date inDictionary:qp]; [qp setObject: hmString forKey:@"hm"]; ENDREP DELTA SVNKx^VQo"7~.b'mz44h^sUIZUEw75g{I{. i<`wŴ{L~Ɗ|rʭPyQZLQCvWk6@twZ?B3 `,Tk}̭ cȅj‚}unViLb2}28Ң64@O '|WC [«O7 1CZ3,VK|EfJ6LZ/w4)=q n )|n10Nbe( C}ȵa>L^db{*45<|88ƂAjUL` oIF藥q4D<0q%,7r'>H/SVYR*8ЋfUDoI`d:j'pcG@%FD?iO!AVxl1Zc