From 05932c4cbc9a57bd20063e424d9b5b71b8949f6a Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 14 Jun 2020 22:23:19 +1000
Subject: [PATCH] Updated harfbuzz to 2.6.7

---
 Tests/images/variation_adobe.png              | Bin 1479 -> 1482 bytes
 Tests/images/variation_adobe_axes.png         | Bin 1448 -> 1439 bytes
 Tests/images/variation_adobe_name.png         | Bin 1454 -> 1461 bytes
 .../images/variation_adobe_older_harfbuzz.png | Bin 0 -> 1479 bytes
 .../variation_adobe_older_harfbuzz_axes.png   | Bin 0 -> 1448 bytes
 .../variation_adobe_older_harfbuzz_name.png   | Bin 0 -> 1454 bytes
 Tests/test_imagefont.py                       |  44 +++++++++---------
 winbuild/build_prepare.py                     |   6 +--
 8 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 Tests/images/variation_adobe_older_harfbuzz.png
 create mode 100644 Tests/images/variation_adobe_older_harfbuzz_axes.png
 create mode 100644 Tests/images/variation_adobe_older_harfbuzz_name.png

diff --git a/Tests/images/variation_adobe.png b/Tests/images/variation_adobe.png
index 71b879bc5a214d09e4b04898327324ce2432e9c4..3ac326f51966bc36b869ab74b5c487844515d102 100644
GIT binary patch
delta 1425
zcmb`F|3A|S9LHV0oU*hm^62cO5Qap^*ZG=pqbOfSV>)wPWL#6e-9BYQl*`IC;?fuj
z!?9ghjPqrh%lB{j{%9vH^KF|iDcrih;hsOeACLFz{mbk9<f-sga&!T*r<?QTgu<nK
zG~yCYvvpR$6Xt2>SPWBpf}YUhPv*(zyWn-Mrn2~F$d0!Jrn;{r`e}YEBn-i6Zo(^)
zY|RfU-Z+!jkaiP;exa;0Y1H+|_aiHQ?XU3Yn5RE!Z|t>8IJPZ)62}$EuD#uY=)ry^
zqQc?x6Wo}&Jq7;0JCBKqFd&vxH8T^cADWb${1B_c^GI*CPY;ioZc?{3x3Td&)NwTq
zjfTQoSS(g!V?JYJH$<7TKHo#j%F60L97-Ly2BOSwewK*EyPsB$pCETHt_K@a`)AbL
z`YmBFSY=fe64O~&Sa@@xSFhhsZG37<n$+xh8iokKVzEg{O{+k$zrX+5#$zoijdsa5
zAg2lzSbZleARwS?1UZNxSDmazSz1~i%PuP|RlF?i%KnbP<(8G{-|c#L3apIu_AX`M
z%|f>hXxw+7%hiSxKp;?eggF_}5m$KG=mrkAx3%^oi$4&YtwDJmarKXLCMF+wddqM8
zNHYf^9_2$0DZp0$f@J>v`_SejN_bvpr#rC?W2U)0%dHu?exdN3vjvSx9UU8^c<I3d
zYsP3angj@Dj`kJ7A7*F&x-HEF4-O3t4G+61lM%XVnIt!$$}_jYQld^OM9Is`pKUBD
zX<u9)bS~<<z0eD_C2THF*BYAAU~qU5_z{^L{t}pMFAfO_ad&su;-Q$M3dxY(xNh@&
zB&Z$i5;NNZ)tH!_rM-?|^?v!15+s!se-<wsES=>75&?(9VYAtwcFpWAg=Bg1FQ~gt
zPDT_pm%93Tv}s^OYG_S){E-9h5iB;Fa-P%FwB^hW_Et_5|Kpk3?CjZSTrz+d$_2dU
z>H8z=^Ysy>gWb=00z(6X<0LaseQhlmq~zh@A>`St%{*gVp?Z}T{~XM;GL|m%71e}s
zt*opD6@C+_GF!u#dTN<(qa#s&(&^zi-0A<~qiHHf@0p1uk`i@agCi-yiHSDAeMGIb
zfgyljO|X|fYiI~ErSZBS0QC5Tgst_(F=-GppvX4fC=<HxUWi4Q&Ia&MaPEnfg#~0Y
zm`m7sN3;8Nn>D%Q<AuBEw_C<~{`}teDW5k?mQNhZ);BR>G8iPVc<1x&Bx`$upXs9L
zZN0QLvc5AgJmo8|%FB5|{8O8o>0omQhaK6L!8Ryt=<{p=Ttt_4)&#t>-o_fdmNaPA
zknnFlzk<m;sIadM(;s0zaNWknW^r+G|Avy@eBJ2i=m&wF4ui{u2Tv4O<4%;ofn8%5
ztf!}Ea(sO5TW$LUr^=C$5vZ0{$MRBp#-SVsXj@#$v`{2s<jeRf4zgc}H|}vvk{U#R
zc@MlPAmtoA9ZFJ-!Qo`C4W<%_#Ej~^f`T6)GA9+s2Yt0NjJdPGCo$G>Z-O0_)J%wr
z8;Gp;Mk23p3BQB=!on`Vui3l0x{|;YFLl)FH0QQ78jHGx#p;>U>GZqRBU4kzKF61n
z&^J}Fm^v+0-th2ncQ+y|Oq=^@8`$11zfk1k<I@7{IZkveEiGx{!2U)fy}hbM(Jv=g
zra2z2XfzrEfv9E>(*ptnz4eD=#~<*-wmH15D=k^}gS~*tii(OCFAVMMIJLF0QBf+a
zSu;#sMP+5ljXbsFrnk{CQBiilu6<9PaSxSBHKOnv8yi=j76)py08){t>WV2mQLM|0
zll354UUn1<MTop{=yCd7-=^F}4Y^!JIqWx1sQ+cW!##x!GKp;shseqBbXW3mt9HSp
F{tHfW%4z@r

delta 1353
zcmV-P1-AOi3&#tPB!7-cL_t(|ob8!QNE=-gfbXas$0yVWYGb1%K3aTi1T`Qkh>Iev
zP_)&MBCT~(7gF50QNh<v5PX54O;n<yo0gD@R$D>wff}$~X%UL3wFE1nT2q@YE({?t
z@t$#*zdxLBHQsaXx#xaPW+oHP>2wl=4Zr`of&UXI3joRjfRUppf4~*8nwpw8sWde;
zDY6CS2w=?PIPUS|$F3t|V`KC{rBdbP<%#3V%gejFyE3)+Z^0_-^XJcZ@7{GC5oMW7
zCRbT@yFENS{2%!pBr-D6X0t6UEVy<k8K!GiP*6~Eax!DZ(9qC?goJCfBpbWCyEdCm
z#)3?;($doW{r%aCf2OCWOYKKa*4NkNEyyG*GcyxZG%YPnQZq6myR0j&S=rgywY9aS
zrKO;v4<A0X+wIxe+1F_7x;Pw;si`TMi#nwuR#;eA08RY<{d;?RyH=}>jEocnL8H+;
zefsp{$B*9Xdu!NRRIAmhR4P9|uOAx8TV}l*%Ei#o(5qLke~yoj!@|OHa&kD1TUuH&
z8jVJyvAVjtySqCuFpy?0FE8)x?C5klajwB&NJ&W%|6E*L{PgKle}Dhl+8QCGp`oFq
zq=XQnR;$%&HSzv%BOS?_#R}|aR(pFpol;d*WwY7n;PLTsMMVW2fA;K|+m!wN{fLMN
zLP$VB!0PI%e_M2KZ!b1BRuF{6#YI^<^o??|%w{vkafFa3PoB7ie*gZh)oN+A+1XjQ
z=*Y+j4c)tU@AULk9RKy}S8i@D$8jc;NtO<;L?KxYheM;$5JEyiLiYFfJrfKD1FcqG
zUhWxv^ym?d*45RCgEciZgpk(OR#`e^K_OWtlZhtle{{M_6D$@BP0(mGp3%d@!>Fhz
zLI}rk@87?7I-Pxeee~ljSBESpBulT?)8y{%Znw~%KYzY{{d)iYeVQN$!lf0&tF>CK
zwpc7Y&leUJo}Zt~)gcQC$x2E}B5XuNM0hJwUS2MyrKF^Yw+LA}WI>@vhr`1|dJq>E
zm!F^Se<Ra})}Ef8iHQk%TvJnX^X5$%J7hw#X0Zax|4k4Cn*8?dTgfZ_{P|N{G&(x^
z;NU>U4p~s>O=)awEIs)4?VIExwY9Z=etx%a-zJ0{9UalTp^_*hD?UD+9;~daNUJb7
zI5;>s*wD~mwOVi8x<v?i^XARKz<_KmvLN}Ke-taQoa8MnEi_rBQu)4xU5eFe4GId%
z&CPW<98RaxY&O$sp`oEWJ3F#;$bv$$wzs$G<2xawt*y;l+T`S<XY|L9AIZtd;o;$5
zzI+h}U%YrhtL5e8U0huF?(oBh4{Uq70_DE$ynOkR=HIw+<Mr#;o(V%kLp;wnHa5DA
zf0vb&5kiKChg}CxPEHaN6KTPYj*d%L3=0dR3FG7AOk27N<z(6I_Kb`SaaK`Lk-=bC
zT3T9JSs5K2EiNu5gcKAM&<~nOXJ;oNM6cI-7Mz=#qh~A6^P8KSo(YA8g><b44<697
z@8ICTn^_iMvNkq0rlzKPdwZLko5gJxe-spSb#;x6jm^)``<{Msa^mAXqF%2*J3AAT
zS65e`KYva`b#-;4qoW%e8#J`FwPiM&dwY9bryGq%tJUhd+`D)0#J5`M>FFgUB_Sap
zF)=ZFdwZZ=i@;=MWo3EWDutzp#bT+fth{sQ4$t#E&nG4(>U6r9nHl%ayw_)MA7FZV
zIzK-@I5=1kgw)j3`uh4SpU!;1`Cc1w1%JK=k*y(-ts#-E4i@|cK{i+|^RxFH00000
LNkvXXu0mjf_V=Kc

diff --git a/Tests/images/variation_adobe_axes.png b/Tests/images/variation_adobe_axes.png
index 9376c1d7b8fc6b11907267aec1a32ad73a0c45fd..93cad98ff0c0c230206f864e5dd9d15505715775 100644
GIT binary patch
delta 1317
zcmV+=1={+k3!e*+B!6Z}L_t(|ob8!QNHS{}$H$cD;-U$@+7!`+AV>?W=nh3>5iJ5&
z-5^~=E-W||?V>0Mq7ot62SE^BAV`CvqzhKqMyV_+D(IeOH@lf<F`W0jNA2>A&3E|X
z{jJ9L{rk)_KgaQ%k>_%`D8kq9`@b9blOVDH5Lp0-EC56n0Fy`sD1QW>CU`s^>*_!3
z0srT+5OsBRK|w+2Wlv8J+EyqOAt52m_T%GYe}Dfswa1>Rsj1b~Rf?ioT3P}E0=}oH
z>ob^`L?ZDz&S10I@Ts)4v@aItj?~mtuf6%gSFc$a85v*y06<|buv)D~qw(9z{!Cdj
zGc#{*Z{J?_XUZBL9)ISf?x$bW+S*!`O656@7xBC<G&D5S*4E-9PN#EpbhNy@JUTi$
zFffp&X|Y(`*x0zax%ok5uid^km7ALz8yow<<-E1E^{dw>Z?L}xe=N%lqtPf5i71NV
z@puIV1xlqdFE5W-ln4ZZ&d$!aw>K2t+S;0&oW$#=r>E<5I)9|qY&MULja5}uF|!(t
z#$+<NT&}<V0e`PTp+Mu))6=Yv*Y$g3O-@b*1_n|TMbq^1@-iBqnVCUrk@og>w|D9F
zdbGr&Y5L^k1fP9<eN9P85eNi&z22AJKyWV0WHJebLMApfHRU$j)z!sJ`T6;+udln!
zDijK|i?XsZe1EF5vy-AIwOZ{<Z%{awm7Sf<WU{lfJ!cOO4^a`hT<$h&wOYf%!cbsj
zWP}+vo6Y|I{uLD!KK2HMTUoQSvnZp{XgmWBhXVy7BO^TnLqkI-5FQ?Wb#?Xf@*<H)
zl9G}h9v*z@jRoAwQYw`wv$(kE8NhAw`TW<{SI<mgVSgdYR99Dbbac=(y}P^XV{a_r
zx!B(8;y2hfn+@F?;)p~dv)RmS%Ve^ss3?5){QP`;eEjb24vjoLJ^B0lyA|2n+e=JL
z#Lq#kR$Ek5<YRAaV67Q1^4_Nx8XEfbP9h>A-rE=Y9bmY*x$(U>7H}(z&*!7e@$oV1
zeZ9QA;D5VQDwV$X#sY31{sjjIqwR}}3)XceCMNKg0|NsK3k$5Pv4&e&F)=Y{duL~d
zU6HM=ExBCY+uK`TU(bxVTrPz|@%Z@o4K0FTeNN&<-aFOn>grIYrly9)UT$x16A}_~
zb90?e=iS{M{u9yM-0VwlEZ|m_Uav<Pp-^~qbbs_-wd?Eay}dopahXge6bjLlPNzc!
z`F#G`+8XQLSit!TUMiKMm{cltI2@jt`}_O+{QT0=Qn&H$?rw^r1_lQ3!OF@?R8TAy
zKR-Wv7Q`QapPiktIXrK0F6;F46u)K3%*<R_S-}GagCRLNStu0l@9*Q|^YilpfuOLk
z(0{Gq<>lqCU%ybnwzf9UohBzIqX51betLR>ALzfpWZCWZ_4Rd~PB%C>h|5x|)mp9A
zXf%4YW-^)L<KyvsTwGjHQBiSmF*6<(7Phpsgz^@PMWfL$$)=_ztyYWH>jwu1i;IgT
zB_((@jYi`py05Pf&1Pj~SuB?A?d|I7YJaIz3KfI{lf`^5KH$BlYj(R`rBdN52?jo&
zFO$g*4i5g)lQ%w?!UGIWr&BJMy9Godk-=a99j_bgZ+BSWa5$EhmNqvx?RI-WKtN1P
zOioS?{+;?>Ha0fq=H{-iuR}vaB@#($YN{{)fl?IpTV?&}kiYK%5Lp0-EC56n0Fy`s
bM;5@};f|xBWRC#L00000NkvXXu0mjfuBeav

delta 1329
zcmV-11<v}P3#bc_B!6#7L_t(|ob8!ONP1fsz^^IN;39)+Q$zznkQG?b3`JxSEdp0f
zkS-z@6}*aeQ4|ExfDrA2AczJC(x515paI<|jZ{?7JlSNE-M6^!op<Q^*ZW<4{`trG
zt*+<$&Ue21Q?KV<1vE`l1aA2J?gsuOh%5j^762j(0FecN$dRfce~2sqL>2&%%M5`)
zz`Obnd%*8n7NWMc*5BVBz3l1fLC0#fIxsMhIevY89T*t!P<tL=dU|?&eVwAHmX;P@
zUthOs(XL?9<Z`*gafZ9QJ3N${n#!@b7f4A-ao8jexL&i;)6==X0ifjnmD}4}qtWQ8
zYCl}o?Ck8<*O#ZNfBkS-BO@c8Ea&ozT2oU~S69a#$BVEp2MrAkH8nNtS$4a9Y;3Ho
ztSmAz($CLNDwQTABs4ZQZf$KjU&3MAzY68#<U~hDJGq><wzj%FaR>eIn8R+A<F(Uh
zG|FT$ilPJpL4JO|Mx)8i&1JSGB9W-Gv-9ig3(w!)-kzG8f5I0^OH0%1^~kKnVi_MF
zudJ+OqFSxiY&O$0{nx+XbJc1!8lRb&;d9D7=KM1gC~InJ%FoY_qA00Uy0Wr@#%E_|
z(T=3Oy`4SLU@)M)o>VG5J3GUppP!$}$;l#-$Y3zI-=uTAB+G0zOC%B|d3t*KTePdI
ziwXJo_?S#4fA(~>T8-8!EiJ`Eot>Q&MfLahyWgZsyd*0tD~rj@%F1F#kB^U0DV0ja
zPPo0j4G9TBIisVa%(%s35sSs;<>ek}(k0%IH8(ehGPPPQJHckNp@i`8aEC>Phlf#4
zXlUro&CSQhhg>dCOiX-vd2zo<E_g$hMx#NQOG``ae+1m7P$>NT{B&5Spr8PyRaI4W
zbaY6i(*6B?k2J{z0nPVb7r(*2ySqd8hHPXqnZ;sZj+IJfL_`E0y}Z1fn3#BadO{;_
zZ*O9;m|f@K;2=Ie9{(8Xbh^UALXR}b3ErCVBF^8mpr9b`{e*>uIVpvH3K$+99z4|~
z7rY@$e<&29%+u3T-Ye2H{qgaEudC5$Jk=x@yz%faARqu8UtL|fQ)+T@5`Q^3IJmgD
z=uSZp-jEd)6@`xX_V#$!+1}n(sZ_naz4i6=%m_`>YPI_H_0`=LIl}uhi5GGH39qfK
zMVZyr)%=!we0+?Hi_6K$vD@uWPfz%-M00bqfBQ{x!5gv+1_R2JNF*mGC%?+PzrQ~?
zIB*zJDwPt61V#0FJ*p`b3O6=3+-#ByUfRJc6bh8AP$+CR8$0Lu`8h8yucV}e9qR7x
zrYLG~a1bA?sHi|S6A}{M-{092@#o+d7Z-rjbA*><ou8lM_bVA08Eb26c*5%HYEn{?
ze?%fVJUsk1cVS^cBoY-A6nq=MzP=6)4n{TG+S=IbCM6}I1bjdI_V&j4ME?UO%WAcn
zOeVcvKQuIi%j)m%*XeXdqtS^qv)LRQ8;j41iHRvJEG#N2V#Y&4LY9}8@hLkyJ6f%l
zNp5Ot(&=<)zkYOdw6wHTTwIJ7)M~Zge_Z$V^`U5HX6DY$&hGARRaKQjp#YsY156h4
zb#Q|7hiX=<wXUuX-$^hCg+irLd31F2y*WoX3E>G0cDr4rQhiI1$z-dmtDqBS;D5Wr
z8=K9xyu7@%wPm$heSLkSqN1|1v+*yK$JyN6oS&b+zrPO(3X;p^DJd!Z{tW#M2D1KK
n$lv#ooG+7V1s@pzkp<vyMj4}_uRh*L00000NkvXXu0mjf{y>;D

diff --git a/Tests/images/variation_adobe_name.png b/Tests/images/variation_adobe_name.png
index 9e5fe70e539e1640d6e9d807c2841487369d25b3..acb0df63c57628b321eb635ef0f588c374d838dd 100644
GIT binary patch
delta 1326
zcmV+}1=0Gh3$+W7B!7HKL_t(|ob8%jNK<bZz~9y8np<;&A;YO-I6`+5MN12r(v3Ep
z-n6?)#3VxyVUB_*?V>Kq4-~!7a5K_EP%q}yF4lzz6@efjLz`bow9E#!85-Np|Kh;;
zza95+p0gbzcz;)C@AJIR`<x$VFXx<1L{StXaO1?^Zs1>n$dgY6GJi-fOOyfK-QB{U
z!to&nWtW$iGso}WzvmeGEBO8Xsi`T1kkM$oe*JoOic;xdGQWKJl5iX$R8v!fhwk0G
zM~`=Pb)~H@5O?q1P1su|aNV<%N@YPo0mtOBvNDdD!r}FLvtE;{EYSJ?by?rOeOp>u
z%6eI@vPw%!xfcZ`3x9#v>!k$v@i_ekfBW`rgiu{w9rvQAPoH);9Fa)m!i5X0(CX^y
zyLaz`!Jt$s)#-E=izPolAJj1yCMG7bUK1e>8+<bGB560#cs%~<)hm<9#9Cb}7T4F;
zZ*6U*D4ww4gdvy9b>_?&nM@|c`BD@GyLI5l-rnBLn>Rfk4}U^PrBXQ@4wK0=KR-V-
zG!%_SJs!{e{Jhuey?F5=Gv(#Wm+R~6U0q#x9lPCbwOZ+8m&>)hyxiN{OMkq2^{U-&
zkHunYwOXxKr?{=j2;Q3UA}Ow{gM)+0%1Sy-p-?O>Eis|-@o}a?VPRn?6k^T&@ZrOW
z6aVk37K<ewkAE}KKp>z{C`2OB^z<~p-k=CBtD~cXNxOglJ|2q4<9fZGi9UPw?CA9N
z_I7-s!NEa#JQ|H&x^xL4^x(k*-n~H)R#qSokVqs<+UDjaE1{~Yiiw)d=A#vU{`{%a
z>6je3T)wupMo|>~AZ4@J@M{g!8xMq)g>O1qt(FxH27iNUwVFxLXfz3n%*@Q-YgJcQ
zzkT~wEEboQmF?~A@$QWW!pf?ssKC?8G0vVno12@9M{{y=lC5R4+0dV;RH~Jgl}vi$
zfv~c)S}o#CNl8hvwYIjl<Z?NlJUl#{VQ)MT_I=jw?k;m|u~<^K5(os6)hRA6e)Q-O
zJ~BHyOMe~vA3TMXC6!8<<DH$IOiF1q8vLWr=Nlaz&7>d?gq2lPRKy%_Y;1(XVSaV|
zet%nA8*9+%bbkK)nSXO|gq4NgIv*Y$(l_x?_V@R%UAy-C_wU8U#m>%7W;`4Y-@0`x
z3te)D_il$5Nw$g3&CTIydc8gz4j)a6#bQpU^MB*Vj|q#=?>QeoeoRr+uV24PN=opW
z&!0c%*BcLnl@*W2&1N&6dHM3?U@(a1ghHW)h6aRCV`Jmd3L_&U2%(CKifA-SkNA8(
zyr5F4+}_@1&BC9h&!0cf`y5#a{<yQYwx(1n@no4ycH_p4r%#{u_4T#1w9rwlR{P_}
z4}aF&#l^)_r%uV`@=u>W;p5HC&3M7u+FI7cbLY-6(UT`n(${P(7JKpHMI;j8f6Ab2
zzu!MJH1zP{!#j8Gpg-y8=y>wv$=KM~(OC-%3#ng88w>{4chK#2x3;!237wstZnv8b
zO-xKUolaH-l}gpq)ARcEYdU9OV1RY?S%0logTa6hnw*^E<B6gusI30}{uJj-lW^kB
z&Q4QP6MiQ_BauiN8ymlW|IThJd1WrE$6~Rzwl<MSgopC-@<v8RfPVf!ly><n5{X0>
z78X`kR>I-1OeQlLjTVaqe>}`Co12?&-n{wx^{YamFdB_lu3Sm|UN9}kD(hc|`~rLr
klT8In93Zj)5Lp2J1L6mgG~L9#cK`qY07*qoM6N<$f@oH){r~^~

delta 1325
zcmV+|1=9Mp3$6>0B!6{DL_t(|ob8%RNE=-gfNwNDVq#1{B=|%UMBRu|A1xBajSqZm
zbf*>3q9TZ(K|wUS(1nkRq6=Gm;S0fbp{p!(ApsRZkRl-(>kBbj8?Z^mN|NbfVE${=
zWKN9ZU%20Da?iPE&ix!OGn4Qrib4c-c)fN5{}MzN03r(jk&(9^k-iRpfNNR2XVB5n
z@$yUH4n8P5H8qtv-rU?|8G2oGI^Dv;0zyckP?VOIKC2ex3MTXH?CjBTgiv;NHXdqe
zX`#o}YPHMyFHLiE^P^3=0oy%GEEb1`hO$hKi;H8K$pIRT##5!($^xzb|0C<-;$mlK
z$5YkV%8HGRWnUDO{Gw=oG#bit-y*x-;H#^v5kmR-`Rt1Z1_m}ZHd-u}H*elNm9w|E
zx3RHdG#dT<{KCS*luBhtNC^8=uw-Ut#*^jT-tF)r?DtN)-99%r7at$*&<3B+FDxuP
zK0bcx6pyz3RA_vBJSHYaAP{(V;jmkWXL5ag{r>&?rKKf=kVGPXX>4qakB?tlTN@r8
zwpy)AOG|5OYZ{FvB_)N<pPrun{{6dJt;UO#l$7M<<<ZCE<Kw%#yZ!zB^vB%X+>(+K
zgpkc<lS-vhsnp5+jXSs@_~Bob&6Ra~dz+q~PUnk6qMe-`CNw!Y$&?BY4>y@i_{6QP
zEibSC_Ex1*X}8;dnW({F5Q#)Q9&d4R@%c?UhdWsf4Gm0wYilbWvfJ%ZQBh2^x3||}
zZhd_{e!8KdA$r_uwZ47(79rHu*5;8Wox_nVgTdhA<HO`19UVC&WMpJ8(d6W0hv=_g
zzrw=8m;|9vcyMq)Q55|+RZviXUu$kR=@O1);rotECUb~?8jVJ&RLUd-2M0f_@a4-F
z{EV5Ind|H8d_F%eF7EpJ+9OT6gd<sLX=!+VDn>#=LO?(O9`*J0eY8kHK>@mtL?Y4a
z^`2_dB^=3;$z+H%a=HA`BFD$aLZJ}P92pt$V3RK4=zZ4J)fIEBR4SeKWH1;WEfN_S
z+1c5Nk9_@q`jz7FXPz9%^7Hd!jxR4S-L4ZH9E^WlSy}n?>680y0pUniL_`F0e0X?h
zHk;ijqSNW>>gpT@RVvlV$;q>tV+}{L@LT6UfBw)n@gRQx{#{&Le0O)Zy}jMk)WnRN
z&E~4AD$jK361R6dyok%ab9s3g&yR|VGMmj0(`+_>n@Xkn_U+rl5dD&~tE-EmsGFM`
zxm=DH{QUXz^P6-DN3!g8dvbCzKIPrJcSfTT&oP-yMMXsjq4M%_hv}oEqX?n2v^1;L
zN{_6ptl-teV)5ze>BIBl&(cXrNp3HehP%g|gM$OHSd7mS2n1ziWj#GTA3uKl@Zkd;
zmC0m(KY#wjCvI<V`}_L~g~I*)eSEyKvJ$VBlaurCq=|`%OoF$!H+{|8Y__SXDT~Dd
zUNR_Kr_&7&54X3s*Vfje`!qB(ba!`;jg2{(uGMOtznhMZj>i87CnhFpYHFBhQ&ZE#
z!~`9hnVC_kR1VW65=mcQ-~9YMQ(<s$(BT4q%*)G*j*dnM&Cbq()=oiX4Gau8St^b5
z3YV9c6%`fuodk`Kk574d`Hvqz?lt#xeU?4gY___(Iv$UQM}vZbMn^|M3#Z|^Jn>6l
zu~@WPtzNG;o6Q1&K%r15l}h~a(6byJ9j&geo}ZtKL?VSkk(HI@{Jr2)ypF7Y6!P@}
jJ(FJrK$BVp5f=Ch<ZzNS0*W5g00000NkvXXu0mjfnOdJx

diff --git a/Tests/images/variation_adobe_older_harfbuzz.png b/Tests/images/variation_adobe_older_harfbuzz.png
new file mode 100644
index 0000000000000000000000000000000000000000..71b879bc5a214d09e4b04898327324ce2432e9c4
GIT binary patch
literal 1479
zcma)62~!dX6lPpq@zx|AMKV0lL@W<j2UI+;G?PpX1&^HdN^^4|=n#);an%%cYpYcZ
z55yxx3ndF&)6CS&!~=;=TeQ4gN78gXmi|F+<{k6ioA=(#d+#d<!5`7nHrECK0D6G|
zxKNc&P;n4YO(nH5gp&Y(MsXm{C;Vc?Vp&iCI0kfixdGB=H?El)&$0C)Wu~bk_dDbl
zTJb~Lq@`ATT9|3*+eat5Wq8BPD^<baH8reTrPl~iJ}Xzu@5Q7TU271k!>dVQEGH*j
zsPhV&{MTb_MLP2Rxur*+v++qV<CnA4Jq*3ayP_+*#`ZdZ=W3S)fGS78cbHv!1?A=C
z?u~9p<N<-kG%)Uk!hLB)(bsGpA0Myu=7vsBPZuZ#2M5Jsv5Rm$z1v}a_4DwB<@Yp*
zQDWIKSOoFB*we#f%W?x^<Ki-!)QWI)e0bj8tnLgUBqW4Faf$DhNF)pf<4l_kSXBeX
z3VwF=m|%2tbZdKCURYOOAGCM`KOvJ%Bl>ONuCB)6ZU{thsH=;$xC!1&l*{Epp^(ev
zR@E3-dbPb-R5@g)7ewwB#f^;z$_mk3D?(&sBp`TeXPZu^iwQhtQ4vVphcn`lwW(C}
zmAs#$pLrD(&Xe8^cfev>EX@a^lKuui|27maqNTW`r02;K3Wefc97Q6zm@^M^?u$es
zu^4mcP-&9W!Gp^S3o}$Sxw$(oATZEqH#$0cOF0{sle7E!wK=r5y1KfymSI>!;7L=F
zD?7hhLk7xwwHJ~JbUNlv=*g3bt@4@4l@+qTzXl{{ZK3SVpWEBp`T0QK0B`TExw*Sh
z)b#X&C=|hv(c9}!L@SvT!HXo<J~E@!?l}8lZuagDUz(aCl*@_jGyVNQy?5dZ%SvUq
z#qO8+h_h#%`pB>wfw%Nqa8ROto*!q#&{suk>+7Dzx<CHFC&b1snPn+wjF=NrX~Azu
zB$81&F+m`r6MUdV*o^|%JXI8A>}aABEIIAQ9_i`nX=t$b1@@7bKRmvGzLS-erBpaZ
z<T={g1hvS<rk0k@wo59pIi1<t8M`}K<@<q8xO<=Sge3lhNJo!hQxg+*W#yn0s-rz{
z^ypEmG#n0h5gr;F>r}_Bt<7%-e(PI(B(JB(FT>E(^mb+Cvh`Tr1e?t+DA3A?4huWC
z`YG59li({zy01348*HdvzO}X(H2~k)+6aqwL!&n*C%vEP6GLW#Q_|8LJ-@CkvZkz5
zw~?Kl-Jbpd#;|}uM#R<E?QP&*UhI8MO-%v3L+;<`l|&LJB&EL-`2#Plej4iPx}1g(
z?BA#W!S7W}ArJ^RA~$rSGdJd%G*wSq`}xoi&D{cDKbD3XOI7U`gTV->{a1Yj58B&j
z6&PqOpFb4!dTOdRS=m=&IWREr@#Du+otZ|Or#deB@Knzd6CM3^>EE6_gEYEGZMt)*
zBXi^Wrw<RwiZAmrww9ltpU3b|D3pkK`{qp}-{14{Vl<EA@q3JoQ@V?bi-RI`b#ypd
z3WefWlt_CzLB6<FRHRELoH+4EcU&ZiL?RN+AP|I;6N~`@fg}dy0m;dBP+W_QZc@Qw
zagyP~t1K3at(BXbOXX`C?31)EPfm8Rh$e9Y6be;WSC>Jjs}g#DF$ICBG#Zo192y?}
zkDX1S{G;%!iEY7RFvd3`A|h0K#{1D|G!BOY27}$&gu+A=OZ8td^<d^<o^($1R&|L_
z+ex#tv$nRjP$<;d*;y5?iYe?$NK8z;^u{5Vo8S9$V^dSdxzGB;s~*F4FxVVbR90rT
z{<1@soF12vfyQF7?(UI>jPddD&CN}C<;%>jjaV>QBd1gIyW#6Qp>9jV2Nj7}ZC$re
P0W=`cACGJHjl23kUTwM}

literal 0
HcmV?d00001

diff --git a/Tests/images/variation_adobe_older_harfbuzz_axes.png b/Tests/images/variation_adobe_older_harfbuzz_axes.png
new file mode 100644
index 0000000000000000000000000000000000000000..9376c1d7b8fc6b11907267aec1a32ad73a0c45fd
GIT binary patch
literal 1448
zcmb7^`#Tc~9L6UU3(0Ndgu~M25|2!Fri8hyx#iMD?$3%wuB%w48%e9saX;2(qm<!<
zY1(Gt5u4kw9VFV;6S?McIy0Bi@$?7uJm-h^eV^xjzt8u_Pp-eOr#kQe5C8zEqr8v-
zJBis5T4mRctKu0F06;krg>(r@tN2=m^1@%xf7<{RNKEfy1Cfd@`MT$Z)Z8)qt#_UE
z$v<KW(q%umc3MYi=$7W!yC(N{s|YBN%M^u=kVip5e>sg|e*gHIxkS1?voX3EM%Z5O
zUaza4-W<5zwi(zk9j<Ke6R4E1CSTmW4Zd#$K<WWZ_W}x(Z}sdtiBT|V1ZbWI{Io9U
zRl9xiEo)=njkil7deoMd5wX~qvoJgB(v4;OW^0=d&m<5I>gzB2-!O{A<M9LniCR-!
ztQQdx@ftf+A1RnjY3)qD$6_Iz3d_s+ub3b&6e{^Wcpo#oNgx!qauq0(-;2h_FVKc&
zUSOR=M-~<qMn_AYzuZbXZ)Rrp)N1-4Vn|?M;Mud?M%~0eZT6_EtHWThh4a@~g!p(m
zoo;1kCm0;`vnVnLgY6w060Tf<M|4DubAeNnlSofbL~F(CmX<e8$$PezOFI(^KQn}}
z_I!-p1FF(4m(0vI4;rt(|6+@|X+cd>)3^Egy@O(r=xKR*2j~<UEu5G3(7U1yjEx)U
zbPP45ZY178Xumbem81@1VF$=%WuH>{PG96lwIOj>EPrq?j|zDa^ro@#&byeHn4!m2
z91iLDP^2w|^EAlfI0Dg0Ba_KI9?!I(C(@QFu1aNtd*dC@U@h}>JbvRsb8RhAb$xBE
z)Z2U&#|U{eVqtCF<whcrbljyf8B1J+W`iv)Es4B7K0n$sFE8&jwCGfqFO$PjS5<X^
z(`d9lW>@rnV%OBvl+k6uAyGc;*s&ZtMu;_{{Zdn9*79;vj{CiwoYTIsu`~Vs{oUO;
zp-23@y))9&lewrPX>P?HG?y|o8oi)2@ys70m&<YIo>M4*>fqqut2mrjwP0(DkY~?R
zR_K?7gShQ&ES8(>UOdLGtSdU|anY%ZNTiYxhs~}iEltDYUCj~`6Qf_1hD}Q(CMQl9
zeb=AEz3J$1-FcuYDqk@j5I0jOCW~8H+1YStb|z5Y$jHcP7z|?niiYS=`-H+kk)^<X
zYh~qjL+w!Pk7Z@q#>510Fd{6hH4vMUqIDDQ=*VO;XM9~WMftkAy4jCqtE*|FV<OR+
z7eO2jM=F)}srU%7j18%D_@f@YWAkV(D0y48p{~xoY<PHBUVI}X;~|mQ%j3No|LW)G
zx7L76O>NrrNohB1RNJk{FZ2Q*K75$VXLGsEj*dzC0TxACxk~O*{PCAi9pEtshl%(n
zd&57pTj~G{>Hd&-2Sdd4`a0akrlG1T>)_nt;xh;~DM{0qUQ=@trmdwV5{t*QSEeN(
z5a^aLHLC<eB9lMMEDa0{;^N}cI_BoE0Rc~trf?@Gxx@9SC>OAnu8vNIA-AnfLqo#@
zHvZwm`+4(2hbomaoaL*l@79su70r9GjB;;tPPntZeOB+>($eTG&Vx3T3u_wt#n6yA
z_#ihIYGq|*VG;e#&DFKIq+|t(Kp;ZuictwztY8)w%gw~$nwy)0LPH;d{>C!Ip)#qo
zGWOD?F9QPui;D@t!9}i>0FtAkx8Ap_Nq4^GV9(St>gzScC|i|m*Xn?D9PVEZ+|yC@
zld9S^R#<fa0iDmo)YjHgv|}VUS)GP|^tZ6tYzE^ZBZNR8(5TeLrlu8}!tSw&i3&2A
z%jNC^0-y9wL7`Cjw%V3@<929|SoU)${Xc~LxRxY(7|<#kPKdmA2n;~E`y%UIBk%kN
Dh{dV$

literal 0
HcmV?d00001

diff --git a/Tests/images/variation_adobe_older_harfbuzz_name.png b/Tests/images/variation_adobe_older_harfbuzz_name.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e5fe70e539e1640d6e9d807c2841487369d25b3
GIT binary patch
literal 1454
zcmb7^`BM@I9L15$Omj6>ZB@jiB-gd57A5n9!2?0pt0s@a3{%lnQ}ZY=*CP)E^1vci
zU38r?Jn~3Vbeq&<(N!eH4v)m6!lPBmQUP86g5B94-g`6er#Ii3?<e2K+g(S?SPK9E
z=wLlCe!EHB6;2bl>-%p!nFav%UdLik0ja+(-^Y2FT-48qLpX(n;a!eyU_hA3JU_GJ
zpcgb<a!k?#1925J?>7_*(J`FED5%m7CQG%SCv&*gN#<$>s5?+|<3;ULK_-u}FFcE7
zVWHd6qeSn*S;EtIqy$lW#E=RM|FLAnvH-1~oZ6MVX9t8a1VFU`MSC;;1iBE_4mShz
z0s(o}fPbqqq60f4hQ;F5HQe+!PL}pIHcY#zi3y_7jf+WVC%e0WXb+B0X<3;Q*Kl47
zCSO`w5?{;qNlvzfkfNeE0txBKz!uyqF;QOa)uA@-h_g1#y?whGPp49^u!L&Hv_Aiu
z*Zsiyot-0#Gc#ck5dwe7>;3{7Eu5fVs;r7c822Z>gYu`Qxm@l+^ycQ~5>-P(!`9X|
z$hr&}H|4-=;qiD)O_veIDy6c!ySvmg+`~gt;s2O;^=e<q{KVAq3UukKH-FLzi9BRx
z_V=(xr3h|q?cn5;zM#)&Qw2nl$qq1>+hM)bWa;DJ+=v7UMYXL`)YMpH-@!nmVqyvz
z3_@_Q2?Wv>RFA{qqNAgYX)p_moT18!itTL`Kd8QsT3T8<H$N{H%+Aj8`Fxd1^;s}6
zF;QF$%DyvrwZyZ=uXa?ZqS-$+-;ffRgUstUZ?Y>YygyJeRpsTTFod0*uvAM|7s<kJ
z^w!rOhd1tgIbY)!#T#cmd>*Qok8yy+UAwlr>2)^OK2S$T2cI4t{R5<VeA(C67vIX`
zy}BGrp*W^@a5&~SCP+{IpePK@N5{tA7s1MVimbDqPtVTw%$b>*+8reli6_N#bHv<_
zjf7{r*Se?9@kx!3ck$I%ojK>@lR=1%Man>QqEtc0!xHn1X>PRv{YTaJ?Q^bMnIAZ$
zEM&1*i;Ih7C+8C<K5cEiJ>u1oeIzg{Dk?SI$_<T1ySM-#>+9>3Ru2?Pt%HGqiWk=_
zNG~nG!eSvY&nBT=DTWFJ0yIZY1U52S4J|n#{YV*;NDLC|0<6lv5>I{yISw*1dh_N@
zK7*{<V$Q5YRDgwRa`_cH91fps_!bN<ycH4{xcOODqWD=&>Tw=}QBNeNrbgPbCoQW+
zWD5%mV2yKD5}{Doa{r2sd-F>02j^Sc!^qXc={wsOLqf<YDZH+($<fi?LiXVMM~|#T
zNiq;G#lACdper#g%}B&3C^*d?)E$YjWqa0aeOVsw(Nh(-aJkf~hitY<dkFoIQn@LY
zvy=9_H!mgMOh`EGG(X8tajQNkI>o}fy1Hs|*47eoW!2Tynw-{F1Xtq8sH>}+mh^_L
z%4D)0`Hbi#7K@FAm)+(I%CoZeG+ihZfi%^_!^0gN9nGB6l`GOcrc5DmcXscw*tj@_
zLZO}0tx{3Qoz2al#<G$U`O5G4`T6)v9uG+wd>hkNTl+or1@O{o%isqiI=Z^M5AkYj
ztV)4EAd*s27&Mw4t3g64f5xWM>3uu<j=^9g66s!~zyC;Yue#}d7R$Fb;F}Q(5SBoA
zr&K!lUyhF-mID787@*SWZkmHbLz!dVsBoPF2hIdq(d1fp@7^^qFxV(pr!g2mrKN2$
z%$z^jd`+U1Ilhi*>*zQOVdT1JWoEj$yQ8!pNZTD&aiL8YT7&8@H6q!Az+YTAK9)>R
z<?3(?*wnPXp`oI(l8S-mpo^Hyd1cqMe<!`}mj2qh<NpTLe_?GydoI2h0W5%w?s6D_
Mb@j$HphGkN0Z(zW)&Kwi

literal 0
HcmV?d00001

diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
index bd79f08e3..bf7cda5e8 100644
--- a/Tests/test_imagefont.py
+++ b/Tests/test_imagefont.py
@@ -661,6 +661,22 @@ class TestImageFont:
             {"name": b"Size", "minimum": 0, "maximum": 300, "default": 0}
         ]
 
+    def _check_text(self, font, path, epsilon):
+        im = Image.new("RGB", (100, 75), "white")
+        d = ImageDraw.Draw(im)
+        d.text((10, 10), "Text", font=font, fill="black")
+
+        try:
+            with Image.open(path) as expected:
+                assert_image_similar(im, expected, epsilon)
+        except AssertionError:
+            if "_adobe" in path:
+                path = path.replace("_adobe", "_adobe_older_harfbuzz")
+                with Image.open(path) as expected:
+                    assert_image_similar(im, expected, epsilon)
+            else:
+                raise
+
     @pytest.mark.skipif(is_mingw(), reason="epsilon too high for meaningful test")
     def test_variation_set_by_name(self):
         font = self.get_font()
@@ -674,25 +690,17 @@ class TestImageFont:
         with pytest.raises(OSError):
             font.set_variation_by_name("Bold")
 
-        def _check_text(font, path, epsilon):
-            im = Image.new("RGB", (100, 75), "white")
-            d = ImageDraw.Draw(im)
-            d.text((10, 10), "Text", font=font, fill="black")
-
-            with Image.open(path) as expected:
-                assert_image_similar(im, expected, epsilon)
-
         font = ImageFont.truetype("Tests/fonts/AdobeVFPrototype.ttf", 36)
-        _check_text(font, "Tests/images/variation_adobe.png", 11)
+        self._check_text(font, "Tests/images/variation_adobe.png", 11)
         for name in ["Bold", b"Bold"]:
             font.set_variation_by_name(name)
-        _check_text(font, "Tests/images/variation_adobe_name.png", 11)
+        self._check_text(font, "Tests/images/variation_adobe_name.png", 11)
 
         font = ImageFont.truetype("Tests/fonts/TINY5x3GX.ttf", 36)
-        _check_text(font, "Tests/images/variation_tiny.png", 40)
+        self._check_text(font, "Tests/images/variation_tiny.png", 40)
         for name in ["200", b"200"]:
             font.set_variation_by_name(name)
-        _check_text(font, "Tests/images/variation_tiny_name.png", 40)
+        self._check_text(font, "Tests/images/variation_tiny_name.png", 40)
 
     @pytest.mark.skipif(is_mingw(), reason="epsilon too high for meaningful test")
     def test_variation_set_by_axes(self):
@@ -707,21 +715,13 @@ class TestImageFont:
         with pytest.raises(OSError):
             font.set_variation_by_axes([500, 50])
 
-        def _check_text(font, path, epsilon):
-            im = Image.new("RGB", (100, 75), "white")
-            d = ImageDraw.Draw(im)
-            d.text((10, 10), "Text", font=font, fill="black")
-
-            with Image.open(path) as expected:
-                assert_image_similar(im, expected, epsilon)
-
         font = ImageFont.truetype("Tests/fonts/AdobeVFPrototype.ttf", 36)
         font.set_variation_by_axes([500, 50])
-        _check_text(font, "Tests/images/variation_adobe_axes.png", 5.1)
+        self._check_text(font, "Tests/images/variation_adobe_axes.png", 5.1)
 
         font = ImageFont.truetype("Tests/fonts/TINY5x3GX.ttf", 36)
         font.set_variation_by_axes([100])
-        _check_text(font, "Tests/images/variation_tiny_axes.png", 32.5)
+        self._check_text(font, "Tests/images/variation_tiny_axes.png", 32.5)
 
 
 @skip_unless_feature("raqm")
diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 8da484283..0ba8a135c 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -251,9 +251,9 @@ deps = {
         "libs": [r"*.lib"],
     },
     "harfbuzz": {
-        "url": "https://github.com/harfbuzz/harfbuzz/archive/2.6.4.zip",
-        "filename": "harfbuzz-2.6.4.zip",
-        "dir": "harfbuzz-2.6.4",
+        "url": "https://github.com/harfbuzz/harfbuzz/archive/2.6.7.zip",
+        "filename": "harfbuzz-2.6.7.zip",
+        "dir": "harfbuzz-2.6.7",
         "build": [
             cmd_cmake("-DHB_HAVE_FREETYPE:BOOL=TRUE"),
             cmd_nmake(target="clean"),