From 63f607a3ead0052b4908134cedcb3f912bceab54 Mon Sep 17 00:00:00 2001 From: Pete LePage Date: Tue, 7 Jul 2020 14:01:18 -0400 Subject: [PATCH 1/2] Adds a maskable icon --- src/assets/icon-large-maskable.png | Bin 0 -> 34541 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/assets/icon-large-maskable.png diff --git a/src/assets/icon-large-maskable.png b/src/assets/icon-large-maskable.png new file mode 100644 index 0000000000000000000000000000000000000000..e35b3a3e29ba40a75c00e6d56eff95ce4dc432a0 GIT binary patch literal 34541 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
4-2dZevl%|(5s;tM9DqMx8r)| z+$!;JxC5;Z6z<6ulqwj_3!Z_{I&c9GT!G$n_p>WIq8w0mV9Fe5%1UWl{QAApsOfOg9 z2aF>_46B5ch16?%B*qr5#BIa7-gTU`bbf1ucCO5zfKXKQ&tofL*J!}+bq{zTR`bkQ3VMlt z3=8`U;7FW-P?xldo`!qNcM+nK_RPkUYH_vO#mcy-`d|f^DGYDz@A`>s1zj^lsN@jY zY*p%kZl2cx1dh1^#&a$YUi*WY^Y$r)ZQf+5YknPC}Fze1uLL}gCSAr)R%v8 z-{U0A{coXjrN)(^mt)X(!GI%wY#{;Q-~%Uvbk8Mh24-?ltq`U?T6q0t zMUadnutGrNB6Xb&WJ1Mn?|%8p0b~g6qhos<&KoO%WK=ynM1bDx;p)5*0>-8>uQ~z- zFZr|~$c(!VmIT184txy?I-nE=y$LfPuK<;c{#3yW%j4;YEJ+Z*$6{Ti1fzihHz!rd z4T;p+9`=_{IhniMn|lcX`bBtZ5&Dh;s;cZ@9U@u;fRu+El`4dh#I1y@DEAq&FeN&A&+Q<73={mlYo%@X%5z*C`OA3a*|iss6=$ zgy@o$B)nhdr^U0~+b6Pzw6eyPAqy032K`Ty{7I8W`~F3ZkE#ecCg6xt7vG{PU1&BR z_t~+;JF1HeZ94Y|sc=H%0~O%a$k1D-$>`CVbR-g~^>}@4ZCy%~+;-W85JVulFj3vVOWe@>;eP-+J0o%39&6b^Pbo(8Q_kg9 zf^@G+hzQS5Lw(#CM%eKB)X{^=qXzqJGEy#Q*xoX0{L-Pgyep;?vFS6qxbkhKV-9lS z+|+k`0EJr*)62@~Ro?TzdBduUD=>=0lSm74VG(Ky>9*lNV-Dgat>lc^Zz47i@WdY) z!-VLa&~#KwIT582dbcW|qiceeWEHLK@qVZjk$RWYDSQuB`TfHt+)H~XB4XM4i|#pszZnq_{U37{X#2s zSFo%`AT0~B&h!p14Q_Hc;;pm~rw3w^(J!<6&?G-qn=dCA-us950Mz&8${r-2oit*E4j-HU7$jO3E3^lUcGXIz1li@p7Cx!h6`ihUhs4((J;tZ}D%=!m{cr4HDnCX} z1%C9~2$O#6quXu0%X29li>xUXfBlgBCt&+0<@{{N(24$hLS5joe)xT#BUUGD*et#t zz`>r05|V8E#E%wG6UJWr7bPxq-RiRJ_D2Civ(alh6eP?^Iv6Ypp-cFwD2p}|YBmAX zKYabv^_U`YrG3apDzsfRRrV`QxGD*&tnOSf{hUd$mBoIDc;9ru_-6jbB{R_IZK`_D8X@y zpW1Vs--Z8TDqE-JqHp|U%lkFmzbTA)Pj%Py0}B6^ z`Ec+}R#*``XBRjSU=v@9BAI3PZVJI9`bJyv=)AOyb!o|%*6jHHr!qu$^KF~2x`~v} zbnWlOw-A;hM{D<4<n^+r>l-p6acqs8YD@Pt1(XmmN&2B2AhJ)0A*3&frRnS+D)xJqpbVM}7y zl@#~GGAZJ;#xcI3#e@s|BrVZo+=;YTXgynh$!hduF^|G^R(x=i-YpJ+Q^K%!yq+Bk z5kYu*@#d}OrMAb9w$3gVoh7anoyx=q^zOuR1`Pcv+3=O+vfP;q-uQMnEaB_z!wF|j z9?);M6#hG4%T09mDtYtwhs695Fv?lb=}Et2s{-9zwt8IzH8;1VQ@FXgm*!uDO9w<( z+>m#~5|C}rFvHr5UxKG6A73>oF5<;+Ih6B#Un3`OI%0{&d0>>fM439vzS;z?UY;bQ?#~mJ;633)Lc44&YM|b_#r8^^Ib+qsT215{`=MWZ z4qQ2_P$6a_!vFovcik_q@J;1J{{Vu;M9D!p!*Np#d9Xuy>xXFLH^?lYQ+bt-mjk%JPL;1w>I$b zgNVU=tvbE7^sN--uq<{(v}`E7F&GQmYasM@lt21^W`z`IZ$}=G1H3n#*6#U!Ml5aj z2rv8U)aBuDtUH_$>qgK|lbwtm98vGYeo;>wJR6Yw)PJq>XWtCNZ#{l+XCqeEGz5%P zdY$+z_R<5!G28Hr=``z~;&FwGzWa>2FOU$p>0@8+4IoR}^|aGX=ILPv^3vfu6v<`H zvcI5Vvy-|#02B(*M9~`0XmNlh1fG?xFcRtGpmxW;ulHZ6sWl`VV+pwF%Q(O@bN3lH z^X_+KVDLpJG?6D9flq?3Zd^aS)SGYub~k7I)0Pqec35zONbq|3-U34H8cEJ$CE!=MDh(@g~(4HZEg8nVw6azdSI76?XjQ9WhC7I*CC=PNlImZh&-S{<%^%v zRlg8{{hLSZxJokvc&|{l{qwJS3S#MFhC&Z%H=#;@PF?frMED`}A+RjH(fPsLfo&sU zvSG{d(j91YFY27uv$%9h z2{kC7!3P{kTakrFNZ=mKbZqty3zgCKWcE{d%;DF0i|_oobQXGz{`N}uTKPiu&>fmaeaV(;1e3pan6K|SQ$Zkl_NHa z=3Sa}-bG&d%L{)za=F^`(B3}3sPDL-9%9|8ta5J{*Ogc$2@^+OF{P2cKl5^rpMNSz zQ;`FRo7dTKF+%P_;0&C03EuK$Byd=?b=w1$#|R71Ych9O=Yl2pT5=~0(vC?J0?(K$ z;V(X;Z6DZWSMrgt{IG8&MX=ivW*iB+jT?L%wL*v~V<8B3`b#1&eJB%#YjH3lF0{VL ziyd&734O%)%yL*Hxp3q9^}aEGCuOop0e)d}!M;wEoIZpz$tnf#|ITz%9q10^b@RH` z$iEc;{f#P%m&Q|oj2zGwR)pVU)DzKr2KWFp)BS5ouLOWDmz=0^LvS4&mjm+0xUa*y z5vdn{pOW;&u;#ou7h~nxtV>wufc^R@pOSBbd*@ULm{G1^1o^bJ^QnhWAQBlw#dU6e zHH_bxcpMV@=g-?7Dc2rX-p32r3|B;t_Qb?Q1tx%mS61!ndA_CuAM-8nAH<>{vNDw1 z{kO^UR4xZU%pcJnk~gD4aI+t;E$l2FsdPy{h;s9na`~9h#O_u(vcN@Ndscrce%JZ% z$FH5$qZW>~wvQgg3e8fUJye& zts~KX*}rU0^?8$73ipq8VX?Ky+nB)Xd2myF;YDD(E12RQu%>?htuqwBw_lUTlmOw3 zYsPOo7l#(zWGp#Fw_j;_{`5J&;J$ffmxOCnX?&4ap#0ip%N^cFmsNsrX%y@U6{*dD zT9sZ_uQHG#LS1)_y4}wlVgnYtn|kXV2eaZ8V<%oDpV`h%#EBgpgwB71!)S1r(-L0j zwX(}H`S9<|tqHr*?{-dJr9ZfqyNe2{)Y@0e)T%kS%t#I*DLRE+`1ZKSrp7inkYDw= z=h81Tl`EaahrVk(FqPRi_U`%G-=MG@ZeK^b-`K{6H)Z2pX1h!|1aD4$2%4XBlt^GBE!;O|Xxd<>O()1pj8z3K?UB+DT#DFgdP-F@HQ_*=5~ z61l@%%}d$$p6!5^iTK+56s=H0wmjvKa3JWPc%WjJq&; z7?Hd5dcy-HSN9%j{@3Dh;j*4VV~a$ci^_MAr@8tx*Ax4pkrirC9~&ITC)-2uL(cG9 z2;W()_kellL|`AkvLn3z^cS21=|?QM2sqDwYunw^gNT>M*i}^GYlJr$8J#z`F-XS( zG?5!g7r(+uI4o`(cETcrp4v4zrP(pkueY6~p)BDbXGyqMu(-|%n|^iMe!RJ=$MQKa zc5t@#OvzpF-lyzHZ>XnRy8Z4m!y{b+TRnoaXVn#nmD3)nRI^e*MvSm@Eu6BOGtw85 zxJu+0ni9C7FcQ~GOUnOCA?ogG1uvXl0CT#urV>XmO_4T4 z#G1O&t-iW+(3%IB$>)wv%aR=`Td^hEVDO|MER$xC#1OzYYFRt85PQJyp6Kvcqp2Rs zQ?1qM>Bv9)4aZ==-8xY6gawEm0mBfr^5=UG2^_Hl9Oil^`CI=*<;y&Ou9Yx7#+ntk zgMIjIR#TnaKfw2~DKkdk^}AX?>_jrS`Z;LyT?>WSxNEKc<_+T>I{~AkBz2L<21faZ zwW+N!iMJ*f+MsRmtc7}@!oopb2EfzDLn7`tGOqL3c8Kh(M4R{$#;b1J(aFc>;e$d8 zxw(afr?7NHSeRDl^u^HQRJb3M$geGuSU1)%po-gbe+~yhw>|Vr?vw55*2-N7=XY&A ze@e#WL}E-|hH9qgrhR-a(&tJwT_SiZqe>NEiAYCjK%9F*wT_oTR%)8CY)#E%T(k)E zEA|>y_&hemr@v^qx-a}!Kf(l)EHsxVzWxk0^69G15?{Zdgh%2E5Et_5Nn>XJ!X_vp!fIULg(HM?RN0$a zml(ev8K=(_N3Qt`uY12aa%v0jV^Q*<*#NWTyf6`%R@NpaVkB~+jB zQk3u{!3lhc;o~6RXgWbl9p9PP#UEh7XV?X4tL8x9??#x7>-~@mKa)hJJ^fvE&64W} zmuT=;T2Sf9>yg3!#8fOs751wu}4S1Xq+i(upjA;}! zxp?tnL|)#d&-Lk5;F9C`dGE({SK(yxZYkjy2eC>*@&Fs?;0X`d*59!m-15*Jk(S*? zC7FnVGwjr%+s>FJzO34=^YQLNDsW`b>wG(Wi<w&=iNp zkKh4`;R*dd$L})x?uWY4!W0?~WbgB3CC#&S`SDU;LCuRhPfqFqQowSxO@#W+R!CWG zG95v_1W{!`Jb*X-`t|nNyYE?x2rq6I&^W$D@IG1B5bOzEA$`4+0V?wlxD)Q*z};V> zI!db1eVjDKAB{Z}1kG_qLX*yXR(llwAqr=+kvp2G8%GhqZ=a>DNTev>2iWr&5RE>O zc@nuil3ywqF!c)53L-Abk+$xID|4`oIwZmLBLbo%#`+U{Xfq-^jpml;b(%k-I<> zSg7qeA#x(P!ped8rrS2XQY>))dc@tw!1`t-0?!YCWXpnjTnHyQ`N0Iwya1fQz9`;f z3aogAP?kO~Fg4dJS2)2@fSs@KVR2lt-pm2x)z&!y-joWk#SlobX z4jU*DqNodm5_e7-!XC_s!WZ*^=_`N-xnH_(s-Vt+FCT4qt~P$>Ppfzb=0*quCGR1c zB;m6XObED+#y^!}MJC^BPkK^Hz6>~eeGp{75j@x&c^FnI3%>;+=8yIP`{2F+Vw(sx zY(sJsAV~)7aM|CD^>v!sosh3X70#3=tSkgM0In;uhu)t9P_4qdn1gTk{VF8^ZR#DB zqHP6`73uxWPqzL&3+dIW(*farlk^jD#z0J>EOUP#+wD5f3-Qu@n0I%epQ<=~5q3rVm+s zWDta-0qxX_0BY1aC;9Ut=>(>gf?&`cRqs7V(*S-(98rP^yrvGGXf=xxLE4QCL*nw8 zb=ze2TC;VA*08y31API4*h*`iZQ)Tv`I9$)FGL!aX`~ zwI*zS3`~g%p`>_0StJmGdOeZfK6y{XCOX?rp8qmXf}7dgV(=Api@;y2pa;H$82Ame*c!RqZdUh4!3)1{g%v_LUYvH=Qui zs$l+D%^~js9~(}90rOJCD<8m8)6%m4UY$z#B1`4o+mn8Vc%|Q<51*~s9@5WlYa6o* z=803&+zP%oHVHZJ*`%WY^iuSo5HpcxXwgQL_qYI*qh({2XJwVrKLLT2bORy&O z_e^ArDcd!(0HXW)wkR0A{E^wYO_sdDGss?E@f4G_de4Xei(owgERc$BOTY zP#>Qaeh-oVnGt?neEpMo8niOElNr&~vrq2MMP)kQ{>M9ZQl{^&T6&KuYp>{+)c z%eL?8e}KwJI8p)qLo8#eo zGrV5CUQmzJv@*F9B;s`_*_877$0W=9QlW- zjT%_QKQ$nSNQS6Ph~D|r3f-XH8K&P1q)`07cr3it!le3KRSnMbQgmAdC2AHCFBwGUI8XC;N%5l?xFKM7K|q!gnB{2!1c^WF_3Yx zTJ4tJA8IQp9o?uN%R=s~laE{X>-vDZ1aK(X7zCuA059eT*Z}qy*A?c>Dmmb1T(!)U z7Mmscy^z{d6k6TLanm(kZ?@f&3a<10f|f0Ux>!^k96BVFUrvk#6Atg-C zD2Go1Km~}2!1KFg2Ye2oNn_nPfgC@Z#qFWnSUC{;MFo!EV)`g>Yv%V-h#1NBs8`^-cwdZ;q7%zdfrS zKJz!eZ!ZKdCLIG+v!_PoiNuGv{h*#{@SF)M2*jIV5bYUoD#q&lry?8zr!R`L=#f3g zS5j(uiYx9a7CUIig6}xM!0d2a-Ze)94#HVRg%a!^E)R?<*@Ozw7Q87p?}YH}wnZ_s zSZKQD5RoqNjQM37rs=(cyx2e)2CBj512R6U5dk{T?Mosh{~D4q3NOD)&5r%ULACVd zlgklGxVg#Aj>}<(S->lZw+4_7$j74pD=JEbi^e!R3ff;q@c7%6Ta+lRjKr5lWY717 zK}MkA?Z^I291AFB29-076$yK*A#;LH@pFlGrz(dL5K;>^dOi$i&=Z##_S4EJ&O%Gaz6WDUbgI z9DS64I_&!{M@_g+<$X>{+qFcy>HYj7%^zaR+x^noQtbOxRE1B|w=-0S#rN{ge5u}B zAu#v`wi1~_s9=6@IS9f}QF;XkCn3+_9$PlTEfhGjzd+f-=<|W^wd$_})OXU%djrO_ zL!XIQvj86aQ(RX^_iln2@ytt`EpF6puHZc|ful@2U4Ge2;3Tz5nbRUR`UeotOgc$9(p1fynh%V5ZkA0+qEvG4-^*QOw)6{i z%Dvtyrg*t9GQyef-T%YnwmJ1a8AR>ga$i6`Hp(MK{1T zmtv_$0Bs0P`&2Kg|5vw!@|`L3TQ8IJMQUrB3M*bm+#7jk{g6pYgTh6?y>B+Y~d2!ph&4Z5d8IhtdN+N7*+jgD9PJu*-Mxs1$ub2${fTPGQRHy(unbSgIsK7B%n~YMeC(dxcm0>kYNbFYfYo69=iWn~)-c~*9e1Pa$tUV& zZ3cFJplMdH&`2IL<#^_#4wO5#Vzrq5+NpI(Vn=?@Gm=~ywJ{baQI6kf6yYoOyBLNB z>GS?c2Gz!SYxsPEph9HUnL1&stNjTOb;seEbiEsOc zwyT5!vxFp-q-UOI;Fk z&Q}=v%-D;~-4~*OB=C8^<3H{7)`Hm{#WWXf;)dI}7bMslkAhZ*r3i~xX}TB-!ApU|6P0FajNm3gqt^!-^q zkzSOv$dQ+{Wmr85tB9~*cE-NHJ$1O!kt`@@8Cy`05VQWNjH|j4&a`04r#@nV_o?Sdv?d2SgXhfX1>|ffVIovWMa06;q5&q1 z8dftkPs*S-n}9mgO13-2)Lzf(R}#qdfC*mx2Rr8__TsVCF_S|M!19#Zu0W3F`UM`it4=l4Kdd%?ski}uFgFYK2V{Ww_F2MMm%+Zp zvRTH2N1xI$Y3@kE5E+_*dc2*qzQ`F7NK;NHoVwhl~mmB@=ndlnAlGFYT#+u3YNk!fA$U8eB+X z#(5KrcZ&ZU{h510tn~&cDXD;tI6*)0z%O1MGCufTTPTff`=It=t-!TWy`x$cm6a=- zGe1^*VhVR|;D-tr1VekV^^Mk!_`uE;CfmC?CZ13x+$#O zkl55jkWb%h%3Q3We`~SuoJuW1=s(v))_(}{!Pj4YyVwzX#c*eQ`*kC` zj_ayUyBZhv42wl<&omzoXbcSu4j_JeG29|mn12c((}bP{k zrFh1;G?Iqlg*8O6oIPMYZa7YVMZjz)TY2HUo~zuUm<2?c``K%d7>n+vC_WK&uD?vB z&n_V2;I6)Vd$Zy533rDPVrJ*%OO;*e!%Lh@mipUVo%p|8GNsqwLdS@d| zr!fzZ-_gP!c3QfdYyXwtzRT|`9$g38Ye+35(c7?ipEct83!3evD)YOVfpvQm3_K)1 zwh^O5>OBXPbWf*(?#m0)?HALcQnTIEA@X1nmJH(Ou8cQ97x9qcd&+7x%!tGSag!7Mn4|dq6r>Kdmkha*XnRHE|1;n`7H#B035c3bW$6ht3dn#ttka*_B7e5G9 z!g>|p6Xqcz^++3}&TT|~I7O8CWBA`9k9d zVSD?%#&;vjc7@AK%@q=Y?q#z&JPbV9A9`kaj@mmuPIyIa=m0lSUMvlf3B1F33@OGC zuXys~&NVNXG1!tDa1&zRSYK&1+2V~QL{T?=rmPO_$(#^(jz9Y2g(=;4U>9k?g_j!y zVZE#2ZNcVR{Kkem)%wAST+>3bRMrkx5hCZcP}Ruywkom3lxf{{ zjNhUt!Zm!#jr~MYn)^ot%N=(uqAj9Za@VGsQUp#Qz-#g%PH=lleq=}8>M)ftevo(C zzwW8EL-nML%nfM-YMimK>%^l;b#ziX)HBPwKmL|f^^<&O!nI1Xe!gAQn)mI(6jy{Y zwW>1j@~rdz-Au_X6arRuHn;!H>U+Nw9d* zPurmbs)RPfOI1~FB>zg@G-aAJYrr=N|CndL;Kao0Z--lN?W!>$*beWR05!}j`jr{X z(KdSYAKVA>#OCp)w(ojyC*F=NHFhCR@2cEkBzX2u_MFOVW8&1SaO$5{>;BqP!apg%lw&$2-QhW7H`<38*8# z0ZENC`X#a3Zp<@tpU>I8n9^Z=DdnY9{Uz0Hsig@g_Y8tVfzxM!wrlQ36Id~!kEzep zS!pNAr@j4jOA-;g(N~$R#N39Px;dWwK$UdMhqd*lf5I;8#nXq4-fm*>Hesltx)=A9 z@-`;SWgeUGyM{}WJ=E5OH2=2sJDaVQpT|^=VbD!kUPA}#b3Agqq~LvAg5dqD<6myd zT7Sk6OBfefUplNd{M`;ZJFP04pG(kKvr2Lx*lvBtU$Arek%UOPj9k6>?iW;R@aU7x zR@40VqBetb=EO@f7>buP@pM2CfG#y9%FiHd20+Sb($d;DFMDz*V^bJh3|Kn*Forj$ zIfslajF4Fhtb4;%=`l6|1}6?*XKQVEwYUiclD(Pkt6tK8u9~!OQUyqrt(|TL7R|p> zzif4DxEYbxXO$QGJpv*>e3mhLkBcT>Tk0veQ@wq42eFvH?fnZGy#9fG0b7pRU+jXp zKf3kzfsI!sxiz`S9xLd?SCT*U>l;ntP&uEBHoS3Vs3<*y*UmdZz2*in^2U90*2hCe!Y3@jo;bEIe}8du7i({#tTL; zzj?NwPetD4BcW$+_W#O{LEidWnb_P+z05Nmfp96DSEi-8M+i{3o1uh!k+AP3^75ya zlbh!6W;^)%ykFh81Wq@C4+5UK$IF|eP1xD5zW%%NTHX_=xK~g^dV-bCVY=6s?>u7{ zp~ezj!H#&MMaRDi;Q*NuGPREI;xO~ZX)aa@y(D+0U5j=MoV<9^=93v$d&b>;Ay-7i zXdKMnW3dIo3Ny2|?d|%aX=g?EmiW16(rue9d_mQy96& zSh9bD9NFdJ=c% zptC>R%VbY^T;x3vu*155AC~MpU8MnYQ#KQGIz(Q7^2tz(xF1zT5I#@N_UZA|DLucq z;RQlH5z+fX{Qk2?upnJKlND3`P5JHaJF6M`$ELC3%Py}l_+AWcC32WiQJAHaY*}b$ zZ?`B;uUGJ1D(NhW9emEOK&WpnZU^kfr_&t~1`007Sk(~qcSk8nP-SudR4p!(C9vhO z)rwt1=3h`tVf3!lY3>kc>(}>`QEeSgUez-3;;=Nut&iXD8N~A1%%sxG^h1eEojF}- zC(YsG2p|3l6#IC*qWoj~V{Ex*9gen~At*d0$-WmA2##L?4J6H-2kVeK#O!$au=2!h za0ljZ_7Dm3!l@K`zr~sP<>g;>Jywv*{~fF<>^b<~ctd^u8*c!H>@_Tif6Fc&)8f5V z%uTH1hhcOIrr%~+aQ^VXPH72=Z+it;<$LE3q_~2t1qt~hi&tRb4wBcITlbv5 z_V;0^Qcb8@u-vQ0Y1$|j110QxzV zaj%XNh2Qh-Ctv)F9kaJ(r+@;}N%s8qnubr+!oW%&1|JV;?yTbyQXqlJn514C>c9j= zK?o_S&7UYE@)Gi`5jW(;?<9?T{qfxE#Pa-0cG-UNw0M(>SvvS}3E2hCar8*6*D?iOI}BlyCe3;+1A1Dp9fD`RYkx%VRLC%v!<{t z`ysIjWRF;C)^PJtEKFNa=&Vn>31 ziqK7f7&~cgnhtmaq;(BW8)y-~W%O<;ydxVSX;g$}s@E}w@4JW_f}@(eyHVAAIlgm& z0b38;kea{J8losvR2%=kxnq--_)%mTL5(a$bYWYkgml?tPFpccCTsO0{Eg#4W<|}r zUq0ZS`p8ooGKM0N1I?0Uw81M6w-hDYC3&(LozR28`y#>Ad4*OP_V6 zU7})0J2E*iqxAbTO7JQl%`Y|bCpCEtw`PBL-_R@e5jPk@9T6sOAfE3YIpIojr8(;A z^MBR>Tig%R(2rh1Jrfv#E0${|5c6^L8Nq-q=gE!z7}}|knCzMaDP(DN6)dj{dJjBw z#p1P)#Tv${1F|)bSPJ?=yLtHFFph~+w1`Qikl~A${t@Tu)G0WmB*u2jY(MyN=;0N_ zk#7Lc@Oq~i{HG1<){;3F*-)A)#Cp~U0b@CE7H zWSpCNI|8rj{@uoKHB=peG8LvwRi2F-t%ZUhq&A3j<+jeccZHv5h9Qx4LulPY+>;sj zQ4)|54>ypcRf$6{RA!yYmvnkiTn*q!Kk6ycf&Qf&gWrWLZq zuTU;ccZl&Nt5$jaX%|fEpVRnA&c|QE^XM!Kee{zDP>&bS-wU)pabR6ZMh4u8P~UD+ zrd9nw=(=nxJat~QC>~Y@9-#UrS2NV`zYA<-j&E|YT|gLx51ft|Fe8Ktl6Kt(-#0nXD$FfoUG2j8Sn>>(Cnu8;3Iz7@tW0f^$Y$)86qepSaq-iDZd zc<+qyIxiR@@DRm(0Uv9Go*XTB6kbLoSwNuE>R>VR*Fx?sm>&-kkN%-jP?RaITJET5 zlb4%<*t#V4XDs3&YyaH=>L+d?RTZ#w1$K|(x{Bc4afGsiNF?QTbthF16Kr@OiBH+zXqkm0e?A0kYo_+K_IQEpv z8G#bGkqI=h)<2P%>fmFjqG8?(fPe9mL6%z$jAyYoAG`U=Gw(=1E?Z{~1-~!G%W!o0 z){lS}t>1w;iHIXtgi@-&*nGxaRtC4I7B@W8rt4{9zfC^YKz@jfj7!>~>9LdX7rd%VQ?x}5&o>|hM6|6)CT;u|aV(5i$RszKg8f7VKb!-euh1U`9F zkhs>Bh@c$~xE2VPqVXHQpGIF~NH{u;!(`IT-U}Q{y#)WIE-x zPzjtx%6mg?V(>t{N}5e7cL1LY*9%Pcu54CvtIRETdl9-zccvQDoVl-zX%>-jbQ^0H z7_zCK%c;IlopFvl=|89hUzAcvi7oaDutvSVFP0^>bdY8wPWsmJPnKLS%b*XNZKvuWkixD&PksH?%pr&*kTN9Ckq&di0#Yc_!u!kR zX6&++qVe9ufOt>6Il0si#E1YUe!c&;hC%d4Ld5JOKsb z+HlA*uyK&OCx{n*2VB&E1rJz9_@CZG$lq=iG@G2H!#8= zJV@Jj5OzHaf_D|PX0BL>!s91=prkbucvG&C8UZ0I^pP6v2S4`qc3fmQMg< z`5~^?-@>ut6(Ybys8TZS!!g3}Nv}G#)Ayg-Fj;Ra3`$zI;XKEOlL~-04=uW*%kBrS zIFR8o4CD_!XE^0`iha3B0NScsR*4?f9iuYkfiYE6V0)R1)ni@y!DJ-W^*4Hijt4hh z0UP}mE#hm$qNEJ*ISM?26};5#k;6gPaEw~h=Iymosw#;`DGos*#UC4`eNO&xR%v1*U^BLZkA0Gikgut$YD_vz%W=BXnbJ$LDiymDX`yg5* z%|&!?coJj%3I~!$IR7zuB<}5Z6rk9wUKIMFMSOvvxHjz}?Wcg)rXdM|T?h0GHv2|K zM&2t}Np5H@rc!bxc7f_<)q`=2o)y6#>J7F-JX)qCWeu=0jv~Hxt{;(6;*8`GVsWf) zs$5SBJ<{tkjLI3&m_Nv?2C{p&@!(W_=m(vmH{mj|W*Z|4Cg6>tkp zLwoxTH5HTD`kjZZ!Ak{^r333snX`O{Y}G`y;Z_HbDa$2a#bx0LWYeAc_QAd!xZYQ? zxs{jKgz2vI_k6p7OtIEq%DCX)T7jQ;q_e>eO|Ir*HSnkc@g(9!9C0^#q@{*hU=2>M zTcf&7C`?lYLt}-@G_q{--srPu$+O$NJLS_)2k!&*c@?svBclJ)Zov5Lb5OZ%jc8;= zf0>lBMADSCxyj?RUa1jrSy9v<$K=^(UvofmnsDb2q5+z?v=a|!g0l-8Iid$pz=JKY z`qF}R&?=<-{JO`efB(Av`Mv4Zli%RGsig52kyki5M+D^~S0;x9*6L|6{HPLs7fyf3 zv|QyI1gw?%kem+*gb%};PO;2>sLq=sDOkjI-U+^T|BrFNYeW+LQt9Ux?>Q_qmxdB^ z$=ob+B&_g3#We0ct_K(28?4aN2|aiNGSx#0DHU(^h$^eVTOHveiXN%EXR`x-Q4Rla z*^GO@j{Saxs?+2QyQ^yEMm;;h*8$ipw$f8%Ti+@ex7CkZjL8v7V&?{QWzj}jM+zg$4+qp)?5 zAW=aHd^}jm>&vZo2|T>R+3D2hEa+DNnY53u!(?ybZ9_}VM?H=AhtRjfNtL{+W&Ffo z5tj}w9@^s>v48hZ+CasN6=v-8$fdFZJnQdq`2DQJw+I~$g%iLDUg3ocL?XYcc^-Xlx*R{Y#vkfZPnym3F|Rj}Z8dP}5Qs*cBo< zoc)!_0EU-iAr)!N429+8Iv95pZzQf* zrex7fGh2-E3$Zw>M7dr8iT=tag57BFEYjD^=juJT72QX}Zv-CL{`6RtXbo?;rv22; z&h^lVFMtTqs%am@p#}*^H~uwX@N`99d6RW2Y&vmv!I6$_+}l0!&-vM#cIrd3`D6vQ z1PYJ6O|MqL28?ZI4Oknk4$0rPk9#-E z`P4_`lZw;?TX}pH;A;BDMVk)dXs3qg5du?Mr2jl^ad(PwX(cL~^?(61iUx2gt*=dv z5A$pZPoW=TC|A*x)!j)I$8%2ZLy)*e5_jHk5CLJ*JrO%bb|i04m=jQJIWE>DqnCFp zq|NQi?cv+>tx|&HCo%j92=UP3@W@HxZxt`$Hee1=XwVwfZ*`<3E^s>WB(*yq%f6ag zOJJlukX>HU!sYr~vVMpCaO064-6sJW592>^d+s`^j1Yaw5CW!9&*vD^S#yXxfRz^` zd~4l&k$mSQD~awbGk2p8xuDfs(HL$#)9R`A5-U6m5mm)xxzfAQ#74XS;;HHX3HOT{ z?I8Ur0Wa5ey$HlPuR7dj^W;nA#L}O^X)8(pJSvMG&{Nh@2e`#`5l@sXmyY74;=ptT zO;U-6CcX}#v!Rsj)H5tYdX1IbCb|4w%+k2gqgw@j3eTIC9m9?vSmnhvhx0b`NMpGM z?Vhv(k`O0|x}64=lK~J#*g+w%cl;2|^u!FGd4xacEa^tQ!J2h{AG4z2t-d;H1lr1w9JlGDNH1ppM zXaDUq#E>Ig228`TR*1;==ikB4SD_`c&D$>{PTQeG3y#Vgnq9!?B=7{+X?Mzp1^OhS zOlWaRI!u%L&J4w8yx;A;WZZ=BKBV2dRK{W30(b9_eBL3IT{Ceg70#M9vO-}Tq7>E- z4$dfBX8a8GH2H;#rml42cGVg!MQ+^<8-9=AvH{<*(3lEhX9FTr37m0@FXuKrSd3$Y z%{bIFSv3x0vk71Bu3q^Vc9)PJ#P75g>%Y79CC>=2;#YScx;*ifpi;Mm=9UM=(3%H+ zRz1|)*SJe{-T8W*(;R`jj`048i;K-)NkN_Mf}5Mgj?Ga_%PL~%_cinj*V|}=*dH(C zcL|b_#{^A|lze$u@5^|)QVT+}+FT zmvo2(PC{+hoD!ld6eO1hiQ!`r;|_^#o0G`|H?wUdW2s6Tfamc~o1eh4lqpw-d#5A6 z=JR_%kHlbXcE(2F!)!x}bbCK!$l@6ut5%)PSfTS|rIA!2f9O0;s2{A? z8KWIO#Ru>vRRJT$O)FvM)h8J$okQmqKH9T4CXTc}hqd^+j$$?Qy;u=HlWDh0p@wWg zZ*3cr)rJF2gl(A*?6AK@^L((cVHxUaT%|Elzzh1~kJjr7#G{48 z;lf=Lb^X;w=W1y)*XM^=OBOn%kIe$tNWk+~3tI1e!-hD`cHlUM^oAeLGEDiUc^SO0 zbOAjElt}icdO{;^eQM!$+=~hKDMj$%`3)rw3$p?p%?G8pp&hdhLr>n_J%w!3;UIU6 zYlq&%PEf6iR1?mvO6Y#xlL4B2cmH*_W*oxDnuD%BaLy4D(iR#RxeOZ6q?yslj=!+q zF~-8o^uo(e|?A`3N9v|HjgajAjbtQ4_4nZ4%%p5-rrgjw&-? zL>QTDFvJW;(lsa(h{Jo4y?G8~o z>rbCVFH$v67YKxD2p}B%DE}6&GbXJFtgFH68PEALsXb5xH^GzfVB67@+Ip-`qn6v- zh(AG{vUv&~G^X9%0S|Ox@Y?Q4A+PxlN6>#PL~QsE1^v1zCkwFV7zNOJ83I3VL5sKNR_D zRJaY{5M|qyCp4BJdDy?eygVcJLyBOT38-}QupPA9ZBYsTaRgsF975rE1>i;qTiD&C zOl#X__68 zx=sq9I=;~8t`3oGt;Aj67W@6Kms!#*J$&o9+m73R^-uuERWR)eH--s+8buL1SgXSm z!B3$}ZWXD8;;)bnLZC51d`)Ui@Oo**tZCO7qA7%BP9l2S&rmSrT(un`~<93OQrrfRl=y zcn^-xl5gaU_j-o#TynDb#GUb%=Jg+a#*&{6-`ZTAkqzRjI;tFc+ZJ-jgzaZfK39is z)AI`kp${IwYdXE@WOg@VpNgML;lwy$Cv9wOOemK9bArM=d!klW^}wz3x9a~&wAp(~ z6$S9X>gewSH;F1os)-849)Q@ae_xzkVYf(%EDjMhX*T>6WDTV^4=7HovD` zNy?__D31)ZViR6Qy?SuvfrJQRFBNf_X0xxgouZ(hky}^ zq6zLF!`D-V@l`3(i1XjUi9MwihJ(Gc#r<=KgIM|no6kuF-23)@J+fk&lUs*)qGvQW zrFEl&{JeXi3A!&dBFyr2)D-+K0R0At#E$Jv8NPlPyLAlGG#Yz2+%LAMJvZD zI})Z8ZESqYr!6P+qobLFz2_mOhbV>vF?ZDA$k=OP#Wg&#ZO5^DK|{Oo!|=es zxQ^et)2B|Kelc^St5@S0Dqvu2;;khejV^C2PpG|zF6v(3M|C}$xOjKqlsmK=nQ0AO z6>Y9`$D5!U`0+Ot0!l?z)qe0_H%wjVw)~wyV;fArAa17Bya|+T{gvnM;h`WoFx1=s za{H@0fk1!NZyU){BSy}hJA<_*Uv_)6TPlewa{PHk?+8eN_R{f-k-`$l9!_7K+ocqlg5Zb zmDPAmmSCTAWJ%)J`LN4UFPS-H^E0gJaub8i`o6@L4_mvy1jx0F)V?XAq@z{A1z+V% z#R$R*8+x$6zuy$aI&__U9rcxfp2~RR6QfdJsM{sqNqzOl|MmxR+{;aCKCI>~iAA0X z@EC{wEQFs+jYM76;Eb_Ankaebn4P`(tG25tLb0sX6Hw<7Z^cx{xwQ*-%wE-PEB>j_ zy}7EkdAL{Oi`6+9?T<(jCS{ew^oG`6-kao)_=BNHA3YdZ&)$DbNS*O@OzPUQ#LGC` zH&!KzH6N7vB6B~HVYxUfK>|`$+@jSfGKk|Jq22J?Idy7*hKkwR8`fGD^S1?KD7=7P z1o#q-4WFGG7NngigSsiR&tWu1^rcvO@+{oznO?lY17Suwm%UG@GU zlQhPw<>Wm`moWdnIPeMe-GU3&!n>hU@B`pHa)ULeE1%8^kp@Q&_kXTcm8$QM@GPqFPWWL$upp^R7951X&!T9uusx)R(T61qs14Jc z0~%tt{a0)(EuYQP-nyR}-5rm-r7} z9Q!OPG=5xYfSXc*9dV>_*YS^#y{qeWHdIIC^G!pW zq5)*|gxAM_dfzaXI-B zIy=VqmCVPER|fNH)*np&Y=|tek4Q3mAINcP8#>OS{wN|kI9cWoM(BdP0U*@IK4JWX zZ7B}K&tz~K?^v>WzWw92956v;>VW~?w^Zy%E4(988kqI5UtbnlW_c`xoqJRD+JN=1 zC3IU`m+#^u9Uk{dmm}>w(TBKBc)gnMgPd>f7kUw|7l)68vwkG0bJ8k~m^;chmhodT zhb?>&cjPm-ka_vjUtJGB$>(-+Tp!!jS|m2{|y9;r6-=Us2ks)|J+IsT;QKe z9Lv90<|fYWxW8HV**L;0imr+D&BGeppcoUs?J-|K3|aD#V&c1Nc5O05=D>A3hZ9Ul zywR$s5b+9l`$=z}oduy_qOzq47CjG6+NjhVD^lkd1)?X(ZJ@C-9*RN(=J?2}F>RFB z(jStDI}iGE76^aHAGkEN+k?9Vm$1QxTIu6@7#bJl7?Q^8jxFaME0qrCvzEgYAMz2~ z&Yl4U`^kmECzz(sngYK!g7AI?U=mGxS1bzFgpobxZ*1Pi#>x}F+0>qXld~Ny1`Z;L zP@9sV7FXvGk^(fhC6gqHPuFrECrli>0q|>Y>k8Q6`C!|MH$uuXnpU$4j)Pd}iL&v* z8R&xm?WX@Djwta;DdL(a$TlT8yYRqOv5=CDibTC3AMM)z|M$OJQZ!wOi8uF3i6uE%4HZdve zzgEwmdzN8gRFbDqaJ;XSgC#f*)`&=A2Gn=Y`7-Jx86NMYzj>esVH?AULWnjsqz&XC zs0IHa*YEl%%a2E`hlmEmQ>Fzqb=^qU#VI&`aFh$qH%(RO+NS`t;E*Th(l@}ADd@j% zTk!A%vrM&h^OmI)elPGe=G4HH)d>H)KKKwpaS=r-30Un4LDJ-DJJU9`P^(gh02i1H zfjb7bv60D{KnSTMuJ5cK0`~yl-$+zm#C-&O3=0F81{RIra#MT)^i>($S;9DkT>Jb= z50E}8duJ4bk^LwOK6x0sm^CT*%9s6P+ZkzNj$pNY3YU0W zoyB@Hp9-b*JP-vJZ1v$^Jn}?NO409Hf)o4Oe!(yk=O}rQIR}O4#DLMFOprsWf_%?& z$6gZzE@?h}3+zE`M8c0du=#N4qp+F^DzpZH6V)Qwx|)Y?ht$3;4f}Zd9T{mRCyFxWIuQuc ztpx zm)@m1f*!>5d!jK~Fv<=%&;Cd=%% z{>hx3RIjM&&(-lD3*^XSMuK;Sa%OL-vsRV#PL&lrHYriDz<#ug>0X?1WZl`FYrDG> zsd{d{YX?HcuX?Fs7R=!}7om(nAzJn6myFn;D!Fg0&23M2Pq@7T$4g|<+mH>XgARiW zSZ}NrXzCb50{wK`R<+;1BeaDRm6py-a}GHvTS&b2m}nYl^f4R zDuAzHSf_^19_HBdF>S$oJKP) za@4iHT9lotif%YWc?7yR4*AJQ5ZNY$#2f`VRN{6Lx%BVA4XP%m0ug4d{e(oFJ+%Iu zq%1y_xW+}n)bmqTw_jsdlL4*V_l)we6G3iGQHkxnTKbDn4TQEi^=FT2MF!55An*s_ zGD$!1<;F`)XF3A){>qxjX440TST+aZ`rs7kA*)PW_NuDly?ul9;w0Xx5LhFWFb?J# z+OIJfsFcXM@7Nu2Q6JD)MNYDh-XZX4KDS`GZa5a|EI#mibhetiO^uz$x@8RVYT0en ze+NKUB)21R;<4KW^vIP5`tXE-pluTJSF_tv`^g9-jr9;_l@%d`-okct{!4(-*3>cPpx%?IQakT3Fr=r`E6 z?4~&CmHopaZw!SCoZw7I2+8Ge36G-qBLqxYXP5*6(~B3on=A$)?mHtAV=ka4(_*2K z@ZIo6J-9iaOhB`bZiqsCq!QKlr>#Vc~z>raG_l%vXU$2+nYb1 z<#q7>?o)pTzeJyFw&C%+%O{wA^p- z(MJwm536`YQf|wcOFVD56l!aXM23xK9 zCX2v3L%upl2or7?l^o&Ex{ZXDCBfnWcoGE<;ZimyOQPg@nFP}r>iMnt8fTZSPIH5^ zn74}XCjWm8sd}R_L~jIf2|GmJkT|5E{FJRfp?z19DY0-PkbI>vd$o14*r_QI)&d2j zph$~7pod)%l*4ijTWpcI^T|kqz5nx7xxdustZym@e%Fs52IMPj2^mi5`gb2=X7J`w zEpD)GzJz^=YhQ9pC$OTH+{P9K3tF*ZJc8_d*`=WVv6d+ufF%$zTW&Br-FlVb-UBh)Ozq5`Nyl7+flXTqSe|P3t@LHJ^A$z$< z$bY9laEXR!!8d1ItwDkZXco*G=F48_@V{?q`I^jnJx*4?+_S(L;f8)-UaC?Ue%=8o z0VIJ$N64z&S?pLRir6n`PDRh>_J4^=Ps(G)%w>#>lAqpWKjzUt8)>*rh9p7jmh3ug zBoBB9&Hi^@e|2H)Z-iIf;!HPMp~AboL_WB?PGE_U z(f;5ZABM&oL1%^MUCj^SQ8U303o?-WT^Q{SW<>|wCn;RP%kJ{$ChfC?hJRD8X zZrp<491=sr8C74{I!W>H_D<0n3;1*;-Xl2J^ZNAyt1a%|ZgfWKH8~aM4P3%S{)bpL zg?;n%4HYA~$5Y0ipa)Q!LZNw_be*}vo4-G~?*@il_w)>I_H?3fYjF}OSx#J64VxMp zRlj@9mt+Y4Sw`oud^eMG=~Su1)6oW-Zmz@XKIiVJG{pIX8d*L#u#Z5V)a)2OED8&W zBURBd0!_CV{$H5vvSPuaG3CG=%3`53v1@$LR^++8-sUM`HeF@lC=XZ`$Yu6(6YP!dsdw@0TP*n0#@&$eH$B!gxU_%7aOa0anm};W}?Z7<*eafLxj|qkEcfxr!$&& zBHPK;pY2%hS%Q3gaPsC{dsBcyKuR+E_Mf-w6Sb~Yj-8H=#Mo0l^fkBAHtNphy2aK& zb|Pzo3q!NT&7gZUb5Eq@cwQpMuJ@V=g1p&O%&92XvPS#jQyoJ zRDM!q z()Vw5J3ae)NFnusm1hZVwc-wcOPf#{LWBf$f=jz*MQH1)kE~fF2az^wR5K;?tHbcW?_%a zez4ywoRRv}KH}zlMkn?y6|)_3 z{eN0IR<*U`R>|J=bp#pqZ`>PpGK8c(>A>kqe7w)xnYQKD%sJGs_abZM4}sE77F(@A zyA@o8huIt@j+TUP2R0vhG6buzUJdLtp3>L8ms7gj(LxaT;^w_Tt#Z$2SsXjEDKR1m z!o2kbRr2D_HnK>5@vh5R>qjaV>CwI3+L!rGkgM^2hOEC!>ogo@BsF+v0 z#{2RH%hIy;G3#9!xfWl#fn^3w`{c0nG^O(XZVMt|#cV4AD*U@YtusP5Db;J;E2}(1 zjO^;Ygq`2dbYE%3z1}=>ongh+0>Qrw59DB&erBrFji9Y_J#Ni=FU&K(h>}&9`azep z#8xK+mr$2N?E@H81m~F)80HY?W8xfyBmVT;q$BtH&N%Dst{@w#Ml8pCVgEDFqxRb| z#mEJ^W74>l-`c)6&uk=jML=h>y?ukbbyvyk;iQZg*~6InI(jXw!z>?vGN0$8kua z1?Hs;PS@#~b8@o8!jM|>T4iQ(SaqzYMFlHhyy6^>?Y{Cp`?Hs-BL8bFRDI!1vnF5k z;Kr5+ifC{lgXzHd!Rhd{?OI;}^$+jwVulBZ{d2vVbe)nt7CM-n8t|+5ON2L5Erfl^ zdab9B?OEIx{NNjzLmE?>AUhVH+%ipmfAyRr3QG8rssy>L zUbhtZ_4p7(*@OFDZug&JcC6JzyA{)$fRNRUXEjCo-&o1DR>WwpxBPD}F41o!>dB>| zWXeW`Jz1lW6>7j(fshn0yA4@Y(bZ2kFuTV>*F-9%625T*ZB(Ymh82V;JWj0y+Hz7qq|uwD(&P~wJR09m%43K zRmE>}iR(G>s{86{>Sszv|D8?U@^Zsy;rraXraY~dh6Cvf zUV|5Jyb*6*xRtKIza`uJD5TGeDpF#3Wh~gMZzTUCXH^`%U_z%JtejfMJRv}f;(vk- zXLa&kEnw}Jewo)LW?VbsND1Cs5910nPE zDbYF7>sjRaAq|lMf{~2}ZRMFPqij2ME_2I^kxA}jyctSbc2hx&l>G_TOL*~tC%Eo$ zm=x;T_N9@;*>5_OBXu8r(GiOof5`5O-CwBfLl!GRzuBe&tQ2N42(C-)Y!?1%-7W_ABTces;BMUu1$?hzspZ0{2=h6XdhM$NNo`;YlmCc zT4_G>t*Fk?hc9`;9_H>naX|{H!xiDiblt@)3H#|Ld+T!cB5TZYFWHjK0Y&AmH0$kslQYs7Qe8d z__sZvZQ)){e@%6DJ3d&$w77;j(e+Egba}YEe2v-ZI(K=Z`%lJkrj!Ecl22HOIaYFx z`-YIqZuC$4#~b|NaWb1JrOdyj3sj3gas|45%q5+KiA#E^mjoVQ)VW?OJ;GPke7vqu zS8e9*6?*xyO72WD^Wmq)X}{6Ip_s?tQqN4$kJ-nO&6fO8P_g<_nBjEU%m=<$Ql#i& zZI%0ocZvND?_&!e6&>Cw@gQ|Fww4o?YM{cX8!x#Z6U6IHSk`)IJq@4RX@bB;ITD_I&v+x`-GK{bQ8Qeo>)T%&L#y7bW}8{$rK3SDaymnsf_pc-j4)z;L?CkaNht9qIJv zn$gl+e?^ho9-*Imc074&HvRo!YuLl0q@tCE55vtGQ$52|ibu%e7q?B?(b$0p3@}CSUC8^X- z+_~VxnDaJx-l+A(UjRxnt`M}nTVv-a5%nk|Mso4SDW#{E*DO_bHh;BWl0F1{ZHzKn za*3Tjzl-w6X+cr?BM05HZmNa5>9M9>_US(WJ(&g(Ngk2MsQq2;l!B({R9ol@J?mOl zNTL23f78bP?b=%?TH}}V5d_&P$;z%Q;=cXgb}v4@MR@Ygt@{`5f#-1cx|SjsN)R8h zeG8r9IV*5NMkFN|W{R+LLIB!Tla3|4Am{ZY$Q#0c9w&M*Se6ym}IfgVc^=t!7DDTV?hNeD>(zpwv?)_}= Date: Tue, 28 Jul 2020 18:37:17 +0100 Subject: [PATCH 2/2] Fixup HQX build Porting over few more improvements from #777 that can be applied to HQX despite the older Rust version: - Removed Cargo.lock from .gitignore (the file itself was added in the original PR, but is still ignored and wouldn't get committed on changes). - Removed couple of stray .DS_Store accidentally added in that PR. - Added a `--locked` to `wasm-pack` build to make sure we rebuild HQX with the same versions from Cargo.lock. - Removed separate `wasm-strip` and `wasm-opt -Os` steps from build.sh in HQX because they're already included in wasm-pack, and running twice only makes build slower. --- codecs/.DS_Store | Bin 6148 -> 0 bytes codecs/hqx/.gitignore | 6 +----- codecs/hqx/Dockerfile | 5 +---- codecs/hqx/build.sh | 6 +----- codecs/hqx/package.json | 2 +- codecs/hqx/pkg/squooshhqx_bg.wasm | Bin 224021 -> 224150 bytes codecs/oxipng/.DS_Store | Bin 6148 -> 0 bytes 7 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 codecs/.DS_Store delete mode 100644 codecs/oxipng/.DS_Store diff --git a/codecs/.DS_Store b/codecs/.DS_Store deleted file mode 100644 index 0dc4c6a9ae6e5d8f1da69e95b740b6e10e993df8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%Sr=55Ukdq0WUdvoL}${mJq)n9}qz$C}AT)#N*!l?NmPu37cF!NHuiVOiyr6=+>FJ~T}N_N9!HBBujujowfyWi+fnp+hv(kn9pBhsg`@m_ zomFvzEl=O@!P@JreK3E5CdZ1G6U?{F4Mb2Sur36#K3_8|2{OTV^=sN z#;1cOMgZc3?hvkHmLN8F5WB)5ksgX=Dlt>7Mhwez`dh_yg+pSd!{TPvshh1P6pP#G zZxIgb5@p4J7&v9%I=3_L|BuuQ^Z#j*c49yb{3`}*vRE$Wd{Xt+(c`?=HtG}gR~Q@N mG|`HQ(Tch8R(yXH*L=66MIr|Nf`L5;*BZnC diff --git a/codecs/hqx/.gitignore b/codecs/hqx/.gitignore index 53f30e50..ea8c4bf7 100644 --- a/codecs/hqx/.gitignore +++ b/codecs/hqx/.gitignore @@ -1,5 +1 @@ -**/*.rs.bk -target -Cargo.lock -bin/ -pkg/README.md +/target diff --git a/codecs/hqx/Dockerfile b/codecs/hqx/Dockerfile index c568a09f..1d1bf545 100644 --- a/codecs/hqx/Dockerfile +++ b/codecs/hqx/Dockerfile @@ -7,8 +7,5 @@ RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh RUN mkdir /opt/binaryen && \ curl -L https://github.com/WebAssembly/binaryen/releases/download/1.38.32/binaryen-1.38.32-x86-linux.tar.gz | tar -xzf - -C /opt/binaryen --strip 1 -RUN mkdir /opt/wabt && \ - curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz | tar -xzf - -C /opt/wabt --strip 1 - -ENV PATH="/opt/binaryen:/opt/wabt:${PATH}" +ENV PATH="/opt/binaryen:${PATH}" WORKDIR /src diff --git a/codecs/hqx/build.sh b/codecs/hqx/build.sh index fe163c2b..0820d1a9 100755 --- a/codecs/hqx/build.sh +++ b/codecs/hqx/build.sh @@ -6,12 +6,8 @@ echo "=============================================" echo "Compiling wasm" echo "=============================================" ( - wasm-pack build - wasm-strip pkg/squooshhqx_bg.wasm - echo "Optimising Wasm so it doesn't break Chrome (this takes like 10-15mins. get a cup of tea)" - echo "Once https://crbug.com/974804 is fixed, we can remove this step" + wasm-pack build -- --verbose --locked rm pkg/.gitignore - wasm-opt -Os --no-validation -o pkg/squooshhqx_bg.wasm pkg/squooshhqx_bg.wasm ) echo "=============================================" echo "Compiling wasm done" diff --git a/codecs/hqx/package.json b/codecs/hqx/package.json index 9c50eb01..61f6193e 100644 --- a/codecs/hqx/package.json +++ b/codecs/hqx/package.json @@ -1,7 +1,7 @@ { "name": "hqx", "scripts": { - "build:image": "docker build -t squoosh-hqx .", + "build:image": "docker build -t squoosh-hqx - < Dockerfile", "build": "docker run --rm -v $(pwd):/src squoosh-hqx ./build.sh" } } diff --git a/codecs/hqx/pkg/squooshhqx_bg.wasm b/codecs/hqx/pkg/squooshhqx_bg.wasm index 141692d2c57a49eb6c2af4d4c633076a3de9308e..2213c7e9614777874bca309cfebe069d0d86f2b9 100644 GIT binary patch delta 146 zcmbPwjd$90-i8*&7N#xCqS^Hf^_&Go`6;EzsYS(1965=3>7|M3sf;W^rNt#IMh1qa zJV5E>)Z*gQ6y2msX4WF0c(Saap0T-}fr3VAVydx;v3W|G0#K=?u7QQFp|K`gd14Mw t8JmHgp@p6SPkCZ-u5MChUP^juo{)i_k)D~Uf`*y7iBXEBnK_fOCICDUDpvpi delta 15 WcmbPsopezXD3Zko z@B!rt^s=_K;YLB|d)a9eavTC<)S0GaV#BU&ia=(mwL?F4QqLosN)9nugi7*2m+&Z&2B4#{PzW9n`Vo*cP(uv-R|ft8-u++i