upgpkg: wps-office 11.1.0.9080

3 files changed, 15 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 654759e6b89b..419ea2365b29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
 pkgbase = wps-office
 	pkgdesc = Kingsoft Office (WPS Office) is an office productivity suite
-	pkgver = 11.1.0.8865
-	pkgrel = 7
+	pkgver = 11.1.0.9080
+	pkgrel = 1
 	url = http://wps-community.org/
 	arch = x86_64
 	license = custom
 	options = !emptydirs
-	source = http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/8865/wps-office_11.1.0.8865_amd64.deb
-	source = fix_desktop_exec.patch
-	sha1sums = b15d1350e5aac5b7b417124b545082b8d4a934a3
-	sha1sums = 2d5c33b279ebc2ce8939a72d2ca0c18a5a5b1173
+	source = http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9080/wps-office_11.1.0.9080.XA_amd64.deb
+	sha1sums = c6735dcfc912f3ee0a5450fe5c38fe0a75e04cc8
 
 pkgname = wps-office
 	install = wps-office.install
@@ -27,6 +25,7 @@ pkgname = wps-office
 	depends = hicolor-icon-theme
 	depends = libxss
 	depends = sqlite
+	depends = libtool
 	optdepends = cups: for printing support
 	optdepends = libjpeg-turbo: JPEG image codec support
 	optdepends = pango: for complex (right-to-left) text support
diff --git a/.gitignore b/.gitignore
index 5ab41ca8ae14..1561816e0ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,6 @@ src
 pkg
 *.src.tar.gz
 *.part
-*.pkg.tar.xz
+*.pkg.tar.*
 *.deb
 *.log
diff --git a/PKGBUILD b/PKGBUILD
index 969049a9425e..d1ea5aa89231 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgbase=wps-office
 pkgname=('wps-office' 'wps-office-mime')
-pkgver=11.1.0.8865
+pkgver=11.1.0.9080
 #_pkgver=8372
-pkgrel=7
+pkgrel=1
 #_pkgrel=1
 pkgdesc="Kingsoft Office (WPS Office) is an office productivity suite"
 arch=('x86_64')
@@ -19,12 +19,10 @@ options=('!emptydirs')
 #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}_amd64.deb"
-        'fix_desktop_exec.patch')
+source=("http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${pkgver##*.}/wps-office_${pkgver}.XA_amd64.deb")
 #sha1sums_i686=('60b1c9e33ee6fc1edcefe40dc9ec529d4a668825'
 #               'dd8b5283ee17a88a3eb0531976abccd6e5e08c48')
-sha1sums=('b15d1350e5aac5b7b417124b545082b8d4a934a3'
-          '2d5c33b279ebc2ce8939a72d2ca0c18a5a5b1173')
+sha1sums=('c6735dcfc912f3ee0a5450fe5c38fe0a75e04cc8')
 
 prepare() {
     bsdtar -xpf data.tar.xz
@@ -43,12 +41,12 @@ prepare() {
         fi
     done
 
-    cd "${srcdir}"
-    patch -Np1 -i "${srcdir}/fix_desktop_exec.patch"
+#   cd "${srcdir}"
+#   patch -Np1 -i "${srcdir}/fix_desktop_exec.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')
+    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'
                 'libjpeg-turbo: JPEG image codec support'
                 'pango: for complex (right-to-left) text support'
@@ -65,7 +63,7 @@ package_wps-office() {
     install -d "${pkgdir}/usr/lib"
     cp -r office6 "${pkgdir}/usr/lib"
 #   chmod -x "${pkgdir}/usr/lib/office6/wpsoffice"
-    ln -rTsf "${pkgdir}/usr/lib/office6"/{libcef.so,addons/cef/libcef.so}
+#   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 -d "${pkgdir}/usr/bin"
@@ -76,7 +74,7 @@ package_wps-office() {
 
     install -d "${pkgdir}/usr/share/applications"
     cp -r applications/* "${pkgdir}/usr/share/applications"
-    rm "${pkgdir}/usr/share/applications/appurl.desktop"
+#   rm "${pkgdir}/usr/share/applications/appurl.desktop"
 
     install -d "${pkgdir}/usr/share/desktop-directories"
     cp -r desktop-directories/* "${pkgdir}/usr/share/desktop-directories"