From 09aa969ca2ceef1469fbcc7e6959ab27c6395f3b Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 19:48:35 +0200 Subject: [PATCH 01/40] change packaging/AppImage/makePkg.sh to be more generic changed .github/workflows/build.yml to build the AppImage --- .github/workflows/build.yml | 14 +- packaging/AppImage/gImageReader.desktop | 12 + packaging/AppImage/gImageReader.png | Bin 0 -> 27701 bytes packaging/AppImage/makePkg.sh | 427 ++++++++++++++++++++++++ 4 files changed, 452 insertions(+), 1 deletion(-) create mode 100644 packaging/AppImage/gImageReader.desktop create mode 100644 packaging/AppImage/gImageReader.png create mode 100755 packaging/AppImage/makePkg.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c63664b4..ed8df08f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,13 +20,23 @@ jobs: run: dnf -y update - name: Install build dependencies - run: ./packaging/win32/mingwdeps.sh + run: ./packaging/win32/mingwdeps.sh ; + sudo apt install cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev - name: Build application run: | PATH=/usr/bin ./packaging/win32/makeinstaller.sh i686 qt6 nodebug ${{ steps.version_number.outputs.version }} PATH=/usr/bin ./packaging/win32/makeinstaller.sh x86_64 qt6 nodebug ${{ steps.version_number.outputs.version }} PATH=/usr/bin ./packaging/win32/makeinstaller.sh x86_64 gtk nodebug ${{ steps.version_number.outputs.version }} + mkdir -p build + cd build + cmake -DINTERFACE_TYPE=gtk .. + make + + - name: Build AppImage + run: | + cd build + ../packaging/AppImage/makePkg.sh -y Linux 64 - name: Reset ci-latest tag run: | @@ -59,4 +69,6 @@ jobs: ./build/mingw64-qt6/gImageReader_*_qt6_x86_64.exe, ./build/mingw64-gtk/gImageReader_*_gtk_x86_64_portable.zip, ./build/mingw64-gtk/gImageReader_*_gtk_x86_64.exe + packaging/gImageReader_*_Linux_x86_64_64bit.tgz + packaging/gImageReader_*_Linux_x86_64_64bit.AppImage " diff --git a/packaging/AppImage/gImageReader.desktop b/packaging/AppImage/gImageReader.desktop new file mode 100644 index 00000000..bdd0854b --- /dev/null +++ b/packaging/AppImage/gImageReader.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Terminal=false +Exec=gimagereader-gtk +Comment=Start gImageReader +Comment[it_IT]=Avvia gImageReader +Icon=gImageReader +Icon[it_IT]=gImageReader +Name=gImageReader +Name[it_IT]=gImageReader +Categories=Utility diff --git a/packaging/AppImage/gImageReader.png b/packaging/AppImage/gImageReader.png new file mode 100644 index 0000000000000000000000000000000000000000..7d8a28ae92a822b8c3829247484e7fce06582a4b GIT binary patch literal 27701 zcmXt91yCGavmJbKch}$^To+4l*Wm61cL?qff)kttg1fthEbdNlhY&3I#&rFTg zOpWyId(Y|9(W=UF=qMy8005wW{2;9k05ETxFaQYlZ8eJ}&h@r}x0Y0r1c16k)F)Gf z|IWIp%Yk8*M_Gg3cBsrhs4D@0F9QGshXKID+o9k?0Px@hfMXK?5Xt}mLYMFDY9enZ zkX=6Lxd8w>?SBi5H$>d??Rwy&w4|o@%4wHRiov4KJMZ+nKNPnCY??6PEBpjr(Q_nv z$(ADtgpeJ!389_A&q6upyNZ+7;@@U-!~&EV0+jQ3N=tdxMQvBlmJ-OJ_4EpbjIlWM zF%_*1w+M`QDB%Gk1FPpb;uI+Gu|qPhA6e!94N9Se_rtkt-gRu=JvO55U!R-6kX+ZKsfDFaH1+a% z$r0(@JB-uJwHEua{6#M(N4awyV2qtD=-D91miO=#8uU*bI@JI0AVe+w_n;J5{lWEF;1MMCurYcl0!#6zzx`l-W5cQdf zD)PrY6#Jt!U-mo>ovrxo+GWo~Ov;S4CTj=jnge0^DVW{_xL%#tUE>wU1>={09bQ+D z<>hJe5KZQ;&dyIiQdS*dA&vTk3*7gb-5I|KEo2`CKg`LYcR6r_vPw6vV_C&KWU=bIG8GRM>H`Vl=MKw!|9 z$(<}R;*AD-GgpgRT;((1x6!Y;wSJwRdyco;)aChK1Q>^5ssGUA$#mx>QG%#vFM*{} zxQG7wRww;Rx6rbcg54E#YUQZ+T3q_Fj*F39RYXG$tib{Pdx@`WP7U3cYvK-21R1qo z2Uqs?_Rwj|0wZT6I7p*zm1XRnX1C@Nh^7FYa`eRWjGS`4#onQeBZTX`OaTd?!~wdW z+(Nozk15&z5NKLJ;N8c(kn z$^rlzY8Z2}<8uD%Bd>&cL~;%M-F>?e@a{& zP60Ku9=w%s!FMph%bO3zuVYqq-=BsOz4{LdQnV}Pn=H87J3H&^3(M_qYTTq7u2HPb}?5$!62Re}CdQ?r2jdk?qA)^Vd1LB!+3u-ro=Z2;Qrk>v^S zn;pm>V)V)~i4&zr9N7`{{vAvOIypI+ws8*(G)l9CFUVZX6d(YonC+^l=cU^im{MjG z+4IH^RK5$3d~W~Xb+9C~LGuIA7 zzuVI^I;K?Rk;1y=H;7D=I2budXh=KdIrlbg?G>3In0o zmPu1DR>8_L9^TzV4$#7N6`1I}%Xr{w0#X2Zn1bDx4Sk?iuZpk2!{0$sYugqfPfe$?CbIbNf5T-Kb9jO-{j?)L8Ur+3g>t~gl7 zJX@hatF7bHl~6xlFLWfLeTun8)3`39n#B`Q?>{D0+6GE=1cZd?1capVh#?Y*)QJEf z!Jt_pL8Dnvre0;#&F5!nhhe@pyGMC`a)Rmg*p-{0_fG%_cBps>btt&~ro;ZSn;I)b zkcf$J8-FL#C_Z!6via@8ikBo35$SDag53KD+S>Y9SqY`eV}o_!iRFDhFj3*aFiUXD zl%o`0N;`O*&F@S(wP1wx2Ne945U8B>$RZFc2lCzh*d!F_^hAT+2fo-n^*sLx+cXz# zeCKcDY_a%(F!Vwa3lV(iE|jBu@CELXv@qiXU0QnD{{B95DoTEeRIs`hre-RDV1`c< zk^wGoZ}z@l+hY+*Lr3U%0QVJa)Xth-9A3)Bz~}Y2o}u>KDa9_k@5QG#?}bc~w_WG; zJnmQJ&R?DGe)u!Bu_5K>m&3Os`uecv>SJna>trPh6>4$9LXZg0pi;y_#j>;i+$`(s zi%2UPAiACt{goW!Pp*v3&r){Qy!P6sycY_LuyxGyBhkhdFRIfv9ePKCSj)TJ-QB@3 zx{sqbn(jWfwzf<;%2EJPIjj~!ximFhlomD|5uY(DzP!$)aaYM~-Fo1KM5|XThXWt6 z@UMVP{a~n$_?_QoV@BL!LeF1n-C(vMt7*z5e4)mcyIzZ*y_=y~e1*u6Ff1*4h`Ns@ zJwdz-?qw@u%vl1SOa>Jqr%>?aO_oTcc^N+$h9?5tMuJ}JD=W~t*vgs~UgSJU7T{Mh zl#O{2dkrrp;_O#+1W16eLkMDREiAlUTvXLk9N0;X^$Zm%t7~dB^lbC69x3pq&m;KG)nUG4OZiJt83S0lP2-M;;rJ0+y$qyb>*- z2-1;IOL2uH8>y5mEV?bTQp5kmNusZeS`P@Vb5B!euCU|%8dp^{vbdP%bG@aU_&VYF z<-7~mUD!5?64AN)99HrJl{CoFMtq)?E<6Psgz1bg$WQNbi7p)*WLOF*ei;+P=twjtPshzSFr zeP~RDa7spYbxI888L{~1t@4%A`uqk3uB%a=L`tD0nBIxmK=9Gqvx+Hh__OdSGRm+? zN!V&!VwXgz$AM&6Ey=Ci5>m#MC-1Kg@&ay`LvaU6*;O>;fnXrmO{ZGWVIfiQ-FcYg z1>D9O2H?#@oS&q=^fv@cCW>ZF8n!u85k0a&|0f$8+s*CmIdR%XPL{pl{aZj?c1WY> z>46I-KZKo5oB=y;kNb^uV4fY3lcKGmJ3Cnq0N`?JVB-%Gbqo^(q!t!sg@y$ts$=Cl z^l2Cn6y@RJ<()gbB7n{h&A&hU6;uAQ-NYaCh?>V0^lA0h%Sw)@060w&=|vjJ4*J*M z;We3UP)7x#h7B&{qwyEzlYfs9%r)Q21&N|@`0ef+%a#h&tkCK*630QFho{bDkpQrO zdEe)EHBWy}jQ@>|@Gv&gvH>uZP0z17`{P)R_Yy#31^`K#I>F=|mc9z%TdI|fB98MZ z@_Dnn^Yxg*Qu_H+bgc2fZy+ZaRj0JQGk5ys0}>!S zpacZtz>1~SBRFr&o-~rS#DSXBOvi~s#=9tIK(vy}WL^35R&wT;l!QJ5t4Pb1Z1R%T&Y zhXHCM=dyV_*&?-p;LWpN>CBg!+R%jP!t1M|nxN;{yl367UlL^)GGGs5u1Os|2kT=P z^3-u3epskmwRpMNAkY>;9o^gdra<(?$;yNa z+j~u6Ya5^IHDt6#=bj$k=9br^#zo5waqKmoh4*-#RPapUj)Gj$Sh7SKC|CoakYFw= zq6n-)Vwl+FIm&CL5uBA@xL{*3&!@YflUUiVZn$7S0)!P$#M*xos|BKuXQBlL&#=-z zx3Bd4#cHjC=(Cv^w(nE%wbC|DNRQaG>$K_1A55!tnGNoT>W+-bviIG`Y-0jiKUaEmnqvG6 ztx}-h?sbvd>9XpKUa)+|)gfw#+u=41*}Z-*g9ihMOsT-golcKrl~c9wdHznVI`VwGWrekfK1>_UOqqHa&ch%*czA%ShCzePKa zJrfsfRC9s(0BzDYOlcbHJvDQ;3p91le{24JR3NI_^?8Y%$U6ii+RB8gROaux#ehbR zT11ONH%;7n0NeoXS3@z$kvdsgFTY3&PtUWP#p-Axzew47XlxAK`YJhH7Nacg5bX%z znC$vs{`?*wTWW=yl*VoE6^4d5Ai?Qk%eA0?o4)BS{QG8!HSNu#sIiwQzH;$5_GE5P zUw%)s!9VHmhh+MfU`1VXGL3 z5ucw3!D$_dNE&Qy>nE#DF2Pt>&h#BRd>G)G_46@)x@355G<;kVKb~S*u<%TJBHKJl zcusvWDO^ialOsRuS%PZIq(<4?FR+xK7H_VA+x@RTL)O-W2H1T!H!&*!%W5Nuv!+~I9I?Xd9pbnC11J?EoQ7mo9fCaB}>ze=&ZstPE@ z`7Iv3n2t3(an-MO_jpeOdel-_pd3AknO}0P%ldWfq~=Qw*B-g~2c~c=s<0KVe3<+_ z(9zAq7pK>u`!e~mG;+VIoQCHDipcpDnBK^;8k zaBolH-9{Dypveq|%#5K38WQv@nl@#4uC_7*Qne#KfBIg!`&^WJar){C zt5+GYWkg%h^xsz^b_|doL0Q>OqgLZ!08Itz&}Q{QPq`0jc%qZp@xv5}ZcLfeMvS9> zV{5uDZ#Z6tSX8?AvsCabvB(<_L>_=)l~QA-Xspe(kgT8}YuU!Yy_A$b!ZY6YUyZw6!N?qKaJ_65;(=wtYSJ>v}9^(VUVL(+g?6W7zMCSv<8n zG^hRnZo-9*(6D`^CG!iODu`*=`x}CdAb4?^^X&^q)Q&V|C~5#8ppfqQ>F}iIF+1-9 z_#LJjW4(@wCfDJpR0U*Qw^vhm_+pINvOh5Trs%CqVZx`_@GW=;`(AH=h zUVFfW{@re_KJ_AF>Nyj#Q$(IUfJoDLHZ@QpU_DaRTvprB*+o%`XR z-q*kJ?_@&{af^CARFV@~j;Fn`Fz-)#g_RJWJ1>`f!^L^Ft=1c#iPhC!u zZ4{-%!O6Pwr;XgGWqs$9fqol4%z=-gPI`dLlDOEkV-pEua0psFnU6bYx7;LYYi|g^~Q?FD#H_XYQ?fy8TC)+vd!UV;j{%F{Z_@~ zV#1*N;l-Xmq~w7A)OU}L773c3=c}T}T!BjdY|a61DZ>rbbk&L)#c{b(!t$Yd8kQq( zZgQ1oqivTg3h(?)ley0#&?8-=8lFsniko2`MW(3q<*YED2qHZ#4(l1h>gXvGRL|`1 z$}Y5VO6+&Nw22(w1*!w1=y5;|vgroDM!4RF5FbWMtkTn%Y*bKf9CY2n{MqH2HQ7;> zLK-{keb4{SKX(kjb;3P`5>#EuB7eIM9vLDKZ{utOdp2x{gg6CTgShh)Wl9NgP@(nS zU6fRL6%+wCe|z(T97KpP{LmuU$cVJG(81;ELm@-!s=6kqWdGdr^;wzf!C%V2Ig0sZ zpCZ3ZZ>`YcnDQ28Y@?~Ng0xj zGZuni7BPZ7`POLQ&J-o4X}~a>dyv!xo9V?3v1P*Zx*$!vFi!^HH=i32MKzof60X1# zt8)+%Q1Hj5hbRAr0M@$q1kL;IWu@TBmjT~cp{f#pfhR>>hI&>b`sfEd&}+rx9iW|N z2>{ZNCjBCHN4!{%LY#ONO792k*jWr}&ef{yj5sPBNlj9muXKfFjZ{=c6b9p!({>xl z54*`nsmqW(d$%4lokr%5_ugYXoW=YklK7ltBaLkm*(OtVt&70aIY>`&n7x!OZ9)o! z1z*TW?z2tT|^y=j`kC004^`9k~ee^s5Y0 zN7}D3u4%tW{pjEs-AFBWf^G5vTA23-51nVn(GUlMi3HKK9dTJy7w!ZLw z>f{2Mh_8H4SNY)L?DozR4q&7nQl!q4Pj?%#tJ9oFCuw>}JD=KXnIM>14pkBNWWfog znsU>fG|kWPE>%}!U@q{kxL`qEO%X3?Y^Ff6O5o4t;&rfv;j7ykzrptHVud~%=0X)N z(`c`MWjo)6cf=z~Apv(^sN(XT1~~_K&AVl37Z(qXPObnzGj-6cEj;{ssK^Z+!Dj%* z*sFKTtuNlKi3;plGkfmQT+I;c3emNjJC4`yQge>-C{U|lsfPvf;iJ&M&R%)#>~axt z8%!AIyKl{0&mG0C5+a7jES1UAfF}%c2t9d7otom_(}Ec^dQD@kvjvl~sK|VF&Nu=e zj^2h8QJjoRMi{*=iVBa;>KJ&@t+d#8vnq-BvHeeAJ5#6Qep34E#hs(S?d_e2SNoF9 ztRq65)tHAJI&N);dlj*>Y7s+yFEH67ri~dMz7&9jW|MaLocx}@P`aU#T~bFj01Su0 z<`2}0Vtb}1s8)CxCGX`gYL#hLkQRg}@VM;^z=eL@c*CS3NUa^_IF5YJU!J$%9tX?D(O3&%we3AQ5{^v`UCIgZ3>&-KX2dcY?<5z1Xw*M zJRPp)fV^w2=s9Hr0?xa|?%w55un`X<)nUS3nKn2njL5t2Zm zHktmRZB+M{IpR!=^!WBDRFjQwunDE&X44_W-KKbx5Q8GVE?ca~u_=^vL_&Tj%fM8(7Hxos+`KFUh&xE}tE| z^G7aD028@Ki4hfgv72b)X#+?Gvn;{&9nqs71D=Nn0d!<1T#-+ZUpNn{#Rbh`wfeSh zQJ*0wTC*eAT2}!@A1#x^;914xT#8ey2>)9>h7E6;?f$-N`7zm2(9<#SW&8bE!G@Wo zw=y<;oxUyQum0_QfAj>)M$XrqKR%H(f_iBK6pN?FLNIu+ACP@6o6Li*n>e-}uLRB$ zW!SKS|Ezq%=3z-BKi+m<<@uM~SIe<|8p~TG#Y`O@k_4S6LD$m)1s6)Hpvw|SYBD3& z))5 zpQZ=LUh@~4R2J|%W7QydwRY>)2}Un@4Z}dl_}AjGzQ+2B@58?%w;sGa;(_GyvHl;=~GPZV)Zg3s^iXcy!3A*&>ip|Vy! ztFGdb)1LFBF9_y(SgFrpk?5xfP^n@JWgQciqV}sDIdnOStm@vHR_FdPya{U;3Y%|E zq*Qfb1JipJyL;{XG0m@|6B1t5t_FJ9ALZGB3vfzrfD3k<)&T+etBcAQ*wPs=0I$Wv z`TSFdjw=H#?lp0jQ`ZQ@YstIlCDbqy4#_XEo3Ci6wY$J6vO{X_Om>fe&f>r;#}R5->?&=4C&>|NW@JcUo17g2rM zrl+oiTBost(p!MFcCQVyv`}_G-udqZG%UYV5;||=YhDQ2H}xaM*$E_A!h=bzo##kQ zJlljCG^c}0W~n2!4r)JRuvoX8urf?oSa5}q#WvHkbp<)!{SH1D{IN$FbkI~?>*cRv z+`71k;)xx6gTW6-fwTo4NY78Qb5vJJXlk~_yUS4)=aYFRNsoH+@q~ncvHWr3)T^H+5VM{q2eUgtI#{R zIt-u)opfx>Sh~BzX0T79lu3!}NZ>CBR{n&dp_4QPFWX zJv$UP0?JSC^vFDmmd8xHj3w97R!9!dkgspc%Cq!7GNhS}LQ=JjNn??L;FcwUqA#;t zf4ct63ExgA)RSHMRkIEmc%7u~IAh+(IB2`Qkvr_wF+}^MiSmi)>))}1Nq%n&y7*#0 zZHwSr$TK+#^`~Tc^OBhaU|_lY3^Xt-H79|e*J3TxrHks8>z??0+V{MUbmw(|+TV0E zXU~y~Lx*$xM!r2tnQ}niPvf6shCRYTucG-Ab2)YkgViI31|CPG2D)10#Z2M?x+IOA zlf*s?^yH2*Ebvq?{phrF&!|f%!gFDDyF*UXW(BP^du`aZ_?$vC3ziv5$m=eJd+yub zvR~9FjXCpESTtkB%<#cg3TM=SsPfbf{Cn&kSA^d9&~|Ew)Ov&pWh2Rb+A$U`14AVM zyp3*Sj^R;JG_3v+gS|mNt*m`w=-<9)f5 zEfrvzup>VCFsUcGrofKn%oWZeHY*BJ|-U? z{Ke4h{Q$xHhzEtQfPc6B>Gb}G(ZogImf6v$nFqQ=BLQAmw}I!J*gCJvI9>lcTR zI%O;Ns=22S;eU1%;E{_WzFbSnOSWo;O~i7B5=6m&F@4pVpSgmV&)FcaQ(-CUlYq+>gH}M_tG0 z+N{8QK!d6IdhjQwTkIHF-!~*}gc9W=x1K^;5z7!{In|=PJibu^EAVC3Pf8LAlCN6+ zmT?%msuQyO6xgzUVpDTV?HW3iWY$X+My0v=IN{3QbyZJ??uoRKV@MNb2kAUuH(uuv zB167eL)z%W5Q+Qj8@Sb{B8p1QI^nFM^mJ(-exO{ffpY7;AT}$E4x`HWYc5XaYwS`C znbQLP0qK*<$C7posKQ}Zt_eYpbrU>RdA{SSmKIPD!l61fJhp$m zy(cuL@w1Na9C-#y>p_`cnrgl}nniTItSU-=Dxm+lh_`c8ZiaS?=_;E;CvT!0;{y}$ zdnsIzl}&_m+g-OUf6?1!=JghmG8uEqpld(npjXAODe*(mhMSgw2VFjvMCbF0JBIK< z?Qtc+gwy{C8eL-kndp_$>45~u-ETI`QjI1aNuVxrAP{ynyqh$wR ztC|4tKz{i}5A-GB%^&-)ZaWTEWT9k!kGs`hB@+jxVS4>A!<;Ho77zY~e-m0LY^PMs zL8>N@3Mqfpyt5>5{G75bX>8WET{zCjn2*Zka33vaJgNfK(aQDbK0Mz5xH?kY*;+2{wOGhD+ zf^AEREn>LmNtUpa@Xe;oJG89%PvRJcfAX+L_Ssl?uv%~yhS9)3`kg&@d8(mwd5Sc* zeu4+UaWDw2g5~7u9|XyZG82qt9{X~95B#1snm!e%JKIpJ>8S-i%uG8!-KLu$0T+{} zPL#;QZ~aQ@=WVUd2WGB++BqFTtcoHV-#|osgtL!v_~aGjqUh~PKD4wD1aoChW_VQ; zruUU!`ryf>%a7ra2|w|N!Xg$cIuk(RKtR-p@w{!?LB9+HL9UR>q8eTDEO@WhMaDWG^|nM!dcIPds^1 z_tUf$^u8t}AUHJ{NEa=e*G&GZU!$q|p4D3nFv?(=q2Yt!oK{T)mKJdjQSUoCC+>Xr zhteE$&0#~R=1x4~(ev`&+((|xdenyV$vNl=N!T-Ra0C|Ee0+T|e>$!k2W(!Hn5192 z4GjxGk-#_`7$S(MD!qSIQX_($LDF1pc+i33CrCNQvN3{)PcR*eeE!6oUS*1oY<$|o zz5ikJ^6CR~?k~ZK8ov^5j8s^VNiX7e0>)7jJ1s;OrHBvfE>y5PA=qyJ#qG| zwy$GA0u_-2z>|5Sh}ihPbKq^Xdn?f|A`iSoUvdPU&%RN*Rbw17cjC`&j_|#AuOmS* zhJj~kz>>GONpa%rdQxAP$#V`OH>RF8<&9z!E@En7W=Kt0JH~CDSZuwz1xK}OI!=S=i@^{4g3lBY$Kh?jzCBJx@QqX*k3Z=YnPhIpsqPISmv}7)nqor z+x;!DwQ^Tenr;<{djN=3Dpk9S@8m=PqLTHipeZy)H4XY`hDKgX7dK0eU6M7+Hm#zF zytc$JACpPqW#7aj3wCch2wziMv9ET{RZsgD{`52Cr@-%Xpq6a)bu zzWe)}aK>Dj=ohCP)lkr6dgsM3I(HxUZ;kinA7|81C{75)MHh6(wt1lKvB!vZl{YAJZ>IkPd6M@qa3c=PHq>c}Q~h^D%1 z{GOPeXCxRm?)RaAJzK+Ea{R*Jn8HS3aH>2+mzi8VNG55Q0CA0d#Q0^Jl3TdO@vk{d zFlE4nI7j!RtG)4127P%sPCYUZ1OEHI&y?Gv#e+K)}OwDzL(yT z=0wdBJf#$*$l(VhUl^dgkiDwd^2ate-yiKh?QgWjv#Um8-G$I@7QhX|8<(zA*-tZu zf)Xot-EaiNYvJuAVRyZ^ofMxUYogzq%_T98Zx9>5NXVn(Si$B|*EuZ*eJuYuxA z>KnFd{;K*_F0UyM(~BkGAk^>$#sw7(0O&rB6Ozog!vZ&g*G9rBpn~A6xQP5s!lUzZ zWW-O(NS$14Z;W75DFT7{rNWik5<_0V@#P4n=$kAt$CA3e{$g~}i57S{dJN(Zx|Kl( zJR@h1T>!x1W4TuO5Li-eK24HQGu-_n02~rI%$!vEl7m$>gb8-)x~XEZfnJO0NU&4n z?A!*s24S&{h;!ZJFvBo0A{;Onk)*4KD6zq-oznoXMDPyy9q*O4w@a@?Et8)Y{#fYV z3N3lL?UqlkYHO0a8q0QD%gj(#mqbMl4w2{;5!-fOa$a5~&gA69#SZ*y!L4Tb$ex6r`ljzocsM&mm0e-*!YjAeLtjO&qGH6X^ zNk2aY>K3VHU><|M~P_vfVH&8skr0yE9o_~NY8@s;OEF6%;1#z2KEKtMFjB(&3 zs`@X_3i4XzDb!=FmIR3Mz58NF8PZc;zOj@j?deD^&=UuD~geAu^A` zs+=!|*f8Z(nWK%Du*owkY72*Qsaa}$br%|Qi|fnhAr>6toJYhaeN#|7k5$>6g`&kO z`pRnAR4AqJozX!6UTLnj+{`Rv@5iw=mf40jGi*s4u58s+I@0(SEG-!weVX#lKs+Cdl1E^DUbGdD)q8aNM-Aa;zUq zQ-)_Df8*LkjIpizmd4DCXXlpxGH>Cstmu@zZ1Ecg!0M}ZiiFy)7l+kXnvI#D#otm{ zw_2jT%zQF^J{Hd4J88UXJrTJg27igBokUx_MGE(v6g0A!7-?g%cc>4uoh60&o`8%v zzHUem84z1nd}GJdMFOoJf`*gXlD1Vd7f&ZKYI&gTdgz|?+x(@J^vLw6dd|a|5@L*2 zl?N^711YL8*vFW6ap>r1GW}s#%~V%S-*vC6p06{FgZ2DIU^`8qxJoD((UgVm z*|1^9MS|Y`r672{J3N|0$1>Y%%Bg3s00;H**J+2fKohZ8R-OOL=mtH%an-LiyLHEg zWm!0H-1d5{PVKF0-@vZ^5*A*=!e|j&tP-d*2K<=kD!~U;ElA4vu6ne;U6uM+3!j4w zbyF52FJ2rFqN!arFz9e1B7gf3u;TPoVboNiNba{*InibRY zgVC{z605aU!HZXfLDxva)=^Ul@Di-u2e^65vOwo`!>i9xd{8BS3PiK534sQbL(nxl z1_Nq=2c}A%HA#oE%9dez)w_9rn6!7AA_z& z!f?JwIYa?2lk75S(7nGW))Uq%f6cJ^t;L_`Xpu1AM8jJ!zXzu&$%BqM zQbHms2YKdYS2NGaV!J$xBu5;O0msiI$yrQ`^fDd>XtKEwyhGiEt$H_+5pJ~pDD^2D zUNfjYvs%;1lEZKp?$+p~)A*vekLSxgf3@8rZ)O~(NbO_qOLTSh_zpZz=2PP9);qCM zdXW{vzfRK{+G=Pq6Ptvbj+u?}TJ8v=CJl!kXjFKEZrA!D(r!O(-usBimP++l{$N7L zPoA{;R?((en4}bo&h!m;&1%8gI=e4Wp2_w|d`Z=R#tMlMVs|CStQB2eUOt^4v^^!+ zvr4Q$XDsg4O%C{qzB<3$QyRn#zfm-4hrf<@aeKPs0fCzbm4vQ;j@j$WHoSJJuI+TY zEa**D++$X|YkY99E((B+T7C?b7W}j`zZwdxWZtY#s7juq)xzQo-kJ#(XDAYlnCOU6 zCxH$gWZWG9$`*H4I=uWhH$L}l20RO$WcEBK2ECrvTu>bM>@|*uIJ{qm6I)$~x2mAO zHJcecY)!)TWerxZ%_t!(v=BscpOTbDZ}VJ%gANxqGy1i!t4OLQ&zIkjvDy50U%)rx`}oPXe@YGW`3&1lV*; z+(;;(0#%W3qJYK0slk7$LB^Q=-jrSj0Cb zN3?Yg(#@b16%h5dc#KBIKZx`jF40+hCPmf~T3SHx>Jib|g{X%m33v%5+AQv6o3w}W z`thQz{_LmS)EUDE(3U<#5hMv({$7nl>9ajpSHuo)NYKr|Y$;ieoLrogsyO5{)5hk- zzRH}=(quPo)9y6L73%CSHz!tbdz-9$kkIY9J-?`2n{kOG!d}{?{_F0xb!PcjcIo~J z>@)xC11ZC|Zu}a>5;xbP)BcKz%ffZ?dXnbW=z-kf;EK<7L;v;*eYoHlAw;kpFeCz0 z%&J(szJ~frZ;EE9Swm_=mO$5+EdfMTD*2d5da}}!3v@ZKXiQ;oLmNcbpPE3Svb1TA z2cglH<4D#B9R~%V2VkS9Xp+FvQSvj(-A`Mjs~-k;K~LACb;v8Wn4?9J98mZ@_j^;FDcu~o9?w*+ruC@vm> zxm6OCn;K75K5ygfX^?bp| zG$aK;X%CoCY=d!5aem&=iF~BVkzTT5(qewyTYasKkLE07ZqxL)v|TuNKSD=jVw z+ibO#%C(I1P3y7U#puu25hNeMma#n}48u}Ob7(K;MxgQe5Z^!ub0VTWn?f&`Mp|Ox@n-A61pG3S6Rk2)z9juBHOc^2Q zdesZ0;jUVmKh}?21q=zY$1V6SJGSUBzKRyST3afDP3b;g_THa@^+d7G#XE{gCR}`X_i3@5 zY3Fj*eo#BBP`Z{i&yg;gg2(;Sr=tSX)gp6GFlb&8fXG8p9HQ#g5K>0>tkVnKpj?t= z&PiWNs8yp2nVBK(t*dhQZ8Sf^BW9f7U#{kts6{d^`aj%-{5#C*i1~9v-9+i;Nye*G^rVv=4lq315~8 zset=WFAzfGIz6Aa0BE%r@mr3OYqO;bjT?xWGiN;X*??S%z=8HRDH z9|YLyvLQz0+!#hN!5@A}?K`l4pU0T#?aHykQP{U28ond}qB{z|s;Kd2)%?;m& zDn0k2cggB;Tm^V)gPg6UELeYh%bOn7X8wNS)viH)Q)inzevti!ae&bF9^&r#Ia=KX zvnxOGw`P=VQD6P(x?=GcEYI+W4)6dFe5&t$zD^6#gq4b+qKlEX_?T9lI=`#mKJ|;( zB+d@KP1pYI9mvhM^(cZNL;reBK-7a*-xtqxjVBG;y+=>(BmvKh<(r3Tc=&v3`8T}f zP&a1>=FPH+!l9Q))4FMnKW3&cWNwHu{k>o;hec94`AIZj9|c0Sv?uCq;(u|z<-+Ka z?J3tH`7rbEVVd5nvT`w{`^WNcAv8|dY+z~wLxoX>^h17%Sr{W2&oqW{=%>l=kw~P7 z2j6t=J2-2hW;&~XmAX&qho;@@B*S0hzdV5Gnf}~S+_`#B5oeu~hWa?*KVPRPq zGxLww7^=~*vO+4MQ*E~KOyvXnrgr60w>CpifqdJi8l8%HSs_DLp(>FYx3;tRh)>M( z=Z691DP<|DfD=M6DXduP%G~u|j!gl-J)w z3cD9%2G51KuH0>3MD8>DqR5ZC6aRB2LVP|ZOK-eHl}fdG9y(vXYF11t!-yd1)H72P zv|Z;13QkNx5OCf7z?}&XFvirk{%791Ke1a@*Ejz&N;Jd^tAZQZtBnz{p1ZoqigKKs z9&W#_D)sHZCEi~b?Z#40LWv$G0PQe8sivxG-xL{=W}J#>suMRTvRbQNl;roXqU9kljQ&~r-KipN2XF%0^vJ!!**STwD5kIqk$QD$#iYIy1}zEc=5h&ExC zd_&mBXavx6c&7>uO&|vJuq4Yn7N}$@GJG5TF5;tJvnWUN_2uQ|16|?b z=6xJzTxR!{XuyCU0Q_h=yoStb5N_(lPuMZ6I&$IJo9WqX=tw4~FV^3*&*9poah8R3 z`kelo&GRi!g2Dn1NDpI2Z&eZ5c?L(wk7Eo{Wg`YZ7GlDWky?^t3dhEzORdukQuHT3 zTUC5fSFLz2jo^_eKG$%16d z=W=a4wd+eQKUUzAhH-fcDo?tylA+LhagRO}Aog zk0P6)2B^c}u#o_Xw2#%Q94V{GBiShNhx-gj@?Vrk&@f~?jMGaiV`G0$ zKWRdBHGnlysjs4mk)EQREt}#i9#RsO_?V7+5v%I3qep>B)N6lTn&vAs6+1+- zM=O><+fH3b!%>i}>Mc@~aX2`;Ie%a<=D;H@u9`_O%`j=fgu#n_N3XWRU6If40{6UC z@Wn*{uNRGhIWyBh%;(sZCUZKF*z|UEGUz7nb(Eh!V4M_?i1O7?mr$E8Suh?6c}tU3 zGU~AB)+}btj#z2P)Jif_g}q+9-Yk*>4)1^!{wisjy4qS!e*Sdm-uX*7Uv^bXi;g*} zmvasiY*@G3y(TL)$C8dIEDvL>XN`{c?b@(A!KU{R)u_;vk%t-JG`|09ZOASRNNA_T z5|*fRx*4UVX3yG=N7IeOzK#kWF$4!X;AxR9d+PL9T=w%+wMTZP09Z9hFd z_4oJx`W555=#j+=jQ~@Rvt}rk+?j;i&1XWbt3P>LKm64zFtW!VsAFyL+RQEZ+Ly+p ziobUt9<*GBgcYK1NI<_rdTYQoyb9N$UzMf+S?FR}EFRQfKDl~X5brPrR-eG9_Xoxu z_`nM43ssnQHnD0FG#vmQDSZFdyqp7yq@(~pOYi~`|$Pms`D`t2AP1%?_gHwTUDy5scB$fw|KZrL4T3)9wEF{+rH3&o^i#wBGf2 zciF~$Z%Yo-HmV=Z?QrUg#>IC=EfT~~(?w|uC{;#z`Tuovl>u!vOY{bJDDLj=v{2j~ z3Y6kn+^sl)0>$0kU5dLDcZcFo+}-u%dnfm2ZZg?Db7pq$&IDTpjst)SjOjQ2_fd#Y zF(gj`)Qz8}s9X5OR+;gGSaS0A4_g*XAp<+u$EMGU%A*Hy>5CUd?TfBZ6@`QKQ&S6d zA^fU2=z8Ch=G|`0vpi@M<;ExfLv?la#%0iw4R88*)@P3yLw1Na`1||IP&*CgZ?c;O z58RvcF>UA170KhHMAC)Uvt@bhI%X0tmdt^aO^ z-w=(Khhb6?B)KvJ#h0Pt*HQHHv<=ybphCYOwdc5b^cKoKkCi4ZowtHGJH+K7jvq(8 z7HewI;dy&BUyhI~Lhf+i-cn9CGmrJSv)}oZajz;v*kgAso~_-%)XAxWZdI_x`s8Yt z!LvgOAwe#2UV=5A$x~0NF4X#yaG`OjzIF2|Yw#a9K|T&#{vSrMP+}BdY=ucyg>h!9 zqj|jALwq%UHMJ1l*^H7MyB6Al3*O^}ERvrXxkT5-Fm`>S5W7#4sS?&7Vt^?}|Fcs3 z$br!RfGDZDb?MGc*g>?efS?5tC_Ozvx094{vsvPTtgI}7E3@+P#|x}%kB87nnY@oa zyC*lhvrD)1g)W}_R?aCJLF(3G9jsRACY@7;T4T-%=_a%jV|`LmJ@`~jqeu1WoI#X9 zruj%@PyzHoj3A+=Kf6b>blCP+0y=XvaG#w&K+3kRm=9*S2TyC2^x zk7GByg|DC6-p(mLr7wMz+oXCLzbzmvXuXYmCN>Iu(`u9c=*!$T!D>^zl_88&*EZI9 zEp+~A|5KzSU8u+B5JX_&jtmEH8xc9iKl!caqY;4l9E^zCoez>J8%4=g$;kW<`;*y| zx9N~V?#tH#m`_VB{|Dydc$&60DBc`aAuGt}o1(^H{!2tp`%UA5XM4Yb`ESBBFCGR{ zA0HMH+uC3_0?C@HEdL&9o_Hud8HC}vvEOxVWa1wp0;AL!tP zWBtGSI13{w)Y6U=P#K^2Njzu-R+fB#ad6~7!Na36$)Lv%jflH2K=>Uy%mX0gltm$6 z5sK7rC=`AoGKvv53%^M}U+=KCv>Yx{lYAOS2x#_vX!U%MYOlT4vUXP0_cYR% z((vF&{+-A5EptuW{YxVMs^&w<#KvH(2}c}80t^*&rz((>UqN>(Xcsj=jcIICQdwMn zSx^%_kYi;5`WcMyLn4SMSFFP*VvvY7R@O8kBKD#b{Y8mAPmWH6#BwUCiu5mov#1d) z#~0*aBgkmEV~s8?Ev>Ds&ChG7si}?qKt;R35gub58>jb8Q6wQGUNeD$p2~^gK*7(* zVwx?6_wf9vR@xh>SXo#&Pm(FfuZ>OTMRn(3jM6`1-FCoC7!0u@=is_j8o!eVzkAL@ zUU=g^NCp{$jBpzjrS98U><}Qp9Fq|<^_P#+`_4#@X+2x$`51i_TTl%8cQhx%hD`D7 z_VzXt6B8;b>XJlcLqh{`JnE&dv%S5&qN1XnUgk&N>&;E_75gF;`n$V3B_$bKT^;O|4 zptmMCK`~E=~zWkiA^YU>A6dX)ZQ~OGCn;$_4!f#wRdxIp$^SNo?5@V zF|w0_%&nFqMSMSTCNd0yv9-y+v%Q_8Jqyzkch>*;_6(u;tVl{Que4GpcTs>;sJjxt*R@MW(*98Z3q@A%;0bFS#T~|V>Dx{Ub>+5U4 z1Y;u=5gD1iv2hP;?1x{q3H|nFKaJeozdf{-s9S0M2Z9xQGcK90U%yhK7BFz_E2nZZtrT#kNfQYn+ho`|fUrf;yNlQoGI)ztex_ii!+|tB_kUe|f@n;sT zqyi8FEEYoP+T-scMpD?ATdpze>#QbjE2<hAu+2l4Qh4`e+{a-{@*4xckdsrDG zuNb~d&Md~=dv8*;?|wE}_@ngY`h`pqef%Vu*;(y{x%GuPgxlxvxa0V541@g9UbZE>BYsxxw*M1 z=SRnftYecC3i9-WcA&0K+whbypWq$m?oB;7J82*%pDS|`@1+m z>+IpfqGC7WL=aAD>4(F28~D9Q03sAXH__6T&W<~@rgylmm8HEsq(??od3iikA%u@- zXJ^KZ9U`jrXR;dlZrYx5-X=aIKnz2I{4qy=-MQJN{BdpKb) zMQpKz)#+gT_^;ob+sm% z+=_PAo>}4U_hMmI#uP(4PU}7DAAHhoa7gh%>#gxN$2;$PS?Dyae%_G5N*g}@TXpLa zog!jcsC+@V*+cdoU(!MX0^?0mCSw;u^k;s49->H?xpPB9L;d~z!^5)P33vCmLX2aR z;|gB7DJHhx&Frl$jVy~Q3#aFzI^OP{w8iN+o5wQOwhbQx zq=TrdU}@s5(PUO9#hiq}d9ZkQf3NUyxt(sDHWXN{;W8Tz5S*8ki;ATmr%YCF4zhum z9bimig47l>4l!9FA&*}B>s5$SzG52lxcU##^$UnHw9u+JIpPQ`1)zfEfBF6SD~kny zDH!LqB>|OCNmdd$2s_i#)BF9rC*|jRd@mL)ca|)z2fNt3C{`@XNOhS=0 zAO{mN;R#7 z5P%zX9Jz$Ch&&5O9I&;mgd~{1e*LPes|z;998WZhWkM|^BqTg>i`CcHhl7K2Vh?m@ zm=>PQ+O+~d^f;jb7%=`!(teOae)9hulbV(m5=ge9_2J>+8zrl9@-;JAoI(k^Bcw_n zUhDfWgC{eD#$iQPdpSP?Riw|E08ou6QLOVM0}cKOj}8e&Q69rRJpmmnHa0fcbJ042 zEKZw&?~7KVc>|@bt*uc}Q4r=sqE*~iwapGAY)R!z{{HX&q}T~iz#zO7JMoIZ#`0iVUpIqBSCqel-7$vC1z0aZvJ9k*ccfcq;s;P*bnjHz!%a7Uw%o@NIpClwVH33HTu ze0=6qqPXS%4bQ)s<>e76F?sp$A<2~%=lwuLEb80fXfojm*zUE}L3cn``0-cG2N3Y0 zZ^SuX2-|&tN~gqzC8WnD$*0THG}NE)=Z~nH`6Gn$qIP3LH66 z#)j}cU{tU;?Ennm&?BMB6)npN1-9>%O#_u>q*TR86UfwC6A=cq0qOk&JrouhYo6Du*W&=_%Ko)X%P@3lmD&YRl3@m3F%S3^vJ)Dn1 z9d~wS*XU|$W`>K2N!gE-L+|+jxf$6-pd7&g_V%wb87+`Q4GdYtI-9hHT`P(n=A$H# z;|G%nd8ZshuZ}Pig8(Q5ay}&zPA(pZ_&FP`3Nm*l_1AGB4P=ID6w^efEJIv zn3hro5J1Y|gsdV2?0hF@U_FdfoC^^i0W-x#ajMV*c163}APk>7b`Wq21#U;74x;Ul z=PH~p;r0Q9D( z)7iBI0!*lo&zvz72~4ZEocBWdVVogMG~VKXELHviA^%iH)D^)=YxOgFgS_C~nUW>BAULu54 zfsuhnM^>R_P|PeWYpbhJP*B*(1(8PIAWOv+dpm1utoKMRv#}ID`>Y6{89UjZ?4$Sb zsv{1Rh~lrE;n>$cfDl9oG6tal?H_&XqPDsMe*TBv09fSKwziffR7$P1#{c8wfKa8)oI6pr>w-Dr@z==N)adC1&K|_C+pygoD|2~5rgB*h_0_Cvfjx0BX z%g(`(%K3dHfkACiN(SNu@pQ^1>SYdUj4UjQqCj`JzrU#Ae;|(^wz04Yf*x+vSa%hwAw)-dK+?aX{NEE&VC;^(`3-xiiOAk1k{|U8N?Wrmc zWbO|Jr2@I7sfeV@(Zk1E4@(shRWaz2Us%jR5wgXeP!UY9p2~0Xqql zq0`Gp)%x}k%I7(^-bO*0%Or!j57hIrFQqNm*9}C}V|cJbeR*0fDF&Hl~FHqht576aCt^i<`ZVY`ys2?M@@Pp=g~A8UPdp$ObRw&yMpm_LZoI z#V^^_C5k&!0F|0DvTUJlhv|)Jqw0nR)X-~VPc_T=+?g`*4XZ`Cr}oFB_jDZvh25{M z{e@}`z$)kk@CHR706-S3Mj?*Gmr0&DNf1im`}t&yqVbt;R(xB_?}KZ-{Ysnjj(4>m zO&PNo7C}`KrI!u(74u^Bk0}qfwWk5f`Y?^~Vf(MdCpmXTMjKHAaD0-j=F)1E}w(GW}UOtLU zhNaoPm&IpfI zk^h&{8vMm+xNNc05}E6!{{T9&y51Vo3v3#zS5KoSqF?0O$!Tn&tXooR0C7OZZk>+j zp;fJ1B{Bc4T0^m#NBqCVKbs#=AQLly4y1WWM&LUMHE3o`Qlu**`?<`@nA>b)6biMF zJlVSnIKn%+9D%^!z*4SXkyk6L;T*w^Vn2;<7DUs2Z{msZrUG-=43s!`lpMPP&vk|T64TJ>+jas>*W*fZa z*}C`43V7R5A~nD2>)v zndUk+c6+AtUN&kOvu#{^IA;O22RdPzkyJq4U#^Pw<%7D3#9#o^dk{u#$lV>k8jam~ z+2O+iwX}bd?C4-M7i==8(aqit>=}Bekg|!~z-5i6RXN%#omts-3vBwxw%l&#ZyWww z@@{=_K14h_81wzvT@Nt0l`K>ODf4nGg3Gy~$zQtAFq_r9W@nLMU0x*M)%M|pH1vx z{TO)h*_L(=uU+1$MSImsw*R##*>x+vfuZJDE|{i7@};k6a7h>jl@Sw&TgM+>R#Br@ zq#oxG=hZVSqQm$k{+P`nr6oGHAkXp66tl0L6Y(VOHMtb@S;_9pO|A3coHCAV@s-3M z1T2e_mAKDnn-+`}qKM@_-&zGO8|Sbd$SucVZ(o+A=XKW28FI!!L4D28ImZ zM{^+h0d(&Jeo&uba)$rHZ@$1I5UR5px6Hx$9^+bECEdy1*X#*NsZjmaa1wXfo)hf+ zxK+&g>0fCx`QL`xRNB~lo-5sgtBk+k&Q5a>}dk3zSI!{Me>ex+HV66<@!_eon0dU zJUBO^!zIZ=2YI?4?em4skj@9~c3)(vb5BC&(wm3SvggNuIfQVIfqgD*W#ZeXVYfr4 z{R@YE9HZbOBt&n=I<|LgBaLfG5E^WG9F^zkn1Y&BkwPT z-AFNPU*m6~lM<6AJ%3a#&{va8b2sRZPB)0g$H#RDQfPRLg)`ioY;pPBLR+s`vVf1`@|+R zoA6$pB~ha$^cBy`uO_8NtE- z%%N#RiQ;Cjv_HSw9WG;$9b3w2L38PH*~sLVYU6ClzrQ)0Xt@?&@d-{|Mso!s07LLVNRry(aTe6;=IRffXBws5 zVjP!ncThamR&J=pp$KornLVANi1w_>?ok*qy08Z}T>eef&5DQD4?Pz?VG``L+v^s6 zjRd}nshmJWYU!G%v%siVdw#AY!Ly)ZL>F~jxbs+rC zo%#9{_fzL77k|F;Kkgez1g(*brdBxT29H{Kn?s6*vu3v-inW|8ep$wJrESu2m<(BAhb`F6MTC z`A%1_S#dK()oS8UKFXKimmLQTbuubmW>@W&ALV=4^hD?bnOOV z0S89=l_)diIdApNrS(WZH)dzH7b-{4wqa@VZ~Ac?oRcenc3exJbaPV_bTI4R9n@|2 zTdlj6_z4lzz=#I@FJBZ=MA)*>!S@6|*>ERT@yT~+#u~Tc&hMor(LU#u`^?$&s6wA^ zSH;J539%?Knk;+sn5JW524|QZZBX1$_5?*gzrp5I2M5zU|Ap?)Cv25VaNb}rEf6&Y~TB0ZP`YM zgh%=?N71LK&^E+wVO3iF5TYH1@5@O0+24yP%pP~OlBQSJE zHh!=ZZ&dp{CM(;Fg)ZpnK*+t!aa&fd$5c}s>!_<{yx8W*=I38^@H$LhneC)ts3E*N zybBs!Z#2e36<|T<;`~dx=&ulAKK5FDXQkzzTXw&d*q+B?K+N&CJ9dip&5PFc&c25T_7TKo|Hq5lvdm{Zn(@ zDho$gf2oG6&~>x9BRe{@(Ii$EqV?aZ9dMXg2TptvmY(U=KJ%23SeWM=5JA}J`)GA8 z%*eSNP5j`wl;^Rmt^N8_+%JQ_iQTC#$bP6cQh;^6eeJ12@2<-jjvd+%ulwG3wluDJ z6gT%%a)c|48F<0F=ISbnEI8FF^G7M)F&@>aBYWaGEVn<(jVqr-pnV7e88LBtb^@u- zyQr?5r@_0Sr;@Lyk`R!BPh_jrMQf~8(v=J!L^+E$y)$MA1I7hof|0ug+h5h^Z&R(_4eu*4BqCZnCoU`>v+cx`<0AmE}7f z|HTX1D_vcKz-L+O22ojQO;0#n)tkFS25oNp`sPiSz={{bEHeo!?+J|mq06_Nq?>_>*5KLv6F3d47Bq`LS)v^n2_;0gDYl_bC zO0no3rKOz>6s{^ND2)!Av*WLBtbEh5+rS_oZSC$I4^oIjZ&wAIfd?UrzqEqdZ}3=t zo%J`pptO)a&f3!O?Xd56$a~r_3fyirv%GV#fal}4YVEsj#_ickD^>rOdR<;_C z5Mc9m*2OaEotGEaWJCR4Gqw6F+Bp7;-CB5cRi(J2mb#(!F`H`3Be z$9_xE4@6a;>TIZBviqH2zMZ8Tyf^GPC+U_l{QC+wjU%>h5GsL$cJY4G(G+k0qL-fT zwATc^!dp?7VTcAfKIZv4@v5QoV+n37rIvbYG20Jf#gHA0)8X7Xunw1kOkVK%bACXX zms@l4(IG#oXyiaLF6#Q^IlBGxK3_&?-Z`z7OFm`0a<`GsB_D-*fXl3FC@vf8-2g2NhquCM|o_l z6(%Z1*kOCYcEFxo16jn-xb3fG5t$1ogj5Bjo9oAicQ?AVW|dR|zn$*CA4YpnZf*gv zlzB#niy*UAdg8{M#|NTGy^hEF21Pe3aI{h;s5@Czg!dBZ;p`?UY9X;0y_p4tGCskF z*XmofUaPpsIQPJaPG@FS0u(PLfzpz(k=+1V4eIQnmIrJo!KWWvn2hDtpiLvk;T5lU zSm3FZUng&&N{@8!e7mraVU}WiLMf9vM5!?4qupz_<1u{2#8GR?Vo|})-pG4!TV>>g( zYGJwzr9$D#)2hgscQ8>3tRA+#VjfB(REXV2{9xU_P(x=C^-r;3JT)O)~gRKH{7 z6K|`X&9%tn51qeMf{Gu^0%QoWdw;(^-$ysMzpkAhIEsa5nV;JrM&;SuKQjiPNTl!PxdK%ATF$Y`C(@gvqZQSuX3hr)smZ-+Y zHeUN?r!7Ng$Aylr$@Zpa9=0ENcZJ23wi_?r4$CtXSmUONyHMqC3cstn2B0@9Vx(MY)*X}ogTdl#+{j2s!bwkwOG%Q=zf5@KU)1hu zdsVi?@vU-y>rJQc|U{q0aOePvK9ymdMIx7^w={1dSHY!9x)F^lWW)dUVDY!GcF@ zfT~q1P5cBAz=kF}o&szRRRwAQyyUvRSSBx$m7!`nmNd##00)E_Z}><9o4YYrM|3~7 z<4v%>IFaJ!wnuge>Sq41UB+lMjOvJNXrF^hR${?puf{vIwrO`xZ#4{04nlYkT)}g> zJg&jI#fU^qf7XUc3=V|@f_(<30cPyi^TW}Ha`dW~Pc#mcAn+xvvd;1uUGciSoTAbs zK>^z32gT|Ntrj=QZx<56wk(eduKP2kI6&l#Pmke0$8AGVJ%3xYq$-^5UtzhRsq@a~ zD4<)Okr`K8_iI){7EXFhoSw>1(`NjOPm@%oUaMhLVn2+>tE63xA1ojq$0wwTC znvy(JB=7d4FDkW)f(i%;NJ*CAZ}pt1bvDNOaz;b_Sx z&MW1}W{P}Vi7PVgN?>D1I$*U<%I>1!YjYrz!AT7Yg`YZ zfUp06d|?2D54pIw<5@MYi9@Msw4>{E(JYjQ>R*+`w@*`+Q&L(N`}~FYft2>F--nCd zP(UEPZkDSHZGjmi=qt*McjG-ngCh%f8&Rz_+4N5Kwy3Ko@SuT0u>*CN62U_|$QQr< z+}efx)Y|@-%Lzq(`D7sa*7@JJZl>f}=>N%IEJ)a?R}g9tp^X>YA73ZM`D7v&O0>=agieaKuxZ*jTw!X|f!MiVaJa~AWc=K5O zIU#UT=)_kn#stVESORsny!nJ`+RNblWHqJD#rwi;|BccU7jiu1xzSCwnqVld^Yjys*;WAsT|>8V?uH+m3UtAs?%nkrIpn6W4pU%;R=Bxcn49x{?zmS&4ohEtSm{(o&T@I1Qr;^nf=rD^4Xos}bm6Y-p_VMc(!){% zLO>vl(in?(U(;+7bH?*qdUg443M3F9hD|fc&reoR&|hpyU1aX&dd)orIb_Dvi+i%( zDjT%6i2z{aeg3CJT3Ttp{5GJ||YLkHF9o>*V*!A-9Ru_OkR#Hi#O3X0ee+I4i Apa1{> literal 0 HcmV?d00001 diff --git a/packaging/AppImage/makePkg.sh b/packaging/AppImage/makePkg.sh new file mode 100755 index 00000000..939a2cb9 --- /dev/null +++ b/packaging/AppImage/makePkg.sh @@ -0,0 +1,427 @@ +#!/bin/bash +# gImageReader v3.4.3 tesseract OCR front-end GUI +# makePkg.sh: Copyright 2005-2025 Valerio Messina efa@iol.it +# makePkg.sh is part of gImageReader +# gImageReader is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# gImageReader is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with gImageReader. If not, see . +# +# Script to generate a Linux|Mingw|MXE|OSX package of 'gImageReader' +# used on: Linux=>bin64, Linux=>bin32, Linux=>macOS64 +# MinGw64=>bin64, MinGw32=>bin32, MXE64=>bin64, MXE32=>bin32 +# 7z Win packages: $AppName/ (bin+assets) src/ +# tar.gz packages: $AppName/ (bin+assets) src/ +# AppImage packages: AppDir/ usr/bin +# macOS packages: DiskImage/$AppName.app/Contents/MacOS/ +# +# Syntax: $ makePkg.sh [-y] Linux|WinMxe|WinMgw|Osx [32|64] + +makePkgVer=2025-08-18 + +APP="gImageReader" # app name +BINRAD="gimagereader" # binary radix +BINPATH=`pwd` # where find the just build binary +SRCPATH="../gtk/src" # source package path +RESPATH="../packaging/AppImage" # other resources (readme, icons, desktop files) to copy in packages +TMPPATH="../packaging" # temp path where create uncompressed dir,AppDir,DiskImage +DSTPATH="../packaging" # path where write the final Linux|Mingw/MXE|OSX package + +DEPSPATHMGW64="/mingw64/bin" # path of DLLs needed to generate the Mingw64 package +DEPSPATHMGW32="/mingw32/bin" # path of DLLs needed to generate the Mingw32 package +DEPSLISTMGW="" # list of dll for MinGW cross-build dynamic link + +echo "makePkg.sh: create a Linux|MinGW|MXE|OSX package for $APP ..." + +# check for external dependency compliance +flag=0 +for extCmd in 7z chmod cp cut date getconf grep mkdir mv pwd realpath rm tar uname wget ; do + exist=`which $extCmd 2> /dev/null` + if (test "" = "$exist") then + echo "ERROR: makePkg.sh Required external dependency: "\"$extCmd\"" unsatisfied!" + flag=1 + fi +done +if [[ "$flag" = 1 ]]; then + echo "ERROR: makePkg.sh Install the required packages and retry. Exit" + exit +fi + +if (test "$1" = "-y") then + batch=1 + shift +fi +if [[ "$1" = "" || "$1" != "Linux" && "$1" != "WinMxe" && "$1" != "WinMgw" && "$1" != "Osx" ]]; then + echo "ERROR: makePkg.sh unsupported/miss target:'$1' platform to create package" + echo "Syntax: $ makePkg.sh [-y] Linux|WinMxe|WinMgw|Osx [32|64]" + echo " -y for batch execution without confirmations" + exit +fi + +#exist=`which gtk-mac-bundler 2> /dev/null` +#if (test "$1" = "Osx" && test "" = "$exist") then +# echo "ERROR: makePkg.sh depend on 'gtk-mac-bundler' to generate for macOS. Exit" +# exit +#fi +exist=`which osxcross-dmg 2> /dev/null` +if (test "$1" = "OSX64" && test "" = "$exist") then + echo "ERROR: makePkg.sh depend on 'osxcross-dmg' to generate for macOS. Exit" + exit +fi + +PKG="$1" +CPU=`uname -m` # i686 or x86_64 +if (test "" = "$2") then + BIT=$(getconf LONG_BIT) +else + BIT="$2" +fi + +BINCLI="" +BINGUI="${BINRAD}-gtk" +BINPATH=`realpath "$BINPATH"` +SRCPATH=`realpath "$SRCPATH"` +RESPATH=`realpath "$RESPATH"` +DSTPATH=`realpath "$DSTPATH"` +if [[ ! -d "$BINPATH" ]]; then + echo "ERROR: makePkg.sh cannot find binary path '$BINPATH'. Exit" + exit +fi +if [[ ! -d "$SRCPATH" ]]; then + echo "ERROR: makePkg.sh cannot find source path '$SRCPATH'. Exit" + exit +fi +if [[ ! -d "$RESPATH" ]]; then + echo "ERROR: makePkg.sh cannot find resource path '$RESPATH'. Exit" + exit +fi +if (test "$BINCLI" = "" && test "$BINGUI" = "") then + echo "ERROR: makePkg.sh cannot be both NULL 'BINCLI' and 'BINGUI'. Exit" + exit +fi +if (test "$BINCLI" != "") then + if [[ ! -f "$BINPATH/$BINCLI" ]]; then + echo "ERROR: makePkg.sh cannot find just built binary '$BINPATH/$BINCLI'. Exit" + exit + fi +fi +if (test "$BINGUI" != "") then + if [[ ! -f "$BINPATH/$BINGUI" ]]; then + echo "ERROR: makePkg.sh cannot find just built binary '$BINPATH/$BINGUI'. Exit" + exit + fi +fi + +OS=`uname` +if (test "$OS" != "Darwin") then + OS=`uname -o` # Msys or GNU/Linux, illegal on macOS +fi +if [[ "$OS" != "Msys" && "$OS" != "GNU/Linux" ]]; then + echo "ERROR makePkg.sh: work in Linux|MXE(Linux)|MinGW only" + exit +fi +if [[ "$OS" = "Msys" && "$PKG" != "MGW32" && "$PKG" != "MGW64" ]]; then + echo "ERROR makePkg.sh: Unsupported target package:$PKG on MinGW/MSYS2" + exit +fi + +if [[ "$OS" = "GNU/Linux" && "$PKG" != "Linux" && "$PKG" != "WinMxe" && "$PKG" != "Osx" ]]; then + echo "ERROR makePkg.sh: Unsupported target package:$PKG on Linux" + exit +fi + +DATE=`date -I` +VER="3.4.3" # VER=`grep VER version.h | cut -d'"' -f2` # M.mm.bb +TGT=$PKG +if [[ "$OS" = "Msys" ]]; then + if [[ "$BIT" = "64" ]]; then + DEPPATH=$DEPSPATHMGW64 + fi + if [[ "$BIT" = "32" ]]; then + DEPPATH=$DEPSPATHMGW32 + fi +fi +TMPBINP="" # temp bin Package Path +if [[ "$PKG" = "Osx" ]]; then + TMPBINP="DiskImage/$APP.app/Contents/MacOS" +fi +if [[ "$PKG" = "Linux" ]]; then + TMPBINP="usr/bin" +fi +if (test "$CPU" = "x86_64" && test "$BIT" = "32") then + CPU=i686 +fi +if (test "$PKG" = "WinMxe" || test "$PKG" = "WinMgw") then + EXT=".exe" +fi +PKGNAME="${APP}_${VER}_${DATE}_${TGT}_${CPU}_${BIT}bit" +echo "DATE : $DATE" # today +echo "HOSTOS : $OS" # current OS +echo "APP : $APP" # app name +echo "VER : $VER" # app src ver +echo "PKG : $PKG" # input parameter +echo "TGTOS : $TGT" # target OS +echo "TGTCPU : $CPU" # target CPU +echo "TGTBIT : $BIT" # target BIT +echo "BINRAD : $BINRAD" # binary radix +if (test "$BINCLI" != "") then +echo "BINCLI : $BINCLI" # binary file for CLI +fi +if (test "$BINGUI" != "") then +echo "BINGUI : $BINGUI" # binary file for GUI +fi +if (test "$EXT" != "") then +echo "EXT : $EXT" # binary extension (Mxe|MinGw) +fi +echo "BINPATH: $BINPATH" # binary path +echo "SRCPATH: $SRCPATH" # packaging file source path +echo "RESPATH: $RESPATH" # resources path +if (test "$DEPPATH" != "") then +echo "DEPPATH: $DEPPATH" # dependancy path (MinGw) +fi +echo "TMPPATH: $TMPPATH" # temp path where create uncompressed dir,AppDir,DiskImage +echo "TMPBINP: $TMPBINP" # tmp bin path. eg. usr/bin | DiskImage/$APP.app/Contents/MacOS +echo "DSTPATH: $DSTPATH" # package creation path +echo "PKGNAME: $PKGNAME" # package name +if (test "$batch" != "1") then + read -p "Proceed? A key to continue" +fi +echo "" + +echo "makePkg: Creating $APP $VER package for $TGT$BIT.$CPU ..." +#cp -a $RESPATH/README.txt $RESPATH/README.md + +echo "Creating temp and destination path if miss ..." +if [[ ! -d "$TMPPATH" ]]; then + mkdir -p "$TMPPATH" +fi +if [[ ! -d "$DSTPATH" ]]; then + mkdir -p "$DSTPATH" +fi + +echo "Removing old temp files if present ..." +if (test "$TGT" = "Linux" || test "$TGT" = "WinMxe" || test "$TGT" = "WinMgw") then + if [[ -d "$TMPPATH/$APP" ]]; then + echo "Removing old $APP ..." + rm -rf "$TMPPATH/$APP" + fi +fi +if (test "$TGT" = "Linux") then + if [[ -d "$TMPPATH/AppDir" ]]; then + echo "Removing old AppDir ..." + rm -rf "$TMPPATH/AppDir" + fi +fi + +echo "Removing old temp packages if present ..." +if (test "$TGT" = "Linux") then + if [[ -f "$TMPPATH/$PKGNAME.tgz" ]]; then + echo "Removing old tgz Package ..." + rm -rf "$TMPPATH/$PKGNAME.tgz" + fi + if [[ -f "$TMPPATH/$PKGNAME.AppImage" ]]; then + echo "Removing old AppImage ..." + rm -f "$TMPPATH/$PKGNAME.AppImage" + fi +fi +if (test "$TGT" = "WinMxe" || test "$TGT" = "WinMgw") then + if [[ -f "$TMPPATH/$PKGNAME.7z" ]]; then + echo "Removing old 7z Package ..." + rm -rf "$TMPPATH/$PKGNAME.7z" + fi +fi +if (test "$TGT" = "Osx") then + if [[ -f "$TMPPATH/$APP.dmg" ]]; then + echo "Removing old dmg Package ..." + rm -rf "$TMPPATH/$APP.dmg" + fi +fi + +if [[ "$TGT" = "Osx" ]]; then + if (test "$BINCLI" != "") then + cp -a $BINPATH/$BINCLI $TMPPATH # bin + fi + if (test "$BINGUI" != "") then + cp -a $BINPATH/$BINGUI $TMPPATH # bin + fi + cp -a $RESPATH/$APP.icns $TMPPATH # need to be near bin + cd $TMPPATH + #gtk-mac-bundler $APP.bundle + osxcross-dmg -rw $BIN $APP $VER # create compressed MacOS package + rm uncompressed.dmg $APP.icns # remove copied + rm $BINCLI $BINGUI 2>/dev/null # remove copied + mv $APP$VER.dmg $DSTPATH + exit +fi + +echo "Creating package directory structure ..." +mkdir -p $TMPPATH/$APP/src +if (test "$TGT" = "Linux") then + mkdir -p "$TMPPATH/AppDir/$TMPBINP" +fi + +echo "Copying sources ..." +cp -a $SRCPATH/*.h* $TMPPATH/$APP/src/ +cp -a $SRCPATH/*.c* $TMPPATH/$APP/src/ +#cp -a $SRCPATH/Makefile* $TMPPATH/$APP/src/ +#cp -a $SRCPATH/*.ini $TMPPATH/$APP/src/ # if needed +#cp -aL $SRCPATH/$APP.png $TMPPATH/$APP/src/ # if needed + +echo "Copying assets ..." +#cp -a $RESPATH/*.ini $TMPPATH/$APP/ # if needed +if (test "$TGT" = "Linux") then +#cp -a $RESPATH/*.ini $TMPPATH/AppDir/$TMPBINP # if needed +cp -a $RESPATH/$APP.desktop $TMPPATH/$APP/ +cp -a $RESPATH/$APP.desktop $TMPPATH/AppDir/ +cp -a $RESPATH/$APP.png $TMPPATH/$APP/ +cp -a $RESPATH/$APP.png $TMPPATH/AppDir/ +cp -a $RESPATH/makePkg.sh $TMPPATH/$APP/ +fi +if (test "$TGT" = "WinMxe" || test "$TGT" = "WinMgw") then +cp -a $RESPATH/$APP.ico $TMPPATH/$APP/ +fi + +echo "Copying docs ..." +cp -a ../COPYING $TMPPATH/$APP/ +#cp -a $RESPATH/README.txt $TMPPATH/$APP/ # if needed +#cp -a $RESPATH/Changelog.txt $TMPPATH/$APP/ # if needed +#cp -a $RESPATH/${APP}GUI.png $TMPPATH/$APP/ # if needed +if (test "$TGT" = "Linux") then +cp -a ../COPYING $TMPPATH/AppDir/ +#cp -a $RESPATH/README.txt $TMPPATH/AppDir/ # if needed +#cp -a $RESPATH/Changelog.txt $TMPPATH/AppDir/ # if needed +fi + +echo "Copying binary ..." +if [[ "$TGT" = "Linux" && "$BIT" = "64" ]]; then + if (test "$BINCLI" != "") then + cp -a $BINPATH/$BINCLI $TMPPATH/$APP/ + cp -a $BINPATH/$BINCLI $TMPPATH/AppDir/$TMPBINP/ + fi + if (test "$BINGUI" != "") then + cp -a $BINPATH/$BINGUI $TMPPATH/$APP/ + cp -a $BINPATH/$BINGUI $TMPPATH/AppDir/$TMPBINP/ + fi +fi +if [[ "$TGT" = "Linux" && "$BIT" = "32" ]]; then + if (test "$BINCLI" != "") then + cp -a $BINPATH/$BINCLI $TMPPATH/$APP/ + cp -a $BINPATH/$BINCLI $TMPPATH/AppDir/$TMPBINP/ + fi + if (test "$BINGUI" != "") then + cp -a $BINPATH/$BINGUI $TMPPATH/$APP/ + cp -a $BINPATH/$BINGUI $TMPPATH/AppDir/$TMPBINP/ + fi +fi + +if [[ "$TGT" = "WinMgw" && "$BIT" = "64" ]]; then + if (test "$BINCLI" != "") then + cp -a $BINPATH/$BINCLI$EXT $TMPPATH/$APP/ + fi + if (test "$BINGUI" != "") then + cp -a $BINPATH/$BINGUI$EXT $TMPPATH/$APP/ + fi + echo "Copying deps ..." + for DLL in $DEPSLISTMGW ; do + cp -a $DEPPATH/$DLL $TMPPATH/$APP/ + done +fi +if [[ "$TGT" = "WinMgw" && "$BIT" = "32" ]]; then + if (test "$BINCLI" != "") then + cp -a $BINPATH/$BINCLI$EXT $TMPPATH/$APP/ + fi + if (test "$BINGUI" != "") then + cp -a $BINPATH/$BINGUI$EXT $TMPPATH/$APP/ + fi + echo "Copying deps ..." + for DLL in $DEPSLISTMGW ; do + if [[ "$DLL" = "libgcc_s_seh-1.dll" ]]; then continue ; fi + cp -a $DEPPATH/$DLL $TMPPATH/$APP/ + done + cp -a $DEPPATH/libgcc_s_dw2-1.dll $TMPPATH/$APP/ +fi + +if [[ "$TGT" = "WinMxe" && "$BIT" = "64" ]]; then + if (test "$BINCLI" != "") then + cp -a $BINPATH/$BINCLI$EXT $TMPPATH/$APP/ + fi + if (test "$BINGUI" != "") then + cp -a $BINPATH/$BINGUI$EXT $TMPPATH/$APP/ + fi +fi +if [[ "$TGT" = "WinMxe" && "$BIT" = "32" ]]; then + if (test "$BINCLI" != "") then + cp -a $BINPATH/$BINCLI$EXT $TMPPATH/$APP/ + fi + if (test "$BINGUI" != "") then + cp -a $BINPATH/$BINGUI$EXT $TMPPATH/$APP/ + fi +fi + +# remove unwanted files if any + +echo "Compressing package ..." +cwd=`pwd` +cd $TMPPATH +if (test "$TGT" = "Linux") then + file="$PKGNAME.tgz" + echo "Creating package file:'$file' ..." + tar -cvaf $file $APP > /dev/null + echo "Package file:'$file' done" +fi +if (test "$TGT" = "WinMxe" || test "$TGT" = "WinMgw") then + file="$PKGNAME.7z" + echo "Creating package file:'$file' ..." + 7z a -m0=lzma -mx=9 -r $file $APP > /dev/null + echo "Package file:'$file' done" +fi +#rm -r AppDir +#rm -r $APP +mv $file $DSTPATH/ +echo "Release file: '$DSTPATH/$file'" + +# make AppImage +if [[ ("$TGT" = "Linux") && ("$CPU" = "x86_64" || "$CPU" = "i686")]]; then # skip on ARM & RISC-V + echo "Generating the AppDir (about 3'50\") ..." + if (test -f logWget$DATE.txt) then { rm logWget$DATE.txt ; } fi + if (test "$BIT" = "64") then + if (! test -x linuxdeploy-x86_64.AppImage) then + echo "Downloading linuxdeploy ..." + wget -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" 2>> logWget$DATE.txt + chmod +x linuxdeploy-x86_64.AppImage + fi + if (! test -x linuxdeploy-plugin-gtk.sh) then + wget -nv "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh" 2>> logWget$DATE.txt + chmod +x linuxdeploy-plugin-gtk.sh + fi + #./linuxdeploy-x86_64.AppImage -e $TMPPATH/AppDir/$TMPBINP/$BINGUI --appdir AppDir -p gtk -i $TMPPATH/AppDir/$APP.png -d $TMPPATH/AppDir/$APP.desktop --output appimage" + ./linuxdeploy-x86_64.AppImage -e $TMPPATH/AppDir/$TMPBINP/$BINGUI --appdir AppDir -p gtk -i $TMPPATH/AppDir/$APP.png -d $TMPPATH/AppDir/$APP.desktop > logLinuxdeploy$DATE.txt + cp -a $BINPATH/glib-2.0/schemas/org.gnome.gimagereader.gschema.xml $TMPPATH/AppDir/usr/share/glib-2.0/schemas/ + mv $TMPPATH/AppDir/usr/share/glib-2.0/schemas/gschemas.compiled $TMPPATH/AppDir/usr/share/glib-2.0/schemas/gschemas.compiled.orig + cp -a $BINPATH/glib-2.0/schemas/gschemas.compiled $TMPPATH/AppDir/usr/share/glib-2.0/schemas/ + echo "Generating the AppImage (about 3'10\") ..." + ./linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage >> logLinuxdeploy$DATE.txt + ret=$? + file="$PKGNAME.AppImage" + if (test "$ret" = "0") then + echo "AppImage created: $DSTPATH/$file" + mv ${APP}-x86_64.AppImage $DSTPATH/$file + else + echo "AppImage failed: $file" + fi + fi + if (test "$BIT" = "32") then + echo "As now skip AppImage at 32 bit" + fi + #rm -rf $TMPPATH/AppDir + cd $cwd +fi +echo Done From 5a87db928dcbc58df121a261e5a17f2c1291cebf Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 19:52:41 +0200 Subject: [PATCH 02/40] trigger CI --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed8df08f..9ba63aa5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,6 +69,6 @@ jobs: ./build/mingw64-qt6/gImageReader_*_qt6_x86_64.exe, ./build/mingw64-gtk/gImageReader_*_gtk_x86_64_portable.zip, ./build/mingw64-gtk/gImageReader_*_gtk_x86_64.exe - packaging/gImageReader_*_Linux_x86_64_64bit.tgz - packaging/gImageReader_*_Linux_x86_64_64bit.AppImage + ./packaging/gImageReader_*_Linux_x86_64_64bit.tgz + ./packaging/gImageReader_*_Linux_x86_64_64bit.AppImage " From 43363e475c9162cefff483b0d70f05a0190ac9db Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 20:57:03 +0200 Subject: [PATCH 03/40] back to master version --- .github/workflows/build.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ba63aa5..c63664b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,23 +20,13 @@ jobs: run: dnf -y update - name: Install build dependencies - run: ./packaging/win32/mingwdeps.sh ; - sudo apt install cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev + run: ./packaging/win32/mingwdeps.sh - name: Build application run: | PATH=/usr/bin ./packaging/win32/makeinstaller.sh i686 qt6 nodebug ${{ steps.version_number.outputs.version }} PATH=/usr/bin ./packaging/win32/makeinstaller.sh x86_64 qt6 nodebug ${{ steps.version_number.outputs.version }} PATH=/usr/bin ./packaging/win32/makeinstaller.sh x86_64 gtk nodebug ${{ steps.version_number.outputs.version }} - mkdir -p build - cd build - cmake -DINTERFACE_TYPE=gtk .. - make - - - name: Build AppImage - run: | - cd build - ../packaging/AppImage/makePkg.sh -y Linux 64 - name: Reset ci-latest tag run: | @@ -69,6 +59,4 @@ jobs: ./build/mingw64-qt6/gImageReader_*_qt6_x86_64.exe, ./build/mingw64-gtk/gImageReader_*_gtk_x86_64_portable.zip, ./build/mingw64-gtk/gImageReader_*_gtk_x86_64.exe - ./packaging/gImageReader_*_Linux_x86_64_64bit.tgz - ./packaging/gImageReader_*_Linux_x86_64_64bit.AppImage " From c93a37b7d57811b08e8d76285c2b765c9be52a03 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 21:05:06 +0200 Subject: [PATCH 04/40] dedicated linux CI --- .github/workflows/linux.yml | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 .github/workflows/linux.yml diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml new file mode 100644 index 00000000..f556eac7 --- /dev/null +++ b/.github/workflows/linux.yml @@ -0,0 +1,64 @@ +name: CI Build +on: [push] + +jobs: + build: + name: Linux build + runs-on: ubuntu-latest + container: + image: fedora:rawhide + options: --security-opt seccomp=unconfined + steps: + - name: Set safe directory + run: | + dnf install -y git + git config --global --add safe.directory ${GITHUB_WORKSPACE} + + - uses: actions/checkout@v4.2.2 + + - name: Update system + run: dnf -y update + + - name: Install build dependencies + run: sudo apt install cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev + + - name: Build application + run: | + mkdir -p build + cd build + cmake -DINTERFACE_TYPE=gtk .. + make + + - name: Build AppImage + run: | + cd build + ../packaging/AppImage/makePkg.sh -y Linux 64 + + - name: Reset ci-latest tag + run: | + VERSION=${{ steps.version_number.outputs.version }} + git config --global user.email "ci@github.com" + git config --global user.name "Github CI" + git tag -d ci-latest || true + git push origin :ci-latest || true + git tag -m ci-latest ci-latest + git push --tags + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Create release + id: create_release + uses: ncipollo/release-action@v1.18.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + allowUpdates: true + tag: ci-latest + name: CI Build + draft: false + prerelease: true + replacesArtifacts: true + artifacts: " + ./packaging/gImageReader_*_Linux_x86_64_64bit.tgz + ./packaging/gImageReader_*_Linux_x86_64_64bit.AppImage + " From 17169379bee672a9596d144a9993882c00aa95be Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 21:09:09 +0200 Subject: [PATCH 05/40] removed container: image: fedora --- .github/workflows/linux.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f556eac7..9f32367b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -5,23 +5,20 @@ jobs: build: name: Linux build runs-on: ubuntu-latest - container: - image: fedora:rawhide - options: --security-opt seccomp=unconfined + permissions: + contents: write steps: - - name: Set safe directory - run: | - dnf install -y git - git config --global --add safe.directory ${GITHUB_WORKSPACE} - - - uses: actions/checkout@v4.2.2 - - name: Update system - run: dnf -y update + # - name: Update distro + # run: sudo apt update + # - name: Upgrade distro + # run: sudo apt upgrade - name: Install build dependencies run: sudo apt install cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev + - uses: actions/checkout@v4.2.2 + - name: Build application run: | mkdir -p build From 7d80d1dff0bf2e6fb8724762e03030b9f30c73bc Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 21:21:12 +0200 Subject: [PATCH 06/40] use deps from: https://github.com/manisandro/gImageReader/blob/master/packaging/debian/control as Ubuntu miss some Debian deps --- .github/workflows/linux.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9f32367b..f64c75b7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -1,4 +1,4 @@ -name: CI Build +name: CI Build Linux on: [push] jobs: @@ -8,15 +8,14 @@ jobs: permissions: contents: write steps: - # - name: Update distro # run: sudo apt update # - name: Upgrade distro # run: sudo apt upgrade - name: Install build dependencies - run: sudo apt install cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev - + # run: sudo apt install cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev + run: sudo apt install debhelper cmake intltool libdjvulibre-dev libgtkspellmm-3.0-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libcairomm-1.0-dev libpoppler-glib-dev libtesseract-dev libsane-dev qtbase5-dev qttools5-dev qttools5-dev-tools libqtspell-qt5-dev libpoppler-qt5-dev libjson-glib-dev libxml++2.6-dev libpodofo-dev libquazip5-dev libzip-dev python3-gi uuid-dev - uses: actions/checkout@v4.2.2 - name: Build application From 4dfcf86f7ba33989f269eab898c964bc7522085e Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 21:32:51 +0200 Subject: [PATCH 07/40] added some diags --- .github/workflows/linux.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f64c75b7..81e3e3e6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -25,10 +25,12 @@ jobs: cmake -DINTERFACE_TYPE=gtk .. make - - name: Build AppImage + - name: Build Packages run: | + pwd cd build ../packaging/AppImage/makePkg.sh -y Linux 64 + ls -l ../packaging/* - name: Reset ci-latest tag run: | From f674ee651b472dbea46fa3757a4f08032dddd075 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 22:19:26 +0200 Subject: [PATCH 08/40] diff diags --- .github/workflows/linux.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 81e3e3e6..26630bcb 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -30,9 +30,11 @@ jobs: pwd cd build ../packaging/AppImage/makePkg.sh -y Linux 64 - ls -l ../packaging/* + ls -l ../packaging - name: Reset ci-latest tag + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | VERSION=${{ steps.version_number.outputs.version }} git config --global user.email "ci@github.com" @@ -41,8 +43,7 @@ jobs: git push origin :ci-latest || true git tag -m ci-latest ci-latest git push --tags - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + pwd - name: Create release id: create_release From 8321b664be838befbf0bc8d377453488e1c17880 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 22:29:09 +0200 Subject: [PATCH 09/40] list pack --- .github/workflows/linux.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 26630bcb..c6e86120 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,10 +27,15 @@ jobs: - name: Build Packages run: | - pwd cd build ../packaging/AppImage/makePkg.sh -y Linux 64 - ls -l ../packaging + + - name: Show packges + run: | + pwd + ls -l + echo "list packaging ..." + ls -l packaging - name: Reset ci-latest tag env: @@ -43,7 +48,6 @@ jobs: git push origin :ci-latest || true git tag -m ci-latest ci-latest git push --tags - pwd - name: Create release id: create_release From b16ef65b044ae00a4a92e87f55e5cf0d9667d860 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 22:34:51 +0200 Subject: [PATCH 10/40] add comma --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c6e86120..c369735e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -62,6 +62,6 @@ jobs: prerelease: true replacesArtifacts: true artifacts: " - ./packaging/gImageReader_*_Linux_x86_64_64bit.tgz + ./packaging/gImageReader_*_Linux_x86_64_64bit.tgz, ./packaging/gImageReader_*_Linux_x86_64_64bit.AppImage " From ee5dbae79126d1966134f36a620ed25d20fffd66 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Mon, 18 Aug 2025 22:44:01 +0200 Subject: [PATCH 11/40] final CI Linux --- .github/workflows/linux.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c369735e..49c49ece 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -33,8 +33,7 @@ jobs: - name: Show packges run: | pwd - ls -l - echo "list packaging ..." + echo "list packaging/ ..." ls -l packaging - name: Reset ci-latest tag From a7e829eecfd84cecb87a4d85f0000a1cc811bbba Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Wed, 20 Aug 2025 00:26:58 +0200 Subject: [PATCH 12/40] generate -gtk and -qt5 packages --- .github/workflows/linux.yml | 40 +++++++++-- ...eader.desktop => gImageReader-gtk.desktop} | 8 +-- packaging/AppImage/gImageReader-qt5.desktop | 12 ++++ packaging/AppImage/gImageReader-qt6.desktop | 12 ++++ packaging/AppImage/makePkg.sh | 68 +++++++++++++------ 5 files changed, 111 insertions(+), 29 deletions(-) rename packaging/AppImage/{gImageReader.desktop => gImageReader-gtk.desktop} (54%) create mode 100644 packaging/AppImage/gImageReader-qt5.desktop create mode 100644 packaging/AppImage/gImageReader-qt6.desktop diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 49c49ece..aecc53ce 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -14,23 +14,51 @@ jobs: # run: sudo apt upgrade - name: Install build dependencies - # run: sudo apt install cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev - run: sudo apt install debhelper cmake intltool libdjvulibre-dev libgtkspellmm-3.0-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libcairomm-1.0-dev libpoppler-glib-dev libtesseract-dev libsane-dev qtbase5-dev qttools5-dev qttools5-dev-tools libqtspell-qt5-dev libpoppler-qt5-dev libjson-glib-dev libxml++2.6-dev libpodofo-dev libquazip5-dev libzip-dev python3-gi uuid-dev + # run: sudo apt install cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev + run: sudo apt install cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev + + - name: Check out code - uses: actions/checkout@v4.2.2 - - name: Build application + - name: Build application GTK run: | mkdir -p build cd build cmake -DINTERFACE_TYPE=gtk .. make - - name: Build Packages + - name: Build Packages GTK + run: | + cd build + ../packaging/AppImage/makePkg.sh -y Linux 64 -gtk + + - name: Build application QT5 run: | + mkdir -p build cd build - ../packaging/AppImage/makePkg.sh -y Linux 64 + rm -rf * + cmake -DINTERFACE_TYPE=qt5 .. + make + + - name: Build Packages QT5 + run: | + cd build + ../packaging/AppImage/makePkg.sh -y Linux 64 -qt5 + + # - name: Build application QT6 + # run: | + # mkdir -p build + # cd build + # rm -rf .* * + # cmake -DINTERFACE_TYPE=qt6 .. + # make + + # - name: Build Packages QT6 + # run: | + # cd build + # ../packaging/AppImage/makePkg.sh -y Linux 64 -qt6 - - name: Show packges + - name: Show packages run: | pwd echo "list packaging/ ..." diff --git a/packaging/AppImage/gImageReader.desktop b/packaging/AppImage/gImageReader-gtk.desktop similarity index 54% rename from packaging/AppImage/gImageReader.desktop rename to packaging/AppImage/gImageReader-gtk.desktop index bdd0854b..084398a0 100644 --- a/packaging/AppImage/gImageReader.desktop +++ b/packaging/AppImage/gImageReader-gtk.desktop @@ -3,10 +3,10 @@ Version=1.0 Type=Application Terminal=false Exec=gimagereader-gtk -Comment=Start gImageReader -Comment[it_IT]=Avvia gImageReader +Comment=Start gImageReader-gtk +Comment[it_IT]=Avvia gImageReader-gtk Icon=gImageReader Icon[it_IT]=gImageReader -Name=gImageReader -Name[it_IT]=gImageReader +Name=gImageReader-gtk +Name[it_IT]=gImageReader-gtk Categories=Utility diff --git a/packaging/AppImage/gImageReader-qt5.desktop b/packaging/AppImage/gImageReader-qt5.desktop new file mode 100644 index 00000000..0bfe265c --- /dev/null +++ b/packaging/AppImage/gImageReader-qt5.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Terminal=false +Exec=gimagereader-qt5 +Comment=Start gImageReader-qt5 +Comment[it_IT]=Avvia gImageReader-qt5 +Icon=gImageReader +Icon[it_IT]=gImageReader +Name=gImageReader-qt5 +Name[it_IT]=gImageReader-qt5 +Categories=Utility diff --git a/packaging/AppImage/gImageReader-qt6.desktop b/packaging/AppImage/gImageReader-qt6.desktop new file mode 100644 index 00000000..7e662740 --- /dev/null +++ b/packaging/AppImage/gImageReader-qt6.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Terminal=false +Exec=gimagereader-qt6 +Comment=Start gImageReader-qt6 +Comment[it_IT]=Avvia gImageReader-qt6 +Icon=gImageReader +Icon[it_IT]=gImageReader +Name=gImageReader-qt6 +Name[it_IT]=gImageReader-qt6 +Categories=Utility diff --git a/packaging/AppImage/makePkg.sh b/packaging/AppImage/makePkg.sh index 939a2cb9..2c42f37f 100755 --- a/packaging/AppImage/makePkg.sh +++ b/packaging/AppImage/makePkg.sh @@ -23,9 +23,9 @@ # AppImage packages: AppDir/ usr/bin # macOS packages: DiskImage/$AppName.app/Contents/MacOS/ # -# Syntax: $ makePkg.sh [-y] Linux|WinMxe|WinMgw|Osx [32|64] +# Syntax: $ makePkg.sh [-y] Linux|WinMxe|WinMgw|Osx [32|64] [trail] -makePkgVer=2025-08-18 +makePkgVer=2025-08-19 APP="gImageReader" # app name BINRAD="gimagereader" # binary radix @@ -61,8 +61,9 @@ if (test "$1" = "-y") then fi if [[ "$1" = "" || "$1" != "Linux" && "$1" != "WinMxe" && "$1" != "WinMgw" && "$1" != "Osx" ]]; then echo "ERROR: makePkg.sh unsupported/miss target:'$1' platform to create package" - echo "Syntax: $ makePkg.sh [-y] Linux|WinMxe|WinMgw|Osx [32|64]" + echo "Syntax: $ makePkg.sh [-y] Linux|WinMxe|WinMgw|Osx [32|64] [trail]" echo " -y for batch execution without confirmations" + echo " trail is the GUI binary trailer. eg. Gui, -gtk, -qt5, -qt6" exit fi @@ -81,12 +82,22 @@ PKG="$1" CPU=`uname -m` # i686 or x86_64 if (test "" = "$2") then BIT=$(getconf LONG_BIT) -else - BIT="$2" +else # at least 2 + if [[ "$2" = "32" || "$2" = "64" ]]; then + BIT="$2" + if [[ "" != "$3" ]]; then + TRAIL="$3" + fi + else + TRAIL="$2" + fi +fi +if [[ "$TRAIL" = "" ]]; then + TRAIL="Gui" fi BINCLI="" -BINGUI="${BINRAD}-gtk" +BINGUI="${BINRAD}${TRAIL}" BINPATH=`realpath "$BINPATH"` SRCPATH=`realpath "$SRCPATH"` RESPATH=`realpath "$RESPATH"` @@ -162,7 +173,7 @@ fi if (test "$PKG" = "WinMxe" || test "$PKG" = "WinMgw") then EXT=".exe" fi -PKGNAME="${APP}_${VER}_${DATE}_${TGT}_${CPU}_${BIT}bit" +PKGNAME="${APP}${TRAIL}_${VER}_${DATE}_${TGT}_${CPU}_${BIT}bit" echo "DATE : $DATE" # today echo "HOSTOS : $OS" # current OS echo "APP : $APP" # app name @@ -279,8 +290,8 @@ echo "Copying assets ..." #cp -a $RESPATH/*.ini $TMPPATH/$APP/ # if needed if (test "$TGT" = "Linux") then #cp -a $RESPATH/*.ini $TMPPATH/AppDir/$TMPBINP # if needed -cp -a $RESPATH/$APP.desktop $TMPPATH/$APP/ -cp -a $RESPATH/$APP.desktop $TMPPATH/AppDir/ +cp -a $RESPATH/$APP$TRAIL.desktop $TMPPATH/$APP/ +cp -a $RESPATH/$APP$TRAIL.desktop $TMPPATH/AppDir/ cp -a $RESPATH/$APP.png $TMPPATH/$APP/ cp -a $RESPATH/$APP.png $TMPPATH/AppDir/ cp -a $RESPATH/makePkg.sh $TMPPATH/$APP/ @@ -390,30 +401,49 @@ echo "Release file: '$DSTPATH/$file'" # make AppImage if [[ ("$TGT" = "Linux") && ("$CPU" = "x86_64" || "$CPU" = "i686")]]; then # skip on ARM & RISC-V - echo "Generating the AppDir (about 3'50\") ..." if (test -f logWget$DATE.txt) then { rm logWget$DATE.txt ; } fi if (test "$BIT" = "64") then + echo "Generating the AppDir (about 3'50\") ..." if (! test -x linuxdeploy-x86_64.AppImage) then echo "Downloading linuxdeploy ..." wget -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" 2>> logWget$DATE.txt chmod +x linuxdeploy-x86_64.AppImage fi - if (! test -x linuxdeploy-plugin-gtk.sh) then - wget -nv "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh" 2>> logWget$DATE.txt - chmod +x linuxdeploy-plugin-gtk.sh + if (test "$TRAIL" = "-gtk") then + if (! test -x linuxdeploy-plugin-gtk.sh) then + echo "Downloading linuxdeploy GTK plugin ..." + wget -nv "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh" 2>> logWget$DATE.txt + chmod +x linuxdeploy-plugin-gtk.sh + fi + #./linuxdeploy-x86_64.AppImage -e $TMPPATH/AppDir/$TMPBINP/$BINGUI --appdir AppDir -p gtk -i $TMPPATH/AppDir/$APP.png -d $TMPPATH/AppDir/$APP$TRAIL.desktop --output appimage" + ./linuxdeploy-x86_64.AppImage -e $TMPPATH/AppDir/$TMPBINP/$BINGUI --appdir AppDir -p gtk -i $TMPPATH/AppDir/$APP.png -d $TMPPATH/AppDir/$APP$TRAIL.desktop > logLinuxdeploy$DATE.txt + cp -a $BINPATH/glib-2.0/schemas/org.gnome.gimagereader.gschema.xml $TMPPATH/AppDir/usr/share/glib-2.0/schemas/ + mv $TMPPATH/AppDir/usr/share/glib-2.0/schemas/gschemas.compiled $TMPPATH/AppDir/usr/share/glib-2.0/schemas/gschemas.compiled.orig + cp -a $BINPATH/glib-2.0/schemas/gschemas.compiled $TMPPATH/AppDir/usr/share/glib-2.0/schemas/ + fi + if [[ "$TRAIL" = "-qt5" || "$TRAIL" = "-qt6" ]]; then + if (! test -x linuxdeploy-plugin-qt-x86_64.AppImage) then + echo "Downloading linuxdeploy QT plugin ..." + wget -nv "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" 2>> logWget$DATE.txt + chmod +x linuxdeploy-plugin-qt-x86_64.AppImage + fi + #./linuxdeploy-x86_64.AppImage -e $TMPPATH/AppDir/$TMPBINP/$BINGUI --appdir AppDir -p qt -i $TMPPATH/AppDir/$APP.png -d $TMPPATH/AppDir/$APP$TRAIL.desktop --output appimage" + ./linuxdeploy-x86_64.AppImage -e $TMPPATH/AppDir/$TMPBINP/$BINGUI --appdir AppDir -p qt -i $TMPPATH/AppDir/$APP.png -d $TMPPATH/AppDir/$APP$TRAIL.desktop > logLinuxdeploy$DATE.txt + #cp -a $BINPATH/glib-2.0/schemas/org.gnome.gimagereader.gschema.xml $TMPPATH/AppDir/usr/share/glib-2.0/schemas/ + #mv $TMPPATH/AppDir/usr/share/glib-2.0/schemas/gschemas.compiled $TMPPATH/AppDir/usr/share/glib-2.0/schemas/gschemas.compiled.orig + #cp -a $BINPATH/glib-2.0/schemas/gschemas.compiled $TMPPATH/AppDir/usr/share/glib-2.0/schemas/ fi - #./linuxdeploy-x86_64.AppImage -e $TMPPATH/AppDir/$TMPBINP/$BINGUI --appdir AppDir -p gtk -i $TMPPATH/AppDir/$APP.png -d $TMPPATH/AppDir/$APP.desktop --output appimage" - ./linuxdeploy-x86_64.AppImage -e $TMPPATH/AppDir/$TMPBINP/$BINGUI --appdir AppDir -p gtk -i $TMPPATH/AppDir/$APP.png -d $TMPPATH/AppDir/$APP.desktop > logLinuxdeploy$DATE.txt - cp -a $BINPATH/glib-2.0/schemas/org.gnome.gimagereader.gschema.xml $TMPPATH/AppDir/usr/share/glib-2.0/schemas/ - mv $TMPPATH/AppDir/usr/share/glib-2.0/schemas/gschemas.compiled $TMPPATH/AppDir/usr/share/glib-2.0/schemas/gschemas.compiled.orig - cp -a $BINPATH/glib-2.0/schemas/gschemas.compiled $TMPPATH/AppDir/usr/share/glib-2.0/schemas/ echo "Generating the AppImage (about 3'10\") ..." ./linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage >> logLinuxdeploy$DATE.txt ret=$? file="$PKGNAME.AppImage" if (test "$ret" = "0") then echo "AppImage created: $DSTPATH/$file" - mv ${APP}-x86_64.AppImage $DSTPATH/$file + if [[ "$TRAIL" = "-qt5" || "$TRAIL" = "-qt6" ]]; then + mv ${APP}${TRAIL}-x86_64.AppImage $DSTPATH/$file + else + mv ${APP}-x86_64.AppImage $DSTPATH/$file + fi else echo "AppImage failed: $file" fi From 0c89cabd83038443cf089c01506bd3ffca05188e Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Wed, 20 Aug 2025 00:42:35 +0200 Subject: [PATCH 13/40] There's not enough info to determine what you meant. Add one of these properties: run, shell, uses, with, working-directory removed -name: Check out code --- .github/workflows/linux.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index aecc53ce..a0cd0e8c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,7 +17,6 @@ jobs: # run: sudo apt install cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev run: sudo apt install cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev - - name: Check out code - uses: actions/checkout@v4.2.2 - name: Build application GTK @@ -68,7 +67,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - VERSION=${{ steps.version_number.outputs.version }} git config --global user.email "ci@github.com" git config --global user.name "Github CI" git tag -d ci-latest || true From 5b9450f562e4728522488797881dcb995ca175c1 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Wed, 20 Aug 2025 00:56:08 +0200 Subject: [PATCH 14/40] fix name for gtk appimage --- .github/workflows/linux.yml | 4 ++-- packaging/AppImage/makePkg.sh | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a0cd0e8c..babc4dee 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -87,6 +87,6 @@ jobs: prerelease: true replacesArtifacts: true artifacts: " - ./packaging/gImageReader_*_Linux_x86_64_64bit.tgz, - ./packaging/gImageReader_*_Linux_x86_64_64bit.AppImage + ./packaging/gImageReader*_Linux_x86_64_64bit.tgz, + ./packaging/gImageReader*_Linux_x86_64_64bit.AppImage " diff --git a/packaging/AppImage/makePkg.sh b/packaging/AppImage/makePkg.sh index 2c42f37f..cbb05109 100755 --- a/packaging/AppImage/makePkg.sh +++ b/packaging/AppImage/makePkg.sh @@ -439,11 +439,7 @@ if [[ ("$TGT" = "Linux") && ("$CPU" = "x86_64" || "$CPU" = "i686")]]; then # ski file="$PKGNAME.AppImage" if (test "$ret" = "0") then echo "AppImage created: $DSTPATH/$file" - if [[ "$TRAIL" = "-qt5" || "$TRAIL" = "-qt6" ]]; then - mv ${APP}${TRAIL}-x86_64.AppImage $DSTPATH/$file - else - mv ${APP}-x86_64.AppImage $DSTPATH/$file - fi + mv ${APP}${TRAIL}-x86_64.AppImage $DSTPATH/$file else echo "AppImage failed: $file" fi From 66bc9443b55373c79c03b3c5dcc40c8aab20b854 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 00:45:27 +0200 Subject: [PATCH 15/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 95 +++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 .github/workflows/docker-debian13.yml diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml new file mode 100644 index 00000000..e0f2b676 --- /dev/null +++ b/.github/workflows/docker-debian13.yml @@ -0,0 +1,95 @@ +name: CI Build Linux Debian13 +on: [push] + +jobs: + build: + name: Linux Debian13 build + runs-on: ubuntu-latest + container: + image: debian:trixie + options: --security-opt seccomp=unconfined + permissions: + contents: write + steps: + # - name: Update distro + # run: sudo apt update + # - name: Upgrade distro + # run: sudo apt upgrade + + - name: Install build dependencies + run: apt install git cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev + # run: apt install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev + + - uses: actions/checkout@v4.2.2 + + - name: Build application GTK + run: | + mkdir -p build + cd build + cmake -DINTERFACE_TYPE=gtk .. + make + + - name: Build Packages GTK + run: | + cd build + ../packaging/AppImage/makePkg.sh -y Linux 64 -gtk + + - name: Build application QT5 + run: | + mkdir -p build + cd build + rm -rf * + cmake -DINTERFACE_TYPE=qt5 .. + make + + - name: Build Packages QT5 + run: | + cd build + ../packaging/AppImage/makePkg.sh -y Linux 64 -qt5 + + - name: Build application QT6 + run: | + mkdir -p build + cd build + rm -rf .* * + cmake -DINTERFACE_TYPE=qt6 .. + make + + - name: Build Packages QT6 + run: | + cd build + ../packaging/AppImage/makePkg.sh -y Linux 64 -qt6 + + - name: Show packages + run: | + pwd + echo "list packaging/ ..." + ls -l packaging + + - name: Reset ci-latest tag + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + git config --global user.email "ci@github.com" + git config --global user.name "Github CI" + git tag -d ci-latest || true + git push origin :ci-latest || true + git tag -m ci-latest ci-latest + git push --tags + + - name: Create release + id: create_release + uses: ncipollo/release-action@v1.18.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + allowUpdates: true + tag: ci-latest + name: CI Build + draft: false + prerelease: true + replacesArtifacts: true + artifacts: " + ./packaging/gImageReader*_Linux_x86_64_64bit.tgz, + ./packaging/gImageReader*_Linux_x86_64_64bit.AppImage + " From a399c4e5c8a8455cda38ed2d84fa8691be0cc4ce Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 00:50:59 +0200 Subject: [PATCH 16/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index e0f2b676..9f28d43d 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -11,8 +11,8 @@ jobs: permissions: contents: write steps: - # - name: Update distro - # run: sudo apt update + - name: Update distro + run: sudo apt update # - name: Upgrade distro # run: sudo apt upgrade From a4c1e1a0d74e6864031d15010fd27e5f58fb97fc Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 00:57:03 +0200 Subject: [PATCH 17/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 9f28d43d..f4b5263e 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -12,9 +12,9 @@ jobs: contents: write steps: - name: Update distro - run: sudo apt update + run: apt update # - name: Upgrade distro - # run: sudo apt upgrade + # run: apt upgrade - name: Install build dependencies run: apt install git cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev From a705030d1918d6dbe68aecf7ffd4e659c8981296 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 01:00:04 +0200 Subject: [PATCH 18/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index f4b5263e..807506ee 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -17,8 +17,8 @@ jobs: # run: apt upgrade - name: Install build dependencies - run: apt install git cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev - # run: apt install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev + run: apt -y install git cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev + # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev - uses: actions/checkout@v4.2.2 From 2912a9e386d230544c4573f8826af48896a59456 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 01:05:56 +0200 Subject: [PATCH 19/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 807506ee..5ccd81ee 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -20,6 +20,9 @@ jobs: run: apt -y install git cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev + - name: Install package dependencies + run: apt -y install 7z wget + - uses: actions/checkout@v4.2.2 - name: Build application GTK @@ -34,18 +37,18 @@ jobs: cd build ../packaging/AppImage/makePkg.sh -y Linux 64 -gtk - - name: Build application QT5 - run: | - mkdir -p build - cd build - rm -rf * - cmake -DINTERFACE_TYPE=qt5 .. - make + # - name: Build application QT5 + # run: | + # mkdir -p build + # cd build + # rm -rf * + # cmake -DINTERFACE_TYPE=qt5 .. + # make - - name: Build Packages QT5 - run: | - cd build - ../packaging/AppImage/makePkg.sh -y Linux 64 -qt5 + # - name: Build Packages QT5 + # run: | + # cd build + # ../packaging/AppImage/makePkg.sh -y Linux 64 -qt5 - name: Build application QT6 run: | From 9fa85ecddc4e9e6f676860b4a3e61507f9bc74a0 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 01:09:01 +0200 Subject: [PATCH 20/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 5ccd81ee..5a565efa 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -21,7 +21,7 @@ jobs: # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev - name: Install package dependencies - run: apt -y install 7z wget + run: apt -y install 7zip wget - uses: actions/checkout@v4.2.2 From 5419b9429d88192b8bcfd99597c56117d6b605b0 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 02:21:52 +0200 Subject: [PATCH 21/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 5a565efa..cf96f4a2 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest container: image: debian:trixie - options: --security-opt seccomp=unconfined + options: --cap-add SYS_ADMIN --device /dev/fuse -v /usr/lib/modules/`uname -r`:/lib/modules/`uname -r`:shared permissions: contents: write steps: @@ -20,8 +20,10 @@ jobs: run: apt -y install git cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev - - name: Install package dependencies - run: apt -y install 7zip wget + - name: Install packaging dependencies + run: | + apt -y install 7zip wget kmod fuse + modprobe fuse - uses: actions/checkout@v4.2.2 From 0228c7ce898ef20de2fb34d48da39f105fbd1c2f Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 02:28:08 +0200 Subject: [PATCH 22/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index cf96f4a2..b89de589 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest container: image: debian:trixie - options: --cap-add SYS_ADMIN --device /dev/fuse -v /usr/lib/modules/`uname -r`:/lib/modules/`uname -r`:shared + options: --cap-add SYS_ADMIN --device /dev/fuse -v /usr/lib/modules/6.11.0-1018-azure:/lib/modules/6.11.0-1018-azure:shared permissions: contents: write steps: From ffd174c9927622ea298163daca0d3dd7ca2c36a3 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 02:35:07 +0200 Subject: [PATCH 23/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index b89de589..e2152b5e 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest container: image: debian:trixie - options: --cap-add SYS_ADMIN --device /dev/fuse -v /usr/lib/modules/6.11.0-1018-azure:/lib/modules/6.11.0-1018-azure:shared + options: --privileged --device /dev/fuse -v /usr/lib/modules/6.11.0-1018-azure:/lib/modules/6.11.0-1018-azure:shared permissions: contents: write steps: From be22bb6cabac2c900d1a7d141a49d7a69e5c2ad8 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 02:40:31 +0200 Subject: [PATCH 24/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index e2152b5e..2b03e4f7 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -43,7 +43,7 @@ jobs: # run: | # mkdir -p build # cd build - # rm -rf * + # rm -rf * .* 2> /dev/null # cmake -DINTERFACE_TYPE=qt5 .. # make @@ -56,7 +56,7 @@ jobs: run: | mkdir -p build cd build - rm -rf .* * + rm -rf * .* 2> /dev/null cmake -DINTERFACE_TYPE=qt6 .. make From c3c96247a0a9913a44c470b0a10b1a69028516fc Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 02:45:33 +0200 Subject: [PATCH 25/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 2b03e4f7..a1dc6d4f 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -22,7 +22,7 @@ jobs: - name: Install packaging dependencies run: | - apt -y install 7zip wget kmod fuse + apt -y install kmod fuse 7zip wget modprobe fuse - uses: actions/checkout@v4.2.2 @@ -43,7 +43,7 @@ jobs: # run: | # mkdir -p build # cd build - # rm -rf * .* 2> /dev/null + # rm -rf * 2> /dev/null # cmake -DINTERFACE_TYPE=qt5 .. # make @@ -56,7 +56,7 @@ jobs: run: | mkdir -p build cd build - rm -rf * .* 2> /dev/null + rm -rf * 2> /dev/null cmake -DINTERFACE_TYPE=qt6 .. make From 6cc40f8355a53bfebb1cb6a3b99042b61197a984 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 02:54:26 +0200 Subject: [PATCH 26/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index a1dc6d4f..aef3b77f 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -71,6 +71,9 @@ jobs: echo "list packaging/ ..." ls -l packaging + - name: Set safe directory + run: git config --global --add safe.directory ${GITHUB_WORKSPACE} + - name: Reset ci-latest tag env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 36bd9f3b10b0a3277c6f07f98ec2ce30c5b56f61 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:07:16 +0200 Subject: [PATCH 27/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index aef3b77f..6b94a16e 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -17,8 +17,8 @@ jobs: # run: apt upgrade - name: Install build dependencies - run: apt -y install git cmake debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qt6-base-dev uuid-dev - # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev + run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt5-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev + # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev - name: Install packaging dependencies run: | @@ -39,18 +39,18 @@ jobs: cd build ../packaging/AppImage/makePkg.sh -y Linux 64 -gtk - # - name: Build application QT5 - # run: | - # mkdir -p build - # cd build - # rm -rf * 2> /dev/null - # cmake -DINTERFACE_TYPE=qt5 .. - # make + - name: Build application QT5 + run: | + mkdir -p build + cd build + rm -rf * 2> /dev/null + cmake -DINTERFACE_TYPE=qt5 .. + make - # - name: Build Packages QT5 - # run: | - # cd build - # ../packaging/AppImage/makePkg.sh -y Linux 64 -qt5 + - name: Build Packages QT5 + run: | + cd build + ../packaging/AppImage/makePkg.sh -y Linux 64 -qt5 - name: Build application QT6 run: | From ba676247808c5d90f10c956d3bdabd38f1a76f87 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:11:43 +0200 Subject: [PATCH 28/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 6b94a16e..ba17e5a8 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -16,6 +16,11 @@ jobs: # - name: Upgrade distro # run: apt upgrade + - name: Show Distro sources + run: | + cat /etc/apt/sources.list + cat /etc/apt/sources.list.d/trixie.sources + - name: Install build dependencies run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt5-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev From 8122beb2f752ac01024ba06591a8929bcdbe715b Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:13:22 +0200 Subject: [PATCH 29/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index ba17e5a8..24e57a9d 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -18,8 +18,8 @@ jobs: - name: Show Distro sources run: | - cat /etc/apt/sources.list - cat /etc/apt/sources.list.d/trixie.sources + cat /etc/apt/sources.list 2> /dev/null + cat /etc/apt/sources.list.d/trixie.sources 2> /dev/null - name: Install build dependencies run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt5-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev From ee318929eded0c19e152a0aee8b92b0742b61727 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:15:28 +0200 Subject: [PATCH 30/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 24e57a9d..a536001c 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -18,7 +18,9 @@ jobs: - name: Show Distro sources run: | - cat /etc/apt/sources.list 2> /dev/null + ls -l /etc/apt/ + # cat /etc/apt/sources.list + ls -l /etc/apt/sources.list.d/ cat /etc/apt/sources.list.d/trixie.sources 2> /dev/null - name: Install build dependencies From 8512956892bee724a1287a5852b1c0552aacf482 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:16:54 +0200 Subject: [PATCH 31/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index a536001c..28767db6 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -21,7 +21,7 @@ jobs: ls -l /etc/apt/ # cat /etc/apt/sources.list ls -l /etc/apt/sources.list.d/ - cat /etc/apt/sources.list.d/trixie.sources 2> /dev/null + cat /etc/apt/sources.list.d/debian.sources 2> /dev/null - name: Install build dependencies run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt5-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev From 5cbdda418b660e598e300e3406a022bc9522f28d Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:24:55 +0200 Subject: [PATCH 32/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 28767db6..ac4bcee3 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -11,18 +11,30 @@ jobs: permissions: contents: write steps: + - name: Show Distro sources + run: | + # ls -l /etc/apt/ + # cat /etc/apt/sources.list + # ls -l /etc/apt/sources.list.d/ + cat /etc/apt/sources.list.d/debian.sources + + - name: Add Distro sources + run: | + sed -i 's/Types: deb /Types: deb deb-src/g' /etc/apt/sources.list.d/debian.sources + sed -i 's/Components: main/Components: main contrib non-free non-free-firmware/g' /etc/apt/sources.list.d/debian.sources + echo " +Types: deb deb-src +URIs: http://deb.debian.org/debian +Suites: trixie-backports +Components: main contrib non-free non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg" >> /etc/apt/sources.list.d/debian.sources + cat /etc/apt/sources.list.d/debian.sources + - name: Update distro run: apt update # - name: Upgrade distro # run: apt upgrade - - name: Show Distro sources - run: | - ls -l /etc/apt/ - # cat /etc/apt/sources.list - ls -l /etc/apt/sources.list.d/ - cat /etc/apt/sources.list.d/debian.sources 2> /dev/null - - name: Install build dependencies run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt5-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev From 11fab1a10c0c842fdf7cbef4efd63dfb445639a5 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:26:14 +0200 Subject: [PATCH 33/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index ac4bcee3..462beb3b 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -22,11 +22,11 @@ jobs: run: | sed -i 's/Types: deb /Types: deb deb-src/g' /etc/apt/sources.list.d/debian.sources sed -i 's/Components: main/Components: main contrib non-free non-free-firmware/g' /etc/apt/sources.list.d/debian.sources - echo " -Types: deb deb-src -URIs: http://deb.debian.org/debian -Suites: trixie-backports -Components: main contrib non-free non-free-firmware + echo "\ +Types: deb deb-src\ +URIs: http://deb.debian.org/debian\ +Suites: trixie-backports\ +Components: main contrib non-free non-free-firmware\ Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg" >> /etc/apt/sources.list.d/debian.sources cat /etc/apt/sources.list.d/debian.sources From 8ed2ad6223aed7109b86384559f3a49d804b4a3e Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:27:24 +0200 Subject: [PATCH 34/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 462beb3b..b26c007a 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -22,11 +22,11 @@ jobs: run: | sed -i 's/Types: deb /Types: deb deb-src/g' /etc/apt/sources.list.d/debian.sources sed -i 's/Components: main/Components: main contrib non-free non-free-firmware/g' /etc/apt/sources.list.d/debian.sources - echo "\ -Types: deb deb-src\ -URIs: http://deb.debian.org/debian\ -Suites: trixie-backports\ -Components: main contrib non-free non-free-firmware\ + echo " \ +Types: deb deb-src \ +URIs: http://deb.debian.org/debian \ +Suites: trixie-backports \ +Components: main contrib non-free non-free-firmware \ Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg" >> /etc/apt/sources.list.d/debian.sources cat /etc/apt/sources.list.d/debian.sources From b1c0c8024975404b73feff16856f01acd9dce107 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:28:14 +0200 Subject: [PATCH 35/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index b26c007a..bfdb0dd4 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -22,12 +22,6 @@ jobs: run: | sed -i 's/Types: deb /Types: deb deb-src/g' /etc/apt/sources.list.d/debian.sources sed -i 's/Components: main/Components: main contrib non-free non-free-firmware/g' /etc/apt/sources.list.d/debian.sources - echo " \ -Types: deb deb-src \ -URIs: http://deb.debian.org/debian \ -Suites: trixie-backports \ -Components: main contrib non-free non-free-firmware \ -Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg" >> /etc/apt/sources.list.d/debian.sources cat /etc/apt/sources.list.d/debian.sources - name: Update distro From 4d01afbf96eb82ee9fec79adbc4149b8bb2a0da2 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:46:40 +0200 Subject: [PATCH 36/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index bfdb0dd4..dafddaea 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -22,6 +22,12 @@ jobs: run: | sed -i 's/Types: deb /Types: deb deb-src/g' /etc/apt/sources.list.d/debian.sources sed -i 's/Components: main/Components: main contrib non-free non-free-firmware/g' /etc/apt/sources.list.d/debian.sources + echo " + Types: deb deb-src + URIs: http://deb.debian.org/debian + Suites: trixie-backports + Components: main contrib non-free non-free-firmware + Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg" >> /etc/apt/sources.list.d/debian.sources cat /etc/apt/sources.list.d/debian.sources - name: Update distro From 5447e424f7f9dbd33ac58a96abf5a1ec393502a2 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:50:46 +0200 Subject: [PATCH 37/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index dafddaea..b38505f4 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -36,7 +36,7 @@ jobs: # run: apt upgrade - name: Install build dependencies - run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt5-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev + run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev - name: Install packaging dependencies From 5c018d621f91db49e51afbf41410966f6281942a Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:53:30 +0200 Subject: [PATCH 38/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index b38505f4..4f1c1177 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -20,7 +20,7 @@ jobs: - name: Add Distro sources run: | - sed -i 's/Types: deb /Types: deb deb-src/g' /etc/apt/sources.list.d/debian.sources + sed -i 's/Types: deb/Types: deb deb-src/g' /etc/apt/sources.list.d/debian.sources sed -i 's/Components: main/Components: main contrib non-free non-free-firmware/g' /etc/apt/sources.list.d/debian.sources echo " Types: deb deb-src @@ -36,7 +36,7 @@ jobs: # run: apt upgrade - name: Install build dependencies - run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev + run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt5-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev - name: Install packaging dependencies From 3c1086f623428ae589651eae58032103beaf4d31 Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 03:56:17 +0200 Subject: [PATCH 39/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index 4f1c1177..db7f6bc2 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -23,11 +23,11 @@ jobs: sed -i 's/Types: deb/Types: deb deb-src/g' /etc/apt/sources.list.d/debian.sources sed -i 's/Components: main/Components: main contrib non-free non-free-firmware/g' /etc/apt/sources.list.d/debian.sources echo " - Types: deb deb-src - URIs: http://deb.debian.org/debian - Suites: trixie-backports - Components: main contrib non-free non-free-firmware - Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg" >> /etc/apt/sources.list.d/debian.sources + Types: deb deb-src + URIs: http://deb.debian.org/debian + Suites: trixie-backports + Components: main contrib non-free non-free-firmware + Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg" >> /etc/apt/sources.list.d/debian.sources cat /etc/apt/sources.list.d/debian.sources - name: Update distro @@ -36,7 +36,7 @@ jobs: # run: apt upgrade - name: Install build dependencies - run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt5-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev + run: apt -y install git cmake debhelper debhelper-compat intltool libcairomm-1.0-dev libdjvulibre-dev libenchant-2-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjpeg-dev libjson-glib-dev libpangomm-1.4-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libpoppler-qt6-dev libqtspell-qt6-dev libquazip5-dev libquazip1-qt6-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools qt6-base-dev uuid-dev # run: apt -y install git cmake debhelper intltool libcairomm-1.0-dev libdjvulibre-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev libgtkspellmm-3.0-dev libjson-glib-dev libpodofo-dev libpoppler-glib-dev libpoppler-qt5-dev libqtspell-qt5-dev libquazip5-dev libsane-dev libtesseract-dev libxml++2.6-dev libzip-dev python3-gi qtbase5-dev qttools5-dev qttools5-dev-tools uuid-dev - name: Install packaging dependencies From e123c69fb8ae19c1507edfa865e3dd1a95eb6abb Mon Sep 17 00:00:00 2001 From: Valerio Messina Date: Thu, 4 Sep 2025 04:01:36 +0200 Subject: [PATCH 40/40] added: docker-debian13.yml to build AppImage using Debian13 --- .github/workflows/docker-debian13.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-debian13.yml b/.github/workflows/docker-debian13.yml index db7f6bc2..9ee45c2f 100644 --- a/.github/workflows/docker-debian13.yml +++ b/.github/workflows/docker-debian13.yml @@ -58,18 +58,18 @@ jobs: cd build ../packaging/AppImage/makePkg.sh -y Linux 64 -gtk - - name: Build application QT5 - run: | - mkdir -p build - cd build - rm -rf * 2> /dev/null - cmake -DINTERFACE_TYPE=qt5 .. - make - - - name: Build Packages QT5 - run: | - cd build - ../packaging/AppImage/makePkg.sh -y Linux 64 -qt5 + # - name: Build application QT5 + # run: | + # mkdir -p build + # cd build + # rm -rf * 2> /dev/null + # cmake -DINTERFACE_TYPE=qt5 .. + # make + + # - name: Build Packages QT5 + # run: | + # cd build + # ../packaging/AppImage/makePkg.sh -y Linux 64 -qt5 - name: Build application QT6 run: |