Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] wps-office: update to 11.1.0.8865
@ 2019-09-18 20:03 voidlinux-github
  2019-10-12  9:22 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: voidlinux-github @ 2019-09-18 20:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 568 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wpsupdate
https://github.com/void-linux/void-packages/pull/14568

wps-office: update to 11.1.0.8865
- wps-office has both a (downloadable) license and an EULA, license is in $FILESDIR and both of them are installed with vlicense.

- It also has a privacy notice, which is treated as documentation.

@the-maldridge : Please review the changes.

A patch file from https://github.com/void-linux/void-packages/pull/14568.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wpsupdate-14568.patch --]
[-- Type: text/x-diff, Size: 20198 bytes --]

From 4deaad45b4e573e504ea19f16327c3db094a270d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Sep 2019 22:06:53 +0300
Subject: [PATCH] wps-office: update to 11.1.0.8865

---
 ...T_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps | Bin 0 -> 62464 bytes
 srcpkgs/wps-office/template                     |  15 ++++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/wps-office/files/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps

diff --git a/srcpkgs/wps-office/files/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps b/srcpkgs/wps-office/files/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
new file mode 100644
index 0000000000000000000000000000000000000000..c58cc3396cdd490571283094ee8238604a73e8d2
GIT binary patch
literal 62464
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
F{D0v|IoSXJ

literal 0
HcmV?d00001

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 20d9be38be1..a87ea8b83ba 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,16 +1,15 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8722
+version=11.1.0.8865
 revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Kingsoft WPS Community License"
-#Full license is at: http://wps-community.org/license.md (Not downloadable)
+license="custom:Kingsoft WPS Community License, custom:EULA"
 homepage="http://wps-community.org"
-checksum=e898a1edcb53bc7c0bd3361e225c8475fc84d54d937eea53e7ef030f12a1345e
+checksum=2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -18,7 +17,7 @@ restricted=yes
 #The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8722
+_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8865
 _distTar="${pkgname}-${version}-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
@@ -34,4 +33,10 @@ post_install() {
 	rm -rf ${DESTDIR}/etc
 	#Delete postinst and prerm scripts
 	rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
+	# Install license and EULA
+	# License downloaded from: http://wps-community.org/license.md
+	vlicense ${FILESDIR}/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
+	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
+	# Install privacy notice as documentation
+	vdoc ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/Privacy_Linux.txt
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wps-office: update to 11.1.0.8865
  2019-09-18 20:03 [PR PATCH] wps-office: update to 11.1.0.8865 voidlinux-github
  2019-10-12  9:22 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-12  9:22 ` voidlinux-github
  2019-10-12  9:24 ` voidlinux-github
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-12  9:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wpsupdate
https://github.com/void-linux/void-packages/pull/14568

wps-office: update to 11.1.0.8865
- wps-office has both a (downloadable) license and an EULA, license is in $FILESDIR and both of them are installed with vlicense.

- It also has a privacy notice, which is treated as documentation.

@the-maldridge : Please review the changes.

A patch file from https://github.com/void-linux/void-packages/pull/14568.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wpsupdate-14568.patch --]
[-- Type: text/x-diff, Size: 20668 bytes --]

From 168c94d20b93a4d61026c7251bbddba839ec1852 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Sep 2019 22:06:53 +0300
Subject: [PATCH] wps-office: update to 11.1.0.8865

---
 ...OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps | Bin 0 -> 62464 bytes
 srcpkgs/wps-office/template                   |  25 +++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/wps-office/files/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps

diff --git a/srcpkgs/wps-office/files/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps b/srcpkgs/wps-office/files/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
new file mode 100644
index 0000000000000000000000000000000000000000..c58cc3396cdd490571283094ee8238604a73e8d2
GIT binary patch
literal 62464
zcmeI53(%frdFSu<%a`zl$U#mbqP)^55g`Ud1U&JP1V{);$blH8YDfqHav}!--CZf$
ziuHh$vaOw=N@u9+wjGDHtm{m7TX*g1)^%&0Rk!P`U0P>nsH0Bmv@>mImT&*R=l@-~
z@8|G--<vN7BFzg|p7(v8=RRH6|2o{)eLv6lXWxA3v%mFk&-=^N_`E&MO3zQsO>>I#
zJ$;9&&*>?R=nKD}pO~2N$&~c<#OG&-1OHEbegC8kM|GSnLgpul#zb>P_lf3-ULrb0
zbgJkyksy#>Dmp`Srsyou*`jkqFB6?Bdb#L4(JMsfi(V;umFNOdU-W9xg`%Gm%@@5!
z^jgtHq6MPYi7pnsUUZ4*Qqe-u8$^plmx(SHy-{?9=uM(4MQ;{eCAwO4jp!|+w~F2-
zdb{WyqH9ItqU%J9MN33WMc0dN5Zx$RCR#4KNwh+AvuLGgm1wo-7SS5fTG2YudeN<-
z4Wf67Hj3UQdbj8{(a($CBYLmseWFdG+eMp2TSRw=wu<f)Z4=!kx?6OQXuD{KXs2kG
zXt(HI(H_xW(LT|B5&8(-KlyzsIIdAmyHv8Tk?+)TPkKP5hX0%+#6<lg(-d3un;&2J
zijCjw&Eh_Qqt6m?U|+=r|31`zPfjDfXrJRS<x6|DNK)G*32d)8KTPTRJ*TSuo=%}V
z!?sTiqbQR;8^rxRlKc`KH%odu)DPq^?B_gL;X@t&$*TN~-*pT09l0SB#?Ynz+<(04
zKe8NF|G9T6{pb2Wwa<q~&XoP`r6*+3kw16<3E2Kmi9S6IT`6ZV9lc)wn~tImHFxmC
zxworqTss!W&#CojhmOSeLB}r*aZi+u`nHM5H;Ur?iDTtsul<{e5qvFSMfDj;o9}s8
z4iVe4Y5uHP^JiT)pQvH+^0U*X<>#iGZX8KFZk#*1SG4oS(XoA^_ukk8#*NSXG=A+*
zCw{AnFyhjj^yi;`>SO=zp11wthIg;Uoge%xOzU;`-&Ao%oSc<@=@ZXC{@ZfXr>E;K
z9(mvLk+fU>c_O|2;@-vSRoC|92QH4AbsS9(-2UA5hws=R$3Lbro93rk>U?@6U7&l<
z=si;0JCgQ)YOaE;&2oxoY&jqu^k{FGpRRrF-1%E{Yj5RO(MY+sUV05DMpwm&(e&Et
zj@5CZmoBRAxFt@Erc?BF<m%J+^m`+U;ubGIBdrpnZxLOU`s&Yxy{j7iIqw&U<Ib4u
zw|Y`kF<RAtiTJF-!7CKvJ@cBBe)4)*3x#IiP+0biLb2x*iv398*LCA5eQ$9}-&N>z
zg~FweD@6JW@$s_?X&zG;^Y{l9v3xA0FFvZs@(JDd<k5?&==0}qR79mVpZSd2YDQWk
zfxml*_Z$VMllA3>a~_q_j*QHiHG6dS$gI(aKOiio^dN%aGoh<|)+uPijqlavl{((1
zBVpDK1sa5ImySN#`>^0LC(Y{d!S$x}$px}@)u$)$@cCE;%gcQCyxFrxMn?7j!z1az
zHE%s_0YNsO3nuUW{CjtO^1uArw`8y1q!Q}qyg8%l=;+Ak#KQEK?|xtUGNCk|iC(X-
z;JQ!Xvu(0pDs|SQ0>|vxy^-EYb4F&L#GQ@LgZy5r0C9%`rd?Gy`o{T>D*U0X5k8|6
z7pG?z-=Drbce1E>a;;jN7*~*Um)awQJvjckbE@(Gkw)~7|LmJr#fW13-}*Fa`Hm~9
z7EYQqcVuMt$mqZp7OO}5t5)vNzrlG0{^EwlHQAre!-JgNp#JSt*u7=)NI*R<o`{p9
zv&G0cvoyMq^z6j^YQ8{`^qHO-(r2+o22VW3z9tC-wcB)MV&V*L&}WyX56g7tQek4P
z{_Sh(af5KNRR7&von5DMt2FuOYqGIScio`-_#Nl3pDf?kxm7CJuWDSWDaSkYeX-8n
ztpC=l<T91nsB^cf-ZiRanXawW?*)|v_Np&^85^WQ*t<o)HfS=lR!7=vw=;d+fvu7B
z<IR`<`fN>E?o!R$tLccxU;f({W_x2FIX9)JdjItn++j+;`q2D4e?!Fg>O{Izc7Jr7
z>F7l|H=1Uh{!uPYetOkizEjgkE0Mz3cWL_gYE2t2k@>zx)4q3T%Jt9F=hDAVUmN+8
zk+b{f^k3e8W&gGPD=+LV8d)@J(d<QY7tLFA%A(U2y>!vpi(a;<H!(7C(!|_}mrR^G
zao)r$CN7wG+r+gKw@v)~#Cs;59cp?JJv<V}1)4a1P<=nQe|~>#(aDQmvgp)Br!P8d
z(K(C8)W5e(ynEs=C;snY_iF5<CucvS5OCzdK<km{`{C8`x&srZNyhI;>2s5^9aP^%
z7n5vo8lZkp@4;UB`?FF-Tmduu<`YN0Pg?qFO2h=<w3H59&xJJSfIyl?Wa615K_Cv|
z``R?`z^in8u!=c;q4&feKAZk!?+?CnAbq*F_ld8h|JIxJc3nO#jU0GT$J5i;0h~ou
zjcojBY1RQbOCs+B3v}$Ixd+1e=;y)DNIJPHho#4maX;nGm^@##ekx{YUe(<X>DniH
zAL{i}zj8`r=^e8e`nzRe9~OOD#E{Q?=i?Lq>cNR?b^DAz&kKBWWMG>gSoG{KedeeC
zuxi`szxyj=>Gc=={{N!S_v==s{#<`jq|bw&(?8Vkv<O*$N*8f~PwB{bpV1NL_+=gO
zOW)8DKK@9@%F(DW)9IJ!sDLD$tE1SF=Iba?rb~2$uUF^@z~8FlnL6&)vH9WD(`uaS
zqiW;=9e0aftj7CCzx|)mFMnjNMts)lKhik$fmIcQiNsD#H?6&C?N=&(SLcg=M#s)M
zm`C9Bq#6}>)W24WHF;{#_bBmH_2n91pidnAtNY)c+{L7Bci+%BOP$Z?+)s3zUtGIL
zkh@AS_>t<9qRjX+B1m=sY+!xgSByzN_6v2}RPeom`Z+@Q8S2m314|vd3ulWT|MS>2
zccP^e95}&&DL9~+ysX2C&j}734hLSWaSapR*C`rYT}^Q}DH(G|>T802ho-$ucuB=@
z++Q6@8SJgrp?ua;WA498DS>UeLNX`HY}eTxBG#?;>9|XEaNRZRo19XUPU!3UHr>J1
z7dNL#E}Y+IwD5UcT!Ytlh)-V6dS(B0I#1Gp^IOGtk`E7PlHON7g)^*!QFg2NWoaNC
z%k3teBRNCrVyk#cqGD@x=jO>Wl!nLLw?Eyl?<9nF=szTktRB$0TXi>eTV}&0M7r9U
zzHUalpprggI={bK?d}rd_KOGmlDPr5KoH2<tpDimZhfb}P9F~D=OrrjfJ*Gwai{Kf
z8fTx*)KLzXjY9eXHutC%@CYaKmA1q(-nXdKX7!0<U+GL_?4H4Mx4G${#JK~0Z!2oA
zw@ay=YJXoP{f(2O*jsVK{q@zp+S#d8(ymH&@C6xWo%BfWtS}X6yF8)`rTZn%FH~8h
zBv2LH?Yi^!TAQGl_Td|NB5k&}`V}^Tv)BT-9dapo5?l&-3@?X;vSQ<tZF$67)jGPe
zQ&PD@iLTrtDQ0-IyW$c(V$A!iV~iGA+&_6`Is|O3IJiT#P}+73gx;w-EW`UG!&8)Q
z9HjUC$x@qiKU_mv@F?>pEQF<Pq!`WUviWwqO70V`z&TbmbJ+H}Z6DyzAY`<)5i1m9
z=t2X!iS*%seL-D&&|<v7=86yamC$B*kF@X(wq5t>K6;1T7~y8|W50CE77orBBk!-u
zg{=a43#Pn(yGmjs_v>i+v}?#{-K`eswK?6s6OKoZ=q<9d7cIRfn(p3mztLI0lRC0a
zV)yrnsIjkvIaqDV4!$7m%|g~&I<EJXcB^x;Us(<~6c{gUge4U=EcgkZT>^{QZPV)G
zww+}$XF5(Z0&2Xg!b8{n)})MW@WN6I-VT1*8<yiKB@p$ut#Gr)`(+6R%Q<*}URjFf
ziMe69g+Iws?HW%VKhzu1)l}`{BQ2dK29At>hfmQHybU%AO$;u*zq*Qz+@gMzyKnYZ
zo@tdv;rJr#O?VD!1-s30cWY?)!?46%@uPc6oztN!d$Fl_%h>O#JiPmwc^x{^wsS56
zKT2P0%|?G5&7uF);m9R8!*963I3o7*ogm0{uxRLbJ9Iz#f<&;a=q>S4j;W20u!**%
zj$i7QW&B{P;ZLyX%PI~;ACYoI9%Vln4_Bf$Wh-t!uC!Z$XTFNQL`x<AB9<`^&~L`K
zPjW6}wih?DLf)Y_Ii4z`hqhmi=z(|!4JHl^pJnfXpWQ9Kmlhulx=(mAp5Zrozq3ND
zk>wbqt1KAA(;*|r;Daql_Mg#Wwl~dsK;yc~0(H#>Vw_k8EDo^-=wJkaAL57YItRxt
ztL#(TYHq6hE1m>?d|+|}fyzKJHSW|-TH-)QA9zJ;Z^=h%MIbXux9x`Gn9u``@SB>b
zfus4oSFIr}tVCUV@2l=(be>0!x5mMhbpz^Md$3;SRd9Nv>Lbd)*2fH<exc>VjfdDE
z+v%*S*Hqlcn&KVum_aD^5zo%};8xv2?vfSc+Ma`UGI9;KtCZ(f#x!LkLg4-#wHQBJ
z+K@<ljP!*#eY5rr=RS5xt{G|UuK2cFobos#dUE7TOSf0DiP$ju&{enj4Vsaj`OfUS
zDg8ET?K!4L(fidOW)?;`@^;)^pY>m(^Ye6HT?b1Zy|Q2Ssm}Yp_@8HgZMiy{$15{0
z#Dm*g?W*Q09tpVHp*x83w^sKA-_QxTx?6}r+vyc!U{7$iCV13My2ml4b0qi=cv<&Q
zZ5v9hVZ*`_;GfVCYn<l{v|w9V$8WaT(SK}|EhJ;64^c1k&wJFb(6wVX%8+05<otdq
zU!xT%+mm2pWB$&4_@_L(VN_XbY{Bl7jPM}ab)^~gO(%h96||z~NVa?K!+a-3&=o^u
z{!S;AL9@l-V$nA5uy}Qwedt^$Yc&@l?*-bkMTuCfsfXD*213ac!cA=59%+!Z&lxpG
z==gE;7u{bk30iBwY+y6%WgFMFU~%Ws*Htvtctq0n33aZQJPeMtF<nOBxqO|U*o8yG
zS~-Ur%r)wz&1PO>IOOGeA2^7Jz<PU@W+~dwX1{oTpP2@|t=n}_gARiSdO1~FV8M1^
zI_;(=X7BXUR^m>b3Cy?_A|h;SSZmHUqgKaxj{jng7b7n@-@LEP;dNX8u5m{H+B2GF
z+i<s@+sZRMI9ZM>YHjxe%QjC|uk^u=JwSTq%-|Z(4RZfP1@@B>;e;NP7BhQe&%2`D
zt~Q&QIolIrCq@ctLQit0J?BW`8v1H)?_6k`2cQDm<`RRVm3D6;V`!i4xXfDZIKdoo
z-PqBXNjp-b|3u>O&#MgG)|UI)Xh2@`^n~5<9`SaMJEYzfoemc}n$ON&GpqE<6}AK2
z1P{n@aHJbn&-FxqW;(wqBiW6@601MqF*4%2<Ikx%)P+|2mFc4v`hZ7;OXvmjRM2Gm
z37<gLTK&7M`q!}*I4!L~SO3tbuAU8}>13L+<zqHaZCGAb+2|p*<nZF8kY_pSZi^px
zwyo*;{q{V*o#9@p(QMJ2eZ9D5%(2#)a|K<xi}za~d2l~7n7Z}!DiT+0wXjT<V^@!s
zs^t}uA~S4kK{NUr9xHId79X96C?Rq!&O>+kN5{^18|F~;SgrIfp%*1aB8PG)@pC=)
zYg@)<JRF`S{AV2p?jdU$k)5b#S-a+7j(0(7teSyXVhvV^y@9_zJDqv{nJA`|A+ou%
zijuG<%(9(NV-AX56KN9_?5RAY=dK|&mjz9p`Iphlp^OHtVw|ibGg|D3z4=~QzTNr{
z{|8S%u(@^kz7=$5jE3H}y)ylQ3(dTScY%Oo_bacV9)90){A$bCv>ca;BYD39`VWV&
zp?<)lecf{cGJ!+~WTh?HK{1SROct^m$DwJ&9!MW9n4cWGY<YM{<Av7Sy!I%JPv=5d
zlb$)+yV?k}He1P92#ww(R66hBY$mx>`b@^r>qXqj?Co{c3g$e0n~q;tb=$r`T$@*(
zvqXjkZ|lBd4RZu-UeN<%5UH}lg`}}E90QrG>5xq#yB@3jgXCoW3e@ME7$du0<sAnZ
zH>?HiQcJ8o#u}REQOx1?OIK|%tP$QZ;?d)euq$vl<HoZLX8ZJxI?8N*@Sz>4P!3Hg
zb#(d|oDmWAzOnLj%c`DWe;j#x9B|)w*eX6_rQkBwsobZ4EUjUlx4`4TS!osHDp6E@
z<XwITE)3e+5EzYlS+o|YvX-+)V7uBv@9`+C%6nx5jK#g#AH=FT{mb*==EzEqOW8Yw
z0wlRz=s!hsh(S8Q`xn|7a3j+wCYK6dm|2rYhvRS{dc9YVda){k?e6mbUEY;ZIu2>0
z(0bzhOK^i@SH5Ygc~_Ke>+&G$6(!(a%x|r&?K+TE=_9jFmL4odXJmk3&)DnnO*{I|
z{4O&L!}KeBag1dU=Vme=wXL8=><Bssm)f}^XJj0mz>Pfb1|xMHV}6a_u^z*pu#olp
zx^&TZOg%pwgnP>7sBt=Oaou>u%D9|$q`hA<>S|-=NZ^i#E5l0IUt1bpO)$c+y4W6U
z3{kgt##s){sD(R`B)zsxxkDZ`mvUwW<dL&y4t%EQMrr!$>H$}F)~?h(qJFyYU@2O<
zM%uAkCEi;}*84)QRaOVS=e?v0D?7eJW&3)5=uk?WtrB5h@xeLf3v5~r$fs-9Nh$wq
z%LYlv*_^x{3|hSl+4iBX&ynXW?KNn@3e<PSBFpd^_73P2b4FsCot3Pc*Wo1(JbNY@
zJgCdbC_!qRw{(d!_KWvK^tn`It3ywnzX*hJq@Ce*t)gq>`LW&gh=iOlvsRF08)%Pb
z?s<e*!SE>=<L*h9?MEZ=iJ@=pmDsjjMGA5M(b7-2JF{Hhs>#0XsXQ*a3?Gmcn(jDi
z5JDr85A<h*mgp`$h&3@|q0Oy)2N7263&MuyI0TL!Jx-QUjc1==tK18PZ}Ao8Jl(6=
z=3MX+eP~-jTR3nFPN&9IAgG*AyF9aEJQyqW*d!3mKKsbx&OAN>?eq*!nR60t%m-T9
zwq_7=y6$Yx0^51;?90nIC?cLVnvR9;4f6JmD`M{}^0U{A-e&HGY`Zu+>>5MV(Z$*B
zd2`pD!^$9Rd9>Q@`Ju~VCKjxW>>NpSjp|5`ztrk1S8`O&UD>OK?ehFJ`*BABaEzz~
zgp%7rhqIrszS%bs7vT{-R{KV*1rb!tO(Q?oHDdvv>x4dPI2PQ=)}8)i)o7JDNX$gK
z<uRN$X~qg|#L{YRGjcarj<#j*=5wGsTfNxl!wiJj7wNIv4!iC=31e)o@G^__iji}v
z^wl!9C2&v6UPU(Tg}_MUKf3%y^ecO{7%#ejA0ih+^bpd2L&YV25yLZkFY(>>-qtD5
z(q2^}u8SQX+=uVQiaOU5HmKZf*zJ=oskpyAyF*jv>8+w*WhyRsy!dU87+iZN0CB>e
zDuN<rxO7tAc5D1#iM~5;X6tC)5Lx(rlv)4V{E3nv2Tfv4%X26&MQ#Mlz&+wX&zz_)
z5Qk*IUpr^ne)^!<`rc|^#Z>vgd3q1)Ag&GagH25~qGA{B^wA#o!v%CPkXO&B21ZNo
zgf-oxIic4g=jq+CgZdqqFA<CcvGdMIm8)@<E66|&j^~h1#6}*EeZOaid7r8?=k@tZ
z8=YZkqQ;#4F>c>njfA-nSo3Z-TbP(*-(PXd*KE=7BJ4$EXP~_d7R^W+l&`Eyrrl3?
z<Z&{3IFfyzW!~H==`|*>8WPKzP_DF^$1(n}2;l`oubb$7WuG3g>(cwY!$vW`@vM=(
z(2PFzM0<BKJ81{+66|gzJcl!()SeLlM#;Q_M(<p+1i_QJ#0cye&}Pqnt-<gG56XOc
zdsXLPEpPX1YUFIF`jhi(^wYdGBAR)!a{Zt=rzvIM<=3d!dz3B9!&x<gSL|$wSwdJy
zXQD6FsF)S8wotbUUHl2#={TxcGx`<&AQ0Wo9Zns;S_j+O5;i(!+JjNd`0|cpdrB-m
zea9nsoeXqjok1Rf$<WCzxkT%sTVY#iF`~A*-gj}ai5%OQI&X9SGZ26tM!R*Jc8XSH
z;Qg8kkyt36O2*eRF3yIg`fMKSdLh{Sz|&G9RtuVlb@W2dr<#R(ZjLWSQ`t>IU+mF2
z(~N!`(?<`m0)yph8PP)Xxx6To{a5ZsJ>SjV4(xjN<#{$z@3EgTDf^7YH%206V?L7m
z&UGSPtd{3A(_7rIIQGujZsSw&cJMB;a-ji%&%>D=)Z?8ljDlkCCW)t1;5tugFut(Y
zj5)YZPa~gQ&v<4($2iG0#(r;Nim>D{H_Q8yBQrBDPJsRwMncU#H|4;5%$Bn&3+6ni
z*QBwDc{Un+YjeM}Mx_;U{dZOzL=Uk!NMO2no%%pij(4K%E<0-r+~jq%f(Dck&!$QP
zBJbxFG$dNz8C%C&vu^r#v^CAKU#wiSa@V$SbxC6-klPE<TR0MWULqi3?eIe(#}}fH
z#uT=0d(qqc1{1i4bp#uEbu!zF7pBj);JFv*5YMhN6Di+-QupFrdeTNY78zvG#sivV
zu)2T6LC+k%lX7+cutvY*Z92TuBCK6Ln`Z{>OaQ0l>?Fp-o<U;wJvw49?VB9+U?&`5
z1ZKL%RASB6#w~@{&(@}?J&g5D)mRtHKGZWj5mQ8LShf;~rX6;rI*)D+Iy+Ub%R7vj
znU?W&jH%m}MzrKyI6UgsF8o(KrIqu5gWGTJ4zsPd{Ujm;3H6xT^S0sV?zWq}9Vaqt
z?5)nRLEDPGypP>-JLS{AwtwEQ-jp423K_Vp747oF#4_Cx$#CnlA#uDvcEd3v86noU
zJoCdUva1L_Z>wV4h$MDZzrYYZXSTz=Jncxlvbp-@7#IYHzBo#`w9=<tliIRFdP`Y!
z41GaYiHnUpA|K8pSL$i{xm>e#_|W8C`l!VkM-zF?+DkuNkA3T!-qwoD1EM())AbBd
z%;D@889TCY%+ZyL*{(jv?%U|AdFW^*TR!t|g*eFb=(#stPlpeiY0TEcaWq*4=Cwqe
z<=m+Y+mY?Ew;!~Jtj$Lx7FKPzy;P;`gA2}eN1v>LwjgmXOV)W9tUQv*+ziVe*2X1=
zw=xSP1?-)zC|Nh-C(n=3{xZAlr^%by%+lZ6a@kX1(<3spUZB?=foEfNZ`<Z`M#x~i
zT6>(QTvv^!OGCSG-t^nU*t)D6F~`jw){z_hLK5{|C3)r<KCAo5a_bG)^}EsdjTOpz
zg=fLOfpBBNcSOBiTy$1}d1`zAr@a?8wEi9~^VM0?z<P<|dfqzxx#dr7Wc=wRHUP_N
z{9@+=Ror#2#sVf{X6gA}L_mkCmw{loMNMuUO`>1ff|qL{#5;Hk+l}lC>lv&ZIh5<t
z<?2Bf-@B}3JN_!IiSvJO^FGNLo9i{ukiWBN<XF7A5gE}g-)@bLcQtxm&!|8R{5DF-
zIhtG4g;fqD5$E`M6!_x^t+Yzk-mpH#BU}utT3YzMl1KcR49+8Q#+TnYWaLEKZEk`g
z;|d-0PI_nY>sAE4L?iNhzq;d-;nq{n?|<u8?!C=9a-IXK{~?Mv@23fPz98gO_tEXK
zqPuloF}^yNI1~HUN?vCEat9V1zF;Yad8P@eV?*rKE!T)LX{GCFr*&$f+244#NHag~
z2+DrrK9xiFz}rsMP21j0YQJE~HL=U6Y)j#%Z9~`>qpi6@67%9_O|0y<dtT-=uo5v(
z@Lo#zXw*k;G|ytE+Q~()9e3Iu58Ic}x#(wI<_nbN;fn2cMuVeOb2)S-u7)2Yi_z3^
zm#|+3H<lK2RQlgs7Y^?eEpY7G_h;QbG%1*0UD+x2zfZL{G1_swl%tQqv()elfyWpZ
zM@GG6(hiY##Tt(bvDRgK5$7fk6_vc9gj_gvnD4e<*)K-F!U7{Ld<M3(T?*ZSYpx62
zV3+Z+WnZU~&@eq37Prxh@U(&7Y@O^$@HX_%dTc-I`IYAkjEHftch?bajL_DC%o5kp
zD)X{=x6wCTzme{;gHkWE_VlCa6R-o$tVHa@sL__3ouA%@F>=Pj9uMz}DLE6Cu8gh1
z+6B_P(Nkifx$_1dT5BD@-=W`r%9pl@Tc)l%BPv@J%Ojpf3LP4b?;+D}`421U=!?A}
z|29`Ai1R_9H9Oyr+~?`9yOp~cj$EwOjGW3S$=t?oIT{_b=d+1DA~o-4ca$HQC3ZZT
z_sAbxNo&N3`7DTwRk-?Duf*kZ%>MioZe6RaY2C2}JTxMid(#`g!zrxTaEPGyAs@cC
zGqE5y>ck4*mvas^d}8>fd#dr{1FVtlIItckwj)gD+55%0(2%H^IM{a9e2dZhtzhsi
z_9t;2Dd+eqo-A`N#m^CVcSDI0q(W3yN}B6?tDQJm&j<I&_2a+17Kyb)Kj;w=SVaBV
zM-m-SUzb0(pK_cXV~)1z6|1N4$sC>OsIB$%nKi9uJ6-bWj^v|fT{94PS9+vC4LK`T
z)Zo!{xS)>E6R%uaHgJGmV};lsg0INffO~kpdhN{!%ULyB25QAxaKv8V7vT}8;W^{*
z6xo;3HkdV{%J+$e)hT0ywqC|v*)|1#>Y5!K&XJj;X8Un0lgHtCPWVReAzM~)=*07)
zw%-{I=n)zS`pJou{vU1j+?be%HI^%@xO8c?3Iswx)*9X8Jdm^Hv7<V_f4obF+^%=&
z-K`q1sa+N?-X?Hq)fd|)OPTNW{H^Up?2?OqG_fCk*_Jt5>Oj|O^(LYeuV*kq@?^1}
zFlt;}*)6;W-ZbYa!ZY$T9Q-D8cGJOcYb#A+kBqfzT)KmY#rBl>G)s!M@u~d60^F=p
zpqSX{@M;PjTc_IY5-0g>X-0dV-Nk*O_g>dPT37|YwS`$iL=JdMuRA#kGCIJ9{U{t~
zw8k9V3vX(Ez{evYb>taQf1Ux^)`YCv$b`pn^@Z(!wsK*~i~^${4n}?edq3Pd7bA;z
zh@vfZy>)KQK0G2ca2FojnXkQ*_-*TJ_7kBYr7XREK#TM}OWnKfgXhjNINN9|)s-!#
zhAgK;ZzY~Bb_;oCm+NdJBcs==CU9n<dU1;Wdvo<|iADwwuq>Xd6Fa(%4LZl$chM#|
z0PnG=>ncr-(PNv4^3XA?F(X4yC=<_rIvVF}j-sM`%&gHi@Z(q@EG5`(d*9G+ygrh~
zCR<<VCG$+LN9LVV!*a>>grA5V2=tB7dj?YOSg5~`YFtkbFVS5aG*ezDOUl(1`j7Wo
zj92eHS|<z0m|_GmPw<W;tZ*rfY?sP8sq+`C@KOss%k_EBYF%cu*IchM{;W?%GZJLx
z0|)J4KmynY_e4r?<$<dAr6%*;`zD9c=NLQImzcE9%Vr<CMic17!tj<9EGAe3JNSGs
zkuyMkqX|)#Gv2YDga3<t-bmLT*fV}O>lsSq_Sh3`es7+vn|_;n-094$`ItQnkuQ1>
zZCk5ciuS-R{NSxA-t*%-uw#4F9_RyeffZ^ZlfxPh^;+`Thfzzc#De#!*H}Ul$U1bf
zZAXLK$ex~hzoK^+L>svjdHJl3p+zoRBDk$r&gF)5qCahmhV|O0k@3Dd#tXN*vqNpG
zQO1dpCt?i?D`zf)8~EGAQuGT+a8G^ZnlmNutr1;zt2?J2@{QWDfXH$CfZlY^<pKv&
zW!k46oi%)4mFdA28-dwkw>jE9p1P-->AbC!bSb&8e&~NGwW)db!jC8GaUDI@d=T%*
zug&Fh^nqJE9_y0WK%`296!yaUHXO38X`mMm1kZ0)UHtYsf>)p;jy~QsF6>5ER>-y$
zo1dc-@&(>U7<MjnFnj~LZ9K;nEY8#`4S8O1WHf<UOIsUbtW(>_5<5pubE54R8=u1x
zAI}<kigNMj=?dY}akb+$e%JjLk@_m#NhG?o((Li{PDQ3SD-yj~znALQI{mv+|Mn-}
zfOB&dxpI~`_B#36Tz*{ltX8|r^cNAwb!|meEAR5$Fd5ad#@`pw>QeoU#HgEi*l}=k
z9{^FvxT53ht2>tIJ8e5gUZQhr^lP!st<pE2U8=s*i&g5|(%QXib>AA5xlZFNORUxJ
z==suv^^B(*RGP7`RUfFIOag5$t@`RaiBcEqD!q44mQ~|gq1Nep@b*H@QtCS#c!v-<
z&+Amqf3q|5?E1;}m@mL#N|vLgX3j0vze`k}UNV#5eDl7w8XG->cfN!EuB^s!i$?C!
z`6^Nm9*%3owC~YJZ&po?3XUvMtv8F{6?~!u@80!TDG9GRUVpG2u5qWwwn5)$1Kxs_
zbqC8Do$G70(I)s=sb`$aE5Ya0s%MpYwZ1|{=F<wDfio-BQ_dO#u8aPGT4USDcH7O-
zfoobV(eF1yt*!b5hb@`qx(`m6E9Rg3=KI%GV+N&btNH@bb#8XG=Q7qv#)@XdtTA7s
z=U{@dZqQw8gg>%tj0>z=Vq66cXbf@!)1Hf>kBk6py7x$Vg<4xL9-?u}bRIeSYHr!}
z-CWfbs54KDYU+v7wBP3OdfidyF_K%WR^3YO7np*p=-jxjgCk^5uPs65)#X@x)-s6x
z^o5C4`frIal`T<QX7CDpXPyLxON{_YXfmxL8QX#OC<94hMOUic8>%w4JB#%j{<t5}
z5=SgAvRF}FHS&>LH|Luzm-2$kVKr@ykrZ6TCN8cr6kugdH4bvWe!Dg{3%fx-mWcOA
z$2ws>&)R5wV{<b<!YaZ^?q`%SF3#OhwYWs%qj$Ex^eJlPJok9~jC^UrlELk4Lwz@+
z1r@f^*vU1z2mI11Xkcu?<t#^Vz?iVmcn4#BgE)Y9BXbkI0hM43k4YKi8TegTohz*!
z2%=uMZok{~3@`6fOW0-O4cRt*O!gWjZ_!VD0(=S7*z#CTS#L|8Vh?Bu%kP#;spPTR
zR&d8!)gF4xoEuBe?7-F>q<|=p#CM|=%MG{jG2q*nu|J45=!yG+jIl{ZBmAwSi~hn*
zWRvB7eN`_UTp)QcMsop4MlZoMo)cSVeTay)9WC2xE~_l0{nMac*ZGI+(GF}^@X36z
zMQBRBn^VI?2N{9Z6(rx(`l<ag=t4IvdE3-gm0p9S9O*f>v-FXkc{i^1kRH((_m&oe
z^GGpt1KmUN_IljS9r&^Jk~(_jI<uF}xzed*Wc%@kgFSL=VPAtTIKHvQ@CHYZs@Zn7
zdUcMF)xNrls@GLBYOihOe1FUiiLuGLIo}sgX|-qUUMX}AoO~o1oh=%B<m9|^$?VXx
z(VT&6?{Ow?uuo-U{z)dD+z0ww=1-}^_3qUb=Kz?ivj34j<h8~6thBpDX8P<bp%l4z
z>h`<3c><nVbDyK#7*AgLi@ZTO3-xYsb{zOA6Ze$%{M3?bCU@E9Ypl`*QWzgkM%449
z&AUAB<w+Z6NFE6*JI%k;nlm(HG#O3Y%NmDA=@n3Ocx%Cfwq3zK#PisztI@(uMsFkx
z&i9b1aAt>gf`=i0I2AjTs0$o$j@ropQM>1{NAjtA#!rr&e7oC-d?T&72f0_V`WJc=
z^6J7GD-&oHZ}Rj?Tlv-)I6!II&%7WX0#0HlUey1>@TTiog|_B(jidcc0$Nue#qhiY
z32mJLyAS9}Q%h+n_=XOW39|-o*Om63vJ&lWIU4PLTD;wdsqJC+jv1^Bxp=R*n4j3*
zVRt-P2l5zQ16=URr1OEnf%b@EuRDDw+X`>uc_M2VxmfS5tM6*H1w&7a|Eb>!QSV3F
zju7W;lce@Z>#s>~(0_ijaJ&Po{0o%})g#_i{e~*8rCtA}7RF3HmrcG+%YMfzT1cC>
z>p!4T=3HmFuNz!3`dGUUPJ{)Rdc}b~;(2!o*sibOd-V)CmFrcOe0W-VP@*JyVBdjF
z#lw1)9vOvH>$PAR+pFlY#uq!eqVA|;rt25<nbFptMr-cI+*{di>^2gPw(IL-j3@j2
za!hf5Q@67Rre1cb600nljBt!hR)ASQV`VqrUtf(cuh5p;!8=kfHrXY^<9NjEHQ-6R
zeAO8D>NeJ$dO%wsD9W*4uWMITmv)vhg`d2i?mZu|r=aPTu#k+7>wa3Ku9GKrSLNMR
z%z0v`6qd1+ChMr23si<(FgLBMT#KifSkEr^C1*5*?tzCrvSE}(O0ni$m(OtMu;l@n
z__m0_h(hB%;;h3HOM(IK;`WL=E7y)31MT3g{OcUCTI5I+UpTH>@Va%(+mhl*V<kO$
zg6%Vktv%7l`kQLV@5dV-?9cE_Sgx##w9(cL?z??*y#Vd=_)Cimuj_jVX#pQW<V6HV
zglQjmcXb|FGrm%WmT#6HIu-jAVy{bAltTUXKl$l;W?{ta*mf)!Hq3voe3?c<d_dno
z1wCA;-^hv9_!}PU)Mq>}qiDVt!1#%I!u8cSkveGe-=LvR`m;b!^$otxlYDjGXwKHT
z(B;#SHLJGplXmR=uG87O(%mBSx!Lm4iWl%3+_L*}b5(k=el4s#$qHTbJgwdHc<yki
zEI(ZGldwi8H4gfV+|6F_JNRR%mAh%0*0pQ&j(d?Gt$VC>|KHYWa2<1@65p{R9&>@I
zdTY6W7<9ATk+N04urcWFD)G=*#UkO02epk9y?Z3y;=@{e-ictF6FY?J?@`aswKscA
z|Ikmz<ivjTHNWvUINU79?~n^41<z=;zj4J@E$WB&^bkC8g`M*4*qwQ@y>;ev=nC5B
z_rC;Bry4Q5-Kg58-@6lXw$&+TDpS=TTEy5xp7Hcq%oV*i(7WOAMAM_c3%|yyIa{w8
z<di<eBf+X*hnjCTn28=Zy7hcG>}*$0z@=v(`Q46q?m<rgM_p5)s_u8YIAaatKF@mS
zL3d1P>w1?o&QFep{tnlV7?azJGF?3~68zK!9I+0t%aUJkE>Ph71(qQ+B<F!>=gw+Y
zm9gVixu5-bXleALv;k$jZh4e5>8>6RMnzjY<F9F=Tg$}rZoCu6ls-RrJ(aAnZJ^h-
zC`Q&j8!C5ETOxydiY@KJYu%<}Lv!2(-*R+V?=|&x`}nY!rM(QxReE`9z{)#{L$d-U
zfrGYu9cMTX>>ZqFw`<M$Afz%b4uX*~ml|=T^$Cu-O>l!X9`4yUm#%Z899Lv8y0{(j
z7B)TN@yM=}yl%>o5jD>R?$Ia5t94l-M@P5yotE6s3<8Y#S-^7tZs={-UYwB2-70JD
z<r!pGZS;ESB$ADN`+>5bN7t8^vBt6X>yDk{nH@jZ2A57b=#8;B_vj410Sv~wQ_y;Q
znzl#w-R3(vo@_NU{>k+0(tk1ALXX>#T`rmZeSLp=#4Yi5#5{XJYG8|~!j{SijMzTx
z7Wx%``6<wY)u2p$btH6hUp41QCqBb+U@WD-5Irlpdu~cQPfqDE(WgaEos!aLML+o3
z?>@3;{nf9mS9#@i7x&(`yq9)wTexsxTD<(Mv}*b6w0ikSx<$wLh&C-hJ8iu&_3r(;
zDoYdkP{T~iT|H%cyB72YHhFYfjON}n_6w~+&a}m5In8Qj#M5ERr7`5Y<kXa|7d>=N
zO1~(2=4B~;QFQssQ@TPV`G0cnhHG9`mw#K5=M34~rX;(|9ZkL-ZLBusc)Yfk#*puG
z=cV*R(e?|a|DyTxQ+loF3$GCtM3(<sE@;ZXjez5IoIfk_IM)44W61aG3sU-qX#49V
zf6*VlKBX^<o)i5<RLTF=YZ~^ysl|2KAA5UzG+I2?@;KJ*r7`4t#U;{Y(K|(3pi5KQ
zDq6Boae%1u|Hpy+k2QCWJ;IOm2-6ty{etMcH>7mFXv-qWUbIbgx9IDlZ-{>I)!%vK
z<Ga_r`4yEDX!f()gSWz>)Z}P)x#Pj}&yqQ5j<RmyBK~WSa;D{)+^M&BH0)cNi){b%
z8&mqWXw4O}0it(_ZWFyv^o&Td|HQrPuCnMW`5*h9o@nu?$bSs^eo^!#(W!4r>2%Rs
zMQ;~9CVEbU{NKOvZT)uqms%Qq^f5a%5(aAJ`mx@ni<X}@{6zI?m6&qMIk2gtqyGb&
zQ$J_gVj4rfKM~EpQZc{iO3^i<+eAOSI;9_pCiVaPQvNe-ai-;_mip1qjeiO)rZMDu
z-nH`mq6<Y=i2CFDE?OYEPIMyv>&kE)4b06{J7!ugjUnG#uan;wy+`yfM5iv69}xYy
z=zF3``A?hwsoVa6_G-o%z?qJ6rsa;k1(<11XId_eA>ZG-F{RIo{$BKtqF=lzr4Ng~
zeRE3R75(6Azw^kRTc^+ez1Za6<ZAb9r5*n_anoJyc$np+G2}aEwQRoVdeM!d`$ZoR
zU4D!Ffrz=^y)StF|HUtjCT{BbbTs^p^1qVr3eif@x7SGDMfb0h{6!yKpVG%ge<k^!
z(Ep>q!gcHsp2m>x{0)lzMPC$sNp$K)`G3*>-mJAjQI-GQa3cSI>=97607pKeN@K|P
z*X~Z~Q=&f>eO2@g(VvO_LiDWYwtG_AC;Eu!qoU7>hzTCLfBWsXuDJHfi&On`4vUs7
z0v9Gr-Y%UP=VKr`c|6~H?DetP;!&6XDai7BqI0&(4v4mh?iYPn^byfxqQ^zsb|@b#
zx?l7G(K9<`FGLURQoJa7O!Rku{eS+)pZv$)|JT3yD-VD0-aFpCYN_Uy?a%Qn@t-w>
z9&Ufr8OZH%(eH^qFM3+^oal$5Z6B1(MUROd7yaE|fB#$0eCmVmz3#PbsdA=?-tM^f
zc!-y$j<gE%)avZ9ALAf>In?uASV<=%*FXHQ)_X-i75%N~tY4Nr5dG=LQhHwWS6}@%
zpHTc?%l}Qy!NTxQ%fX{<<C+qiX?rh5G^a7-JM!_AMn$)MBBe(}pZ;V@Pl~?qsBFAQ
z@t**&PFdo^`MkA}Ot15^Kup)fxV6quFMTK)J5%`&TkeHeIh-lR(-`u7&*NI_6WuP_
zB6>vhsOZ!ur2Aia>fyUrUUnFQZ(53(ORl?Q%fK84R%YJU!$bGsm7aO8(@Ds9f#`|P
zNbf~YioPIvM)d6`l@Aa-`<2iB^7hqNXlKwcpR*P(x1h>xpsm<oSZ!(|`*_B{%;hli
zl81+!G^YQmy}#@OWe+I(KiT`qzCiYWus?v@@Q+K;f3N)UwerU^<&WPge>_(H_)z&{
zclqPz%O6vJKO?0xwp`Lvyz<n6v~fvFSItkCE*TrW`Ku>SZZ)3JMUCl<E!w8sef1FP
z`1bRMRmX5G9m%_18vNNbzc*`suai4-ku5oY^1kGJ$p?}PBp*O7Am#+j2bc>SC}r~f
z^2eW+KmMTn@q6Wu-za~4wEXdr@`u9E{JAfGm4_;S<nP0AZfZ0LB?+4Pt|QUX@lwY;
zWXc?X_@CIHxG&-WVu0`o_=Cfi{cmP*Dat5+3^oXx%G)}>Pc5zL>OkEc;_5)#F+|yc
z?H(`kKN-2=<A2o2+7l;#W;rk%!g`mb3!Z*xVgKo`j=%cpv6Fu8(I;nLsN;McU-NWI
zFME3JtaG1!cGl&qN77}FUe%lU*2vE+Lr!$OivzRu&PV<N5btT>@5C(Avvq!klQZ!y
zpstcWw;+x5X6fr}Q9R)__-<dhOoz`+0%^A1O<8}V-=X#Asx(ryOWS;=Yn$tD6&=9O
zAEA$1_P<A{%0sH=aN6e$qfG2B5Cu#4j!b{N`SM@ap>?gi?<KmvQWEr=e)!vcym?}u
z@Z@rHbmYw_Je$3L@*JYSTy(7{J+$$f^EQ67$M*;S_SFktq3^U!IgWSE^Ko?C^=W#d
zx7qR>H}7lUtvkFcjkkZ4?=IL-^@vE3I;Q$OFT~90wXGUwM!xgkzw^YxSDgN<zdn{;
zf5|_5UQ>)TyK(L|G2>j(>AI#vnhated{p006MafVT~CP=FeDk(YHa^OM|9?oMGDl@
zH$?RH+oDm?v!atk&xyuF2Sjs4e=j;&L}Ox28k=nUbRB8uX%#+G$59n(%9Q@`DbLg9
zMIw$w;~bZ)Xy2pL2YJaoe40o4!zYdkAFHu&Zh?sQZ{vqVy+!}f-|ZsK^PPU*RJ}Ra
zZ{GAf*!Jno&Ai8NyO4Ej^*pd{>l`aGxLof`dz1dXw0biv?;Ya(X;<jnW%}D`Cq7LM
F{D0v|IoSXJ

literal 0
HcmV?d00001

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 20d9be38be1..d78c0828089 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,37 +1,50 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8722
+version=11.1.0.8865
 revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Kingsoft WPS Community License"
-#Full license is at: http://wps-community.org/license.md (Not downloadable)
+license="custom:Kingsoft WPS Community License, custom:EULA"
 homepage="http://wps-community.org"
-checksum=e898a1edcb53bc7c0bd3361e225c8475fc84d54d937eea53e7ef030f12a1345e
+checksum="2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
+ bd8e8a2f7142710bd3a86e2a978d6371e304dc1cbcf0712d94f21551647bb748"
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
+skip_extraction="LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 #The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8722
+_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8865
 _distTar="${pkgname}-${version}-1.x86_64.rpm"
-distfiles="${_disturl}/${_distTar}"
+distfiles="${_disturl}/${_distTar}
+http://wps-community.org/download/licenses/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 do_install() {
 	cp -R ${wrksrc}/* ${DESTDIR}
 }
 
 post_install() {
+	
 	#Clean up:
 	#Delete everything under /etc. It contains cron, logrotate and autostart
 	# configuration for the update check and a seperate menu category for the
 	# wps programs that does not work.
 	rm -rf ${DESTDIR}/etc
+	
 	#Delete postinst and prerm scripts
 	rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
+	
+	# Install license and EULA
+	vlicense ${XBPS_SRCDISTDIR}/$pkgname-$version/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
+	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
+	
+	# Install privacy notice as documentation
+	vdoc ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/Privacy_Linux.txt
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wps-office: update to 11.1.0.8865
  2019-09-18 20:03 [PR PATCH] wps-office: update to 11.1.0.8865 voidlinux-github
@ 2019-10-12  9:22 ` voidlinux-github
  2019-10-12  9:22 ` voidlinux-github
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-12  9:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wpsupdate
https://github.com/void-linux/void-packages/pull/14568

wps-office: update to 11.1.0.8865
- wps-office has both a (downloadable) license and an EULA, license is in $FILESDIR and both of them are installed with vlicense.

- It also has a privacy notice, which is treated as documentation.

@the-maldridge : Please review the changes.

A patch file from https://github.com/void-linux/void-packages/pull/14568.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wpsupdate-14568.patch --]
[-- Type: text/x-diff, Size: 20668 bytes --]

From 168c94d20b93a4d61026c7251bbddba839ec1852 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Sep 2019 22:06:53 +0300
Subject: [PATCH] wps-office: update to 11.1.0.8865

---
 ...OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps | Bin 0 -> 62464 bytes
 srcpkgs/wps-office/template                   |  25 +++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/wps-office/files/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps

diff --git a/srcpkgs/wps-office/files/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps b/srcpkgs/wps-office/files/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
new file mode 100644
index 0000000000000000000000000000000000000000..c58cc3396cdd490571283094ee8238604a73e8d2
GIT binary patch
literal 62464
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
F{D0v|IoSXJ

literal 0
HcmV?d00001

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 20d9be38be1..d78c0828089 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,37 +1,50 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8722
+version=11.1.0.8865
 revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Kingsoft WPS Community License"
-#Full license is at: http://wps-community.org/license.md (Not downloadable)
+license="custom:Kingsoft WPS Community License, custom:EULA"
 homepage="http://wps-community.org"
-checksum=e898a1edcb53bc7c0bd3361e225c8475fc84d54d937eea53e7ef030f12a1345e
+checksum="2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
+ bd8e8a2f7142710bd3a86e2a978d6371e304dc1cbcf0712d94f21551647bb748"
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
+skip_extraction="LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 #The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8722
+_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8865
 _distTar="${pkgname}-${version}-1.x86_64.rpm"
-distfiles="${_disturl}/${_distTar}"
+distfiles="${_disturl}/${_distTar}
+http://wps-community.org/download/licenses/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 do_install() {
 	cp -R ${wrksrc}/* ${DESTDIR}
 }
 
 post_install() {
+	
 	#Clean up:
 	#Delete everything under /etc. It contains cron, logrotate and autostart
 	# configuration for the update check and a seperate menu category for the
 	# wps programs that does not work.
 	rm -rf ${DESTDIR}/etc
+	
 	#Delete postinst and prerm scripts
 	rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
+	
+	# Install license and EULA
+	vlicense ${XBPS_SRCDISTDIR}/$pkgname-$version/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
+	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
+	
+	# Install privacy notice as documentation
+	vdoc ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/Privacy_Linux.txt
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: wps-office: update to 11.1.0.8865
  2019-09-18 20:03 [PR PATCH] wps-office: update to 11.1.0.8865 voidlinux-github
  2019-10-12  9:22 ` [PR PATCH] [Updated] " voidlinux-github
  2019-10-12  9:22 ` voidlinux-github
@ 2019-10-12  9:24 ` voidlinux-github
  2019-10-12 10:01 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-12  9:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/14568#issuecomment-541306052

Comment:
Impovement:

- Τhe downloadable license is now downloaded (...) and installed from the $XBPS_SRCDISTDIR.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wps-office: update to 11.1.0.8865
  2019-09-18 20:03 [PR PATCH] wps-office: update to 11.1.0.8865 voidlinux-github
                   ` (2 preceding siblings ...)
  2019-10-12  9:24 ` voidlinux-github
@ 2019-10-12 10:01 ` voidlinux-github
  2019-10-12 10:01 ` voidlinux-github
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-12 10:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wpsupdate
https://github.com/void-linux/void-packages/pull/14568

wps-office: update to 11.1.0.8865
- wps-office has both a (downloadable) license and an EULA, license is in $FILESDIR and both of them are installed with vlicense.

- It also has a privacy notice, which is treated as documentation.

@the-maldridge : Please review the changes.

A patch file from https://github.com/void-linux/void-packages/pull/14568.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wpsupdate-14568.patch --]
[-- Type: text/x-diff, Size: 2561 bytes --]

From 2e11cf5ad9123424387e71b22b1ed35348304d33 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Sep 2019 22:06:53 +0300
Subject: [PATCH] wps-office: update to 11.1.0.8865

---
 srcpkgs/wps-office/template | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 20d9be38be1..d78c0828089 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,37 +1,50 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8722
+version=11.1.0.8865
 revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Kingsoft WPS Community License"
-#Full license is at: http://wps-community.org/license.md (Not downloadable)
+license="custom:Kingsoft WPS Community License, custom:EULA"
 homepage="http://wps-community.org"
-checksum=e898a1edcb53bc7c0bd3361e225c8475fc84d54d937eea53e7ef030f12a1345e
+checksum="2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
+ bd8e8a2f7142710bd3a86e2a978d6371e304dc1cbcf0712d94f21551647bb748"
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
+skip_extraction="LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 #The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8722
+_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8865
 _distTar="${pkgname}-${version}-1.x86_64.rpm"
-distfiles="${_disturl}/${_distTar}"
+distfiles="${_disturl}/${_distTar}
+http://wps-community.org/download/licenses/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 do_install() {
 	cp -R ${wrksrc}/* ${DESTDIR}
 }
 
 post_install() {
+	
 	#Clean up:
 	#Delete everything under /etc. It contains cron, logrotate and autostart
 	# configuration for the update check and a seperate menu category for the
 	# wps programs that does not work.
 	rm -rf ${DESTDIR}/etc
+	
 	#Delete postinst and prerm scripts
 	rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
+	
+	# Install license and EULA
+	vlicense ${XBPS_SRCDISTDIR}/$pkgname-$version/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
+	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
+	
+	# Install privacy notice as documentation
+	vdoc ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/Privacy_Linux.txt
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wps-office: update to 11.1.0.8865
  2019-09-18 20:03 [PR PATCH] wps-office: update to 11.1.0.8865 voidlinux-github
                   ` (3 preceding siblings ...)
  2019-10-12 10:01 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-12 10:01 ` voidlinux-github
  2019-10-12 14:41 ` voidlinux-github
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-12 10:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wpsupdate
https://github.com/void-linux/void-packages/pull/14568

wps-office: update to 11.1.0.8865
- wps-office has both a (downloadable) license and an EULA, license is in $FILESDIR and both of them are installed with vlicense.

- It also has a privacy notice, which is treated as documentation.

@the-maldridge : Please review the changes.

A patch file from https://github.com/void-linux/void-packages/pull/14568.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wpsupdate-14568.patch --]
[-- Type: text/x-diff, Size: 2561 bytes --]

From 2e11cf5ad9123424387e71b22b1ed35348304d33 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Sep 2019 22:06:53 +0300
Subject: [PATCH] wps-office: update to 11.1.0.8865

---
 srcpkgs/wps-office/template | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 20d9be38be1..d78c0828089 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,37 +1,50 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8722
+version=11.1.0.8865
 revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Kingsoft WPS Community License"
-#Full license is at: http://wps-community.org/license.md (Not downloadable)
+license="custom:Kingsoft WPS Community License, custom:EULA"
 homepage="http://wps-community.org"
-checksum=e898a1edcb53bc7c0bd3361e225c8475fc84d54d937eea53e7ef030f12a1345e
+checksum="2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
+ bd8e8a2f7142710bd3a86e2a978d6371e304dc1cbcf0712d94f21551647bb748"
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
+skip_extraction="LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 #The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8722
+_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8865
 _distTar="${pkgname}-${version}-1.x86_64.rpm"
-distfiles="${_disturl}/${_distTar}"
+distfiles="${_disturl}/${_distTar}
+http://wps-community.org/download/licenses/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 do_install() {
 	cp -R ${wrksrc}/* ${DESTDIR}
 }
 
 post_install() {
+	
 	#Clean up:
 	#Delete everything under /etc. It contains cron, logrotate and autostart
 	# configuration for the update check and a seperate menu category for the
 	# wps programs that does not work.
 	rm -rf ${DESTDIR}/etc
+	
 	#Delete postinst and prerm scripts
 	rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
+	
+	# Install license and EULA
+	vlicense ${XBPS_SRCDISTDIR}/$pkgname-$version/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
+	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
+	
+	# Install privacy notice as documentation
+	vdoc ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/Privacy_Linux.txt
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wps-office: update to 11.1.0.8865
  2019-09-18 20:03 [PR PATCH] wps-office: update to 11.1.0.8865 voidlinux-github
                   ` (5 preceding siblings ...)
  2019-10-12 14:41 ` voidlinux-github
@ 2019-10-12 14:41 ` voidlinux-github
  2019-11-08  5:36 ` [PR PATCH] [Merged]: " voidlinux-github
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-12 14:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wpsupdate
https://github.com/void-linux/void-packages/pull/14568

wps-office: update to 11.1.0.8865
- wps-office has both a (downloadable) license and an EULA, license is in $FILESDIR and both of them are installed with vlicense.

- It also has a privacy notice, which is treated as documentation.

@the-maldridge : Please review the changes.

A patch file from https://github.com/void-linux/void-packages/pull/14568.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wpsupdate-14568.patch --]
[-- Type: text/x-diff, Size: 2557 bytes --]

From 7b1e7054173a6d240bbe209926a2b66bc4dc018c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Sep 2019 22:06:53 +0300
Subject: [PATCH] wps-office: update to 11.1.0.8865

---
 srcpkgs/wps-office/template | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 20d9be38be1..549c488e0ed 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,37 +1,50 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8722
+version=11.1.0.8865
 revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Kingsoft WPS Community License"
-#Full license is at: http://wps-community.org/license.md (Not downloadable)
+license="custom:Kingsoft WPS Community License, custom:EULA"
 homepage="http://wps-community.org"
-checksum=e898a1edcb53bc7c0bd3361e225c8475fc84d54d937eea53e7ef030f12a1345e
+checksum="2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
+ bd8e8a2f7142710bd3a86e2a978d6371e304dc1cbcf0712d94f21551647bb748"
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
+skip_extraction="LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 #The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8722
+_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8865
 _distTar="${pkgname}-${version}-1.x86_64.rpm"
-distfiles="${_disturl}/${_distTar}"
+distfiles="${_disturl}/${_distTar}
+http://wps-community.org/download/licenses/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 do_install() {
 	cp -R ${wrksrc}/* ${DESTDIR}
 }
 
 post_install() {
+
 	#Clean up:
 	#Delete everything under /etc. It contains cron, logrotate and autostart
 	# configuration for the update check and a seperate menu category for the
 	# wps programs that does not work.
 	rm -rf ${DESTDIR}/etc
+
 	#Delete postinst and prerm scripts
 	rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
+
+	# Install license and EULA
+	vlicense ${XBPS_SRCDISTDIR}/$pkgname-$version/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
+	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
+
+	# Install privacy notice as documentation
+	vdoc ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/Privacy_Linux.txt
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] wps-office: update to 11.1.0.8865
  2019-09-18 20:03 [PR PATCH] wps-office: update to 11.1.0.8865 voidlinux-github
                   ` (4 preceding siblings ...)
  2019-10-12 10:01 ` voidlinux-github
@ 2019-10-12 14:41 ` voidlinux-github
  2019-10-12 14:41 ` voidlinux-github
  2019-11-08  5:36 ` [PR PATCH] [Merged]: " voidlinux-github
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-12 14:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages wpsupdate
https://github.com/void-linux/void-packages/pull/14568

wps-office: update to 11.1.0.8865
- wps-office has both a (downloadable) license and an EULA, license is in $FILESDIR and both of them are installed with vlicense.

- It also has a privacy notice, which is treated as documentation.

@the-maldridge : Please review the changes.

A patch file from https://github.com/void-linux/void-packages/pull/14568.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wpsupdate-14568.patch --]
[-- Type: text/x-diff, Size: 2557 bytes --]

From 7b1e7054173a6d240bbe209926a2b66bc4dc018c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Sep 2019 22:06:53 +0300
Subject: [PATCH] wps-office: update to 11.1.0.8865

---
 srcpkgs/wps-office/template | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 20d9be38be1..549c488e0ed 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,37 +1,50 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8722
+version=11.1.0.8865
 revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Kingsoft WPS Community License"
-#Full license is at: http://wps-community.org/license.md (Not downloadable)
+license="custom:Kingsoft WPS Community License, custom:EULA"
 homepage="http://wps-community.org"
-checksum=e898a1edcb53bc7c0bd3361e225c8475fc84d54d937eea53e7ef030f12a1345e
+checksum="2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
+ bd8e8a2f7142710bd3a86e2a978d6371e304dc1cbcf0712d94f21551647bb748"
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
+skip_extraction="LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 #The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8722
+_disturl=http://kdl.cc.ksosoft.com/wps-community/download/8865
 _distTar="${pkgname}-${version}-1.x86_64.rpm"
-distfiles="${_disturl}/${_distTar}"
+distfiles="${_disturl}/${_distTar}
+http://wps-community.org/download/licenses/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+
 
 do_install() {
 	cp -R ${wrksrc}/* ${DESTDIR}
 }
 
 post_install() {
+
 	#Clean up:
 	#Delete everything under /etc. It contains cron, logrotate and autostart
 	# configuration for the update check and a seperate menu category for the
 	# wps programs that does not work.
 	rm -rf ${DESTDIR}/etc
+
 	#Delete postinst and prerm scripts
 	rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
+
+	# Install license and EULA
+	vlicense ${XBPS_SRCDISTDIR}/$pkgname-$version/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps
+	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
+
+	# Install privacy notice as documentation
+	vdoc ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/Privacy_Linux.txt
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Merged]: wps-office: update to 11.1.0.8865
  2019-09-18 20:03 [PR PATCH] wps-office: update to 11.1.0.8865 voidlinux-github
                   ` (6 preceding siblings ...)
  2019-10-12 14:41 ` voidlinux-github
@ 2019-11-08  5:36 ` voidlinux-github
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-08  5:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

There's a merged pull request on the void-packages repository

wps-office: update to 11.1.0.8865
https://github.com/void-linux/void-packages/pull/14568

Description:
- wps-office has both a (downloadable) license and an EULA, license is in $FILESDIR and both of them are installed with vlicense.

- It also has a privacy notice, which is treated as documentation.

@the-maldridge : Please review the changes.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2019-11-08  5:36 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-18 20:03 [PR PATCH] wps-office: update to 11.1.0.8865 voidlinux-github
2019-10-12  9:22 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-12  9:22 ` voidlinux-github
2019-10-12  9:24 ` voidlinux-github
2019-10-12 10:01 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-12 10:01 ` voidlinux-github
2019-10-12 14:41 ` voidlinux-github
2019-10-12 14:41 ` voidlinux-github
2019-11-08  5:36 ` [PR PATCH] [Merged]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).