diff options
| -rw-r--r-- | .SRCINFO | 21 | ||||
| -rw-r--r-- | PKGBUILD | 30 | ||||
| -rw-r--r-- | fix-wps-python-parse.patch | 20 |
3 files changed, 53 insertions, 18 deletions
@@ -1,31 +1,36 @@ pkgbase = wps-office pkgdesc = Kingsoft Office (WPS Office) - an office productivity suite - pkgver = 11.1.0.9604 + pkgver = 11.1.0.11719 pkgrel = 1 - url = http://wps-community.org/ + url = http://wps-community.org arch = x86_64 - license = custom + license = LicenseRef-WPS-EULA options = !emptydirs - source = http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9604/wps-office_11.1.0.9604.XA_amd64.deb - sha1sums = f7d905898a6777d4c3caf6ffe1e33aa43cd6b549 + source = https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/11719/wps-office_11.1.0.11719.XA_amd64.deb + source = fix-wps-python-parse.patch + sha1sums = 576be9de62fdf8715a77b955526cb457b75c4a10 + sha1sums = f3713481edf04ffb08be8d24dce66554dd5a4f13 pkgname = wps-office install = wps-office.install depends = fontconfig depends = xorg-mkfontdir depends = libxrender - depends = gtk2 depends = desktop-file-utils depends = shared-mime-info depends = xdg-utils depends = glu - depends = openssl-1.0 + depends = openssl-1.1 depends = sdl2 depends = libpulse depends = hicolor-icon-theme depends = libxss depends = sqlite depends = libtool + depends = libxslt + depends = qt5-base + depends = libjpeg-turbo + optdepends = libtiff5: Provide libtiff.so.5 for wpspdf working optdepends = cups: for printing support optdepends = libjpeg-turbo: JPEG image codec support optdepends = pango: for complex (right-to-left) text support @@ -39,5 +44,5 @@ pkgname = wps-office pkgname = wps-office-mime pkgdesc = Mime files provided by Kingsoft Office (WPS Office) + arch = any depends = shared-mime-info - @@ -3,26 +3,29 @@ # Maintainer: Felix Yan <felixonmars@archlinux.org> # Contributor: Jove Yu <yushijun110 [at] gmail.com> # Contributor: Ariel AxionL <axionl at aosc dot io> +# Contributor: v71 pkgbase=wps-office pkgname=('wps-office' 'wps-office-mime') -pkgver=11.1.0.9604 +pkgver=11.1.0.11719 #_pkgver=8372 pkgrel=1 #_pkgrel=1 pkgdesc="Kingsoft Office (WPS Office) - an office productivity suite" arch=('x86_64') -license=('custom') -url="http://wps-community.org/" +license=('LicenseRef-WPS-EULA') +url="http://wps-community.org" options=('!emptydirs') #[[ "$CARCH" = "i686" ]] && _archext=x86 || _archext=x86_64 #source_i686=("http://kdl.cc.ksosoft.com/wps-community/download/${pkgver##*.}/wps-office_${pkgver}_i386.deb" # 'add_no_kdialog_variable.patch') #source=("http://kdl.cc.ksosoft.com/wps-community/download/${pkgver##*.}/wps-office_${pkgver}_amd64.deb" -source=("http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${pkgver##*.}/wps-office_${pkgver}.XA_amd64.deb") +source=("https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${pkgver##*.}/wps-office_${pkgver}.XA_amd64.deb" + 'fix-wps-python-parse.patch') #sha1sums_i686=('60b1c9e33ee6fc1edcefe40dc9ec529d4a668825' # 'dd8b5283ee17a88a3eb0531976abccd6e5e08c48') -sha1sums=('f7d905898a6777d4c3caf6ffe1e33aa43cd6b549') +sha1sums=('576be9de62fdf8715a77b955526cb457b75c4a10' + 'f3713481edf04ffb08be8d24dce66554dd5a4f13') prepare() { bsdtar -xpf data.tar.xz @@ -41,13 +44,15 @@ prepare() { fi done -# cd "${srcdir}" + cd "${srcdir}" # patch -Np1 -i "${srcdir}/fix_desktop_exec.patch" + patch -Np1 -i "${srcdir}/fix-wps-python-parse.patch" } package_wps-office() { - depends=('fontconfig' 'xorg-mkfontdir' 'libxrender' 'gtk2' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu' 'openssl-1.0' 'sdl2' 'libpulse' 'hicolor-icon-theme' 'libxss' 'sqlite' 'libtool') - optdepends=('cups: for printing support' + depends=('fontconfig' 'xorg-mkfontdir' 'libxrender' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu' 'openssl-1.1' 'sdl2' 'libpulse' 'hicolor-icon-theme' 'libxss' 'sqlite' 'libtool' 'libxslt' 'qt5-base' 'libjpeg-turbo') + optdepends=('libtiff5: Provide libtiff.so.5 for wpspdf working' + 'cups: for printing support' 'libjpeg-turbo: JPEG image codec support' 'pango: for complex (right-to-left) text support' 'curl: An URL retrieval utility and library' @@ -63,9 +68,13 @@ package_wps-office() { install -d "${pkgdir}/usr/lib" cp -r office6 "${pkgdir}/usr/lib" + # Fix for icu>=71.1 + rm ${pkgdir}/usr/lib/office6/libstdc++.so* + # Use system libjpeg + rm ${pkgdir}/usr/lib/office6/libjpeg.so* # chmod -x "${pkgdir}/usr/lib/office6/wpsoffice" # ln -rTsf "${pkgdir}/usr/lib/office6"/{libcef.so,addons/cef/libcef.so} - install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" office6/mui/default/*.txt + install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" office6/mui/default/*.html install -d "${pkgdir}/usr/bin" cd "${srcdir}/usr/bin" @@ -92,6 +101,7 @@ package_wps-office() { package_wps-office-mime() { pkgdesc="Mime files provided by Kingsoft Office (WPS Office)" + arch=('any') depends=('shared-mime-info') cd "${srcdir}/usr/share" @@ -99,5 +109,5 @@ package_wps-office-mime() { cp -r mime/* "${pkgdir}/usr/share/mime" cd "${srcdir}/opt/kingsoft/wps-office/" - install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" office6/mui/default/*.txt + install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" office6/mui/default/*.html } diff --git a/fix-wps-python-parse.patch b/fix-wps-python-parse.patch new file mode 100644 index 000000000000..092781f67efc --- /dev/null +++ b/fix-wps-python-parse.patch @@ -0,0 +1,20 @@ +--- a/usr/bin/wps 2022-12-14 14:42:22.494474822 +0800 ++++ b/usr/bin/wps 2022-12-14 14:40:49.544596650 +0800 +@@ -61,7 +61,7 @@ + + gFilePath=$1 + if [ ${gFilePath:0:7} = "file://" ]; then +- gFilePath=$(python -c 'import sys, urllib; print urllib.unquote(sys.argv[1])' "$1") ++ gFilePath=$(python -c 'import sys, urllib.parse; print(urllib.parse.unquote(sys.argv[1]))' "$1") + gFilePath=${gFilePath#file://} + gIsUrl=1 + fi +@@ -83,7 +83,7 @@ + do + gFilePath=$file + if [ ${gFilePath:0:7} = "file://" ]; then +- gFilePath=$(python -c 'import sys, urllib; print urllib.unquote(sys.argv[1])' "$file") ++ gFilePath=$(python -c 'import sys, urllib.parse; print(urllib.parse.unquote(sys.argv[1]))' "$file") + gFilePath=${gFilePath#file://} + else + return 0 |