summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorUniversebenzene2019-10-29 22:02:34 +0800
committerUniversebenzene2019-10-29 22:02:34 +0800
commit8d9a70a86d60e3296279354e7b6999d97b8ee2ef (patch)
treed05b6ffb71541c4fe180e333988a5dc81af772d8
parentebfa405670723734d9c8db5f43d4619858e3d0aa (diff)
downloadaur-8d9a70a86d60e3296279354e7b6999d97b8ee2ef.tar.gz
Improve destkop Exec
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD14
-rw-r--r--fix_desktop_exec.patch44
3 files changed, 54 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 854f0cb8c07..0894742d1e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
pkgbase = wps-office
pkgdesc = Kingsoft Office (WPS Office) is an office productivity suite
pkgver = 11.1.0.8865
- pkgrel = 5
+ pkgrel = 6
url = http://wps-community.org/
arch = x86_64
license = custom
options = !emptydirs
source = http://kdl.cc.ksosoft.com/wps-community/download/8865/wps-office_11.1.0.8865_amd64.deb
+ source = fix_desktop_exec.patch
sha1sums = ee5e2ea5f7480bb7d6e116dd7690990a861c8a37
+ sha1sums = 2d5c33b279ebc2ce8939a72d2ca0c18a5a5b1173
pkgname = wps-office
install = wps-office.install
diff --git a/PKGBUILD b/PKGBUILD
index 48479cba7f7..5ea8d883418 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=wps-office
pkgname=('wps-office' 'wps-office-mime')
pkgver=11.1.0.8865
#_pkgver=8372
-pkgrel=5
+pkgrel=6
#_pkgrel=1
pkgdesc="Kingsoft Office (WPS Office) is an office productivity suite"
arch=('x86_64')
@@ -18,12 +18,12 @@ 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")
-# 'add_no_kdialog_variable.patch')
+source=("http://kdl.cc.ksosoft.com/wps-community/download/${pkgver##*.}/wps-office_${pkgver}_amd64.deb"
+ 'fix_desktop_exec.patch')
#sha1sums_i686=('60b1c9e33ee6fc1edcefe40dc9ec529d4a668825'
# 'dd8b5283ee17a88a3eb0531976abccd6e5e08c48')
-sha1sums=('ee5e2ea5f7480bb7d6e116dd7690990a861c8a37')
-# '49ccf3e3d9c7c9c80294127ce063c56d2b57d7c4')
+sha1sums=('ee5e2ea5f7480bb7d6e116dd7690990a861c8a37'
+ '2d5c33b279ebc2ce8939a72d2ca0c18a5a5b1173')
prepare() {
bsdtar -xpf data.tar.xz
@@ -42,8 +42,8 @@ prepare() {
fi
done
-# cd "${srcdir}"
-# patch -Np1 -i "${srcdir}/add_no_kdialog_variable.patch"
+ cd "${srcdir}"
+ patch -Np1 -i "${srcdir}/fix_desktop_exec.patch"
}
package_wps-office() {
diff --git a/fix_desktop_exec.patch b/fix_desktop_exec.patch
new file mode 100644
index 00000000000..c148850750e
--- /dev/null
+++ b/fix_desktop_exec.patch
@@ -0,0 +1,44 @@
+--- a/usr/share/applications/wps-office-et.desktop 2019-09-10 17:59:37.000000000 +0800
++++ b/usr/share/applications/wps-office-et.desktop 2019-10-29 20:33:33.331491047 +0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Comment=Use WPS Spreadsheets to analyze manage data.
+ Comment[zh_CN]=使用WPS表格分析、管理数据
+-Exec=/usr/bin/et %f
++Exec=/usr/bin/et %F
+ GenericName=WPS Spreadsheets
+ GenericName[zh_CN]=WPS 表格
+ MimeType=application/wps-office.et;application/wps-office.ett;application/wps-office.ets;application/wps-office.eto;application/wps-office.xls;application/wps-office.xlt;application/vnd.ms-excel;application/msexcel;application/x-msexcel;application/wps-office.xlsx;application/wps-office.xltx;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+--- a/usr/share/applications/wps-office-pdf.desktop 2019-09-10 17:59:37.000000000 +0800
++++ b/usr/share/applications/wps-office-pdf.desktop 2019-10-29 20:33:45.314824380 +0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Comment=Kingsoft Pdf Reader
+ Comment[zh_CN]=金山PDF阅读器
+-Exec=/usr/bin/wpspdf %f
++Exec=/usr/bin/wpspdf %F
+ GenericName=Kingsoft Pdf Reader
+ GenericName[zh_CN]=金山 PDF
+ MimeType=application/wps-office.pdf;application/pdf
+--- a/usr/share/applications/wps-office-wpp.desktop 2019-09-10 17:59:37.000000000 +0800
++++ b/usr/share/applications/wps-office-wpp.desktop 2019-10-29 20:33:58.498157713 +0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Comment=Use WPS Presentation to edit and play presentations.
+ Comment[zh_CN]=使用 WPS 演示编辑、播放演示文稿
+-Exec=/usr/bin/wpp %f
++Exec=/usr/bin/wpp %F
+ GenericName=WPS Presentation
+ GenericName[zh_CN]=WPS 演示
+ MimeType=application/wps-office.dps;application/wps-office.dpt;application/wps-office.dpss;application/wps-office.dpso;application/wps-office.ppt;application/wps-office.pot;application/vnd.ms-powerpoint;application/vnd.mspowerpoint;application/mspowerpoint;application/powerpoint;application/x-mspowerpoint;application/wps-office.pptx;application/wps-office.potx;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.slideshow
+--- a/usr/share/applications/wps-office-wps.desktop 2019-09-10 17:59:37.000000000 +0800
++++ b/usr/share/applications/wps-office-wps.desktop 2019-10-29 20:33:25.658157711 +0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Comment=Use WPS Writer to edit articles and reports.
+ Comment[zh_CN]=使用 WPS 文字编写报告,排版文章
+-Exec=/usr/bin/wps %f
++Exec=/usr/bin/wps %F
+ GenericName=WPS Writer
+ GenericName[zh_CN]=WPS 文字
+ MimeType=application/wps-office.wps;application/wps-office.wpt;application/wps-office.wpso;application/wps-office.wpss;application/wps-office.doc;application/wps-office.dot;application/vnd.ms-word;application/msword;application/x-msword;application/msword-template;application/wps-office.docx;application/wps-office.dotx;application/rtf;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.document