Github messages for voidlinux
 help / color / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wps-office: update to 11.1.0.8865
Date: Sat, 12 Oct 2019 12:01:41 +0200
Message-ID: <20191012100141.uRKX27jx7W2rRzC6Q681CMv5pfjbT2cmMVfialW9KZY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14568@inbox.vuxu.org>

[-- 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 --]
[-- 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
 }

  parent reply index

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-18 20:03 [PR PATCH] " 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 ` voidlinux-github [this message]
2019-10-12 10:01 ` [PR PATCH] [Updated] " 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

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191012100141.uRKX27jx7W2rRzC6Q681CMv5pfjbT2cmMVfialW9KZY@z \
    --to=voidlinux-github@inbox.vuxu.org \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git