Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] wps-office: update to 11.1.0.9080.
@ 2020-01-09 20:10 voidlinux-github
  2020-01-09 20:32 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-09 20:10 UTC (permalink / raw)
  To: ml


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

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

https://github.com/mobinmob/void-packages wps-office
https://github.com/void-linux/void-packages/pull/18144

wps-office: update to 11.1.0.9080.


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

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

From 5c77998688cc20819c87fdda05e6fe0556851109 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 9 Jan 2020 22:06:40 +0200
Subject: [PATCH] wps-office: update to 11.1.0.9080.

---
 srcpkgs/wps-office/template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 549c488e0ed..2d2582b3d35 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,29 +1,28 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8865
+version=11.1.0.9080
 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="custom:Kingsoft WPS Community License, custom:EULA"
+license="custom:EULA"
 homepage="http://wps-community.org"
-checksum="2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
+changelog="http://linux.wps.com/wpslinuxlog.html"
+checksum="8ccb3ea634e5e6b7f10753f792104900507e6d7e67988d5b259bbc9fb6952ee3
  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/8865
-_distTar="${pkgname}-${version}-1.x86_64.rpm"
-distfiles="${_disturl}/${_distTar}
-http://wps-community.org/download/licenses/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9080/
+_distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
+distfiles="${_disturl}/${_distTar}"
 
 
 do_install() {
@@ -41,8 +40,7 @@ post_install() {
 	#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
+	# Install license
 	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
 
 	# Install privacy notice as documentation

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

* Re: [PR PATCH] [Updated] wps-office: update to 11.1.0.9080.
  2020-01-09 20:10 [PR PATCH] wps-office: update to 11.1.0.9080 voidlinux-github
@ 2020-01-09 20:32 ` voidlinux-github
  2020-01-09 20:39 ` voidlinux-github
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-09 20:32 UTC (permalink / raw)
  To: ml


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

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

https://github.com/mobinmob/void-packages wps-office
https://github.com/void-linux/void-packages/pull/18144

wps-office: update to 11.1.0.9080.


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

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

From a19eb850bcb7aa021e987a90b90e5584ef1f23d5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 9 Jan 2020 22:06:40 +0200
Subject: [PATCH] wps-office: update to 11.1.0.9080.

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

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 549c488e0ed..cde15c1ca86 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,29 +1,27 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8865
+version=11.1.0.9080
 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="custom:Kingsoft WPS Community License, custom:EULA"
+license="custom:EULA"
 homepage="http://wps-community.org"
-checksum="2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
- bd8e8a2f7142710bd3a86e2a978d6371e304dc1cbcf0712d94f21551647bb748"
+changelog="http://linux.wps.com/wpslinuxlog.html"
+checksum="8ccb3ea634e5e6b7f10753f792104900507e6d7e67988d5b259bbc9fb6952ee3"
 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/8865
-_distTar="${pkgname}-${version}-1.x86_64.rpm"
-distfiles="${_disturl}/${_distTar}
-http://wps-community.org/download/licenses/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9080/
+_distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
+distfiles="${_disturl}/${_distTar}"
 
 
 do_install() {
@@ -41,8 +39,7 @@ post_install() {
 	#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
+	# Install license
 	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
 
 	# Install privacy notice as documentation

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

* Re: [PR PATCH] [Updated] wps-office: update to 11.1.0.9080.
  2020-01-09 20:10 [PR PATCH] wps-office: update to 11.1.0.9080 voidlinux-github
  2020-01-09 20:32 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-09 20:39 ` voidlinux-github
  2020-01-09 20:42 ` voidlinux-github
  2020-01-12 18:26 ` [PR PATCH] [Merged]: " voidlinux-github
  3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-09 20:39 UTC (permalink / raw)
  To: ml


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

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

https://github.com/mobinmob/void-packages wps-office
https://github.com/void-linux/void-packages/pull/18144

wps-office: update to 11.1.0.9080.


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

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

From 650f5dcaa0791647b05c90782a1b1e409bdbf4d6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 9 Jan 2020 22:06:40 +0200
Subject: [PATCH] wps-office: update to 11.1.0.9080.

---
 srcpkgs/wps-office/template | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 549c488e0ed..2e8ffb6dd51 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,29 +1,31 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.8865
+version=11.1.0.9080
 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="custom:Kingsoft WPS Community License, custom:EULA"
+#The old Kingsoft WPS Community License has disappeared from the
+#site. There is an EULA in the archive which is instaled as license
+#and a non-downloadable EULA which is accesible from inside the program:
+#https://www.wps.com/eula?distsrc=2019help&lang=en_US&version=11.1.0.9080
+license="custom:EULA"
 homepage="http://wps-community.org"
-checksum="2b7d51dd56516fc5c89a9d4d145e4e201334b000f841d0520e33b0c4a199efe3
- bd8e8a2f7142710bd3a86e2a978d6371e304dc1cbcf0712d94f21551647bb748"
+changelog="http://linux.wps.com/wpslinuxlog.html"
+checksum="8ccb3ea634e5e6b7f10753f792104900507e6d7e67988d5b259bbc9fb6952ee3"
 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/8865
-_distTar="${pkgname}-${version}-1.x86_64.rpm"
-distfiles="${_disturl}/${_distTar}
-http://wps-community.org/download/licenses/LICENSE_AGREEMENT_OF_KINGSOFT_OFFICE_FOR_LINUX_COMMUNITY.wps"
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9080/
+_distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
+distfiles="${_disturl}/${_distTar}"
 
 
 do_install() {
@@ -41,8 +43,7 @@ post_install() {
 	#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
+	# Install license
 	vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/mui/default/EULA_linux.txt
 
 	# Install privacy notice as documentation

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

* Re: wps-office: update to 11.1.0.9080.
  2020-01-09 20:10 [PR PATCH] wps-office: update to 11.1.0.9080 voidlinux-github
  2020-01-09 20:32 ` [PR PATCH] [Updated] " voidlinux-github
  2020-01-09 20:39 ` voidlinux-github
@ 2020-01-09 20:42 ` voidlinux-github
  2020-01-12 18:26 ` [PR PATCH] [Merged]: " voidlinux-github
  3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-09 20:42 UTC (permalink / raw)
  To: ml


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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/18144#issuecomment-572745854

Comment:
@the-maldridge : Please take a look. They seem to have changed the license to an EULA only.

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

* Re: [PR PATCH] [Merged]: wps-office: update to 11.1.0.9080.
  2020-01-09 20:10 [PR PATCH] wps-office: update to 11.1.0.9080 voidlinux-github
                   ` (2 preceding siblings ...)
  2020-01-09 20:42 ` voidlinux-github
@ 2020-01-12 18:26 ` voidlinux-github
  3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-12 18:26 UTC (permalink / raw)
  To: ml


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

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

wps-office: update to 11.1.0.9080.
https://github.com/void-linux/void-packages/pull/18144

Description:


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

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-09 20:10 [PR PATCH] wps-office: update to 11.1.0.9080 voidlinux-github
2020-01-09 20:32 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-09 20:39 ` voidlinux-github
2020-01-09 20:42 ` voidlinux-github
2020-01-12 18:26 ` [PR PATCH] [Merged]: " voidlinux-github

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