DELTA 415570 0 55 SVNsLT?S]z\f]q+F\&\'BFKsGJ7x 0IOshx^mQo0_aA6kV66 +07ȱoRKm:HB%98V/bjniͅht^N&ͨ0*ȅ F-ZcPF8_3QGZ.SE NSt jXԒ?KñN m4 ; ˜@aO3oeJ.\h`(Varxi&F| 󻪌G_c T8 ӊ'}ﴊ8C%FhiYߋqÅs%؃0<#tț" E$C6YIO?o;ks?y֎4Z"WvyssyM+ J#\b7ߐqOl}Vɧq'aB*'ENDREP DELTA 412868 411 319 SVNH[][[TIMESTAMP = 1465247626 SHA256 (chromium-51.0.2704.84.tar.xz) = 33a3fe1cb8fa5be7b35aa8ae00c8b0a6dc90975bfa9aea9865180b57b0a4dc6a SIZE (chromium-51.0.2704.84.tar.xz) = 448556852 SHA256 (chromium-51.0.2704.84-testdata.tar.xz) = f74796ad850f874df407dd624eeb3a887d6d4fff312c79d4269f370f179490a1 SIZE (chromium-51.0.2704.84-testdata.tar.xz) = 121441480 ENDREP DELTA SVNcecc--- base/trace_event/process_memory_dump.h.orig 2016-05-25 15:00:55.000000000 -0400 +++ base/trace_event/process_memory_dump.h 2016-05-27 01:46:53.167565000 -0400 @@ -23,7 +23,7 @@ // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the // resident memory. -#if (defined(OS_POSIX) && !defined(OS_NACL)) || defined(OS_WIN) +#if (defined(OS_POSIX) && !defined(OS_NACL) && !defined(OS_BSD)) || defined(OS_WIN) #define COUNT_RESIDENT_BYTES_SUPPORTED #endif ENDREP DELTA SVN5 55x^Pj0xM 8m0t-th;clY1Žd$${&Vj{;hЅJn1tLdH\`}zXd\4tBMnB%p'ԅ|6@@=ꍎZŊ6rT-s&V!]Z48h4zz!KcqNFs,75rcC=Ϳ 5̶T3D\>WȨ^3nOxvQ˾:X+:ɋ(#` ];LJX9_XENDREP DELTA SVN]6]]x^Qj0<_Ђ8Ѐs2J{JZ!k[ KF4>+`î쬢(L7CcyYh)nK?s,[𜷐L*јN %YM;?f51iLA8y=S)\d5ɨC;*t<9[s5H{f[l٢sDpV,sg ^͋f0Z5E[̪}/"j^^M? QZ4*|WG&8)qg-qQQ'vT?be.ENDREP DELTA SVNx^Qo0~!$*MLZ:!&!^vFENDREP DELTA SVN^`^^--- base/files/file_path_watcher_kqueue.h.orig 2016-03-25 13:04:44 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ +#ifdef __FreeBSD__ +#include +#include +#endif #include #include ENDREP DELTA SVN--- base/i18n/icu_util.cc.orig 2016-05-21 17:18:09 UTC +++ base/i18n/icu_util.cc @@ -36,10 +36,6 @@ #include "base/mac/foundation_util.h" #endif -#define ICU_UTIL_DATA_FILE 0 -#define ICU_UTIL_DATA_SHARED 1 -#define ICU_UTIL_DATA_STATIC 2 - namespace base { namespace i18n { ENDREP DELTA SVN6866--- base/i18n/icu_util.h.orig 2016-05-21 17:19:29 UTC +++ base/i18n/icu_util.h @@ -11,6 +11,10 @@ #include "base/i18n/base_i18n_export.h" #include "build/build_config.h" +#define ICU_UTIL_DATA_FILE 0 +#define ICU_UTIL_DATA_SHARED 1 +#define ICU_UTIL_DATA_STATIC 2 + namespace base { namespace i18n { ENDREP DELTA SVNqx^T]oH}^5LH*&@5o0&kf%{@m0߹qEf;2SKj˄̌hRy[i׍ϣi;t}J0 g iB3ɶh*ƱI_XeSO:β ;X*mA= 5ט腻 *gCV1=A 9ܸ !roU]mHS:cp%# D=MEc4\*maEG,/:h ǭwu[)AN@1+8*!,,~Ut9{;H.#rvBZ(q ٜ o55J W0`eJ(BM F帥\GIBc zHm)(,nAڠuUbfrl9Jd܂04U *-|#coyQZqp[I揷fYinQm9gI 80W2RgXע [4 I*zVGy6sN,mho&t{V#nݭ#Ӝ uYB>"鰎6׉'&M6ׯsXN A0e MD%HI+RQƙ'{{'l #include #include #include +#if defined(OS_BSD) +#include +#endif #include #include "base/bind.h" ENDREP DELTA SVN^`^^--- base/process/internal_linux.h.orig 2016-03-25 13:04:44 UTC +++ base/process/internal_linux.h @@ -14,6 +14,8 @@ #include "base/files/file_path.h" +#include /* pid_t */ + namespace base { class Time; ENDREP DELTA SVN#x^u_K0şͧfP' *Blo`sC᭫ݺyNߘ*c<62_O|4B?w8F~S> qɡ ⃛4-WDղOY*fvf;^OZt5-!V*0`#rK\@%VxV6r~?^\( 2?ҙjK{a΅J҆i--!ȢMwBb$]F ;Ȼ6k.w!cENDREP DELTA SVN>:>>x^o0ǟ_q/Ҥ`1((Z%#ۡĩUO}EYGcf5Wq+-g2_DIɛجa>@W0Vwl/5,Uk"`/vB0A`5J-;j l^jյsYBU/ӻv'sbq&HQ:L( Td:EJӻu]@o P-$Sr߰YZXՀEHbrȒX= $JycLپBr^ZhbXaÞ=RCOR {0^VGg/K?~Jp(CT?+~C/-`ڃcR1*-WH*}pOP )ux88] ENDREP DELTA SVN@&@@x^S]o0}^~Z*fläI\ؔ}NR2S;9Vkl4"; %ioGQ;ͻ>wX}Wp%ZAώ:LSV)iT'1M0&5RX?&i)Ɍ}FWOaL|t#?8.nlz %BC e0)̊@wm %$feO섔 m$JVmT@eV܀GfkyFRB<4%\ip#N{ȞVvOR잦PǍH\Hv<3)T*~9d"b^_7q+f_ZVZanS7l0{́+~̥XbFfkSNrJ;|4,Ɠw6L6} hƊf'SRz |%]b/9Q^+|ś"< ?oq$,ȁr 8RmڗOHo[(\ENDREP DELTA SVNn{nnx^RMO1<׿bPM$$!E $Z )h^h.rz7f=#ZEװ.4A1^& *{5*Q5Xo?o U&@$&ӇvgȒKEwvqH&۽vO:A_Mh1mcMg /ȋ"&Ӱ$=&CĄŸf>:w`o&Oʶ_?x[41{-ՂGS}-'?h'O1دCSݸ? iENDREP DELTA SVN%E%%x^SN@}b Rȗ\K+UĥQx*:]KwֆP9sf̌yp)lndR;"YEqDZKiV|v7h^8;8~vm} "A{a$C ZJLfl,OfCPhq%y(mŅ b$B 8c5te6(MaTKÅ] WSNҎeU+ʢHQ;TF"ʂ`Qbg2j "s̒ʭo.l>g#cfu/4an9Iskq(2<ׂt}(nTz:Oi-EƙED&%9aŽHkQQ{%*LsYDiT 1$W`_C2 Ɠ3%rSap~ԁӢz$TT2:~2Wvӷ gRe}أ%)0\gt3_-,NJ5h#_/>&ۖ ֵzL19#mTGTwRa9ʒفѩTPbJBpMaw8L8dMCʷ$\yİ%G䐋z9"1QOGOZjF.zq7E Ӣ55$7c.DCH>W]enV/5_n7tYye+{_rdOJ& ">1'[pog @B3҆:Qx\j/?ϕX9|-88{x'A d.Ԃ)X#L2R= 6>nc_D!ZW6((]Uȯ@@Ib2 @M|tz amKc8iCw7XRWdHvbqmKaTA1~5C&СS9XoU 7@:sg8iVM*]|ft]kԳ R9&J%/԰~d|@3qz}Fo3Hƺ1x@*(.hӠnIǺ"z HW2`t=8pGnB ®YvqD˽Mg[3VNf239y0*%]Mҹm9y_ &2m',ͬDv[ʚ6ckw~Si Ou y5ߔ]v|Qs_eLm=<ssfZl78MZͣtYwo2ۙ_7(`!/uH?jjArZ8՛qM,!`Odb/̏0n`U$h⒦;d<~z(\K{4FZrZtr[`G:C#9 }52Nw%-9U\\q.b.4h{/q?nі،Vj󘊑?v>:`Ia+ ҃U<gq0VI1&.GJ7Ci*ȸ3[C\Q/q kfDLj֫JIkQGiwv^At}YЇ]H<0com%B^V꩎JAn[ EQ.K=a'c/z-+`L4nrGL ^%VRc黐.?z cENNxY:ZN ,FMt nh Jn<!`GI|“g"O׮ cC[ Z, ^&G~2OscE!-]ub \ݾ`_xP 6v (=د 4Q-:GpPNKɈnfiPI~LrLyuPON0O/пj[Mcho?6OZ' CIVY̛ಂ&ӽDjP'q3߮# qMDW1 P*ջtǘ-|"oYhzdUk^i`m _ENDREP DELTA SVN8:88--- base/sys_info_posix.cc.orig 2016-03-25 13:04:44 UTC +++ base/sys_info_posix.cc @@ -77,7 +77,7 @@ base::LazyInstance< namespace base { -#if !defined(OS_OPENBSD) +#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD) int SysInfo::NumberOfProcessors() { return g_lazy_number_of_processors.Get().value(); } ENDREP DELTA SVN\^\\--- base/test/launcher/test_launcher.cc.orig 2016-05-11 19:02:11 UTC +++ base/test/launcher/test_launcher.cc @@ -52,6 +52,10 @@ #include "base/win/windows_version.h" #endif +#if defined(OS_FREEBSD) +#include +#endif + namespace base { // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ . ENDREP DELTA SVNx^Vo6~]34@dnh뇤C14uФFR^"{lRҦ ļ}:}wtfg.&2f\1b;T!L,F$,`q..^`2<gpu|+LA0 BOS K[o:w66k) `Тa&mJ~30OAo[:7ޡQúܾ+$9L=F*Ȏ lDS>+O 0v$>3)ErMOA ]v<"LAN |5q-aifUkYf& ̞0l^)"ǒD3r'dǘ:uLRw2-y%.#+zHmk]1n_7rͻ? ec MYh*Nh^J2 dn6r6%?٥i|T8ۆRCXBƐ[rf$L+L`X$睈iM4J}ZGĪI -\^P 6pR[hKVw6H&1՚h ?TG :Ү<*UX2b\j~%n'a?nzuiN+ִ1(ݬq O:=]MsVKҏunr Y$j#/[K=9 b462Z;BRфs2WX5.HIM准CͺpXr=l*QM͕B ? ȶr à2Ӈog ENDREP DELTA SVN 7 x^R]k0}q섒l(R-An-dٯdϗνrPqm[Rh4m2HmUnRyy`|< gH{ePW FN"|mbh{dW/芦T<twF9uV?Uf;1B{L5g0@2p?5@Zz7A~h]tm2 xd%DPVQc,fs-"ŵ]XCxO=^? a89ycEWj$-B|]ĪP!-۴Vs6{zp|$8pC!XZ*$se ޹P{!3v~Ni͵NENDREP DELTA SVNwyww--- base/threading/platform_thread_posix.cc.orig 2016-05-11 19:02:11 UTC +++ base/threading/platform_thread_posix.cc @@ -53,7 +53,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::ThreadRestrictions::SetSingletonAllowed(false); -#if !defined(OS_NACL) +#if !defined(OS_NACL) && !defined(OS_BSD) // Threads on linux/android may inherit their priority from the thread // where they were created. This explicitly sets the priority of all new // threads. ENDREP DELTA SVNAPAAx^O]oP }/0/Os,Msà*q| .NL=؇6mO$ ^k,q\Ő$r1MiA쩗r+(M4$ ԎFZ(jA DQ/ږUitMbu7 Sf,ywІNK88BgGҴD"}0;+GYy!8q^yP=Wr%t9/å[6=p8-p_Q(e!Yr뮝eq5>(SA۹0۽Ag0L`N ɚzS2/RENDREP DELTA SVNsssx^VmO63)&]eLۤ] EB(rmHvࢩ}I/\]>͉9A),S?{E_i1nFAxDDY4ۛ^9?9GЫt`xTI&PxgpЅB2lH Y|p(4q5 RY0~'h{_O&BPNok92Kg(a1z" %(c?B,Z.*4( Wb.iǹVyGk%gJ=ݾ6sr xܨ|Y\ %7b&HM N (=#@22IWmܾ%ѪZ2kh:Czn.^砧L8^97՜zk ZĮG$NdVL]1j;bU]Exe`TJ0Gm/)INFZډB;_ ̴!a p#)Ϧ1&p7: ,M I&UqG["߅[>\c2ZV(2,&J[ )Rێ-]W4WH.%U۞>젅<̕V,3n|跼k0gl~ؤٮsfK8I$;-jʘDJ&ZE0trM( l% *I UW6L+f”/ݡT^O|x(nacl_untrusted_build)==1', { + ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', { 'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ] }], ['<(use_ozone)==0 or >(nacl_untrusted_build)==1', { ENDREP DELTA SVNxzxx--- build/linux/system.gyp.orig 2016-05-11 19:02:12 UTC +++ build/linux/system.gyp @@ -1051,6 +1051,13 @@ 'include_dirs': [ '../..', ], + 'conditions' : [ + ['OS=="freebsd"', { + 'include_dirs': [ + '<(prefix_dir)/include', + ], + }], + ], 'hard_dependency': 1, 'actions': [ { ENDREP DELTA SVN>2>>x^QMO@=_C!&ȡ x'cm6i D|7o21yXrawyIM~PZ ⫫0c1"O$:9$ X^$Oob >OKRqjopٚ P)$2,Оikw8>&p^|Mp.NUmR`|z?B#eLn+^6MPp/4dNqa]rU{Iu )YFZ+%/9W㝣wМENDREP DELTA SVN+ ++x^AO0W|Gm GL< R:6iץ`ݎM>o)#->j^Zj$Ⱥr3OIO6+B),Yr7!4}Uas+k r^!dqB(ӛFKX@<6ȵN`i&0q8*A ;!;۰q=-ݵ. <Rx| nް}z!_Ej,Jy\& dʷENDREP DELTA SVNc;ccx^n S6Ū ,hET' Ҭݲw:]q9p0Zzq 9vr*-%WhQ/dc [nj5k71!@c@EsO DV~ <29 X5@ OHĔeE͢ chi.E!;!) }I̒X`TFJA\L 4fK!`p|K ~ӱSm۔O% 39R[44!X%-9dUfh@TVnVLlGA1jt ,̩5ɚ:JJb{3{a>\=D`Q CHr Pw۩y.F5º_an^ݎ,k 0C|a\~YKA˥)i~c$&2~8)˜< gVXѶQ.PX;2 CtjVpO+` tuG /5 *{53DQJwJA?T^3`9o]]`[ ??oҺo]]߱~N]EEENDREP DELTA SVN`6``x^QMO1=b j 1xٔvm\:[XI=L:̼Dnh-^ιҩ37ɨӎ/y_'NwaDAԽ:p}* n-7G~@J PP=Y$(ՠ4$ԭJl-%f͘rZ#. WrJ_CN>D-:B@Li1K'c6|o@;x8h၄"~%) 2ǍSַ2A%7meK Hs{SY#f޻tENDREP DELTA SVNMbMMx^RQo@ ~C)BnkEP4Ր&7tN;twgmv?8JV豺7U"n2W*[/}on[w+k6W~y.\ǖe a5PԂ f9ޓ)Eb"+HZVK@* bԝZ(^N0**\}lm$zJuo2~Ѻ@@+jT2!m2ǔ5@䁗Ha^jAT( Rw* `7ɣgA4I/#]:>M>u1DqDv uxu~ČLƐ1aw5,zXUxBeLC)?i_K2@&Qr4TS6(` }1Cޙ9r_ yЈLddHWd ΋?FENDREP DELTA SVNY[YYx^QO0ǟS\xŲ1u- MƖ >5hd۷l=˯wQ{,{)x1SXFEX٩mDz6;Cҿ"ͨ?93ò0S ë5XݭK%5DOʜGhólcnxP-M:b Ac!esf]l,LƦiH:Ce-dl+^.I-II !X(VhmlNOYN ]E$RMQ7\N7؝Jw: ]z]SK 29 - + 300 ENDREP DELTA SVN|||x^So0VB"Mj .4E!`6kQ$@Wu;Oޙ4'R<*x":\5!$iKմ,d]u[u ojύkd^v.Tۅ4X%`-_?7l,}2~B"K;wͧRi}ǞsqZ[ q?t0N꯺aŒqVB#;Uݾ} F7u;g'4ޘ1:#Ƶ4oص"۳4!>{BFD( ZI Ub4eV)dyk&xQ괯 _C;cbi2"|`̏(Ǿ* o^7~vaENDREP DELTA SVN . x^K0ş_qɓRVnU}$Ͷh:1rp~^1d+%׬*j(e2[Kqs]ێu mGXAػqίJXм.YQ ]F "C'eQ/ kVќVt7k][j lSʙ~dI . H\*r%yF pgȷf|Yo\q'Ûu~ʛrENDREP DELTA SVN,L,,x^oo0_Oqm Dӆ4)[RmQ0m;?GbȘu^ҕn+=pǁt)5z,o*^}1nW'?sH\r!CB ۶_f6rA?s`x~<3pEZ_?$NW6l#˜DtEsσ s.03ÈO2pt8n1tN'Oadv7;wԂ=zLzRL«7 gj VpQ蹮듋kMC#׃p3~c"yz]7*PK}Y*b!ʸZM)U6I\!&R]:iW5;=[ᶢt5iMYjoگ-baZk=}}< E-=~ PCJz^o@ Qj_#2;FyENDREP DELTA SVN"x^]O0ݯ1![F- q& H LAhI[@4wOa!Ah=J)%D)\jPcZ)"-5!͠E4 HЊ($/$sno m $.礳vS=~(((ڠ%< n\|8A1?vPpO8z6x;L 7S0g:gzfTyX>1F1åpm(zd3 ;F% D |bOGoc=lIYb~ ~0?j99GQ7 jĒvJܢ==d LQzuRRoݮ߾']_*WL&K 'X;5}VENDREP DELTA SVNF=FFx^Rkk0[]y5Σ4viW҄c1b_",e}|-霣{8ﰷ|/Qet\F;BYTrIv ӿpc\;phۧ5NG m V ߳$$Qjv& @oi a\oh[^VڟyQb%w8Ă4KP@4 =BArlv:s췻~%|Tƾ3wH5gg(Y0 KR;aq-tG*КՊ?9şP-bxγTྔ0SAop3~M\s6O+GȏR5\ nK>/ý`2` WF :X*^lO0~]!H6'VɳQ/O-s{Dovo9 <ōTSS⑤*:ha89l3dziN8U=IܻTw-iQUhV! h0:6(_Je u51Kӄ c'd Qо}@"A/ 4QpR!\1 ނR^E!~`9ԅ!O`ɗG8]iX%L#P*w?&ΜG`BuLb)B'7r`G^)8B'F9܌6p9$oQe9sDF9x~Rbu+%V[;T@{|,bq{בrorS9#4q4!%v[-2x3*B%& 01T2"Z ̗佻 |dUi.KIt JEۋ !c; D\E5ĵ2nF2`P9T#JNdƦ$p:WTfFvȪʭֆ3f: >ܒ,;vAQ)xW(h7T"o/tHf+Z-lid,ָe 5HE1CENDREP DELTA SVN"$""--- chrome/browser/defaults.cc.orig 2016-05-11 19:02:14 UTC +++ chrome/browser/defaults.cc @@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false; const bool kShowOtherBrowsersInAboutMemory = true; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) const bool kScrollEventChangesTab = true; #else const bool kScrollEventChangesTab = false; ENDREP DELTA SVNfhff--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2016-03-25 13:04:45 UTC +++ chrome/browser/diagnostics/diagnostics_writer.cc @@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool console_->SetColor(color); console_->Write(base::ASCIIToUTF16(result)); } - if (format_ == MACHINE) { + if (format_ == THEMACHINE) { return WriteInfoLine(base::StringPrintf( "%03d %s (%s)", outcome_code, id.c_str(), extra.c_str())); } else { ENDREP DELTA SVNKMKK--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2016-05-11 19:02:14 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h @@ -18,7 +18,7 @@ class DiagnosticsWriter : public Diagnos public: // The type of formatting done by this writer. enum FormatType { - MACHINE, + THEMACHINE, LOG, HUMAN }; ENDREP DELTA SVN`x^_k0şO0l<9q4iqf86awl'e#lzCcXC{)ţ٦vSOɚpL( ^zBi?Ý.}_:=+[ -uuum6Sxa-a#핽^GBA'gJ2VޕD sP֡0~lfNWbSЙ dTg<ur7 YeB8P;ip{w_Ûyرܣ_ǣqӤ6AG &K"eYh&x{8[m')z]WoGѳRowUx Nv*\i$h'T~#};B (OHV@+^Ht5jʠ'tv1v+ir*MXH>ҌF%6Y2l@XCzvYWENDREP DELTA SVN///x^TN@}nb Ipk]A NZ¡UgZKPw}Ę6}>x9gF4.8[ޜaw4`y.[.Jot۝#}ߣΑct93fU5ΐtfvIÜso#wu3߀( "= Xb3ijTPTP,p, 4X hQ1{u"@USk0k7mC<:62'Iꧦ9=cj_Wv_-*Cd,Ծd?_}*QSnq]&:Y7P}qm0*`%ukxTK3a7Rv3ZiJU?v^ ui6{Tb.!2mIG u )=nj@T+a7CvICn&J'yo!L( {y&@Q[&d.7'tD\!N? &:9~ pT2Rrr*Cs4VoEV<\FV+$V1GRLVOWy2TC>xN?,T>%3$.Xօy %H`?5/L`=mK8pENDREP DELTA SVNIKII--- chrome/browser/download/download_commands.h.orig 2016-03-25 13:04:45 UTC +++ chrome/browser/download/download_commands.h @@ -42,7 +42,8 @@ class DownloadCommands { void ExecuteCommand(Command command); #if defined(OS_WIN) || defined(OS_LINUX) || \ - (defined(OS_MACOSX) && !defined(OS_IOS)) + defined(OS_BSD) || (defined(OS_MACOSX) && \ + !defined(OS_IOS)) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; #endif ENDREP DELTA SVN*B**x^VaO0ӐX`SA[F5m4Eъj٩KS&urɝ;k0(yJ~ר.M)Lt}4K4aU8~jNV}ʻwmGnPglБBxg /8cTr_@0 GF9H& jdf31lL"MRN킙I_w1p4ZM-yAqLR<DiSR+5ï_ƣ[mꊩ.h/޼GsBn@B&n/lV`/f57# _Ȱ,ݒj %%d*W(.&l65ޫ8jT6 29z:VvQ ڏ=)e"x"sm&VȨQch{d\o #)d"rL'\pgٴ ɔ4qJ )>7X5-j2D1Ũt"'e¶i/8p3X!E shR!Gуf$enBbѿv^mf2ijAFNBjeI.Jw⧛|gr)AgTѢfK4kL86 x0)Ŧa5CG"BAA R _/S0_qwqG۫QpxǙ8߮AOͺe睮s:S:OmRShRpR @MENDREP DELTA SVNQSQQ--- chrome/browser/download/download_query.cc.orig 2016-05-11 19:02:14 UTC +++ chrome/browser/download/download_query.cc @@ -31,7 +31,11 @@ #include "components/url_formatter/url_formatter.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/download_item.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "url/gurl.h" using content::DownloadDangerType; ENDREP DELTA SVNx^MK@W,xi&"BcRdii= i2iݲM߭T4u/3<,d%Y)YkT\֢iـ`Y@&E (Y֖Ϻ3vvv|ekF:%NVFՕb IaH)A~x. l sEp'WJa =ǒ$ǂ [,Y4Ф$/M7x+I^\oENDREP DELTA SVNfhff--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2016-05-11 19:02:14 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc @@ -39,7 +39,11 @@ #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "extensions/common/one_shot_event.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "url/gurl.h" namespace constants = activity_log_constants; ENDREP DELTA SVN&&&x^]KA_q"u)FM PrُXgDյ"}AنÔ"P[2چɎB&kL91Ua\۝,E7 y7|/|`2vF)0o'n[S%iKg(CԘי2Rg^ԢC{Y˃w_ .s\Ƽ5[d2Z=߫l*ʑz@7,suEF3ęnP#'6d=_F]o ENDREP DELTA SVNnpnn--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2016-05-11 19:02:14 UTC +++ chrome/browser/extensions/api/input_ime/input_ime_api.h @@ -27,7 +27,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h" -#elif defined(OS_LINUX) || defined(OS_WIN) +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h" #endif // defined(OS_CHROMEOS) ENDREP DELTA SVNy8yyx^S]O0|&b^BZR;AC!]A Jm"{[@dzi8#/D'M &ZM1ѠnEiHIgԘ1m ZuiM@r<, Irs_Gi_$d @X ҂eqH~"cZ+}~LÒHP &`U:4G$7^^/uNvzyѽ k[ ., X2@ݍ'`V9 >k5!Y,ZK{Kg^ O.f(I>WlejF͵ϯε!LjJ܆߬tN7Ӓ)i9059Z9jk ǎ؛~Pn/ *>SENDREP DELTA SVN?D??x^UN0}_14 VP[EBqHnM+.l_L܎gN]g)Ec 3!=2^:) D1/bϜGaAi#šlnnuVSMgM'ao5X&Èҗ40Z} YW}[0ivHzj4`[ <QRڙx\)o$ REX6 mMpJh#2)/#O QdBM|՜9vY8ņ4 ePpchf**Rt,9U< "δ3K$+SL9@oIY*VNQw[Ŷ[5t02 Ic*qwi,3&H\0GiJjB:2KP -7j ƙANB-<bFLԋHen{Lø+JMzø.z$sݕ$Iʓ9 XY Ӂ5m^30EUZsF&-(z %v5bN**+dK˚# ՞ʞLS%I33)>OFH. Wwvpy$?TxFUbQn^c'd! Jj\}TQRhOI*P)j߭8QĮC"3Iߤ&l\Oe̶5̬㧋7}μ#9|7~eb>VKsbr)[, ENDREP DELTA SVNqmqqx^RMO@=_ Z|J֬iXvvݶ32;4 eW|{q>r p&$|B bͩw e KɣR,Xy5!$m[im]g&=ö@w'},*bI \D __Gn@/FsW z_8Zh\ZY4Se$ 3B)㘘prm;س*%jnkL)ːt|,)kYPz 3c T7tŷKQ㷘м'@ާQvpr'%O2f%@HJ9D)cŸƁfjhԯyp\571c{F <}76X? 2ǻ71g\Y2iENDREP DELTA SVNEx^Kk@O1CHzє bDmYQn 7қsg~B|N vlQq !U0d<qWiq'PuGD38D2 :4KZ36]_#ք4BMFpBcދ=$&$d_m\V|j֎{B abGa εFiosasP?n! :F5o3 d*˳ ȓn]Y<5Ra\sHrʅaCTI , #ENDREP DELTA SVNfhff--- chrome/browser/gpu/gl_string_manager.cc.orig 2016-04-08 16:02:07 UTC +++ chrome/browser/gpu/gl_string_manager.cc @@ -28,7 +28,7 @@ GLStringManager::~GLStringManager() { void GLStringManager::Initialize() { // On MacOSX or Windows, preliminary GPUInfo is enough. -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) // We never remove this observer from GpuDataManager. content::GpuDataManager::GetInstance()->AddObserver(this); ENDREP DELTA SVN[n[[x^P]K0} tSCp֯ᶊsH5,&#MM7EQ=sN!xaRW%|Yg//49oj#[ ߉ݨ{}A)a8F]EoQ. oV}aen25QryR%roT##7l/̆m2<7tԏo?>K~mj!Qx*sT 93X8S`r^K<JH% )J+C0#.JRVbɌn} uBU/CY *ŋc~-Tk)[Z3A{ٺtENDREP DELTA SVNG GGx^RN0< ! M>^Jm*8 Em,T[zf.%R)L3RֺPE2O)=-μv.\];=`qw./4{Y&XF4gf|"~ 8чfǹx2*' ^yMޜc .}t@5{yd7놇-Uɫe,d (e0g(NFɶ=\Wqhף`QgkFJDWsNJ-J`j_ۺ>a+ dR!\Lx4~&4i4Kϖ[kܩ,|NS AW#Cm O<7?@1 %ENDREP DELTA SVNUUUx^[K0ǟ8"F۵ۼD2HIz0KJ:'MڡC.MP ǓtoA@<>)~xUn*Y=d}$$e3n!$] pX10b#VC/% r u2WnxdKy](9J6J/· k#AP K{rvqq6;k:^XO[YR2_l曉73O9`C̓hY[ #'JNe@ê< !=G'ENDREP DELTA SVN\^\\x^Q]O0}v⼱eQЙ F1|^F{M$FݘDM$F܏s9FQԪ\!),ͳ -4BTra޵k+-^7G(_&^i60to8D4_V_܅˰"3 xpؠP`KUBbYjBỈekC" \iqZ)޶_ ~z >KdJZz/i}h_"S=i ؉$#?o8;k7}&BTg.[kYJ"N Y-W[n#`uX,P_TQA%xpmwֽGiENDREP DELTA SVN$&$$--- chrome/browser/media/webrtc_log_uploader.cc.orig 2016-05-11 19:02:14 UTC +++ chrome/browser/media/webrtc_log_uploader.cc @@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; +#elif defined(OS_FREEBSD) + const char product[] = "Chrome_FreeBSD"; #else #error Platform not supported. #endif ENDREP DELTA SVN2m22x^͒O0`р8 . 5Zv*wgh~%K/m$)qx$sSl 1Q ʤ#2>iԽ]oٞ+ 0eY&K`J9b9&W+w/E.i*saR-NR9~Swe^sEdU('p ;Q>Q3 /Rwqs=Z(!d/e{1]5vKROb0{%yc |%"> Pλsڎ5 Afڷ,G6@DJgCi}]*T 7>GA?d6lM{Z^ENDREP DELTA SVNX XXx^Q]K0}Xi9EHqtka l$xW;Cŧ{s/NMh 54_ 9n #0;_J?7*;g1`7`}Hyp WAj)Δƴ~L\tQս2EtIj* U׎FثwvamoiH?Zœx'JE5aZԲ ҿ-?zƣ?WJTb?-24U7nENDREP DELTA SVN'd''x^Qk0_qc ʜ{qvZ SqӫHP},w]rmVݵBrY(Lp`BkI&ls5{wvh{x~{\eY {#{u18z574c /?]b+j=})D@oڳlA\P% ʉ+,+':P%{M.$uj˾D#,AIe:u~HT/&w*[/@4]ENDREP DELTA SVN 0 x^PO0> dneD0c6X4DxkmkRڥ$$vJpxbVV[Ԙ9PIK'Lp6d,TWA4 Pt7 ' Z<1 F["C].hr@uB\7옳(VSGT)К\RNiJ8Hchy C%LWi{ C^X=8Ӎ5v׊  n9/OVqCEnh>%zBpaIk |̉N&VuP@*,%C,R m%`锌 Pᭂsx$**6^Dnx8dq{e)_TmWkM6SV:4u\l5@Yjل) ZT)`̗TX!(R%BA _;h]/H?{%߀ڤL-K sTdu]t|B"D'68C˂_њ +AARm*u[l+ץz'YMxENDREP DELTA SVNx^Tn0}^⮕dT*R!QfS8ZgbО;srlۆd;>q3Pp&7E9[IҢ<;uO{f{xm=MhtΚШǤH*pBB8euI|N 3 RY\9)PI5;ڬ3RTL,Hbgu"0섏)k d85!Fw ^^6dCYߟ,{Roi-?֓ }zu"`ZR^\g[Ctp 5}MdW;F3cԫe_F\LKmǫ(qp|OTLu?P8NP HiR]9MXuZ vkҴ0C4gS99R$Er׸m!rENDREP DELTA SVN]_]]--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2016-03-25 13:04:45 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,12 @@ #include "base/hash.h" #include "base/logging.h" +//XXX(rene) needs shim headers? +#if defined(USE_SYSTEM_PROTOBUF) +#include +#else #include "third_party/protobuf/src/google/protobuf/message_lite.h" +#endif namespace safe_browsing { ENDREP DELTA SVNprpp--- chrome/browser/search/local_files_ntp_source.cc.orig 2016-05-11 19:02:15 UTC +++ chrome/browser/search/local_files_ntp_source.cc @@ -19,8 +19,13 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/url_data_source.h" +#if defined(OS_BSD) +#include +#include +#else #include "third_party/re2/src/re2/re2.h" #include "third_party/re2/src/re2/stringpiece.h" +#endif namespace { ENDREP DELTA SVN*x^AK@%!nTmiQOaLb-kKw)y1q)? BA2^ű`l(0d: :t><z=xW_}[\D_D M˜6dHA ޷ha |4/wEݺ| NI߷0 km ozE]=ۜ4 @7dd'%*ENDREP DELTA SVNstssx^R]o0}^~]+! Fٚi6RK*>ֽEN|93=;枣smH (2NΜ "s~`bKE-!]KӁΕ>,#lh `>_|9 "KT'm0(䒴Vg>g1PGZg7Yh@tGSڟ5ivz87*&@/[^]=nz##=ޠ$I*^k/b lNDTd|1$OSA{w9s)f"sN kŏ2H='% ?"Z|OA>Ha9S \J,e6'p9,œB@2XAH$P^\Q?nENDREP DELTA SVN%%%x^Mo0 㺉Kqs(BVl菟@2 C"RKEQţ5F/4 Ze3g0(0>'QC|,> p߂%DN t;7 $/40xZ%xУPY>4&KvJJeZhƂnik.?騇rү!xMe7eKk̼#eYP^&Υ-pHNUa4 T%V`.b Q!k/(9kF>=Zr[ $RK˭(iA|nGC!'VYvc]g.İ'rl8 w@푽㯞o |mm*6kL*'.8zkNIB Rt~3fhENDREP DELTA SVN7x^PJ@=_1ISZZ,&ٴw7AA9 ǼR yUыVuԊh-pD>i֡0CxO1ėhX=IG)yr̈52SU~cYXJ. E !{KX=$ݮOΖ7~䪮3Yi[eq%djʥN]ʮ[V֭K{)L|x'J*J4|zݠa5ʶZUրgJWN5hx7,a`^;cӂբENDREP DELTA SVN`I``x^Q]k0}^EKcauޭMF!c*L2{>B)%"*jf% aXpPc]!JswG],cq5a"Ȱ "DRu.>q7P0"CgrQ'u|gWSةW{=ibW(9Gб铯 fkP;c#mCz/6頉|?#uENDREP DELTA SVN///x^SkO0L~HSBHӀHSiyJk|J|Zv4~줃JChW:>>_'I(J0WrQ Kj`9t-DA{! 664z:7DF(\؁cIz4hxa{fLˀ6v-/P[Ƶm7/=*p`lM+M wJ>ENDREP DELTA SVNx^QK0ͯ".2 * ΂u[6F~MCys.J)V/Z+%+Jט,Mc*GBɘxJvfzyqP6A@k*N @`ٲAW6뱎w2eم;4Qꝟá/?B@2 Kۅ' uNSy15̾Vn_7gηZivJ|<1fENDREP DELTA SVNa\aax^MO@W1!4-h"o,Ӳ![0!1r4ɻ< bŔ`jdFVXavՁ'G,ӳf#踍tF3 :4[izදW|2Xe0Q>hFjL ָ RڂO 4= xAejհr/dKL*h:{xzVԶ^-7Ӂ}B}Rd#U fW #I @RؠFS+J3 slnW2ýr uޔx0E"~ju[cL{,D+v#Vv:? Z_tENDREP DELTA SVN}\}}x^TmO0X6)AZAxoE۷M.E#iAb}wN1TĴ~s<  -~E3p!qiNW1ORe&LP9AA'~?E;쎾 ,XhTN ~F񹒮ctmA+;]T"BM / bJ5TT6eB[biaÖ ߖb\*̺דg89:wi~w Zu[yV-2Q p^%RW{ۍfԉG˓POc2ј/AƬ62n}GבOÉ/T), ̕3i!,ӯU4<߭|ř ? p$PHX.֫y3/M-|0/ѻ|?Uxb.ENDREP DELTA SVNx^_k0ş秸c0A[&ٱ V؛TmͅԲ~v0&_N! 17On);zKʱ!BEݷaENDREP DELTA SVN`b``--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig 2016-05-11 19:02:16 UTC +++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc @@ -25,7 +25,11 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "ui/base/l10n/l10n_util.h" namespace extensions { ENDREP DELTA SVN\\\x^Umo0<~K% )B%%}Lr4fiUsbÀvcӤ'w~wsضi2J2g>b LiF>OA>`WzV;8UOoJ]^"Y\=B%*=g!jhAmծAvx@#JO(/1>|XDmav;GSo8\Ρ]C6FRA!Y alٻʿ"*Ϋ?_?COhV򢂶7$CRKizz]U`r w v΍ɵTA6#* 131vHv㔾Xo`v_m%R%NҗvHW9Q43H|‡NW9V=9:-^4j&LHHn@}BA^,c//#*Vk> /,tAYrDX<VW3h_A'T|hpk-IY6"_jGǩNf"7R{"'gXX{(K>yh y]JW<1zX3*8D<*HNS5Nosd)H|/ T} [:ia_ '8ےbpZy;%>h($ұtv6)Zӿ6}PlmjE h#緐f{Eƶ唆َ=D(fC*ӛG}CzTqjda,ys'/j 9{PS}0b'ENDREP DELTA SVN<><<--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2016-05-11 19:02:17 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.h @@ -204,7 +204,7 @@ class BrowserOptionsHandler void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) void ThemesSetNative(const base::ListValue* args); #endif ENDREP DELTA SVN3533--- chrome/browser/web_applications/web_app.cc.orig 2016-05-11 19:02:17 UTC +++ chrome/browser/web_applications/web_app.cc @@ -514,7 +514,7 @@ void GetIconsInfo(const WebApplicationIn } #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) std::string GetWMClassFromAppName(std::string app_name) { base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_'); base::TrimString(app_name, "_", &app_name); ENDREP DELTA SVNGx^QK0ͯ80ͮZaa: s̷5k`MJ7xӺ>ܛn0DV]R2zgD;Z-yUmdƝ^FO~|8F|4`:bAņCI2|^p aH-eNn 4ej)@nyj-)Rz֦Һ3I犡EJȜ-DyNo)c)޿ǷCa!+C![i%4D %prdJ|4͕hH>XN`8p@6%j=^Qrd6 wKp,UpG?= @q/ENDREP DELTA SVNt7ttx^T]o0}ŭ  i?ݞPg9 ւod;+h_j ~}ϹA ѰaDëzgrZ?4~ Epfo^ׂ,(OrAƒAoD\Rb5UEhi v^XTPr`ϞVXǧ8R.לџNF`HbxG\dBq/R$)+e* 6x69ݗxs#.c ׬ _w),Qvm30rEN'9F-e]ߖ`zٕY+3uijij6D -xT e/ 30E=]Tsk%UZy%JXsQ`:}u۬i ]\]Uނ5H*K)4`y{I:]YHIF݇ku*HؑФxʱC擱d0n$y?5Zťt6 BNJߴi3_E@Rʬ./ Yp:+|pv9 CENDREP DELTA SVN;;;x^Qn0 }^"K6qI ]*{#" V J M3Rb B@a'y'JNƮDu ^Nw9E_c@:Az[}I\jdlţ",p- (kp;=OfޡmS$dk Z29d6>ENDREP DELTA SVN--- chrome/chrome_exe.gypi.orig 2016-05-11 19:02:17 UTC +++ chrome/chrome_exe.gypi @@ -182,7 +182,7 @@ '../build/linux/system.gyp:xext', ], }], - ['OS=="linux" and enable_plugins==1', { + ['(OS=="linux" or os_bsd==1) and enable_plugins==1', { 'dependencies': [ '../pdf/pdf.gyp:pdf', ], ENDREP DELTA SVN4x^U[o@~^i7B"˖fRAJ`OX'E0n; zfa;7#IDӔٌ̐$rlJϣ蜤KzKRP.zCU:0j߽ru^@x1!1 ؎AJN2x@5 )R_r([ L˜|a1e%[@7zݽulWӽzZ 'h,^pk9"l+Cwn=],Kde#R<%1 T)2>{ g"Zlv5Un|N^T'2`Q p`Lo<,NF b3yz NV}zfw`8 mu=6<V`5麦mݛ7eM? y`7l1lTFY$y$<'10x:@zEcGXTI<ٮDQy8mLxjsc NآNsd*q[?oxfZ3cW2cj Vvq$F?no"gfI3Dix{iJUES§H+#k9;ʱ.#=ϵ^Y, b\?P>P٩ǬCzWO^kv`vCv.[MG:V]Gkj  zENDREP DELTA SVNvHvvx^_o0şOqJmHѧH!:&MB&KAiVI O)!'ǿs4!E`-L$b6^Pj\M}[iY`57wVQ.?6WPίz|:n0'IGkb1g!U,rs[ܬ_ⱉbeM M!)]ȸN \8*fuvǭuJy/ɔN%VYnȨ '4T` X0BǨz)_[H= }ezr]*J*L ڣ7!A)ĩ<#~-6YR g/|t7>iENDREP DELTA SVN  x^MK@ƸISx)6(iXV,$;Qx7!~2 <RSaFuM*Q4h9}8 ̀_L'HpvmPEVb"5f0#e,l8emlrҾoᩁFe][']-+|p3hz r,|J7Ob~l&M`DmV8wU{3(HTG%SGt*ENDREP DELTA SVNvxvv--- chrome/common/chrome_switches.cc.orig 2016-05-25 15:00:58.000000000 -0400 +++ chrome/common/chrome_switches.cc 2016-05-27 09:57:28.188798000 -0400 @@ -1298,7 +1298,7 @@ "tab-management-experiment-type-elderberry"; #endif // defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) extern const char kEnableInputImeAPI[] = "enable-input-ime-api"; extern const char kDisableInputImeAPI[] = "disable-input-ime-api"; #endif ENDREP DELTA SVN " --- chrome/common/chrome_switches.h.orig 2016-05-25 15:00:58.000000000 -0400 +++ chrome/common/chrome_switches.h 2016-05-27 10:00:47.232609000 -0400 @@ -387,7 +387,7 @@ extern const char kEnableWaylandServer[]; #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) extern const char kEnableInputImeAPI[]; extern const char kDisableInputImeAPI[]; #endif ENDREP DELTA SVN8:88--- chrome/common/component_flash_hint_file_linux.h.orig 2016-03-25 13:04:46 UTC +++ chrome/common/component_flash_hint_file_linux.h @@ -7,9 +7,9 @@ #include "build/build_config.h" -#if !defined(OS_LINUX) +#if !defined(OS_LINUX) && !defined(OS_FREEBSD) #error "This file only applies to the Linux component update of Flash." -#endif // !defined(OS_LINUX) +#endif // !defined(OS_LINUX) && !defined(OS_FREEBSD) #include ENDREP DELTA SVN --- chrome/common/extensions/api/schemas.gypi.orig 2016-05-21 16:05:09 UTC +++ chrome/common/extensions/api/schemas.gypi @@ -177,7 +177,7 @@ ], }, { # chromeos==0 'conditions': [ - ['OS=="linux" or OS=="win"', { + ['OS=="linux" or OS=="win" or os_bsd==1', { 'schema_files': [ '<@(input_ime_schema_file)', ], ENDREP DELTA SVN%'%%--- chrome/common/extensions/command.cc.orig 2016-05-11 19:02:17 UTC +++ chrome/common/extensions/command.cc @@ -306,7 +306,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif defined(OS_CHROMEOS) return values::kKeybindingPlatformChromeOs; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) return values::kKeybindingPlatformLinux; #else return ""; ENDREP DELTA SVN!H!!x^Rao0L~űIӪ!A;J낚V !X4vd;tqjB|qޝ{hU}R~璔hbJc y Σ$2|a7rpupxB8*ic ?>*MwG*_;8 SW jTiv#Uziri£n{ \HdiN=89;fNӬMz;C6BnTHPJº@[5)TbPK p X6%_4Y[7U,J#\[9ηi8FoI^6tA4c+E9Wv,[[EuԄ!qJQbbʁ{z0yb]wkL.}p~f]2]]i[yәqGrb<=צy'_3ENDREP DELTA SVN}|}}x^Q]k0}"CƏ^֡V2a Dk@t˅sNr1Msc(<9+,SFby :+bĖYPѪa\x+ A$a"rX[U\D2ldGB@0s&Uh@ F4ʃ. גCѴ[o6M+7kR4 Q!ed]oǓdm=t{-˥ C~srW?= TpǕ; FK<]@ H8 *Rnzķ4ٌ>/g\!s& k! &:l⢞'#ENDREP DELTA SVNd ddx^J0U|+B6Bxu$6$N{7v+B(,$Oy)^5"dضJ˪L]6e'L'U]2TY{Z(^hA7/h,Wtxw2 ^?gA,e 6@Ng[)QrM n5&#s"vraOHy͠$ESGODIHHݹ4'^_)_ θbS%Xd7f 'I4SB)ENDREP DELTA SVNASAAx^Tn0}_ !бVKWZ2C8l}׆" <8}|}98DS%,T,b*Y_8D8  R5^?j|{Q]MNJj–m4.]QQ 9y+y73ɌZ D,ڨ%,_`;R%hHBy,3a^L!BrcHBX,;<`nYOϼ>? oR Q$\67=8rl4ށՍ;tB@(zPBRA(rFxͬudC(Z۩PŌ3.knbJ荷,m_KdRZGz Ɠn_wO&xp|Mgf戢KF}YE 9g  _cyka )_>"g.J#̹XB09;5j}ivݞ¥ 0J|Rkˊhq#NۣA;HK[ I”\M Lj .CdK-3Gfe@M2:V|MZ&}d엏( $~7Q%ENDREP DELTA SVN x x^_K0şv Ӂ} izc I:TM D0M8_E -1XQ :/)%\H iv-x% $i&pw{a'`0(@A-Q6J,VZ̩X),?XAAg,F֚}dAr|zFƓ6,lߨJ&6L*̛?Rbnx?'Ac|ѹ7yD{=ݕ9 ؑ:r4FK7& T?ZTvO,X>L.z!tk]ԅys]0 @գ-u45 +#endif + // Passed as value of kTestType. const char kBrowserTestType[] = "browser"; ENDREP DELTA SVNk=kkx^O0ş_q aes F 2J%a>}j;9B ] BOT<Ɗ, ()J\6`YEo ̦]ue@\sh扔05.9KAs z|[E2 !ͽ!𖜭0XH}N6gAs<8Y\U˕&,`*5\7M0}0t:`$knnR9GЄMs=|@HҤԦ,a׆K֫lVK&Ɣ́#n{8}Ll\L4'G.Ϙ.p-xa"J`lAsU\־ŕ$U"Xʬpyȇ@ C`n+F5De??H!X q 9x Tx(7FSr4FoQ+ENDREP DELTA SVNx^AK0W݋Rl )*x,m IyI\xXü|!r,e1R9Hca[u^;[ŠOJIȖbq!g"/+fI%',kLlB<>4O:16F+fR(wMTt@ǚ/`2omuݜMw BNiK*Ѧ1Lٴg +#else +# include "third_party/re2/src/re2/re2.h" +#endif namespace autofill { namespace { ENDREP DELTA SVNtjttx^SN0}v_qda:C2d.n4vYK n7! /mzN9iy2)ڄ7,$$/1ZJh%.:7ٹX=7 `vsF8GQaO>i^L)ä1 Xzz&GpkiC0wV݆P 9/%e_ ȑcFE.@r@FU!7A0UVUu{ݦm)` t?X1#xՓRB8?Ы%e oEZS&l|B*[Fs:YYi&g9UeE7tJfENDREP DELTA SVNjljj--- components/dom_distiller/core/page_features.cc.orig 2016-05-25 15:00:59.000000000 -0400 +++ components/dom_distiller/core/page_features.cc 2016-05-27 10:13:11.588307000 -0400 @@ -10,7 +10,11 @@ #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" -#include "third_party/re2/src/re2/re2.h" +#if defined(OS_BSD) +# include +#else +# include "third_party/re2/src/re2/re2.h" +#endif // defined(OS_BSD) #include "url/gurl.h" namespace dom_distiller { ENDREP DELTA SVN--- components/drive/drive_api_util.cc.orig 2016-05-11 19:02:18 UTC +++ components/drive/drive_api_util.cc @@ -22,7 +22,11 @@ #include "google_apis/drive/drive_api_parser.h" #include "net/base/escape.h" #include "net/base/net_errors.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "url/gurl.h" namespace drive { ENDREP DELTA SVN--- components/feedback/anonymizer_tool.cc.orig 2016-05-11 19:02:18 UTC +++ components/feedback/anonymizer_tool.cc @@ -9,7 +9,11 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif using re2::RE2; ENDREP DELTA SVNNPNN--- components/flags_ui/flags_state.cc.orig 2016-03-25 13:04:47 UTC +++ components/flags_ui/flags_state.cc @@ -450,7 +450,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) return kOsLinux; #elif defined(OS_ANDROID) return kOsAndroid; ENDREP DELTA SVN(*((--- components/json_schema/json_schema_validator.cc.orig 2016-05-11 19:02:18 UTC +++ components/json_schema/json_schema_validator.cc @@ -20,7 +20,11 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "components/json_schema/json_schema_constants.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace schema = json_schema_constants; ENDREP DELTA SVNJLJJ--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2016-03-25 13:04:47 UTC +++ components/keyed_service/core/dependency_graph_unittest.cc @@ -9,7 +9,11 @@ #include "components/keyed_service/core/dependency_graph.h" #include "components/keyed_service/core/dependency_node.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace { ENDREP DELTA SVN2422--- components/metrics/drive_metrics_provider_linux.cc.orig 2016-03-25 13:04:47 UTC +++ components/metrics/drive_metrics_provider_linux.cc @@ -4,7 +4,13 @@ #include "components/metrics/drive_metrics_provider.h" +#if defined(OS_BSD) +#include +#define MAJOR(dev) major(dev) +#define MINOR(dev) minor(dev) +#else #include // For MAJOR()/MINOR(). +#endif #include #include ENDREP DELTA SVN/://x^P]O0}veUG/"E ]"kۮ>IL/7s W5gȔ +Te(ORaE+8Q2%=.U D1춷VvS"qzdYro%t`чU,ٚ>5Ȭ x8޺f{OZKI}X;8x$qIJ+s'-K\u-k`qdJm uou7Ng~DgS s ENDREP DELTA SVN--- components/neterror/resources/neterror.js.orig 2016-05-11 19:02:18 UTC +++ components/neterror/resources/neterror.js @@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings } var primaryControlOnLeft = true; - + primaryControlOnLeft = false; ENDREP DELTA SVN--- components/password_manager/core/browser/import/csv_reader.cc.orig 2016-03-25 13:04:48 UTC +++ components/password_manager/core/browser/import/csv_reader.cc @@ -9,7 +9,11 @@ #include "base/logging.h" #include "base/macros.h" #include "base/strings/string_util.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace { ENDREP DELTA SVN9;99--- components/plugins/renderer/plugin_placeholder.cc.orig 2016-03-25 13:04:48 UTC +++ components/plugins/renderer/plugin_placeholder.cc @@ -11,7 +11,11 @@ #include "gin/object_template_builder.h" #include "third_party/WebKit/public/web/WebElement.h" #include "third_party/WebKit/public/web/WebPluginContainer.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace plugins { ENDREP DELTA SVNQSQQ--- components/policy/core/common/schema.cc.orig 2016-05-11 19:02:18 UTC +++ components/policy/core/common/schema.cc @@ -21,7 +21,11 @@ #include "components/json_schema/json_schema_constants.h" #include "components/json_schema/json_schema_validator.h" #include "components/policy/core/common/schema_internal.h" +#if defined(OS_FREEBSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace schema = json_schema_constants; ENDREP DELTA SVNt-ttx^Oo@S۩4RQT-'z/g̬ ߝuHjIP+/#y;;{(G UF,ua+d-MZpBlώc"B&i|ʙt}A|."YR:{b|T5\]~|{arVzߋ=_j>۲僦%ʵůЋ֮i[(2Bg뒩IeMzSJ m2o~qõ#`t9Ue!|`kia*,=ݓLt7u{GuV!<+As 'TKb;pX+#yꜨcևedʐſ&s'kgz">Mݓ+oL切ר 2%'p]2y f0Qv?pvI7lENDREP DELTA SVNjljj--- components/policy/tools/generate_policy_source.py.orig 2016-05-11 19:02:19 UTC +++ components/policy/tools/generate_policy_source.py @@ -98,7 +98,7 @@ class PolicyDetails: if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': - self.platforms.extend(['win', 'mac', 'linux']) + self.platforms.extend(['win', 'mac', 'linux', 'freebsd']) else: self.platforms.append(platform_sub) else: ENDREP DELTA SVN8V88x^Rj0^"&=X A(vJ$iaM~IR{S֋ߩ0D WMsN$(Qh? 4GpY<۳~$(=$ F E)TekNh#mY0 +@̿ENDREP DELTA SVN7.77x^V[oG~.ĕ%ۦ:lPcpj5ةgg,޳07;(R|;93jϔDiMXXIN?шcւ4ph6~4=yaTTt~q*f J-5[iB+*I 652Z&=2j6Jtd\@өx . xl,L3Jd\BnL@Ҕk׹grH31łYd@$dw*:ڠ`lU-*KGcf>2Zj:ɪf>Ls!^,AaJ@NM$%)MBgwb'~}r/Wh{EVcl,qN5Z`,#9UTBb*jiIu/z044H1-6x~,ꘌCn#PJg-U1p)Tp?Hfa,W/8G67w 6cFn;OۨX..63~/ o9,̅:Xev>@͙P+w۽Olhat2TzwݴAk¥ReW7v@=*1?3e[^JNuguf{ rZb'ulTŢ/:ݞW.gv15֝Ԛ%L%U7I:ќSC6 3P1c;@9 :+3N؟߀O?INxI')k]sI6vnotrirgT_=}6UbtFae.kAJPhF(oޮ(ԆcʂE< 8,cIh,bBNm:T܁Ax#Eqo\VvS_%gBduFx_  "%#{MQ%9(!1$Z"ϠyH1to;%xsC6UhPY02wVwnK*OwV2fzEƹgvi+ɠcK;]zйL zM]QGs\>e1;e˺w;nߖ-Xƭ`+\땱h)$9ENDREP DELTA SVNx^TmO0<~ʼnISYbl&hWZ}XsvU;e*"D>$y{k$:/Bl:m \+Avĩ9jNj&>[G'p{۫VRtOņoi:m:?~e/ 6h6ˆMt<.s[ /'DjE9hL^`i^UmhiHf>kmO\iO3]JN-)44RwfAY Yx(n_Uh9QV>{\W2 w/K6bM)UYh)?ׂCD0_UFp #< 97(5#RhsE=XR;L< /x6D߯Xq+ y4qo|#d]*[Kzw>i(뮇[eENDREP DELTA SVN2422--- components/update_client/update_query_params.cc.orig 2016-05-11 19:02:20 UTC +++ components/update_client/update_query_params.cc @@ -31,6 +31,8 @@ const char kOs[] = "linux"; #elif defined(OS_OPENBSD) "openbsd"; +#elif defined(OS_FREEBSD) + "freebsd"; #else #error "unknown os" #endif ENDREP DELTA SVNacaa--- components/url_matcher/regex_set_matcher.cc.orig 2016-03-25 13:04:48 UTC +++ components/url_matcher/regex_set_matcher.cc @@ -10,8 +10,13 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "components/url_matcher/substring_set_matcher.h" +#if defined(OS_BSD) +#include +#include +#else #include "third_party/re2/src/re2/filtered_re2.h" #include "third_party/re2/src/re2/re2.h" +#endif namespace url_matcher { ENDREP DELTA SVN#%##--- components/url_matcher/url_matcher_factory.cc.orig 2016-05-11 19:02:20 UTC +++ components/url_matcher/url_matcher_factory.cc @@ -15,7 +15,11 @@ #include "base/values.h" #include "components/url_matcher/url_matcher_constants.h" #include "components/url_matcher/url_matcher_helpers.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace url_matcher { ENDREP DELTA SVNRTRR--- components/webcrypto/algorithms/test_helpers.cc.orig 2016-05-11 19:02:20 UTC +++ components/webcrypto/algorithms/test_helpers.cc @@ -26,7 +26,11 @@ #include "components/webcrypto/status.h" #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h" #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace webcrypto { ENDREP DELTA SVN```x^U]O0}^~]X~( @SERMcؑth}v@'7瞜sy)dEUSB\䌡hA |mw'ӁIup;8Fc A Q$yP[KzZ&|Ay24S\f\έe".|އQaݟo.4^yO_Cl\vR>c|~=_7fB>){e@%fqDPn38?JϓRVW(ENDREP DELTA SVN$;$$x^j0ק8CK誢7@ktWUVp.~|!6j+Զ:7a$scORruSäjIzM|<=ƚaۤѶf4ZHm@]|ڶXJ%`9`';R9!B.5PI.P_T=:t(? s<-GL׌Q.{ b& gia@)CDI:t_*N'g;g!Sx=.=voENDREP DELTA SVN,+,,x^]k0_BѺhojB*N."eǯ*GGؖs`!HxNy>ؤkFӁ4؆,UҴOR, d܏;pl Iz4&W ~ʩزJMPGa`ИE҈q xFÚ Gp\]l\U>ԺcKE83Aau.J+bpIK`_OO]Sb7|;5ENDREP DELTA SVNSSSx^͒o0ǟJ(Q$jtBm "$;h~N3$ئ U}~pͥ)"m0 Qu#$]|(EyIk0? 5f0 Q.ȞEX9]BII34Kɣ |9Pq+y:QfC2Uyg4X(fc[ӂ KEJT4bFt&a!.VKó`mۀ)#3נ )u~tcZY˝ʭYJ%X bFbMśX3nPdI:uϿ~nZ\Z-+!7m|MRHbTAkV(c@xo+*W`2SǏ2sHȌ75ENDREP DELTA SVN&x^Քoo0_OqhҔЦh@b2LXxv8 ؎u $x+'KHP,V2Ne&B$)f$iʌ-u۝WA tsow6\NZ^Rw v^.zc% O t\Tl@"%!2GP)' rnwF!$) ͐320Q k&bR4kP S3ԋ&qMZodlR  fԾ-( ~@Uz6[`9W TZ fEiҵH^߭^_.[J)`6pb8O0 xF ϱI$<F.4MB)3^q蓖%AB7xis @eѐ 3X-M>[1RYn/Җl\Y2ʩ4"ށQ.[1 ے'OSQKNx*ro&%BEL5RwAx2 ?z4g15~6hmS+;S2e?e&w,;5`oIGA2,/7OH-/Sa@;-G;#f6sEkBmq8+==TlVgPXnGpKYg\ vFO=Z7Q_ 6/Gq ˹T}0sk)`d|>Pib+nv Yj5fڀ64Q\l(*nȶ5|>ZUݷENDREP DELTA SVN--- content/browser/download/base_file_linux.cc.orig 2016-05-24 22:54:15.000000000 -0400 +++ content/browser/download/base_file_linux.cc 2016-05-27 10:52:35.163174000 -0400 @@ -16,7 +16,9 @@ DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(!detached_); +#if !defined(OS_BSD) AddOriginMetadataToFile(full_path_, source_url, referrer_url); +#endif return DOWNLOAD_INTERRUPT_REASON_NONE; } ENDREP DELTA SVN~~~--- content/browser/geolocation/location_arbitrator_impl.cc.orig 2016-05-11 19:02:20 UTC +++ content/browser/geolocation/location_arbitrator_impl.cc @@ -163,7 +163,7 @@ LocationProvider* LocationArbitratorImpl } LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() { -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) return NULL; #else return content::NewSystemLocationProvider(); ENDREP DELTA SVNZ{ZZx^Xo6+x{VNW9NP'(z A(XYt\Hl{b[7Pj2ױoLNE(S:AyҙSfDF )9ڡZL9LHUhϠPb0zQjxLe*y,9Z }q0O=XTSY3`P2ٝjZp0|XòE!l04cvMu P4\6%pB͠!4v7;=/l E:O4zjChWY!t'!AV&C< ]l!iL EGfx:泔qCS{_I-m,(AɏkXIৡ?.!&<]h O0S%ƘKO,Yd oFRRDe4FX8@@@z0PX"34vz?i niʧk2UXaw.chnX3T8JA/2uHj&& fgp$5Җڢg+IY"j*s:~j; z*lxysgIN0fCǹsJZ`H!= H]w}{uTp@|]6XmKak3iyεBpj\e;{WWWfW5-H52DܒgPng|5|? 7PmAqG^x0*F7R@_zD]: ;.FUҬ.&j2+5E0)s_CW߱"ʝpdѯ .Յib|nٮjun\MDDA$N؊Mp_qq[7%r}R)u;tn|17N4Թh,,| tAlO$>omvCG U+G[YO'Y͓c=$2H1d@H'Jc7H\=MtP-Rt;ݿЬٛ|* !k$*<&K, [Zn;O֡?bbn;s[Xq|7<+K@uyn%I2]U)=Tn]:'W̸r¬b8c.]:Kdpsy/mwɿ%< tŎ]xtCa_Эh_8nPxtv` d7eshNe(Jpt?!>NF&KO8VM/.a:9Xg@cHKj')nWX`w*7S i[G-18\fncB%2D3%7q RjeBRaa Sy+ cAae^Kv&$(:O}X&oaH쎑YR³ oԮ5kjAyEr;%_NGjw^mUi~,e kzCKBauyqxBL%U {nBBW/5cuť_r"bļz!Յ*!ђTR;,ZyfAx*/RѠ/=,䖳%5DDX bhvvلh p| O!xni6aC<'wlju\GLcF =xBm ޞc1,]Nht2? i@=+V8)om@IR8v=LDT2niXXE۞M DX21n9AlI,R2:Qb Fwa>JU0GPf7|.ѽdO&850C wz5NDF-R :hj9VVHgn"\$ܕ_b7ԏSH"2@J=/0Flt;5JEciR"nt>Fc͓;b1Wo ޶%]IrcWnrLq $ %_fL2o'!DQ&z:duڕXjּFZfGnq_q!3`bʩa*'^sNVqEa[H.5()!έNS'uSAENDREP DELTA SVN"L""x^S]o0}&)!KX@SNJJPJY,q+%vdǤx줰U쁁s1)Z.ZQ\1%`JJ1cTP<4JI:է+/ S=;;9CaN:*q4jKPijwX+k)4H)pQt-+A\^t9xg%y7_:>i\-ߒu^B{oplš w&7EGÉ˷rъhʇQBmC5[MbZ%?i+k(+;K~XMgZ]7f.ryxbf@K4 O`j8j壶I9'UQYqʋꪀu?uX5{~H8g`L&;l˩ND<U,x-^F;#Xic4a[empPhX!NˑNY9[*Nu}'l(NFrj! ?2_Q&a-۾J Nn#0^R"__H5zENDREP DELTA SVNf#ffx^Ւ]K0ͯ82jZ"L;ut*7%K%%nlNAsKs^ H{UȒ"3R0T*J2*d6^ |A./"N-p!@ 2g#{R8A :,Qκ~ +壼w׏cGy#;S%!OMih~](Z >F`9U eaE;6CKO"s `X{ަ;M8BmR,Pc aDa$&70s]¬F]TBL M4Fj8;߰7D=.}``cM;_Tv5RfA^Q :i,7 ZENDREP DELTA SVNSoSSx^Ք]k0_qJ!tu)%YBAٍX`KAtc}c7^yy ~"/g(QƹP]k)RTbV^d7p ?ç1v0B4.l=ҵf'u%9t}J;%dd<hz@{?4|.yt_I4Bҥ3 !T""<8"sz>菔Yu| 5nrVT*7}3w"?pG~Ǜ#%}?{ih'&qpd7hj8ХsW~պ<%%u)DLϔ9G3MoZE,TkXoގbg04e/d&uXUkwwLDe}ENDREP DELTA SVNULUUx^PMk@<7bK5B[L?ꡂP^$naRIR;;oAuFrEV4Yi%Y5m/E[Q5CGTvAU_N|2r,Ery&!)%͍yh]zGx C1SfqdThQvD=-~$$Ag|\+T ͤ}Ns?av?a+NBcasbePtA+?ALyXjNULsޫc`=k)kxK݋%;;[GGOqa>>x^Oo@xKRǎ݄R!B9U QzBhHl;v+!;k^V{o~o<$tp𲌤vd;pwN,/WKTr}>w&˲G YzϱЃR}NN@2p10Z+?;{Ylvd&{-7ԲP3tc?|y?ߞc] xXgL_ E1 **WW n`-I38Sk/ҏT)K@!爻;z:s}@BGQK"@dq4Eq2qtG(HX;&$:.{=='ζENDREP DELTA SVNSSSx^Ao@ @I^h(QDHjc"02dg g(жҚ A;d6%4x4ENDREP DELTA SVN M x^Vێ0}n»DW@KB$H>}nbfiH<&:3s|sm La_K,&'c.Hi'}!Л?L<=Z,={Y.3X@1@'0vm^u䀒BUЛͬ)0zm]ffi|[XTp}z.$ }hXo-eҿ.@'%IsF8,,$Xsl)㱳*H9UZGn´s~RD&z@ϴ5}SI("g4+ 538kq}beXMqճڃ\w&9>ѪTmơcY-~:=jbM>8ÒٷdjIh]/ G -=6Pm,.{=N %zt`wWhR" !6J{eY{cz]vENDREP DELTA SVN ( x^Rn ]ׯ+MgRB2 AD&c#Ne<.pB)9q9eNG%~"UFEO(FREY`qG99oU n-o4BE7$`> T* }k:%fø}%hBs5𢙥kՅ BΗ1ڃ),gI?wX!3㞅z&Z -w*&jM8F5\vpv8yZ~\aB! Un! FF n LӬeb'>_F9_ENDREP DELTA SVNR|RRx^n0 Sj, P {v, A#Sd6b #?>C mK% ?jZMqۀjJ <g@|UϛnV>{u7  (M'S[5X\xeޡTtd9dW-hYSw!wim6?_S;<>Jd9SX ƎZ C޷l\q&?|X5rDb_iE ~)Ͻ:7IpNQl5Ѿ| tcYuc$ܶ1y00'Y!2xj͒Zo+p̲ 0/ Vw(MK`gつiNB]ZKGͺtT ;g0 =o&eh[lDg5ENDREP DELTA SVNBhBBx^KO0W AMSWH@78tEjC$8⋥Oecm kͭ9}[q5$rp `x:Lt%(8?<9:!j y蹪~N(UTP +#if defined(OS_FREEBSD) +#include +#endif + #include "base/bind.h" #include "base/command_line.h" #include "base/debug/stack_trace.h" ENDREP DELTA SVN:x^QO0g+.Y: N%Dʓ/4c&ckچܵI])V ǍB6c,D3L4u*% ꎨw~{|!t t4 M\O61 o פλ۱-&1A+а4q&Y[C'i, ٵcL PH۾sZӇ\v.jՎ#X 8fD{"'"'Wuڎ I38tGC_Qj{w'+olއ&fsENDREP DELTA SVN:>::x^Rn0}^*KY@*%o8Q@uHQNds9JWLS*X@RV@bF7~ݏ"DaЏ;s{ ۏOx{%R,i=7|X7'`p:u6p,֌ \ RIi'Y6t?ųwj:UVEoǿtZ]5.Zh|7O}oTyk~zo7on*J(_!K< 0i+m"J==4xENDREP DELTA SVN1L11x^Un8}^}l YD-4٤ZoE,2%m}l'n$O5`PΌ8JV(2Ez'_`U"r>TZ )A; wa0썧}=;&>?p:?86a0kC,ssU8ra W !Y!RV=e#= a!#bN"yWZA*w }Rj:ArVCxi5;Qfn?^ڞeCNdA¥ O-|PZNj K^d/4K3ZWKbEifi8 u'#KL>c#%Uƍq,𰼟Ђw 9_>ΙfrthGENDREP DELTA SVNHJHH--- content/renderer/renderer_blink_platform_impl.h.orig 2016-05-11 19:02:22 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -250,7 +250,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo class MimeRegistry; scoped_ptr mime_registry_; -#if !defined(OS_ANDROID) && !defined(OS_WIN) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) class SandboxSupport; scoped_ptr sandbox_support_; #endif ENDREP DELTA SVNtbttx^_k0şOq:/2- sɵDt}Ǎ{!p*G *ª\*v,sצbK,r>EGj0 IOx dp2%|NOz݉B/w%nr%v4' r={P 7v)l+i8 8?^hp4iW^vkmJ)?]ɺ  Ljҡp*#[zbևa]u-H_Y4luϲahlxHf KУiEHGf<SoeENDREP DELTA SVN?W??x^œ[O0ǟOq&$(M/P6-jVDʉOkWvg'n ,Nr|s$B  Uo.<'*NJ<0fl;s/t+{sK 0~o '' ׫ͥloN 'Lܧs4[co+V \_+&᭭dR,@Nۖurv32͢(_P<=A8N)>'Oikbre8=7'V?k۟ ⡽L}s'j;Dh@ p`*|pif[AAxa醧0]K&\:jc4 l"K!f# xQ87`]g/KL>\7>uXq4j{ ~s.oo8q 2`ENDREP DELTA SVN  x^mk0_ϟH`8vӭT{ fYH#pe#+~Yv!Aߜ|;~gu!-FVšBz&稽4 %`|rCЁO}Cq|z4v4Ǎ%ױ]^ak{_)N`8$Fth#6L\.5DŽi.éU>Z9 X y%"tZ5;y)ʼnJSRH ]'TH'TH)2XJ(v@|]-뤾g6j_jJŵC#+i8p؃~v`lwԻn{N&pA sY%Hdl/x K`qpfݳB|_Zh'~/IECW׭6`f4tQj'\=nK=e@F4K H&X 2ߧզ~r,W7\Q0 ̝JYi2k Rgu~SgBʪP(2רiحv>ˀZo "qE-FIJ2PGɚⵂV%.G{4MĆ&JZ|)͟?\i^`Hz 㿷1Q2x%KvNV#+| Ui QϤQk=%k%~_fz]On0::;S1庤g6gF+{f]&P|@T.Zxu. 00Qɧmz֠L5!Z+]ZU9/@s+ܾ@1k)ݻї6 uQbRY` ˽4 WKAct7Fћ ?E]N\g#uu$({"r(ix^mOENDREP DELTA SVNz|zz--- device/usb/usb_context_unittest.cc.orig 2016-03-25 13:04:49 UTC +++ device/usb/usb_context_unittest.cc @@ -7,7 +7,11 @@ #include "build/build_config.h" #include "device/usb/usb_context.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif namespace device { ENDREP DELTA SVN*,**--- device/usb/usb_device_handle_impl.cc.orig 2016-05-11 19:02:22 UTC +++ device/usb/usb_device_handle_impl.cc @@ -24,7 +24,11 @@ #include "device/usb/usb_error.h" #include "device/usb/usb_service.h" #include "net/base/io_buffer.h" -#include "third_party/libusb/src/libusb/libusb.h" +#if defined(OS_FREEBSD) +# include "libusb.h" +#else +# include "third_party/libusb/src/libusb/libusb.h" +#endif namespace device { ENDREP DELTA SVN2422--- device/usb/usb_device_handle_impl.h.orig 2016-05-11 19:02:22 UTC +++ device/usb/usb_device_handle_impl.h @@ -17,7 +17,12 @@ #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" #include "device/usb/usb_device_handle.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#define LIBUSB_CALL +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif namespace base { class SequencedTaskRunner; ENDREP DELTA SVN,.,,--- device/usb/usb_device_impl.cc.orig 2016-05-11 19:02:22 UTC +++ device/usb/usb_device_impl.cc @@ -20,7 +20,11 @@ #include "device/usb/usb_descriptors.h" #include "device/usb/usb_device_handle_impl.h" #include "device/usb/usb_error.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif #if defined(OS_CHROMEOS) #include "chromeos/dbus/dbus_thread_manager.h" ENDREP DELTA SVN--- device/usb/usb_error.cc.orig 2016-03-25 13:04:49 UTC +++ device/usb/usb_error.cc @@ -4,7 +4,11 @@ #include "device/usb/usb_error.h" +#if defined(__FreeBSD__) +#include "libusb.h" +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif namespace device { ENDREP DELTA SVNbx^[o0ǯZi @ ֡RH[4V*n}B|R$ ]u}vriH\sMDVԃs`E<1z*uӪ 4ݴm4wrB~i3*ȧ??ϡcz:R"V"3%E{"b|K6Q4³Cb|s]&UʜyRJ23@_b2kg|KnCa?|AHC* w8eTyL6b]m%_1᳑ߓo#zR/ }C!<(1~8a%0>!mH3\Þ3F/\JF~D!zGÓtXBoIr"ˈ'1Mc@VņL׶7v[2fUD,RRϭm}2`\lrܥ>˸{D=o}X ]2O_ŷVvm=hzCXD+51hY'\bS]VZpå^aU}%2Km5S\"\P9 K1'Rʵ uLX[! @ \rZSR43&/}!+UV JU40z%8r(ju`3ۙjWr*>7!)CqtwI9UaHP!3JO J)UDü9 =Kj4.g]B7yY8 BtjHMR.T/ÏQ4 +#else #include "third_party/re2/src/re2/re2.h" +#endif using content::ResourceRequestInfo; ENDREP DELTA SVNox^]O0ݯ8 :-i jݎ!hLi9u]/rW)lZ&qRn$t$lb9pG?0XtHkfng)Cz= 0^˩y0═v,I|ƗQr>9Naelr'iV NΒ`S,qZqz87KŌLnC+ϟ̴=ڥ'q/^b>hUe_TݨȊ(?jOP݃8k]+o"J5-hnݟ^n%AyU X}_[}UENDREP DELTA SVN$&$$--- extensions/browser/api/web_request/form_data_parser.cc.orig 2016-05-11 19:02:22 UTC +++ extensions/browser/api/web_request/form_data_parser.cc @@ -15,7 +15,11 @@ #include "base/values.h" #include "net/base/escape.h" #include "net/url_request/url_request.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif using base::DictionaryValue; using base::ListValue; ENDREP DELTA SVN7977--- extensions/common/image_util.cc.orig 2016-05-11 19:02:22 UTC +++ extensions/common/image_util.cc @@ -11,7 +11,11 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/color_utils.h" ENDREP DELTA SVN?A??--- extensions/common/stack_frame.cc.orig 2016-05-11 19:02:22 UTC +++ extensions/common/stack_frame.cc @@ -7,7 +7,11 @@ #include #include "base/strings/utf_string_conversions.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace extensions { ENDREP DELTA SVN[][[--- gpu/command_buffer/service/program_manager.cc.orig 2016-05-11 19:02:23 UTC +++ gpu/command_buffer/service/program_manager.cc @@ -29,7 +29,11 @@ #include "gpu/command_buffer/service/gpu_switches.h" #include "gpu/command_buffer/service/program_cache.h" #include "gpu/command_buffer/service/shader_manager.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "ui/gl/gl_version_info.h" using base::TimeDelta; ENDREP DELTA SVNZ\ZZ--- gpu/config/gpu_control_list.cc.orig 2016-05-11 19:02:23 UTC +++ gpu/config/gpu_control_list.cc @@ -17,7 +17,11 @@ #include "base/sys_info.h" #include "gpu/config/gpu_info.h" #include "gpu/config/gpu_util.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace gpu { namespace { ENDREP DELTA SVNx^Q]K0} -mu2?&5c!6ѐ6&N*ysnAjts)JRUjEyGVl7@Ѱ`\s0ľX7kV \RQ 縶KTh{ij&m:.9>:fy@W2͞0QJq 3AF(C2 GbڟǼ4 Z2A *Jx}mCq,Q zc!3p<;f8.lQ2h8W.vTLqJhJ7U{ f-p,XuZ[EW )lW& XENDREP DELTA SVN%'%%--- gpu/config/gpu_info_collector.cc.orig 2016-05-11 19:02:23 UTC +++ gpu/config/gpu_info_collector.cc @@ -167,8 +167,10 @@ CollectInfoResult CollectGraphicsInfoGL( gpu_info->pixel_shader_version = glsl_version; gpu_info->vertex_shader_version = glsl_version; +#ifndef __FreeBSD__ IdentifyActiveGPU(gpu_info); return CollectDriverInfoGL(gpu_info); +#endif } void MergeGPUInfoGL(GPUInfo* basic_gpu_info, ENDREP DELTA SVNNfNNx^ao0?_qk U2-+MH Ш282Ď6M2T6|ǶmV"g$ 9"k׃<0NVo<v]p?o]!4zrlo=K\cY / qEpT$isRB%XIɗIZp e:7s+DxՂn07e-_ "KgV*.Lzl&BRz&}c:a[ElY쉵!U[r>%f-ċ(`Րf*r||2i( dj@LOxO-Ubif@ Zy;(ktBYcTBrտ6[w9l#)/ ܒ}::Log(cons l->append(base::UintToString(p)); } -#if defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) void ParamTraits::Log(const param_type& p, std::string* l) { l->append(base::Int64ToString(static_cast(p))); ENDREP DELTA SVN'V''x^Q]k0}^ŅZjc"b+l*~= J6PnK;$ι^۶IO@"+drrGHx}׷w ne%4S݇AJVDVj\q2NS`'e@JRHDy0FcISo 3nO(|M8֔RH .hZ]GJo~6nSERa/V7`\s\_E $@R9} ds&~&NSؽ6a' mgW 2tuQ1WXpm7iCY0nO=oUENDREP DELTA SVNyyyx^[K1ͯ˺mw녦*jZTBm$(K&d;$b,ybM umd5í!mڌhԂMmAno_\) E<4C8" VbHqm0dѭG2.׽+|2,cO&)HǙ/ vN5bmU%:ØeTTK;+$O3=z&0C?g VUɅ2EvJ{Sn\'Ib awe0+-CS=,LnvO,5/gtFǝdCt' .K|hszx2ENDREP DELTA SVNrtrr--- media/audio/audio_manager.h.orig 2016-05-11 19:02:23 UTC +++ media/audio/audio_manager.h @@ -68,7 +68,7 @@ class MEDIA_EXPORT AudioManager { // See http://crbug.com/422522 static void EnableCrashKeyLoggingForAudioThreadHangs(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) // Sets the name of the audio source as seen by external apps. Only actually // used with PulseAudio as of this writing. static void SetGlobalAppName(const std::string& app_name); ENDREP DELTA SVNu(uux^R]O0}^~OBJS4ؼ *vϖ 'lGBctn˃-{t9)䂝m3s館Pjؽ ˋb(K(?ሌkx9`gF֬Y+)mZ$?[Q+45G١ f=YnPZ<K@aeuI jH儰I`. &2Jb'owEZEkuqջ@ި ;鞓TVpCxz}s3B3֭ pwOB\Ηїއ Q'4^`uyN~ &ENDREP DELTA SVNl.llx^]K08l-iLas_ j7ޅIFХuq?Bq\sÎ3;I2 UI x!NEiINz7ؽƞ^>`42B&nϾTed0u)q%:Bf< LrPpn_w h*) >JO,!at27^QI] U}~Z6(ˮY)9~RB*EDyz tr C4qRY[!nh΂ ]pb@~8-",ENDREP DELTA SVNpppx^͏]k0FucZ q`݅,k_XS`ͮv.IN}Kj1t}+ArQ[,[r.)d̬[~ql7 ݮ],.l9^Zrl6`pڈWg#o՟(BxNT.KZqRj3mh3ZB =a|i\2A˂8ž ci Ǵh8!QWM/ 9nv$ &ZiOσENDREP DELTA SVNh$hhx^msF_WbdH%+i& ЄRsV#w'n?{$myno}P݆Kκ[FawK݊泿W%/0wNQt}|NHβ4K{p5Q}+h)DQfx7RVp|Wya!6d,L,TQ >1£\`~̇o߾ENDREP DELTA SVNeXeex^S]k0}~ťaO%mdM),$-{Zc˳v}l"_9:k!Bԥ 7JHEQ!7ˀ@j&EsҋIa!C!Q `8D g e6+TT nҋsR2PB\;.tJi+s89ɪ:%S0] ~ǧgH&PPrX˖P/Aȥ,[:z F@M& msߦ{w 89~>DϳCm&B&Թ^Kup<oUۺʥpfs:|u>Eֶ](^'ska[=B-~vt^۳lpWjKݫ;? :ϾkqXi#J%k0d"Ia#![aꋺ8j^v'=˶bY\/`gM.<ߏ&d|{k?t*$?58q3AfYX} //o~5{CFOƠ3@5tcYPA@9a aJ4P(x=x,D{e<][d߇r?ZkˠSP1Lx~wh|a wֺ~aiN; 2% ݎj{a&M!0\ˇS6"3I7E&sjdHaio)_)#ɷ1G^? {K\W/jݘ$C\^ddéCA!-Gߑߒ /03 Ģi`ET[gz x\ۘlJENDREP DELTA SVNlllx^RN0}v_q_sA0gx2GKڢ1v CޞsMV($8[U a*cU3y?L8u;HQ><(IF .Vlv8B :$rFQ|eix {4%5X{gf(fR-/\̙}y(f Y9iq%DzT(Yu=D AW9;~mŔ qsAX-p`ԫSA \ng!iSnAhmLTJ?ZhS`#ZJ-q' dݰft' ?k {*!>!92!z_(ENDREP DELTA SVN*#**x^?O0g)*8T T@+'V;U!p;I%V@g7AN R]$6Mjߔy1/ */rK(Z{$>(!jfe4ͤ3Y;Ew';h; aIa$N(0T Bz?&*](b\g1%qLL$J~TG1^_vÞ%߉_s-;ԸOENDREP DELTA SVN   --- media/filters/vp9_parser.h.orig 2016-05-25 15:01:03.000000000 -0400 +++ media/filters/vp9_parser.h 2016-05-27 11:13:20.498371000 -0400 @@ -14,6 +14,7 @@ #include #include +#include #include #include ENDREP DELTA SVNAAAx^]O0x/A I5S3 *Gߥl349J)$/D旪n\Ij_e5|j:YT#NA`AI%wQdp^}]C?l8юu1F :ZR-u#$f&%}xY\4\wM t<]3w{5O0g^榶0ʬjPښazlفMYENDREP DELTA SVN 2 x^SMO@=7ݚJTxz7Bh~|gmCJO֮g޼4MP)Ť2M 4FOLU9r)(PVg՛yzr$-،AZ T$E^aQK+ԖqMiU 焕\e x%'K>ZQm}^{bh,(;je9YPU GvCB[ /̸7E QGԱiWk ue=3J(גڃ/0&jԶ0ޅDV..,QX/gow|*wbm⋁'۸sTA,QS\g@vmG6n)S ] RLvENDREP DELTA SVNlx^QMO@=_1^L6ڂă&$`<)4.n?wR!~̼f rLrGJv:(*%q"{>]Gy]]Z?X!О|R:0| rR!G/ƼzEmnļ ʬPgLDuKdbP@oLfhE44`L߉'fkRyj mc~ k0f(ӷ"~"xgU={nu >9GJ9}jΝr*w[~y#/ENDREP DELTA SVN9r99x^j@5CRz ^,1N$h@ZMJ \037;qpF݄,좠Er"HY';.xx7[#Xp5O31.##3 xalv! b *5"4Q]B܎W3m7*uh dц$(au1ʪ KD?׶HaM`.Rh-F -v Ƙ !6|6 o{NJӹJ4B[=gaUjSw&IyJLs)Wk_(G. NU5wfv ([ENDREP DELTA SVN!m!!x^QN0}f_QI5cl d? HS 4ۄVP*>ޞssOh BОnӹ\ 8q=?{4E?$rCnL0lyV ]) N{׫wo.㌇$dRN=["E]Lvg!9abzx2XzEVswh@:Q 95t;\+! B\[B-Y%O$YHOsf 4r-… 鮬19ЋF1%_:{i{{/k r]Z/ W5 NҚENDREP DELTA SVN:.::x^Mo0 Ћ3q[] @b."Q[ $nGi:춓|a7Ln8*1AO̒[Wֶ׃@\~,PÞd m { >:&B/|C."/wy=N\vrϕ4:6+YpٓO7h ΌpJ?x>{{糿m/]Q2 F)dA{+}F]og)ʒ*Xػs̜Y*p*3?uAē"ӇZb8}TU vmmQV kYJ6lmVeFst~զy ق|dOk: 3 IjscRgq #]So#6F8K*c#y"!" $>/( k5,C(eԏGХ/))-U_~gQBOՁX8ʀ8Ih* -7WP-Ae*JAuF. +u#rQҧss(*kٞT!<{,jb{M7G39iVRת!gx3XX=w^H<(@݁w۟^oLzW޸݄7}ДGףK?%t؋ӈ%+iTGt\ǴlfO;r2E@GPV6v=0$D׆rrÌ)n?4甼Vfs2F+7kGuDvwvllUv+]]_{ے`R!(|~_|N"c b4 TmWSuT߷Rϔ]YYKGIū  Dv~Afr鍮tTvmK_;g.G|"L.p`_D8gdnSU^Ѳ_;n7z;0-M Tmh<-V|19\E0x02Kq}u%m׃)+@zMhl*CCy9'ENDREP DELTA SVNPRPP--- net/base/address_tracker_linux_unittest.cc.orig 2016-05-11 19:02:24 UTC +++ net/base/address_tracker_linux_unittest.cc @@ -8,7 +8,11 @@ #include "base/threading/simple_thread.h" #include "net/base/address_tracker_linux.h" +#if defined(__linux__) #include +#else +#include +#endif #include ENDREP DELTA SVNQSQQ--- net/base/mime_util_unittest.cc.orig 2016-03-25 13:04:50 UTC +++ net/base/mime_util_unittest.cc @@ -241,7 +241,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM { "MeSsAge/*", 1, "eml" }, { "image/bmp", 1, "bmp" }, { "video/*", 6, "mp4" }, -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS) +#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS) { "video/*", 6, "mpg" }, #else { "video/*", 6, "mpeg" }, ENDREP DELTA SVN%'%%--- net/base/network_change_notifier.cc.orig 2016-05-11 19:02:24 UTC +++ net/base/network_change_notifier.cc @@ -532,7 +532,6 @@ NetworkChangeNotifier* NetworkChangeNoti #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); #else - NOTIMPLEMENTED(); return NULL; #endif } ENDREP DELTA SVNx^VmsF\~ڙCb;`1ʸ/!pcD;L޽ċ͋)jߞ}v+ 0"@*yLO$|D1eVZ _5Q}6ZY?^P._epy 3ӮCxGY/"mNQN$"Hd G~s-)[ے۽:$T%r&$fZ}2zώED=RNb"f r˚X*MB?rN@GƘ+x|I $} ^|iKx!0htT' $cd1nʦ gr \V&b|iSN11k>ʍp#]j45%R4r+PTKprP[5 a.b(]ΞWyfo}D}UOVzzp8F=v^LK?*ECc`92-ȑٲSxKDn.dl"2V )5BlJ1C?(L$wA뫩f? 2^ݴM%9{̱mtbla{[ϓP l ʩm1M^kknkIekId(_bfs|Yf;ݕ< u@~[Hk+{ \D!EcwB1vCuQ*[Uw²s}7/ȖMENDREP DELTA SVNw{wwx^n0SLQHKSԽ$u/l&pYB6y. rEog*8J4oqB4ŵhZt<Ɵt>=(Mt|vR_ NS+xPk5zX\lkQFh ;Xuetx[f.[QLhm]sҺb6˭@t +f>)>2G?CIKrIcIoeJ!N]phD1mJŎR[ 5M Dt.zҦ5RT^5}`F)2^?܄g{rz}ѫENDREP DELTA SVNEGEE--- net/dns/address_sorter_posix.cc.orig 2016-05-11 19:02:24 UTC +++ net/dns/address_sorter_posix.cc @@ -11,6 +11,7 @@ #include // Must be included before ifaddrs.h. #include #include +#include #include #include #include ENDREP DELTA SVN}}}--- net/dns/dns_config_service_posix_unittest.cc.orig 2016-05-11 19:02:24 UTC +++ net/dns/dns_config_service_posix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include - #include "base/cancelable_callback.h" #include "base/files/file_util.h" #include "base/sys_byteorder.h" ENDREP DELTA SVNACAA--- net/dns/dns_reloader.cc.orig 2016-03-25 13:04:50 UTC +++ net/dns/dns_reloader.cc @@ -7,6 +7,10 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ !defined(OS_ANDROID) +#if defined(OS_FREEBSD) +#include +#endif + #include #include "base/lazy_instance.h" ENDREP DELTA SVNtvtt--- net/dns/dns_session.cc.orig 2016-05-11 19:02:24 UTC +++ net/dns/dns_session.cc @@ -190,7 +190,7 @@ void DnsSession::RecordRTT(unsigned serv base::TimeDelta current_error = rtt - estimate; estimate += current_error / 8; // * alpha base::TimeDelta abs_error = base::TimeDelta::FromInternalValue( - std::abs(current_error.ToInternalValue())); + std::labs(current_error.ToInternalValue())); deviation += (abs_error - deviation) / 4; // * delta // Histogram-based method. ENDREP DELTA SVN`P``x^]K0k+ݍڦ_nasu:A'"%mO-Id7$B(͕~ V¥daYeıQp߀v8BDJ,1q*P/!"Ჹ=L6MnP|+a)$s?^@ vBlWς9A!/kmIUH߲?ޅB:c Q.ӄ'df@/1Bv)05 *E5zd8GGP`+жt0b4?5x>zzENDREP DELTA SVNx^RMO0=_1tuRò'TYmZ<6 ںGF79h+/]aZL''W9@&~L4YQ B!sC-xN]r#h2 |dA 9Ph/8hQ+G~ZĈd/I ]V(8`DNj!5WFdgږ=zř3Ń G(퓴!K\VY i/m><ĎLi'3-#-8|0sc(RJDlHZ3Z I?ߖ7],o|ܮf;eE+D*g 0gͰR~ͶL(lVocaFӲzX.ENDREP DELTA SVNPPPx^An0E˜`MVHBl bQKO_RPdy1a^tT>>$1bqN'dK^JҔf?iHKQ  0(t.grajީ[8|&N,bhvNY7Hu.!+m݈O}$XVKhS*)KUQyz ENDREP DELTA SVNrx^j )؅$J7h+lWeH!Mw(Kʮ6AE?eλ;T@ݕ䝨n ujLJsʚZ| k4MƌwF.?7ѮV>~ ئXQ5=Bn(a7zm[סv~-åD~p,OcR#W28UOlfft!OVENDREP DELTA SVN(x^Xmsڸݙ] $ Rܝ;;aˠX[rH2&v?,Zhkl%4^2zD̦?gjfy| Jw~ 9 6Nq?J W3fDLz6fF -Ƀ uF)RPhFqzN(//3\qpHJ-Ѹ;_Dv\h"Ḋhޚ8yC&n&$ͦ˗,|:ʗޒTڊziㅁgUsPɖ smlG@#:%zVcW$DA2,NW`dp: 9V]А17'<%gmh''%T.O1i5|Y| $ rPPHəH%N)8嵜;SRmu̒ ܁pHHH5 &B)ƉqAk`DB"S9Q$-̧%KL)ZV!X+q˗33Y*;b-e:wn+ojYĥ*&BDL*DB _(.P`r/O挱xFPmaJfR.GG~dd*tOfa ؠ !-fXz4nbBAZܬ@^ &cNk',<]4"dE?әzDUWh@Eb&qA L5P*|2jjĐhI 3§!ÈE(V"#5]jPjyb1gjE-Iib2+@q#Nn1(U"Ѭ5eK*%D=NY*Ms=-DAnt<^mI"\5Cȴlް3~S.MW*r *Dyҽ.t?y#wlҥSno}:zn:{3t?ݰ;v -z긦VRsh13'6 o&E$/3 O|SvRn{?toC{S2P\#`3n=ؾ) qwl&-z}4|=UV=S1w7;otLШ壮Z-Kp%]!&ҝ  Zhz0p#`v>> Jxz=ᚇi1n{CFaPLV_܀5kɛ}KWm%1ma_[z<6+zTmT};U@B :tiyꪬҹ;9>scѷO0{떽믾\`qA{Û0?GP{{o6lxgGd*O e޷yN9`V/b&j)f6[Vi,z }R>ccz]B`5{32h5|*gYb':8PV3I\},hׂyqͻ|ʺaK՞Cӕb4U_pXSuViFV#) ^wN.N~ 'Amҕ^(doF-e/QÌڨ!/zl,9]@ Ѳ`/go/O-׻-ENDREP DELTA SVN { x^Qo0ǯc08C,2m)4tdNao-yu1.R{JBL 24瑮Ca@?w/A 3yGYpUg:ǡ,:+|r 8{͌U\,Tl/iL A N9׏$" $7ćgr45ùKd粻sn=J(dt>FX2CZ^(S(3GZMu ˷q{ջv/7r]Ʊ=/+OO~[f eҁ=!{XO)^?7ˢ62Klܺ_y,/8dW -B.}o;ٺ:R=W1.U`~te[L[u5ݯ$a8N Ƨo3ENDREP DELTA SVN " --- net/socket/socks5_client_socket.cc.orig 2016-05-11 19:02:24 UTC +++ net/socket/socks5_client_socket.cc @@ -4,6 +4,10 @@ #include "net/socket/socks5_client_socket.h" +#if defined(OS_BSD) +#include +#endif + #include #include "base/callback_helpers.h" ENDREP DELTA SVN --- net/udp/udp_socket_unittest.cc.orig 2016-05-11 19:02:25 UTC +++ net/udp/udp_socket_unittest.cc @@ -266,7 +266,7 @@ TEST_F(UDPSocketTest, ConnectNonBlocking } #endif -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // UDPSocketPrivate_Broadcast is disabled for OSX because it requires // root permissions on OSX 10.7+. TEST_F(UDPSocketTest, DISABLED_Broadcast) { ENDREP DELTA SVNXXXx^Uo0<*u cJtjfI&v8ݺ}*U$ϗ{eYGYe|l E3]lca'$k.aqݑQ52pT6#) $uL\_3J̛̬.kxJz}uSFQV-'p| 0U@;f*5$V%u]&0^7kWz눐~Y1dHWJ-i`@[?K7ը%eq1a4kK5L:nU‘žeTMA.f3tk2]X_H@ DҢ`+.x4[\A:0k) T3Z^[GVkVդT12 B7DU#ӂXȌW#2|FL@&+2խDV }a4"_Xfo+USENDREP DELTA SVN7x^mo0_Oq{3%JBH;ԮV=LUSZU|9iWԮwwwqHP7΍(#r$H7\՛~;tz˲蜞0#A)EUʣtF`k\+Lϖ*G`I#;NfJ+"Ej='ͮ 11pB7TMp, {_-tנO?ƵvM5`&9$1\3IBPGbp"W;r2OM/>~6`!k<SD"6c\naz_0G|(weG6R+g5r4 T'Ȑ*8mn'a-,Tb1[;>΋7<)ӧe) 1V:@ù`_ N7KYI%26hVA/M7P=Zlk6<$EUQA!o $&x1*q{jkqsFT%WF~`_5ENDREP DELTA SVNqsqq--- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2016-05-11 19:02:25 UTC +++ ppapi/shared_impl/private/net_address_private_impl.cc @@ -26,9 +26,12 @@ #include #include #include +#if defined(OS_BSD) +#include +#endif #endif -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // This is a bit evil, but it's standard operating procedure for |s6_addr|.... #define s6_addr16 __u6_addr.__u6_addr16 #endif ENDREP DELTA SVN--- printing/printing.gyp.orig 2016-04-08 16:02:10 UTC +++ printing/printing.gyp @@ -187,7 +187,7 @@ 'backend/print_backend_chromeos.cc', ], }], - ['OS=="linux" and chromeos==0', { + ['(OS=="linux" or os_bsd == 1) and chromeos==0', { 'sources': [ 'printing_context_linux.cc', 'printing_context_linux.h', ENDREP DELTA SVNzzzx^MO@+&@ Ih`vvɜvJ灤,Cv߷/W=az5q\{[e-ZcC#gׅA PQ Q`atZLM;!A;!2U*BAjk%6EjMҊ^"# B.-IF t g1ijWՉL*j| 0rIXOeqSq<~gYV~G 90t lL񽒆o6ږjT% P>OTKB Nw'e- sqI؏uENDREP DELTA SVN--- skia/skia_chrome.gypi.orig 2016-04-08 16:02:10 UTC +++ skia/skia_chrome.gypi @@ -61,6 +61,11 @@ 'ext/platform_canvas.cc', ], }], + [ 'use_cairo == 1', { + 'dependencies': [ + '../build/linux/system.gyp:pangocairo', + ], + }], [ 'OS == "android" and ' 'enable_basic_printing==0 and enable_print_preview==0', { 'sources!': [ ENDREP DELTA SVNUWUU--- skia/skia_common.gypi.orig 2016-05-11 19:02:26 UTC +++ skia/skia_common.gypi @@ -65,7 +65,7 @@ }], #Settings for text blitting, chosen to approximate the system browser. - [ 'OS == "linux"', { + [ 'OS == "linux" or os_bsd == 1', { 'defines': [ 'SK_GAMMA_EXPONENT=1.2', 'SK_GAMMA_CONTRAST=0.2', ENDREP DELTA SVN7x^j@O1ŮƤ`(Hmi@$Y]Kݫ!ib`Ι( kڕbDK @+M-QŠ\\p^s4: ]}zl.LFq0~>?L#42-]@!mYK;KQV=E& 殡u`߈sƫ\'>„l5Z bJyT%KxDf'j \T2u km33/1Yw矬2Iyc!U[׍IJQl&Uy{ENDREP DELTA SVNWYWW--- sync/util/get_session_name_linux.cc.orig 2016-03-25 13:04:51 UTC +++ sync/util/get_session_name_linux.cc @@ -13,8 +13,9 @@ namespace syncer { namespace internal { std::string GetHostname() { - char hostname[HOST_NAME_MAX]; - if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. + int len = sysconf(_SC_HOST_NAME_MAX); + char hostname[len]; + if (gethostname(hostname, len) == 0) // Success. return hostname; return base::GetLinuxDistro(); } ENDREP DELTA SVN[][[x^Q]O@|b j )MZo b!] $ħΙ IEnƖv!VY-ӹ2]ܶ4=ׁah|L0Z |_ jLP>mxL$${1z =0(pAep+WҖ%ygʚ!8v|&Y84 2jEasun:5l7/"V$ +#elif OS(FREEBSD) +#include #else #include #endif ENDREP DELTA SVNO OOx^k0x%5mgPz\ءb5B5!*LJ#@'2:@Iaox)Cf\6uerz8%3Lۥ1w@ܜn:/ {6f)[ln_Co-`|NkL%Y'ˁY24܋Y{q'{nR__ԑqZoMKkX&2LH,qްf͖m86ۊp $pH]!dV5Tr{$\zO'8%(m0"-MٚLy#BӈW^U|#&A@9$Z 0]/>q^dEO:pZ7LAv'B'>?"m0%yu6${QLzޖhENDREP DELTA SVNIeIIx^QJ0}_qa06i;W"mneudYچMI`oJSC¹{!eʙؾXB7L9 :uUE餼R҉=$vns3# ]X^.`_.B,4D0M_ Ⱦ Fn!Xn0`OǁyY[pvc)W4Iv[ bEGx%4ަTjxI3 \JMO%Xu%_`X2-|ڇáo Zfgi)^2ҊCF6q1ɵ=%S&nʾ=ϨmȢ`ӿM,>r,ENDREP DELTA SVNRHRRx^Sn1}~HH5$ziH-Tl-2,+$EIB(}v=c9>0 ҈qE8k1+ mVq]Js"^ב6r&K~¬io40y$A_t*ʒl~r4n@ښqy%)dӼ}2Ϧ<Nq 'J-dT DAg$J (+S۔ϙEZ5;jkc^2@ R Z-֜bଁaD:H۟:ڨ{;7zkG`K >O<ߋYǜ䤉n!_nxVց_VV!A`[dIJÿ̺~VYG!U޳8m{Hm Ϥ߱?7 QEc;N@T{WsmZV j {`h }yXcO 2&BஔPi;O֕. pZENDREP DELTA SVNTVTT--- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2016-04-08 16:02:13 UTC +++ third_party/WebKit/Source/platform/heap/GCInfo.cpp @@ -7,6 +7,8 @@ #include "platform/heap/Handle.h" #include "platform/heap/Heap.h" +#include + namespace blink { // GCInfo indices start from 1 for heap objects, with 0 being treated ENDREP DELTA SVN+-++--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2016-05-11 19:02:33 UTC +++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp @@ -6,6 +6,8 @@ #include "public/platform/Platform.h" +#include + #if OS(WIN) #include #include ENDREP DELTA SVNBaBBx^QMO0 =_a uYnt_Aņ8VuH]%!;- /gB0iq32 R]p)bs$)&*Ec9n/Yl'ZN:!a$Cg0# <c@X1nY3N&@n>&vQ"`3Jx%h2Q -x+2د9XLQU@L`-_bY%j Z+?k\߯р親P&'2.mנ9ʧKnO -xahVgФ`i #.NuAy7!["^ʹ^P ߍgQtw???ՏENDREP DELTA SVNx^P]O@| ^W- Etm?O& Þvgwvg *y-,=F8PT;P4-ІCcݗzqcϘx>N,mO& cq2`WiY59a49Fݣ<ڊ:iUB`Wc4{Yz~uӟ%?f~wya4Ըz,HF+ذMjο[o1y֏IX.VnN~3" 54ZUPUcL YqXptn~stJxܿ=G%$VRR}ẲAю k:]r]p 9m:g*]wkENDREP DELTA SVN4D44x^OK@S<5nlmj`mkJ!-Ӳ&/B6H^<=yBL\w7¸tns*s >wqczU7|57J;qQ8Jx=B! y,۶geHn7 C S*AyY4ZVD('Y%R8N0:X& 6;}36Ոc:a^M5.,5Qծ9BE^iBUS u2P6B&Ni`LDjAhFİW"m32ImZfҰENDREP DELTA SVNGIGG--- third_party/WebKit/Source/web/web.gyp.orig 2016-05-11 19:02:33 UTC +++ third_party/WebKit/Source/web/web.gyp @@ -160,7 +160,7 @@ '../core/core.gyp:webcore', ], }], - ['OS == "linux"', { + ['OS == "linux" or os_bsd == 1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:fontconfig', ], ENDREP DELTA SVN|~||--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2016-03-25 13:05:01 UTC +++ third_party/WebKit/Source/wtf/ByteSwap.h @@ -52,9 +52,15 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t #else +#ifndef bswap64 ALWAYS_INLINE uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); } +#endif +#ifndef bswap32 ALWAYS_INLINE uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); } +#endif +#ifndef bswap16 ALWAYS_INLINE uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); } +#endif #endif ENDREP DELTA SVNKMKK--- third_party/WebKit/Source/wtf/wtf.gyp.orig 2016-03-25 13:05:01 UTC +++ third_party/WebKit/Source/wtf/wtf.gyp @@ -57,7 +57,7 @@ 'target_name': 'wtf', 'type': '<(component)', 'include_dirs': [ - '..', + '..', '<(prefix_dir)/include', ], 'dependencies': [ 'wtf_config', ENDREP DELTA SVNx^J0F)30(5MNUu%864$-8qaq@dqNr[H;X54SߠR kw.MH6m`" N s2],*YZ$9c 2ahzmY^wdM魪ڈnJ7\ݨ֒ i>ă6(8ﴙ9f?C}8/͗oSm-t\Xf %]ENDREP DELTA SVNax^AK@WݴVObAb,x dbeA޴= °|ac eHZ^)4!5-Txj modn)-&&K>Ez:! ex .Á8}jœ 7N&pZb@U ib(^<)˵9ilCi;ZmZI۰u[eu1΂TWF/;-2YDr}7:'(3av$5INx_Zn-46"ix k#S ;ENDREP DELTA SVNGIGG--- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2016-05-20 23:45:41 UTC +++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h @@ -334,6 +334,8 @@ class Status { */ PERMANENT_FAILURE }; + + Status() : code_(SUCCESS), message_() {} /* Creates a new Status object given the code and message. */ Status(Code code, const string& message) : code_(code), message_(message) {} ENDREP DELTA SVN.x^_o0şɧ8JUe#$mAJ-NKS?7cG3oORxa,Kw=σ*mL?+˦jJ6kf:W5zV :T}뷽/^,7<!@ UpP@fKض=F`6Hj;SK}9QHz·0&r4erB. PV򉔠Y6='p:5SFR);QOlw%[dhdJFE1SUҌ/X}N^Ƌ3ɿFcbL1:ŘTkLJd.drsOC`I߭X.thyjJO;)rOϓ8ݷ\QnO ! .L?#o^_`w,ENDREP DELTA SVN$($$x^n |Q4pXG^@SMTMi{ɡ,_k(˛0oYuY>-|d2[w.yNٻE}׽ /NԹcߟ...XO?E[9-yo=~|%^͞|svM~Vx>8(yt%ˇ jЏPpRڗEЁ”0s8]Jsq:빿92㍽c뷍a;`x]ĕ )(U1$ '܀/"fJX_t@sh&%6#-T;n8lńl:!Ƶ!+||ȱs"wSuq+ Ս[&֊8Yo`''qmUn} `P&6k+,|#jF `W/3x/Ѡnmq:m%l{L,fi_զW) Tl@;  ȬcmF| "yr?מ>8pŝwþ(jȟegj>Ss?RRMǤ.LbFɺwY;V<{ ]=3'Ъ&ղX1K0tyGHhN3 V |/ȜiI1 ]w-]ekAFW8I1uLm;2T܎yUf~Z~x~sݛN1ʤB/UpJ!T#ۚ3Knwn:Wӭn'CClL u-%EʥSu)1D)|>0"L]ߦAԫ7F&{!%.%1sL:*GʿDNmmy|lnycuн<ɜ]H,%haWaqKaw qի Zň[ \a1ܡ( H8Ck,_-)Ʋ_3Fn(SM㦔&H?ӌoɕǝl6N֝ZbG݂X= Oo<ە`n`iN &VOUST+뜪jɲˑSM⢑=NkL/{X|$ɺIՇfM˗Y˛4w$MofߵGNa7?{_odid䱛I)S205쎆fMa2O:|i2t𳅜V&Ѵ0`? n,kovwx>$Q۾|LǭtfwUgvyBY3ns^-pn+rŸyFeh[tc 6&_t,r*Oy<#M3gs{}N;-'5Mn̟pn4'-RzB e">cInuT9n87c -d:GnL X^ŸS&pW:Tf`gR߲;Xw0nq52t֗ ݪzl\h݋ߤDLd16-˪On-7fu~݁tcC CC9 V4 ë@sw;RRL`2,wʛy/rQ A| 8O1;l2J;\_hHymmcю o g k?G򭓎Vyn"Sa hZMD"7qhta]2IbpbŚf6 z50|m4Z\]+5|F^̠e&A91a gu*0yPZ2Ҷcg[{4'`ܞdxކ P/x ʴOGP֙' K$dcb)z Y<=Ow|]PpG1HHwrJ_%*Bα8) $ C/_2Y2 6z;=}`܎k,ڕš3ݮbsͰ85k ib0 "zE GE"ǭ$ Seޅꂰ VJw,5+RwΛ\_)k5ҍ6OɹiY Nq@(V"`{^s^':j:"& RdAQfb-%nKS;ϤqJt;o8JՍr\tɠ_Rw^A q&՞*rY?{H[OOȓpG~ǃ^?{Z7hZ-i9ASL\ ־zUYfdux!Q&]~w|]aK76?}XyW9_]_j+Bzn'HcθGDd+=Wo0C$u#'>epsQ%)Kܱ'r0UKT-4D+ԾE)?߯nX?1iy;#X]? RdӫYOV[BdL!z]PHE5O}~T'r.ޡWq梱+[kJA-1`~<.w!:iP8/YG4OܥkMT%AXb*ja[*qHw.'r\ O-xOb._tz𐆵fEC+(9Դ]U?\y`NSW5rQFim_ZRjfT?`.گ^k#/EǨ#y|"d{n)T.\VןO[}{>~WKGjy|N] OC8ڊAT45xZ׶>h4;?K8@[!q= C(2ZźRsԣvbĹTS@c<>GC֌.f#vblj 0$X Q(t$IްF/)'iwR+x8u{oY^9zT!R*~D$xC 18 Q@ Amg"sQu͈h`|Ahh1ic[h*k[_KJv;dRi T٦>E/ @`R7j& F-ä b95T,ōb5h2,nwg"#y|"d{MK) [{Y6>tG8ccU4?|{ca|~z+_ WtʈmzթFޓBPQؓAw3̦h;`%Cn gNZgfya "U1`g sx,_q. B Z/8drЊw<WQ- b[4R+3Nw;ʆu^8q_;_K ^Љ5=8fye#a?f7si3 95M`2c ś -B(#JKFYr^ɾYV8@]{`=VƷh G}<^t "E80Le–-Ƕ҇<q ?$ eK%#nٮL^e[}FtZ(o4j}E,>~ /(XIdu*= _k#`bsVnSM@dQZ2RΊl2 ?Z3d4f^#"j{hu%p^(-ig', rk<e ǶNݥe|K%# ] (YX ]D7!֩s@,Cu p^(-,/7ןؘ5KGs|}N{4f0{o͛YY@b{I,td!Xj R*409Zwhur"p^(-ieR`=7Nc[^2>_' %Ғ扠Nj6u5\iq#xC/줾RC+^Β=Q(:xU½6F@Mg΀{sp#C/[s5=5[48SK Jd\[IfGVvs[~JVoW('PDv" CCu%%x"5mX3Qv14 G} LS W;yщأ߲i _4+͙/8`8e51 ͏S3JX̢n ~1u!W9h1`<~*^W6F@Mg=\naOh xgoڗ8K4ʉO8qۍٝe&"B\$l45kqP{!H)Lm x`W½JsuNGrot۰\њ̎ӗF0_ndǩ%,WfQ7mnAVC߸g_}mkI?!s͙i=`%#/7xʪ08o~Q@#\1%$C  %Ғ7$x3pմbF@Mgk/'(x\vDvgrF\FFx^nP&Ҋt?8Y%9?罔Sz/iQMcᠩMKr 'х;3_Bھ&0NL Ă|ݔ8G-|zOI x$XfJtp(x/\#IywΑx0DMk]Ny!q+N#f($RH5G<(fZR4eO5tѱw#0{xhk,5 =oZC `o M )\@^FV ̓M/qK/yU|R rls]Sv1Wes-uߋɩmaCܠ*Ky!q5+N#?)PI %jxT12StҤٳiaFL7[$rׁ9ۉ1Nvʀhi{S' Ԗ>G[; `X -`p|KjvKx`hu7O5ZE}j?V#e5mV;M㣵ENDREP DELTA SVN--- third_party/ffmpeg/libavutil/mem.c.orig 2016-05-11 19:03:23 UTC +++ third_party/ffmpeg/libavutil/mem.c @@ -32,7 +32,7 @@ #include #include #include -#if HAVE_MALLOC_H +#if HAVE_MALLOC_H && !defined(__FreeBSD__) #include #endif ENDREP DELTA SVN7I77x^Wmo8|v^{w*uR%JSNY$@B$d 9Ѐf7 :4<a.bFe:d>.ӒE0_k@I41R s<-T&# f\0\'#9t-KfMw gVH0TwvRR,!vbcauP$[]Pe(}S!Τ6XGCaNW}KBz 40JG\Ra|c5I1G}IT3WE!ϱ%*>>AIc eeDཧQ-_7b .oN1٬bx2kp7}NkT=?>ܼFEX_ٞ ט9*e2bYuk|k͹uo$ߨt.Xί RF;]MUn)٪xcGC[c}C[jʨUN0U50yM[kp(\+%v?arhNG9+$4xs+|QE ^rЙ1[(f:U*RaUi)9Xb̎S()֐O!&P%)XfyŋL:$wO6=*UK>*{g\$(7nΑwDk}a~>}]| ` qE$S+*I_Eoپe^#xt\eCY:'+xdÑ8lB,{(MMt̔IvfYJ7cqιG6c VԌ~8ɺcM:|`,c6SGqff&td8,b07UK;)ܕҚ7p]SiKZ)h,:[I; ;wLm 6[,3s(% >JNPp K N+SkR{|v+ЯcR|#> @kNcOoӽE eqEra8xJTF{%r}]-h۳A*v}#|CH8d?ϳ+>ϭSk[.furUyjg%=ǔ<3IF\R+&wr łrjrDROۺ_0[4ͯj43??EXܘ+l0K, ͟yԱ3-UZd Zx]ppd|WԚ]YrpENDREP DELTA SVN--- third_party/khronos/khronos.gyp.orig 2016-03-25 13:05:02 UTC +++ third_party/khronos/khronos.gyp @@ -11,6 +11,7 @@ 'include_dirs': [ '.', '../../gpu', # Contains GLES2/gl2chromium.h + '<(prefix_dir)/include', ], }, }, ENDREP DELTA SVN7977--- third_party/leveldatabase/env_chromium.cc.orig 2016-05-11 19:02:34 UTC +++ third_party/leveldatabase/env_chromium.cc @@ -21,7 +21,11 @@ #include "base/threading/thread_restrictions.h" #include "base/trace_event/trace_event.h" #include "third_party/leveldatabase/chromium_logger.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif using base::FilePath; using leveldb::FileLock; ENDREP DELTA SVN--- third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2016-03-25 13:05:02 UTC +++ third_party/libXNVCtrl/libXNVCtrl.gyp @@ -13,6 +13,9 @@ 'NVCtrlLib.h', 'nv_control.h', ], + 'include_dirs': [ + '<(prefix_dir)/include', + ], }, ], } ENDREP DELTA SVNkx^U(,J/H,*LKIE+ 29 t LuL M `@AK[[f+Z),]C#C3meI):  Դ̼bu+hdqS6XSPs_h.I>$X$^-2'Z?V) 5:%x#8^Gsz&ENDREP DELTA SVNDDDx^VQo6~ŭ}P G@(Zti; h$HRN[2tӃ-;}c`3yT2mX}+1u9RZLǓp:]^sWWN& NΦpu5_µ*9*~ 1 :ӪU*)mF.ϡ14Ѡ~@> 7e2[*#Ċ#gPKZ?Bc9B.b4fB$Jr>,搈)!ѲSB$92C4 W1am վX,Z;y V +4%CwAe0jD[l'Lh&$@2 ѺlPcqM3qL^}/79ZCu ,-]#a gwItRB.d,wB$(Wډʪ$RLH&P07 DNvYSzZj,= +J42nj νYb>(+7/5p5p5i;ofygv+4ɝqȝ Cw(N8q^qt/!RcNiCFv!TLډBL]HeEdM-PG\ lıDQȠ%] ۣN'm_JAwviohb93{ .z]L2|64=`[CQut42 잻ًBV6nY܇ڍn;6?_DݺB|y=!3D^x>7CdB~?\{¼'樲;:~/j7 :Nj9v/(ENDREP DELTA SVNw<wwx^R]k0}a]aP}]e)qFv=Lq=WPm2횭Jp]Vyح@kmUI W?*KHsqLA00M? {my~t /G`{ ө ]D h2F kf8dӓ6+2uM|OWPP``PVYX25OJp~~ 7L(z#t,ф'_ܫ.n8W.qBwlNM>PJ!!Xa_BS)~SCoۀjMolkQi+gy>`F4Ltl\ݗ8Y7O-%SUX'+ENDREP DELTA SVNKMKK--- third_party/libphonenumber/libphonenumber.gyp.orig 2016-05-11 19:02:34 UTC +++ third_party/libphonenumber/libphonenumber.gyp @@ -11,6 +11,7 @@ # generated protocol headers to be available with "phonenumbers" include # path, e.g. #include "phonenumbers/foo.pb.h". '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber', + '<(prefix_dir)/include', ], 'defines': [ 'I18N_PHONENUMBERS_USE_ICU_REGEXP=1', ENDREP DELTA SVNg@ggx^Wmo8| oCvu!tUݫ !;g;$@H^ZT5q3/LL'܃I$&>[u쏳yyv _/.OxԭT+WWl־wuU1?. J/'(g`c9hڑuX`zU6|cjqbj9cϘSL!Amw%@.5MYD=@zAZS`e'?gfi&8h0ϹȦ2U{=#h V$ 4ur4D z#dAC&ȯsJԈosVճێݱMނ߭^f1vÛ2@ѷ;c{ӽ;VD޼8ym {JíբS 5 s;tYf[∷4{ž5CJA@zLL\iq~{}߶N-4T摁WZ1qbY;,ҟND $-YT#[C1Vͳfv5m79}gF(g0Up`f7=&FA%[ T!'*o1~^/{UӿY!bs6Bյ˜1Bz l}CqRP5Z{3#(UPh0[+>~y0yl[]"B]5R6$Z/g_NSr}L-%W=/+_dENDREP DELTA SVNnx^Zo6|+f6;GnZ XDټHJRN|7,[ζEpfH΋T|d" r"z`\Ƨ+| 73nztrrrHѻw㋷pcx?)(y%1-)LHPK. A%+ Np cIR6]) f E=G#SD, ""Qһ,鈄`;^öUV3#)E8;;unPbaLu!9"eH{};=(Ϭ`X"wn¤h1a& Z:Hc$ †6MqLFɔ^oB6A[#W|^o[zT246cCwxT>&*ǂ\p%])˥1A>02yytHn^X(A:A)ذ$&6Q䒤ybx@ʺX٩n*"3 %7Tu:{ǡ{[L,5ۈɦ_ 7/X 7ÆYtK DZc`T &PⰠDQ0JHϜ%DtmY]$K(dҿ"WZj SVD0Cp8%uq*`q!Pq4WŤǸz4FƖ&ۢYV-/yp[rzb(" \)b}jRT8Opr@)fJ)͔Y_7RDŽ~KQnWbWau`8:0]N*8m vI =#I5O%&n$7oi`6@n9~ws`6Fçm.Ǧ;OXM[v*h2=#O=0!b2}vl[Fe)X4zelxHc8=eJwPJK01W/A]ʕlFӓ)Os = \ە`Ԏ"pלv8=YͲ#_Z+5ͪ՞1|ǤvG?P`Rxb^ӷojvtJ"4>FGP2/LKLjK24Uoi!y K\rpXA-m-QŞ÷g56]_/Ƕ|s s(hCA80Y*ઌAz ]q^LVq:n$qo2̡XN ֶ00..a>zhq:!.gF~xrL3ZwVp0Vt *g Ce-YTCs?#\1k.ܑoKsCM[[/ыm*6Hӗ|cJ;nQ"ǵs{;72߃2Maڂ}i\g qї?xN&ٖow[I1X㳂 z345.io Wd:'[`GEYx5OwW󢼫݁GT2d/}sj; , GU9lWJ2~?N:aENDREP DELTA SVN555x^Zms۸\Mؔ-ۉsyDH]&#C$$Zwz#@AK?Ȳ TDܟfG)<5MZ\џNo1/]Aw lӷN |2Ch  ׉c*W Wi (API#[; p6a>K | y." )"1 f@}&jRHYD3 " 4y9ۏ[<;N< 2(ೈg1SgC@~7t2 %}EiӗP(pJ Fl"ь hPSm m#T`J]ച"2 3kF9Bd$D)JԪ\.\^B%Qxq /$zq28T6j/tBd?bN0 ֆǧ' xL*:/>6PD*LNFAgd\sEMj%5"EZ Al!X8E CJg+]+VRFQ.F4L%/MbBh(& OZ^\|n?ޏ'4RNhL%U l) VUmmROaſnR<U!Yxcd XIHrRԴq.Y׽NKqT(g;񚅤KoPg#yܓ.w6tՏ] Svԥ˿taCSI/E-.zg%QD,| N8֤Knv 3)j}$& <~'Eyӹ~-b :/ZaGmł|@{NL?>o+A:eP`2/b&~`AS从ݫ_'~H%tL*u]|d`~-<):NI8xBpϭO.s阋?ykq* _ %c7~"?Lyg7-œ9 (9q+Hɣ, NE1}PUK8e`ΫYvR=`t8DRU dUjJ;i6pL^S:"E4[a S75 ^PE)`VNm[2o*I;l,18$nIcVc{q9#eV -)dAZE݄Mb^v8ȦpL&wI/sdc'c7̷EuW) (snVf8fykշIw\ QӼS05 Wip%)TauɀqlC9*C0ǤS&:n M1A 1L0=c\0AV_X泴(%٨_ w% | LӺxr \WG׽Wz^<Ϊ¼A#}k|snnIڟE5&N}&)Mo98AḚvTL{(u>qDT(27<QIC<,벮 {.sJR5YiQ3"k{*hX돾nqy=!Hg=?^"mjҬfݸִr6Uskb0 {ϧnc2Lr\}CˈmdqZ7FI(UniK|Z\ $3Y\1Wx[*^6MhDG20-)mD'<q s3Rbaeb2ڂI\ iV}zuVKd fa# gi|TtƖe.+(0`&t|vԶF8/X}X2i.)a?>E` ¡v׹=d’ߜߞdӾo:: DјL%l^>;9>!{vIt?kxsZh2)c!c,WY8;n=7;yjϳ}Q,ŲTSkuG@qף벥<Ƹ`{0݄݄1 $M5ufivucvyyb-Jb=[\+<'[ct1ENDREP DELTA SVN'c''x^Wmo6}m1S&p24 gp{s xN~u|(N1ި1*E A*5 A1\7q>@,4B^EU/?kһŒ`m{'.qtXë!|gi 0' #1 f10L \DyBTkb9if\ <,$q1#h_UDgIȩ ?#:r 1C%X¿6}t/4s_4!SCAOPx;FGc"yT _oY% Vkǚ_]!S!W d)!&FXj`9(}|njGUu9U\~+A/EoW~aޙӿܧ³^m5F3/@,Vk6e_Tǟ5iPldVśqZ=!(ǖ]6 z4P,ZtY1س=Tɤ2AGjL;ORql"ȧWW};¾tJP SLra"',ŲCB88K.Ρ7 ΂g=0"BMx;C6s ÑΓ-k؁KЎ _{`ϻڧzW,)fv r3eǮ@7Ϯ`cz:W!Llގ+v f;r6ޫ[ۛo'xirsI.mcxT7sRW\x^Ma֨MƮ5D;Orj3;ZD?j؇Q!h m@ j;{VgwTeIK577&P5͢JW8; v$:=wgMj"R'_ 9]"*s4&"ŵzF>DDݟO ʢ ;*b;:/[z6)kHXe"m? @Æ4I;M\f>qh)CzeZcX˪EiZ̈́Uצ*烆rFŒn1uKk*vnTgAK-3/M5Vl*1x_ŗi=-Żx8tXENDREP DELTA SVNgigg--- third_party/libyuv/include/libyuv/row.h.orig 2016-05-11 19:03:40 UTC +++ third_party/libyuv/include/libyuv/row.h @@ -201,7 +201,7 @@ extern "C" { #define HAS_COPYROW_AVX #define HAS_H422TOARGBROW_AVX2 #define HAS_I400TOARGBROW_AVX2 -#if !(defined(_DEBUG) && defined(__i386__)) +#if !(defined(__i386__) && defined(__GNUC__)) // TODO(fbarchard): fix build error on android_full_debug=1 // https://code.google.com/p/libyuv/issues/detail?id=517 #define HAS_I422ALPHATOARGBROW_AVX2 ENDREP DELTA SVN " --- third_party/ots/include/opentype-sanitiser.h.orig 2016-03-25 13:05:02 UTC +++ third_party/ots/include/opentype-sanitiser.h @@ -22,6 +22,7 @@ typedef unsigned __int64 uint64_t; #else #include #include +#include #endif #include ENDREP DELTA SVN!=!!x^TQo0~&脲Ҧiڮ@IE;眲Rw|w luX1m۰J3^a\s22$Nyj6*"> h4z1^CQcXWILJ:׃sws3\( Yd fأiؤd8]-JUR+%C%͔. 49JLRdn9GR'e(˱*f Uch PiSSZh-95`jJ*!@SZ.0 O4]tRt,#R,s9"d2E8'37w۱w_C{]!gg}99 q\F>}'/D&;ml`ZKPY榉LK'KWZ0Y-Ūe#+&e7YUH\OA3ENDREP DELTA SVNlnll--- third_party/pdfium/core/fxcrt/include/fx_system.h.orig 2016-05-27 12:08:17.275494000 -0400 +++ third_party/pdfium/core/fxcrt/include/fx_system.h 2016-05-27 12:08:33.590631000 -0400 @@ -40,7 +40,7 @@ #elif defined(_WIN64) #define _FX_OS_ _FX_WIN64_DESKTOP_ #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_ -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) #define _FX_OS_ _FX_LINUX_DESKTOP_ #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_ #elif defined(__APPLE__) ENDREP DELTA SVNDDDx^_o0şOqJk4ڪ?[ЂM$uӾe'[W׿{9<jeL *S^m>[+2Pw!YQQFT\UzWUN}x~-ui_F Z=σn}0XeBWL/COJ%HAmp&Ե'_O{2+CwE.x4ɨt13Gog&|B$ @T%35S #z n(osmy0Jehedj 7lb!"hV@($%TUmN GSؓTr&b *Y 4k]dU0|7Σ{p~b0f) 0ѐCUk,cLG@T2v q_{]ЎByjCҍʓgOq'L¿>O}+}f܊$*v-AB͂KxSrF6;W<1~چ(RXTd|$?]ݶ> ٩A\__Cc%J+d'/I6OeZ,`< '*~b1$yRrĕMv&-m =[-SxLk'R(mE E^ %l3jR'C匯b ۫J& $*V{'C,W} N = ޮ YtE_M(WTH hmT!}4H>~#ĸئ)]B&E ZN]i9Dߐ \Qv?S p XZ˹ 5ߛoeiRu)"B5W9QWHsk<73u_9~nF[!D{Ay > ب" Cu>u>t>k 麰[3h%>wHm4O ZUbdEӈ_ScT=0# S3АK] 7X: 5 p Ƒg3vt.P׋jNѣneIw4=D:(9@ SgU:wiqP6q#=53qiWNbc(ZE`jRdu]lސ&skʺ!G6,| ޔỬT?7$ %)Œ)I/W)6H pJv/#P; 9zh7LcENDREP DELTA SVNxzxx--- third_party/pdfium/pdfium.gyp.orig 2016-05-11 19:03:45 UTC +++ third_party/pdfium/pdfium.gyp @@ -44,7 +44,7 @@ ['pdf_enable_xfa==1', { 'defines': ['PDF_ENABLE_XFA'], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd"', { 'conditions': [ ['target_arch=="x64"', { 'defines' : [ '_FX_CPU_=_FX_X64_', ], ENDREP DELTA SVN--- third_party/pdfium/third_party/base/logging.h.orig 2016-05-25 15:02:25.000000000 -0400 +++ third_party/pdfium/third_party/base/logging.h 2016-05-27 11:35:39.166720000 -0400 @@ -10,7 +10,7 @@ #ifndef _WIN32 #define NULL_DEREF_IF_POSSIBLE \ - *(reinterpret_cast(NULL) + 42) = 0x42; + *(reinterpret_cast(__null) + 42) = 0x42; #else #define NULL_DEREF_IF_POSSIBLE #endif ENDREP DELTA SVN Q x^Vmo6< 8i6XdXҢvvE I"BIyU)HfFH o^t蘜=r! ɗdQ(,Y]R鈜sNI h4~|@dfWJ$2\eC(k~jp % PԐ k)H (f>#~F($$XQ蒃NZ ʖ5iI)G7T`gNP5 ZU#n5[TjXsTT5 SSZk!r~;Cb*)k0ɟ{sm$㭅h JJJh ^=v][3 j@A.kO1,7 ϧb 6eH Ϻ@siʬ1ǓR#m$(gA޿_}!YB69tKe ~[I-cfuV{LI^SL&6?\S+r:IPd 0!iwchK>?¼/+gDžVx4>},q("pc^(J֕_mmʿ>gJ~ v /_ϡêx6egaeYx5;a'FZ0qB5dsy6G#ְB&6OcAOq{bh#2==j1x.˱( 92]e{u=[Q:v3|-ENDREP DELTA SVN4644--- third_party/sfntly/sfntly.gyp.orig 2016-03-25 13:05:02 UTC +++ third_party/sfntly/sfntly.gyp @@ -127,6 +127,7 @@ ], 'include_dirs': [ 'src/cpp/src', + '<(prefix_dir)/include', ], # This macro must be define to suppress the use of exception 'defines': [ ENDREP DELTA SVN{"{{x^Vo6[A liŘtIꇤC4EKDeR 8^}Gʲ>l}w}LUfDU_ e ^eTۄe xD*4A1NO^rf q Z22b|`Jf+ ͕*er3 1@Hs@9/?\Ü tkd27GRXBv\0@C.hGJx&pemNo|1BSİBLMdUz6H EЯ9sTT`)z=+?dC4B ,=ze.* C+{f2V^rK'J嚅z [)=._P{vza))(BAFQ#Ϭbé5+ #[UWGpG+~T*#2jˆeLDLP3cJk 7sdە4殻) `^o4%"D )\,7?6g."^K+1&~߶pKcQg%qs3hr~ڀ;!ܟla`BRH>>-R I!L%$MW=\Fu3MԄ{ygMw!*TwPIiM}[)u1olI\1~)8wVϐs8FxY?U]QhU:}vPԼgZGo?BH"v :j>č҉lR,̱9T`AE,-o7`SlTmW,[ 3}=^33˞.B|T1cFv6CAYfxmۯοTENDREP DELTA SVNPRPP--- third_party/sqlite/sqlite.gyp.orig 2016-05-11 19:02:34 UTC +++ third_party/sqlite/sqlite.gyp @@ -153,6 +153,8 @@ }, 'include_dirs': [ 'amalgamation', + # FreeBSD ... + '<(prefix_dir)/include', ], 'dependencies': [ '../icu/icu.gyp:icui18n', ENDREP DELTA SVNRRRx^PAO0=_ɥ( Б,adzX i1b,D^^1P"aU$Ż2~ٱ2Kgg.&SX&d_fʧzYgspl:>`J.j`Es~B1* {zvh.Z*88~ dc4aWkl=d|J.dŜ5TTV-T(֠Ё_凄iy*R?ENDREP DELTA SVNGPGGx^P]O0}ve  3]3&lk[%(n O؇{s==!Pk*p\%B}[ i"VxYrͲ.tus!ru;}xfeY1c@Ksֱi 开;- E"$gXt ¾/le@}Vk`͂3$J(0tmCo 6UŅvڪHh`2[OE4'3M8?҄T>y +#include #include #endif // WEBRTC_ANDROID ENDREP DELTA SVNMOMM--- third_party/webrtc/base/ipaddress.h.orig 2016-05-11 19:04:03 UTC +++ third_party/webrtc/base/ipaddress.h @@ -17,6 +17,10 @@ #include #include #endif +#if defined(WEBRTC_BSD) +#include +#include +#endif #if defined(WEBRTC_WIN) #include #include ENDREP DELTA SVNbdbb--- third_party/webrtc/base/linux.cc.orig 2016-05-11 19:04:03 UTC +++ third_party/webrtc/base/linux.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) #include "webrtc/base/linux.h" #include @@ -261,4 +261,4 @@ int ReadCpuMaxFreq() { } // namespace rtc -#endif // defined(WEBRTC_LINUX) +#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) ENDREP DELTA SVNwyww--- third_party/webrtc/base/linux.h.orig 2016-05-11 19:04:03 UTC +++ third_party/webrtc/base/linux.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_BASE_LINUX_H_ #define WEBRTC_BASE_LINUX_H_ -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) #include #include #include @@ -114,5 +114,5 @@ int ReadCpuMaxFreq(); } // namespace rtc -#endif // defined(WEBRTC_LINUX) +#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) #endif // WEBRTC_BASE_LINUX_H_ ENDREP DELTA SVN 0 x^R]k0}m Mb;YfnH3h7#ש#eFge{1#s =WEb fq4F(#^< }KzgIc7B@ǭáq 6et9myUX3DpZv| z.0Q82nt@1kv[QeFJڠA8IiJs)@'ctBdrĐSE@ P`ݧ8Nf+''p \L}x `E*?T0|WI%~zfoTȤ`4g'b-P%X!3TVBaciMftD_b\\ PEhX@3Sg^!K({[!uї 0skuhͧRDOBT9ُ|#oA)3%t\\@14V&FguOwhkekY5X6  R C::PL K,u:u=ᯁKhpENDREP DELTA SVNNPNN--- third_party/webrtc/base/network.h.orig 2016-05-11 19:04:03 UTC +++ third_party/webrtc/base/network.h @@ -23,6 +23,10 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/sigslot.h" +#if defined(WEBRTC_BSD) +#include +#endif + #if defined(WEBRTC_POSIX) struct ifaddrs; #endif // defined(WEBRTC_POSIX) ENDREP DELTA SVN-%--x^ՒQs@ǟ$3Q1m1Nc:(0MnWÄ8M{kMV^oWUU`],甅yc+̣04|@# ma3͹_ZGu?څaj`xJiE0px712;cQH4c5z1& =ȣ. ^QB"NXyrҀ< H=B"RZ$NzPWжOn<Y j^2Jp!ݎn\@&5Eɞo ]5n<.+Y+*~!ԟ MoP.G7z"Z.ń sdBޑ d> <V3`/ ^i[-r8ҟ1s7t U >-1;t/d?J=[?eFFz-kg~NI@c_[5IJKEROрuOBě1k ⇽ʐاrlh[ӊ(<8Kˈ2Z"P%5Rb\Y%[|06eE>e{ty6[BʃPi?lM<#>B!*#D(rG׽2q2~Cc>vY^~Ѣy8jCmxl9SKKP/A.0'OIq.##aU[Lg4s(ۀh$;߀IA69s̥i,\}`'S*ΊuZ#nݖg9*8[Z/|AsE]Zx5 8'-JV휶ENDREP DELTA SVN--- third_party/webrtc/base/stringutils.h.orig 2016-05-11 19:04:03 UTC +++ third_party/webrtc/base/stringutils.h @@ -23,11 +23,11 @@ #endif // WEBRTC_WIN #if defined(WEBRTC_POSIX) -#ifdef BSD +#if defined(WEBRTC_BSD) || defined(BSD) #include -#else // BSD +#else // WEBRTC_BSD #include -#endif // !BSD +#endif // !WEBRTC_BSD #endif // WEBRTC_POSIX #include ENDREP DELTA SVN!z!!x^Ts@\q`$Ęa@F0G;${@4{EpJ)㑨MSd+٨]e[/<)HXi+ͦ|!ДCprg܍XLo<- АppBǥrN ~(|S;XBbn!5Cvhs#W[^߶ T5KcL߹ܑ绎B]|w*\Mާe7-ubNTHQv&,_{z`Ch$󧽑c9C:l$nk?!hBzp{(߭wqKʰ7;!P'Y,-P,fتE<8ͳPOoH"*J>`moIˆʵHTKc^6>;oDENDREP DELTA SVN(x^]k0_ɅFk* V:Ȑ.Pe+}jk99ox(?Yu^8P lia$Yn;f9阘SS@u *n@'Xͫa}2: &q2@ ~j:rci6} ޯjs"mpl&?Xrh1-{CZ>w]Q^Nܡ_-%Pjlqhox+xUzU\H -KR7t#迹K?.ENDREP DELTA SVN  x^j0ƯSɅ[ {]l*#h@jJdݧWk.G0P>Daj5oQp) ܶj#71&Cx /^ jXC,`*e%0R4e)LCBLW\RW%hAOi+Y5>Z\-6--,OS$$+.(f8ի["ds l7gcׂa_.= K#Dz!2WuNQln}UJP C ©$ENDREP DELTA SVNWYWW--- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2016-05-11 19:04:03 UTC +++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi @@ -114,6 +114,11 @@ ], }, }], + ['os_bsd==1', { + 'include_dirs': [ + '<(prefix_dir)/include', + ], + }], ['OS!="win" and OS!="mac" and use_x11==0', { 'sources': [ "mouse_cursor_monitor_null.cc", ENDREP DELTA SVN>@>>--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2016-05-11 19:04:03 UTC +++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -14,6 +14,7 @@ #include #include +#include #include #include "webrtc/base/checks.h" ENDREP DELTA SVNWWWx^[o0ɯ8ڧo"HB+Rr{Fc!;v҇ ZQK3DximuM++kKuI"k=l7v楨EӠy/z_>eY8:hvP$|=Υ^2':ݙoPUXwU3ĈKF f OR X C,Ȥy5;nI2Hv 3-ˁ7A!mi[ N3S7rC[uTD6.bk+DZHçπۿ| #include +#if defined(WEBRTC_BSD) +#include +#else #include +#endif #include "webrtc/common_types.h" ENDREP DELTA SVN--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2016-05-11 19:04:03 UTC +++ third_party/webrtc/voice_engine/voice_engine_defines.h @@ -210,7 +210,7 @@ inline int VoEChannelId(int moduleId) { #include #include #include -#ifndef QNX +#if !defined(QNX) && !defined(WEBRTC_BSD) #include #ifndef ANDROID #include ENDREP DELTA SVNZ ZZx^Smo0 P2jePjhT@'!ؑㄢi}ļ %b~!`i}NZY[045Jcʂd(.+Ҹ$&4?ZKxw<ƻrq}u~ ~ f-Uf-F{jp!n29$dy՞a~8aA=D_&7(.Kh8;Z b3B@UP p%AQ@)1T\Ɋܒa\DfS`2ZɘIRh \hBA*݉f |$v=-[Jx="gL0Bִ|m\#( 0CB~E90͑jMϠp]qk2%5R K*%OhXj,d*2+Y1.M,NFkiQ9Ma봪fkiu<GZݝf&Rj hrۉب,0S1PTF}w<zOGjp ?*ҕT[if1EzoS pPf8X&X=,V_ ENDREP DELTA SVNIKII--- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2016-05-11 19:04:05 UTC +++ tools/gyp/test/additional-targets/src/dir1/actions.gyp @@ -47,7 +47,7 @@ }, ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd"', { 'target_defaults': { 'cflags': ['-fPIC'], }, ENDREP DELTA SVNcecc--- tools/gyp/test/library/src/library.gyp.orig 2016-05-11 19:04:05 UTC +++ tools/gyp/test/library/src/library.gyp @@ -48,7 +48,7 @@ }, ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd"', { 'target_defaults': { # Support 64-bit shared libs (also works fine for 32-bit). 'cflags': ['-fPIC'], ENDREP DELTA SVN+?++x^j0SɊF[M=.]"ij5(]ٺBN9/!ЊPʵ[Q8U~~}D~x%8%x{v\׽"ISVp5M`M!jLBJMDx:/I2/ET B=:I^gC|:輵Rf uWWTp caۊ}@u}Ϥ 9X:߯7og6m fpw4e̷.K gUS5¸RENDREP DELTA SVN --- ui/accessibility/platform/ax_platform_node.h.orig 2016-05-11 19:02:35 UTC +++ ui/accessibility/platform/ax_platform_node.h @@ -22,7 +22,7 @@ #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1 #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1 #endif ENDREP DELTA SVN?A??--- ui/app_list/app_list_constants.cc.orig 2016-05-11 19:02:35 UTC +++ ui/app_list/app_list_constants.cc @@ -144,7 +144,7 @@ const char kSearchQueryLength[] = "Apps. const char kSearchResultDistanceFromOrigin[] = "Apps.AppListSearchResultDistanceFromOrigin"; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) #if defined(GOOGLE_CHROME_BUILD) const char kAppListWMClass[] = "chrome_app_list"; #else // CHROMIUM_BUILD ENDREP DELTA SVN(((x^j@ݧȥCJ^bB4(ERʺz(=2|3SJkJҬbBfi֒{tK1u&0O:al޹t4|.UxT(CL{LfCy QT] Y#1=/ ǂ ̯X#!IY^1G(j JX'%B.Ip>?!1 $f6M=,mE mU4ENDREP DELTA SVNDCDDx^aO0?_qƄllMfd0  ZH[`3$2Q>\{BPF$' ҞLlg'-yt=9.fArkoPTaבnG\WŇR^Wnd"Q>v[XGQ40geNlq3)P6Q=\^Ʌ?z6VJD C3cv><~)"2Rbw)z?$U#n\ .){_{VU:ªژq9N1Kmkw=J.DENDREP DELTA SVN  x^j@|HnHHlD;F`iW쮬Bwʲ]Ch.$f4./ #m[J͠6;Qԑ֟.z׻}g ^GN@ o/W޽J_TF)ertE&JQ3a*ɼ I3R Hxvv3(~0_^]8?'яaNhOy{;3.4;i AHcZB o*̀)gyAoPk>ֱ}QL-B 1 ehI(^8&E0\oBնFآҖD=nB52V`ͲɯÓ?Ỹd~6Z\\{MNeo/y*|Dj4P!*9fhzE#dT=;U'j74W{(Q(!IK)Ċ9 UD:m}X':h  !+aW$Ŗ< 6)W,RىNߣCJގzgG3M D, *Zp\ \е_EE(9BOt¢Φv<΃Qʽhu^8O ϝx'y;rb!_(8|MYTTNy0,\⸋-pi)r+8 Y);f7 D];Ԩ.t1 aOs6cJNtdUc_G/Bo ENDREP DELTA SVNDx^Œ[O0ǟSi].9qoY1xMD_$ i/a@Jjkd_z2gl7"/T='$iFe4hYoRt]/ R]0:rvP`c@(vɸ?5C(v.s?lW10v9^jP.穣FS-/-gTr(CBC1ˆ#BӧZޡfSO \sF@@B9.]¥w6אp- {`#v(tL+S9DCH?Zq3Btթ.WYnR5az5.+;xq';f,U;pZ*< ,ʍa eS+L} 2Bl-I;Ȟ?&Tzu޷.ÇYO ASmMENDREP DELTA SVN|x^_O0şݧ /[`C8^ J2y[JWZnD?.1sqXeHD&%e 0=LR!:h:#Tw;%68xEn,ni)'S˰/u8)vнei&9&V<7 (ѥ= k!SgVsq͏"}R&}MsB! B<~0w&_E(dG2)ըsx4*3(hݸ(\W;zA{3i#_B2ꑌ,0p?Y"R7M9=W:̠DF])pΠȱaJ4@M]\%p| rf !iOp LTT :rIN zE||")ão^qO{*OV\6qrx`5m*,8hj&8ϰENDREP DELTA SVN8Z88x^mK0_Oqn -O|]eu )]r݂k"iM7"w!AGvkcnxn4_RN'NA #wHۑjg0 IQkFH 8G}&>+*zq=xs(4uT`|BH_@KD7BRU j(^ZIf(5͖r#&@,B*ۉ^m^Ò dnWٝ{{]Lq}?eeQ0^:ENDREP DELTA SVNRx^}mK0?_qQӽ1A Qq EF`$/M) b>$9\96C%)gҾH'26i ;<:gA'fzWuYl&BxS4i/\ R6vt+V*kD joEw7ߗ)Ju3[^M6 ,gn29]:Dև4zMpR92!L8?d[O7*2y~SUlhɐB,`ɔd GJe4-tZuzXaEm櫬si]3d{ߨENDREP DELTA SVN%'%%--- ui/events/event_switches.h.orig 2016-03-25 13:05:03 UTC +++ ui/events/event_switches.h @@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTo EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[]; EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) EVENTS_BASE_EXPORT extern const char kTouchDevices[]; #endif ENDREP DELTA SVNx^KKP_qR]4B Uris#I$EQąt3|g8pq{ -&Ǧc3g;pǁ3ٽQat]q(&, {.}TIȤ&CGn h#燏V3AOû'wr=TxT(6XBñjgr PUԟ_\u+՝<}q<ENDREP DELTA SVNuwuu--- ui/gfx/canvas_skia.cc.orig 2016-05-11 19:02:35 UTC +++ ui/gfx/canvas_skia.cc @@ -246,7 +246,7 @@ void Canvas::DrawStringRectWithShadows(c Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // On Linux, eliding really means fading the end of the string. But only // for LTR text. RTL text is still elided (on the left) with "...". if (elide_text) { ENDREP DELTA SVN9;99--- ui/gfx/font_fallback_linux.cc.orig 2016-05-27 10:26:15.843855000 -0400 +++ ui/gfx/font_fallback_linux.cc 2016-05-27 10:26:38.723265000 -0400 @@ -15,6 +15,10 @@ #include "base/memory/ptr_util.h" #include "ui/gfx/font.h" +#if defined(OS_BSD) +# include +#endif + namespace gfx { namespace { ENDREP DELTA SVNVxVVx^}]O0ݯ8 2F7> ȗ$*pMƪm!m:ޜ뺰,'EBx9o1Nm|ͰN4!p 8@ڝ h0]p}8߱۵@BPg<5-kСvl2 C!9-[Hm}oVh IiAd=_ޖL;0 FD7bBJlj)@̉!k\dj_#O MiAXRVxhNf 1(Ӈ/Ԕ\QE{MyYO.JUјP>+d\;c>4Lu5vhFz#ENDREP DELTA SVNw wwx^U]o0}>GIM׮NjhX 1rwK(9^_;1Uoz 6ja|bc6$c><ۿuq{4Zc3+-2mZu N3 ŘFp[ܢ*q ’2~Z瑹ɴnhCL$@}ZbTʵEp؄Ūz=.9De4aHf131c)įWbUAwEJEEЮUd$(ch 퇽IH\&j(lT!\>>qP$X>5S?۠`bP}VSn=z_st8~ "i1DͅD0Y`66a4Eʀ* 5e)HFSYwj2<B$6FStref]XbW2bU:GA6E0򥐥c)٦ZgHBoꄝc3=Ov #j4Ed[zk<-bٍq#RNY j"܂ x՞=^wb5.dLDiq4wkrte| xޚ2NENDREP DELTA SVNx^MK0W d6mK \ORj6)I.ԭ^&>B~Qu+'g Uism9ڊcl)-f,N(Οp&.z9C-[=0‹je3z P42_-nn6wKߔIBLv#N'H:X70i51DȾGEHENDREP DELTA SVNegee--- ui/gl/gl_surface_glx.cc.orig 2016-05-11 19:02:35 UTC +++ ui/gl/gl_surface_glx.cc @@ -48,7 +48,7 @@ bool g_glx_get_msc_rate_oml_supported = bool g_glx_sgi_video_sync_supported = false; static const int kGetVSyncParametersMinSeconds = -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // See crbug.com/373489 // On Linux, querying the vsync parameters might burn CPU for up to an // entire vsync, so we only query periodically to reduce CPU usage. ENDREP DELTA SVN;A;;x^Tmk0<#'mm lYѼoFώ"IN$'B(sϝl6q.cS_`6Ez],p e"Tb ;[+h!d՟< L(LwvX'|>Q aD@1 2[HTiCn$/$s"3h CeG{Pt@g鞄(!9&цBU8X5"_ϛY ^~*ִmR{f,nB;.>v"{~߼~ϫP[-7?ѕf:[?6) \0 V ~{hiZ7E9R#A,8o@GrdqWP|p;pҨ05ϙ,\7 W$^}1Y LhGט XG㼦SSuKP_$˵Nø'ApT)e9ѓx_B  ~EENDREP DELTA SVN000x^ok@ _"CKmoL:fal⵰wx;lWW SWX^$ɓ_b6y'mPhTm 7G*t;dhw6!@G70edLPHF\Roޗ:V1c\$02NPe#c __N^ug'. pp Մ*1,\L:[3Gf )M2.VT'՜^?zn߆*+R~BVx&J{甎 Ʒ7ΰENDREP DELTA SVNDDDx^ŕmO0_rTB0? )i^ߝuт5 D<:\o1%#MR9Mb?M?4cyzNIQԩZ@ _u۷QsB׸ȅDI,!9˧.LfXAtVW=%ҹ;lRR< i~:hw}\v}:Qay%2qVP$M<MVRÁƜM;4rWҾKvA_ЏRU88_te2V%sꞷҴ3cYzzH*VjBP:!e b9cY瞇 .cXwB¨t0۷C7(]ҍn` ˪`*FE3\l9$e-KjAP,$!yPkφYM93!MfϠ"/$q,,N |qVl[m*V5⺊ ɢ==2hZ-d_q}` E ?olC2n X~t9Q1fOGag}x2T&j}? r˧ <~K5/4RENDREP DELTA SVNRbRRx^]k0_q s5Щ[w# sUaw%MO56c bUbBr>99%ST0dZ} QY2 #[kK|us!qns sz;bj1#0]_J6I<ؖ *nmkTHdFb-̀+IbbOzQ(4I*%EYg aE?PA։\FS DRD !kRak.DxEmf"">) TV[ ˣre1}n-x1&<—6\Eo:_4vInFyTwW"ݏ ha ÇENDREP DELTA SVNjjjx^QMO@=_1 )-*FÇDMeC%ۭȏw[P ƃ'$3͛7Bƽ%)qJQhT+Ƿ8͋5JkR-oAEۯO4[tm4N)I1_*Lb".2 #98%z۹Ąo{'{gp2{NGO/UTx8UOfS›'2-tg1 gƇzaMp㳱kY{m dLW;o-E)=',Z5&`p 񎂧xZL>,QօlaL}mN[tyr-|PjENDREP DELTA SVN  x^_K0şͧ".3a u[ $鶇}xSYK\J)\༧Cxgh8)#6 XHqi4z*PKuRdhv;*w)]#ظ)(4)7s?ENDREP DELTA SVN   x^MO0ͯrJـU&5Ip xeUBH_m8i3SⰙi'3/P@l~rvJ(nK@28?&%LxE<?eP1 )NI S9V$ŵ/vj~0'pUiSzSW$PoUHY/r]=ǭ#4SJ8ӄAVx|Pj~ǷkwH=mE>=JafPcf<%b ^ {G=[46nxg۩!ܔP🨌 ym7Atm蟯#ENDREP DELTA SVN<><<--- ui/views/accessibility/native_view_accessibility.h.orig 2016-03-25 13:05:04 UTC +++ ui/views/accessibility/native_view_accessibility.h @@ -22,7 +22,7 @@ #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1 #endif -#if defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) && !defined(OS_CHROMEOS) #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1 #endif ENDREP DELTA SVNT TTx^]O0_NH!$m("H"V]'LƮbpӤjIr^~1j05vye(Sh PlatformStyle::Cre #endif -#if !defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) // static scoped_ptr PlatformStyle::CreateThemedLabelButtonBorder( LabelButton* button) { ENDREP DELTA SVNObOOx^Smk0</i2Kea?`}*C mMĘFA!w1ͽw>Tvׇ•%_M =?f!ՎŲZ" &(g E<\?+sꙁ: Hv~7Q i.jRldΝ9ح/5RL88G.$xlV1Lm+Y&IwdֵW\#5J7;^8pIq6v V_6 Xz-aENDREP DELTA SVNCECC--- ui/views/views_delegate.cc.orig 2016-03-25 13:05:04 UTC +++ ui/views/views_delegate.cc @@ -70,7 +70,7 @@ HICON ViewsDelegate::GetDefaultWindowIco bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { return false; } -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const { return nullptr; } ENDREP DELTA SVNgigg--- ui/views/views_delegate.h.orig 2016-05-11 19:02:36 UTC +++ ui/views/views_delegate.h @@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD) virtual gfx::ImageSkia* GetDefaultWindowIcon() const; #endif ENDREP DELTA SVNnpnn--- ui/views/views_switches.cc.orig 2016-03-25 13:05:04 UTC +++ ui/views/views_switches.cc @@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeti "disable-views-rect-based-targeting"; bool IsRectBasedTargetingEnabled() { -#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) return !base::CommandLine::ForCurrentProcess()->HasSwitch( kDisableViewsRectBasedTargeting); #else ENDREP DELTA SVN]c]]x^]K08"JM(Ln^ؾ[]2֏xMd z''/'aыFTSN3MZ [aa;{&^JNOv,'HHE;4oJ Iz&#sL&bRnɬcGe|xUN;exZarPjp$z!9vr*&d! -ˌEisy¦E&] oYOn{!zjz h,e`Ի{𱹉5_|Jwg~=!.¢e\ϊmG6.,<^O~ @3ȅ9>uYENDREP DELTA SVN~~~--- ui/views/window/dialog_delegate.cc.orig 2016-05-11 19:02:36 UTC +++ ui/views/window/dialog_delegate.cc @@ -53,7 +53,7 @@ Widget* DialogDelegate::CreateDialogWidg params.bounds = bounds; DialogDelegate* dialog = delegate->AsDialogDelegate(); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // The new style doesn't support unparented dialogs on Linux desktop. if (dialog) dialog->supports_new_style_ &= parent != NULL; ENDREP DELTA SVNrtrr--- ui/webui/resources/js/cr.js.orig 2016-05-11 19:02:36 UTC +++ ui/webui/resources/js/cr.js @@ -444,6 +444,11 @@ var cr = function() { get doc() { return document; }, + + /** Whether this is on *BSD. */ + get isBSD() { + return /BSD/.test(navigator.userAgent); + }, /** Whether we are using a Mac or not. */ get isMac() { ENDREP DELTA SVNMWMMx^QAN0H8܀ADґ$Q 04l36mf*S|(PS08z sN'Y_}& b52qxnZwPn` jf8=9_Fo}pߎO!~\[<Ju9}߽z_ϴq9*Rq9wʥ* #iT-Z,M )G#L *AmBvi%F 5΁4-IsJɹZ>J2?e8