From bf1344dd682fa9c1ad5b3ce5fd556019b2b31464 Mon Sep 17 00:00:00 2001 From: Arnaud Diederen Date: Mon, 12 Jun 2023 14:43:43 +0200 Subject: [PATCH] Fix build against the SDK --- out_of_tree/parsed_notifications.zip | Bin 4306931 -> 4306931 bytes python/init.py | 24 +++++++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/out_of_tree/parsed_notifications.zip b/out_of_tree/parsed_notifications.zip index 0bd9948dbc18dc91bf83189c437fc95a5723ac68..159c463bfc99ea949ab0afda11a098964df44274 100644 GIT binary patch delta 12206 zcmYjXcX(4}7k@IEG;L{Gnr>QX(pF@pG)Xg>6cmtEkRcn{doS5bKtSMQDwi!~$Ph$U z51)#%L_{{Sl&LJ)pvX|*JNNu9^8In2ym`mj>pl1Wad)Er4}NAYF zL%qKZm%+@z{d6)g4E-5{i^D!BtIjCz4l$%{{$SbHn6AF!NTh5`{GxKKthcWmO5WUQ zXJc7c`s#e~n-A|AV3SSNPmKzb!Je}(O33c_<1KNU&)oP7Xea%#5Yt6(M8=U%r&}vf z=!#xvG0A>juqki96&6V`7Ts2??u*df!RWtHy6Sp$U$IpeD+98{>MmjNaYl}iRCTHu8%c`OhLjB9?2FikR_kkys^p$l*W)&QL>eJN_%9Wzox;WAm==@fpr){`3 zo*LEDbp+&X&2?`9udbD@u~E)8YpaVB;;DCMT}Fb;%^IOw1H2ijhB#_4O7{~szcx-c zS`g9dNjkqpaLj7#OHkULvWAm>mTnQ4VKOE}38=E4=wg5}zeu;zASa4id*YNkXR27} z#R^?4;Ki-gl@w+aYfeN8y}41>3JXh%b+5$5pYW}3#hb`&H0_l`)A8%N1z@4y zL!FW?6hzqcHK2g2qs{5muay2XKuJ&6zX|F^QG>Jee}U4z<@HN7(_p44D_6e-!anQM zpT-s{(5I9Xx%9iKkEh=o=(_>O#*Bg_>eWKu41`x6#;Q2eQhyhJ+sv_~(e>8){rJmV zCexud`u6zSXC42o+fIK@bVTKQ=s&G2IGkrHrO=&)`kk_mHZ9iI6)ua{>i@*lqtEnj zMaW)Nv(&U$-xCXaNWU1oO!?ECLZiRY&j1H8d-M^okF~H;g}}Y(sb>remSURPD|06>-zft{ws-8)XHQa9T~-%}8m{BS z&U%KwAj6lTB7#o8WB3HC!# zz{VbvN_YDh5Q1`EA4!Z0UUto-ap zhO^lA)m(!g@?!oHsKi18!V&$p$e@Q;UteOFBb${=)BQG@z0~kuoUOmi@CW?1da+@v zgd-IhF*5rY!Q-i6Oayc}+Of8A6OJa;HJ%r3(38f-JrIca)$wM=ILKc}6>< zg3;?8jQKFMuAPlTVQ6frY#xJ+*8qj%l8ycuZv08}@yW*76~xqw_L}2p#8%@mfNDU- zu`sBY@{XW;JB{yPwdQW)cQR6DwsEIXh3||Zn18PyjNQeX6ggHu${R_4oiJ*4-29aB z4*;lt##kGaE;wr(0n*ktib|rKi^d+XYvK2cUyV~?EsV%Ujea+-#W4!lrx@ zZ#B_>?ilA{j-yd&s&UU)8fV$o%h061jL23>?DttI%Dp(dks3WVYR0|iiBYp$cA$8g z|F;pwgS=yTW_%a==pGg}L?{qdJ_-+`ED@hjyQflEFKEY=7xp70qRS8Sitj0^y%VQK zEi0O9g~dWeQQtX5*w7p?mxVLJc414qSz$X;WX`cJ zY!RGt*T%4SG{;f{ZG~-N;qsTf--P`Ju?UelJHjepq3zzV5%~h;oX)fmadJeYsXSKK z#F`c$qO)n(sAaMV$d#N&nQ0VEH4UgLXE(Moje}0|+L~^FK1X}gUd-Lu^(7P%vz)>5jM!^_XcY6jxG?{N_lZ1ML6W>A59Y=zn8JFB$Yd2La3neM@>OQiJj-|Hl=} z*J;x*;4QdrdMif2PkL;6fDk&;Xs!>5AGDZLe z=2id@k!2nQ2B(xa--EGlpsYmtsFFDs3qQEc{lLO2TW#q#&jOLUmN^^&4H0Gv&o^I- z7Wy94HaErDx(&@p~Zf#x)T~6EWNuqk4%wfPQ;_TbStknYhyP5~#>>GW| zhXt|{dgdxkxueXQb#mU{t#LHgT!`rY_Y|{F$fdj)W*4~ZwZJ?@Kp_>BC^9cZU|>72 z(YNc(L3qmZEoLubk#Co|3!t#UodS*#`^=hKiuu&v|59{^j+iF_QS-BAFHCCo6*EE! z#r$p_f>jQGwINB)5lM9Cv03xWub-LE!RojeD@EIM;m;wf|C+FQfdAJTJORo$6RZb`z58^5L z^YG`jgo2bu;j`mqv?0o3f~JMsAEPasp&x0!$ZWTD}2z zH6qdIY|9f+HN2eV9w_MTwk!u9ufl!hfTbgjUFzVDr*-+3+6bMGt67Q!`P?xPHu|ED zr5M{do+QwiLd)5=gk(;%w?Rt%k1bA6J9eQ3g%V{iwj4!LefouE9~5}6u{DJ*Y_Uwl zv2Mkds~9!hX0bsN-M;>J?i))u=xM#zGE7r~T5H_-(V~@0Ee=}BimlRwGnVJz`Ga$o z{TMa6WNC!xufjVMzwwgvXXskmkK-mPuG0{z3z)sE$nR$d|J`xhA+TSch><{c zw{OJXkdk`mC>|8iQe(MsOezf>7V&}nEglnrd`|nuMtmXSSvBIrh@~o6g`=oV8Jih0 z(Y)6qH8m8JkNgS__D^2qGDHE+ZwG+1U$w|Wsictej<=5d0t*w{M4kuzT{}f?z+7^d z$n&R!{->d+X^@0UD=n%UH3!6UX`e=KH;mGPJ{JlT!Dn8RsGG>4?9M4v&^2njFsq7f z(&-*ibh<~0sAB^BS}-~mt|XBp`iVMkh;+| zuvyL?YZQG5CbYa&^bkZzaj%>n(F0(xEBi&S0iz8EM}G+})L08wuRJmuR~ni+D*9`9 zYMnXJ8932rUbJRM_vc3^KzW?16R6DM=oZNOBPsen2%lU#Aa&9C9ntUq8)4(`wV4d7LaE8^m68gx}D(Q1X{ zt0r5I!T#dYt$Q2-kE5=Q?!951jimTuf-8v@7h1Io0<)h)QyN(j9EhD(1IpFeHh>Q_ zvyMkW!qDRT2m?rcu~dG16G@`r3Mj&gNTJvezGDrDRN)DdcxWcx|7=*-^=>} z`mxj2aY&ZUu33*jCww1Dr5d-bZtyblzV&7kF_#`SV-9LW)sE3Ze5*z=12A`_am?RP z)}aM8?pV*X1+h9T^*Q3CFg45TljcA5MzV zip<|<#4H1V>2qVWV(9UrnDf%4p)(s}w0eKw=9oPiky~RbY!t$~cZppO&rBW=`yW7A zGc>mDOQG>4W^C+AoZ9++>{6(+`Gi@KmI)vgiAZ&qNGLaYsiw z%{-8y1%)>cWoTJr`pJv~u;X{nXN<;K*0W9F>#>FYzMY{()er7wfGakPG^%qyL#tPw zKgd`m=l`$l-}^KJ;ZZVCi+?gsiaeCj&fFxb^E~4SRFh_~|16?ZI1k5@)oR}ZV%4II z_yVDs?Pu}!4L~7zctDyxuA=ZgxsH7ZB&{#B--IsiHL`~b6vmxS$<6E&t+u$0FnvXCFs0GNJUm+Kh1Qz&`%V#o8#xQT*jw za2jQgaV!O;Ka6!00;P08%TIK)M?{*TIJSY@IzD%4hh_|pZH~=ps=+FP?bZp$ z?*Pw1urxh7<@glfm!5HaiL}71mZD+j9EBRc+&fU(U2#Ovl}iq-&%@z}j3f?%1rjYWdqc*fZ{k>2I8UJ?l$1%yMQ~z;X!>R=HsfJ86G3k~ub8l&JvaOk! zxJWA82yqZ)zub~kHghGQ?GsB_UdL1*b34IFRxKgO$_{_Zk zpc;e1ZH)->evnxeVdK@DGA;8L@GCwuc~0g*7)|p9nKR&EHLncK6kyUondfpJWY0D~;_mg{o}I>MhI=UqZVBTk1DiTfm^& zhEupSHqo8kSz5v#^<9=0JU9?80b9~zKC&-MYq?e2pQYV=#F?rb$U=EVI}c`^gN+xR z%(7s#{(ROGjcN6owC75eR==;mmZg>2`bSw8AuA~(o;}ZM4ZK`dCu|*%-4&dk)n%83 zl+32=9}$L5Sh62LC;OwawLaj==j z0%*-Z_FF0WrdZld?1PwYgl}&(hTT_E4TX~m@|%zyuVb+@`=*h#yO8e0G=f0A_(QD zWM?%fIHk1H3j3~5)>#Hs!rLzA1esH~osmelgU$k^>PmH-(U4n}Lgyi{&E`H6K$kak zmcZ)f#!een_cwJm$Jwk-&YwYszPob;yl%}9XAh`Q-f!fLacb`}rcQ8Hgt4jdU*Ud# zB%S}z*%%B;PpH;Z=VP!?ZI*Kvu!Vo@oCO?<<~t8#)Mtsa5T30bQ@E96rqgSkzW}_{ zyGOrpYSH}WCTCaZP->BGUpc=7l&l@j1n^d{%Xul<@GHMyvLAJhs-ce5TbfPb{)LIY zPRO}nR_8dCCn#K2S!jED&MKX3T zRZ;Zt=4{f-sB|FbghfV=s^$Cwcq&@@y+#fPOZ6VPN zT8qNgVxcRIbCP9__^zpx5SRhfkG9PhReKfcGqz z`_U6Q#vR}k`aI9I%piZo)Vl;+;DzQ_b$yJ5m)$%Q)v4~{IHQU|?T~T~4>QrO8mChievqikI@+gb1?sadCB^uJRj|*P>*! zYJ`g$>gwE;(XJZ8jFfG4$GbLSFJE%XfFb)-*BNN|`E1vE5iote+VzRZh8pZ}{QyX% z_PCZpEZ^>Py${KYBAOj`m4ntNoOVr(5VR$Kb8W}mv0E-~_Nb)L9oHGG&UxZm1)$ud z`w6SI7p@Wl9-V8i!MzfCx)A9;2~gYO-Irvu+I>n=%JmB+)4@b{H2{c9cJBjy=hNJr zRaBIply={TMCMd*+hSyHZO}bZ%oR}hW*0^Es<>gy3Wx3#+FsS&KT z?cC4ZI9B$3^}gFGzNZ%c2})`M*75C$?!`DOCEC)-ZhoVs0?nW9?vo^=b)UL*U`w{_ zUhRI0EjvDUTcIr}MXqmg4+YAO#cqCqszUjEo15=1>Zsk9?i1x?pWbg4M`)55LIdIYsc^Oz`jvICTqO0(wGB91P0P+zbzQMAdz4G;!43 z;o&#p+Fu*}QQq?>j@`)htOqR%+@2AjAgQY7Ys{T`!!uLnP>heN=jjG6uQ&3%27*d9 z^X!DmPPX*y!!ahU2>WVu@LY#xa(a6B<+@7g+`*pdSbc4zr#?({=tR$DoNYVVV*=!E z(>!-E*K)dNi)c%c7Eh(6o({60-sBxrT;wUlzOdyUuIp7C*H?Jv!T!c?_4F5;MBSIN z%hMNIxZu)I4*bs32b#J3y=Ni#WvRuJa@^Aiy5t)}DN6a-qs6Ctzj#_Peo;<+NGqF!Nbbi8C9SHUm!f%aXM#JtxK3c9D~HJK@d@BBQkiHK8rV(KRn zTmf#%s#+xyP!1w>RkFXI`F!0*Xx3fIp?>`jCan=!AaD) ziH}>O{BPCnrapm-Hv+%3^A#q@{&GWn{opL@!ZzAC-nSO)wfWH3R7MJ?`gA%m-PZWYrvDdMI)3A8kA?5|_z;B@ zxwLjT;?r#N*-_sbXlTtZzAX@8yNkY9;23nv$Ja|KYyBhEG{?~m4K&hcy3{IUj!q87RS_BgTK<-ZNpaoLef zd-MES#UUn`=kqs#3G&$lh1g%jrLUY^E(suFMq<3 zM2GA7TY-g&t^7|Rp>iGk+=o(GFm&>7fo*=-%l{Y#Ah+m!gZx@K$T&*VcZ27_}jk;RNd7DhRR6c8%Zge7#g+MyhDifFuRwcyW%Ltr?xBi$DH~}cja|3+aRL@Qf z1X{w=f2$Gr4uF);g05GRhAQMqXt=NexcCBit z+daUY5*0^Y&p;xWk#Na9juJGmf1o;uw_^pzv#+TQe2wFKj zFa%H}4CcNcK$$=f#swzZWV4v=OeOFM+%2~#FcT&z4j|uZ{I)hQ8C3E2Q%kWbpU`C& z2Ufu18H$ZAeG~W;6udlZqUC!6T|gu!)fCF!8*oAu&G!Wm2C4Cnfk+6E3-T|4h%^5n zj6Oad7=oy1Js;o?DO3huiKOUCpf

?WU0VTA(5Ra=uTaq1OYu@%Pn<_BR5rTriG~ z-wcd~-rji-$bx!CJ_&3>0m99rQdBQ8Ut|AtRK8X^)VAiwd4v|p_XDfvo1x@UwenxQ zN+=4ya4Ah23-h^$s%kaoo%}M`*SLAU7T{jA&p&|-a;kHFHL)wXPUQE`Uk&2b&T{d< z{K5DqmEg2N`C2OabXdMtL2Ve7{}p80du%@UNL7S4-_Ku-pfPt!{s|D#XLf#})GrFR zu~O*Nvi$F{xoAcHffjO%eK9Uo9j%&}9E2Bg&nJnB(tL{P%e;6h;In!FSp85V?w z)vy&urqRL9INN7T@G9Lb|yDOn441&x-27@*?;PU>cNQ5 zH4HrjxhI;1mf_g&7NLJI8rCX=i=pIMwJ~F+Mel}=%UOjJR02)z92x-trk){-jD$<# zn=dkrB63;LKg3_jsZ?=iW(vUb+qwlfyKQ6$wnlA7hx$VS{CQw1-I*48soI&LD>!y^ zb_h2uY5C!M%rzf{=E^F*y=*@>v=W;w^FqrCRlNUqH8^lNv>B`8u7(c4FPX?B>V7ly z9th&te;mwk2u-1*e}z57-e!Bo=SF;g+=Y-0Ef@uW{nEiS|I|Sl~u7dIvWs9`q^V%2icSNGMZUvVCWk>Gn|1wS_w9Ne!-Blk}Qh!$#YPp6V63lQM`)vt-xo+{AFVu?tN zE)?_z;k&LBd|y^T$z@_`bd|*a3b|i?U*!U}EIL%>hKz7!T6Cg{7WD)af0K>8M#_aM hPDq!T7@=Vt@`HC{{a9QVle;! delta 12354 zcmYjXXIKsAOfPY3)o#`ci9da#fruf71Y>!Z=ZsSirr|`*v2l{d&I&q z#ol{~ioGQE9!;V~#qZ8NXEi_Oc?Ndo-c#T6o^$8*i;1$=?3%e$9`qo$Aiq*yF;rf| zwC!f!A2oQFH?)I*cc!f4boVm*e--%u#Jq5gv88$_ zKCmm#4UJU2{-BXm|n2U@YN8bAkb}G zsBn(U3U5mY-GijPp;H;bg37}D1mOVRgv$W~D+q%%(lg?VSB_|qRTuKr{FT)%Ax$Y( zf1hfCV!z-s@@Lv>jN#C%k_F6B+Kxj&^AIXg}e;gtW|r#q{4sZbQMBN;-mQ^ zgax>7Y_!}2O>%?_3T^;!juraRPCF+F6}6~$lR}vWKFk!B3%FFlEMbVA|Fp)nOpr;I z1aH2uN-h~p%x~*3iO;X3YT?sLA(U3LtQTZl8PS-ii-NBTgf`q2kXI;_H}MsY9}_Z^ zD4^qvFbEARmTO`)!Kt%C78yF@yzrE6TU`)#(o@yWdkm0xNoYrZ8=omOu&zkRphv^5 z2rijq5ix(3V1iE9gnq%?w7)$R7NROJ=5JwA8U9aQm@ExlB>po>ZGZu#WgAHKYGq_e z>d&DAL*r%tpdS4z%kotG2T6a3Pm*m{@x`vYWS5mvm;$88qDpWJiesM0l<=sDtOso~ zD$8wxVVSaYlJ`<;*(*||-)wC#JZvkYY!I2MS~%TK))76}Z=)v?8g`J~Kwp8kmuy~j zbX)3`YC3qnNVZSl+izVWYe=ewte4#txY6Hikk!$l(V3SAl9m@h_Pt6T&CK=PU+O3r zwOckr$>S;HpiHOWX%TZ&mV#*k{Z7j^$Z?G-=Viqdg#L@N$&{5dS{RM+;J$1HsdV$A zQ3I&oz9&*ZW)0;cp^8NTO{kfe)0&CfZH*4h@7Gx zX8liolmdt$KSI(W? zy{jTC6mx6gUur!R4^=!MIGQDd!H40B3&A|3ew(bARRx#K+M&28@VA?QVhn{7v$h^y z>{GO$%~~B$>_Fd(dF|}MQ00)quiz{7Ii~1|`6RNJbmEr!%o_h(RJ5lzdlV`Dpr~ng zMd2ou)?ZfyT)wNBUIU4@6}>29HvO)cu9B7(XSTD4L9<7S^^{f&&N`CKnH?13vT&mc zzJIQmN0KpAGD6x*MOg|n7VjZ2=^w>q?SB~ zg-H8R@hwje=&4i=Lm8ylfj1f@#G{p&YZP#(nzA=XL$D<)PoP-@uhNMnN#yl1vyO5D zT3KCB8A^yydXFI(T$#!O^yAak%F+ssHv@V)!=YSzWmY2kXu}NURxIW);0NWFC@fR9 zjml|C9xVF{l;2Q+tGH7cL|I&Sw=xj9Rre~b^xyu6mA$5;)r%$`6>XJBhdaGQ7 z$v+HHQHpgKs+x~sdFQ1+42;87-BnzS>@lk6M!rO^nW}UXS6;mRheZd!tx&Z=D^*{m zii$(Cv^%DX;cy6}PN>EQGHQ-r3uVr#7+OfgW!yQHkAR|ebcznHUs9dnzlf~nhQa>J zs%#^gv++Y!atM#2jSKG+y-s z1J~zOeRWG-VWD9YbrV{9b4&Fdq8Q8Ds%N7A#Ki|38fer-twbJ%hV0)>oq9WrC81AUI#W zNFT_hFxaz6?Nf94i?^$t!D!oh`_(N`aVR*fK0;=kdQ{C4lGD6~$JJv< zTvt1_9A9VMQ;(2yhlM<1zv4R#_uRZTOLd|YJb$Y`p}=2GepH|0@hNe$(y&v|6eDT* zNv%=F@fG(~)(pb`C0Ey!Q1cqp(50!Y;aU0TGnWab)zFlofZkPK!)hEkt!2r zXsFOgl|c_ve$aeC3r?P`xlW-d#k9y=p@r`jXwvcLD+@JU*614A7w&9huFSV$2j$J#O^!Wn) z)jitIDBPV+_Hfwf)z(K4eOpVLPrw{9TBm?54YaI-;0+2x7Zr?7*IuuKva`B-10`xa zR~x{snTxcu(NGCXwC7CR@BePm9z`6Q_l;2px3+61QWRwsYA@juO?PU;$TeBNe*Wif ztp@9C+r!%IfKw#$@%)6g2X2#jN?SqCw;6v$Ta1A=;fD4&VqCL3+Ga)+7hY;t5Kab4 zj24E!(&peg|Gw5nV!D)kt1ZI43X8SFP`u%vq_w4@BV{|VY`=@?A>Nqe4u)Bwx@?|S zoI{vP=^jV$5MjZcjJQ5j=MsYFJOYe8GU~BMq%cp+z}{jp5wG4Q3l+>7`Ng4Fl+RVWB~VYKg3n ztDxKxLuM3zek2&ar;KL2Vh`H-=3Yato=YdrNcWmy&MCugdZ_C~!!^=#Oi!l*S``^0 ztlR-2Yng&zn#y<<84K&N?;uU6Rl=Ai$DEZI7%&DljRZ@HFn+>{TO-nVUcpOdcp2kC zixeFq1L!b#S<^U6hr$>q*fg*t-FW_sEi~|5Gh=65t?(P;NLrVXxV3cKpp|j3m+Q(( z%&TC8yhC|LT@`M0-o)HLX$&K8N+=^Tl+i-e1!JH{vu2?OE+;Z?YoKG1u^)Yj(HLCDg-Qhq24d{W8Ke~&{g#6q1@1!GLDBC<3j_ziFI-)H3pO3ObKOI33i#-6~?Y` zc9mpT1iMPHE0SGN?22YrX?Df1s|>r!va1}tnG(CK95>H`^|3W*0`(MP_v5684`~h_ ziQRxU5f68^7+~hf*dH-Szd9Yu3XL@FnSLquBujb4ZW5FJkB7t;j+o z7#jQ;%LusSmf}~jYe@M3kQ?Cmzp*rRksen-=7(5TS)`yIWlbst4T@vWBK*e4%~yjs zQDF5u9E?WuK@v5vm=69jnHdU7ymUjj`A6D|QFHQsr!veTG`D)$)?9;ABT*CMh=C^E%ow<0<130%u&kH45og`-qOZ9n z@jZs+I_Nag9B^{fD053H9OK5AhtREV91|O{fn(&w@#Y+|X4i?5Ad>YWC!0s2-RI9R zKPOCFFyEYuj4EcSc~YQYZZhLgKx7~n4V!*67g3;#+s$XFMaVMySo#qkk-kAeM=;XhFwZ%YRs)aot0(*06 zQn%PVohW*6 zpZve{fBsNVytfSG8zJ$X`oZ#me(o^PV}kkexTdt`2Sr?AS(NrrT--^r1DmUu021QZ zIEgnQ6)ME_Qu4HBa1sMstHuTMA`kn$aV==_!Nyh!s8%m-Fuk+Aew>NybhTMr5EVHF z^+6!dh+~1sSALWkx0Zfl^W73q*gkFwiPo%R+}nWWo#Tp7N~xjKLDO+@tSgrm5ZS0C z7@QO0YN-G7w>T~C8mAqYD3fQ$ox<9Xu`q51rP;qrwiGPdG~RnH`3N$MoN=p$Tl@!5~B$w}-)8Q^GVO z4vgCZV83ZJZ_}!tESy57e z^IEld7s}Y*WIaI9lUB+)4U5=?NNX+PsFliEKVhR+rGm8_HRJ7V)*&3=L^eH%fM-5y z3Sm%618Xtnb85QvG+C5o!5H$zQR@fmekwnu=2~-+ zwk=*@Jwuw0T59#-R6}}EWP>X;TwZUzMvHUad~S<10$Y+NTdmzGF1!9>-9>9S_F7f= zd&++69W29;bk5p0O$teA^cW_xafu3kEtz=hKU7R)R7?xI$|T~DN$T2SV0^j6ZsdTE z@rlzA2Vim4#8z~q!XVKAVabWj$(X~PiOXf&T4gYiH1X($W(Ug!< zY)x7}E)mv`tG;+RFNO7stItN*xTQ#HO;$?}PU?fz>zDAPClN?M_$kKGs!6QONvX+5 z*iEu*e|r*@Y)5j^AqweWf71AO2#;*&tb@(Tw&kB^k0$8mu_Y4qU01_4fhZO~O=(!$ zmWhQ#8pn!k9IJx;X|^gc+R^xYgt+QpFGE4b`^V=)G^gC!OuQ>A4FALh_#A(Xq0Ma zVa+E<4AOP5tA>3b4kN0k+xKFh3W_EHxi)6ldyt7a*jvA~2WmV!(?~%Q&xTe@QH`;^ z?KC)rg?;VRpYs{2G`Q14RDXLtl(_2vdvomTe#x~P2@5#qk8I-8!?TI@C0t*ACJcF# z?enoS^iH?;D~0;~y4wCHu>v;o_=t>o?`Av8K1qMl1-o%UrY zM~9#77b|fay6)K>I4vFU(mo=R6Ts(M2Rnj60v`Jbg$3ujK#NLk1=9g{=2iO2153?%l)8DrFbM}Kk-qiJkw?x%5w9PRLg;_ea0BCLvNw0XZd zx{`BQzrn)ks^d3Q_T@E48*)Uu-yPFKILxtcA?_hQ7QJ)aD}@<cy`LlhZKVSVv=kwS~zH z%cOuAyfgU`Ihe_MkZe(BUvd?S63+1F97>)~3#T4Qj;Mte=&5tE`34W-FGJ!?y>lt8 zqBA%*VV(WCgmW25-zUmBgqC_8?ZlINX&A#2AxBWcnHXmg!rMBtvpv=Yi1s)Mg)v*S zJ}1F9585oha}Oe)r>^rOCsrcE^)P7Mz*$rpWp#CTI&i|lei>-v6iJ%E!<)s<{!~y| zUTYwCl{3&|{=M3H2y-Lt-H9ir<}U zu_OQSo|BHV;mTv@bj;^oPo4ew3UK{}voR%;|GkqAn%{kJ4yMMRec@9RXIBS|uDAaI zO1M#g66}KU;I4r3*I@`AFkh2UmJYu4tuUt^s;(PL|1GP%zH5 z9@Dwq6jw{0x*{V0W#Hm;S33%UI`dqCFxAd?u@I1I!>I+Xd>m&&?rPWXxJI{)uIZF7 z>TRw%9QP1kI`4LMM94dG&_!q@@;~{-h~C9cP&7Vt-I#hPNZ_cZI^)A4db7> zdg1PDs=Jh=TmH98MyFUHbN9pAQ9QwUrKLJCpR^hVCv#tiIc{k`?%kd z-iL;`Z+_Xr2#1EcSL5Hnm^InyNw)h1#sQCyzsI{<(mR|4u(}&0<^=moz_^L-x}+*Q z>=1Ad>C`L;K1_F85jd;;;9iXYQ8d^67oM}9Ug9nwOV3*F{<;jN?_Yb}Z*ds-V!vCC zKKc8wyE4uX2NZk5!F9>~7(+7tnLC`&i{ZT>Lc+T^98el2^Bh7ON`15Iet)58XF5{*vo?TMfmU}KU1+hJVW0G9`OunbH5B?>kT z@f7jIlX8srKss18+%t^cw&r^Fq7z$^P$7Ycb=`pJQ#CeG&aaP8JB>EdM~33 z64KQ-dQA>)JXZF?U~p}(8j~QWp7#^6e0HL<6c5!CzwwsCpPOfR*WpOcP#?NyzjghDQrj0^7@dwi)`$rgQDf$Blvj!O7F=`9&;=sP0^B$YbHkeC>PnJ zh#mOF_yTjkGG%>N2_k}GeS-)yXD0Z@Ak8#Y@KvFj!~N4X$=8QeW8q+cM>gND^!`qV zuPzy+gxj~9p5imLXC9xKK0h-1eM4wWy)NB1lN^)Y*vAg5KW8#9V$Y_TWM}E6q2^W}b+!1lh`P|%0#|PjzN-eFhSKy(WU!@%mWO>e5Sxnyyvyb;3-)OLZE{)pGJcvM!$h)tzY15<&i5}*=kX1!NnmVCI!GIP-+vMhAedaGpyw0+|7h0q=S%+q(tv@e4$l4K zpG#(EGhzkgy!9V9<8thyE7oyICB_$%GKjKV>aaxCVFkg3*pzShZpheDEGbP9FK1Ou z>7YaRDD5fHRe7@UbM@qoDS61EuJlN`OKEVnZ%Tl;tm~f=M|6duNe_}M0CWcEo0T#W zjrue@r6EmQ8;ngkjstIzjdOy*ej$aO@A8CarQQG~E~ShhKQreprkMEpR>}Y*nEUUg z9I1fM^V9S^Lu$lN+=@RRNxen%bmQsNt8}~IVrnWC>L*uH*I`{3Z>3tvto&o(`*%~B X>!jcki?t5@q=NgYP;kG-SLgl@_+)n) diff --git a/python/init.py b/python/init.py index 15eb53e..61f78b4 100644 --- a/python/init.py +++ b/python/init.py @@ -31,27 +31,21 @@ if os.name == 'nt' and \ sys.path.insert(i, dllspath) +if not os.path.isabs(IDAPYTHON_DYNLOAD_BASE): + IDAPYTHON_DYNLOAD_BASE = os.path.abspath(IDAPYTHON_DYNLOAD_BASE); + # Prepare sys.path so loading of the shared objects works lib_dynload = os.path.join( - sys.executable, IDAPYTHON_DYNLOAD_BASE, "python", str(sys.version_info.major)) -is_x64 = sys.maxsize >= 0x100000000 -if is_x64: - # x64 python requires our lib_dynload to be added; sys.path seems - # to be composed differently than x86 builds. - # In addition, we always want our own lib-dynload to come first: - # the PyQt (& sip) modules that might have to be loaded, should - # be the ones shipped with IDA and not those possibly available - # on the system. - sys.path.insert(0, os.path.join(lib_dynload, IDAPYTHON_DYNLOAD_RELPATH)) - sys.path.insert(0, lib_dynload) -else: - # for non-x64 platforms, make sure everything works as it used to, - # by appending our own lib-dynload to sys.argv.. - sys.path.append(os.path.join(lib_dynload, IDAPYTHON_DYNLOAD_RELPATH)) +# We always want our own lib-dynload to come first: +# the PyQt (& sip) modules that might have to be loaded, should +# be the ones shipped with IDA and not those possibly available +# on the system. +sys.path.insert(0, os.path.join(lib_dynload, IDAPYTHON_DYNLOAD_RELPATH)) +sys.path.insert(0, lib_dynload) try: import ida_idaapi