diff options
author | Universebenzene | 2019-04-15 14:59:12 +0800 |
---|---|---|
committer | Universebenzene | 2019-04-15 14:59:12 +0800 |
commit | bcf3996b9ce64f1dc1688cf3c4b494b6bd25efbc (patch) | |
tree | 1486a78739328861534b6ce10e04cd3c3ef72434 | |
parent | 80a0e6c1ec8b6d2e5e2716f85f46ff865b7e8bff (diff) | |
download | aur-bcf3996b9ce64f1dc1688cf3c4b494b6bd25efbc.tar.gz |
Fix conflict with kdialog; add depends
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | add_no_kdialog_variable.patch | 63 |
3 files changed, 83 insertions, 9 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Apr 9 16:37:20 UTC 2019 +# Mon Apr 15 06:58:16 UTC 2019 pkgbase = wps-office pkgdesc = Kingsoft Office (WPS Office) is an office productivity suite pkgver = 11.1.0.8372 - pkgrel = 1 + pkgrel = 2 url = http://wps-community.org/ install = wps-office.install arch = i686 @@ -12,6 +12,7 @@ pkgbase = wps-office depends = fontconfig depends = xorg-mkfontdir depends = libxrender + depends = gtk2 depends = desktop-file-utils depends = shared-mime-info depends = xdg-utils @@ -28,9 +29,13 @@ pkgbase = wps-office conflicts = kingsoft-office options = !emptydirs source_i686 = http://kdl.cc.ksosoft.com/wps-community/download/8372/wps-office-11.1.0.8372-1.i686.rpm + source_i686 = add_no_kdialog_variable.patch sha1sums_i686 = 9deb3908d8edad310258de0e31bcafdb5ff6bc5c + sha1sums_i686 = dd8b5283ee17a88a3eb0531976abccd6e5e08c48 source_x86_64 = http://kdl.cc.ksosoft.com/wps-community/download/8372/wps-office-11.1.0.8372-1.x86_64.rpm + source_x86_64 = add_no_kdialog_variable.patch sha1sums_x86_64 = d3abdfe94a579083c8bd5e0c817de877e7531e48 + sha1sums_x86_64 = dd8b5283ee17a88a3eb0531976abccd6e5e08c48 pkgname = wps-office @@ -7,13 +7,13 @@ pkgname=wps-office pkgver=11.1.0.8372 #_pkgver=8372 -pkgrel=1 +pkgrel=2 _pkgrel=1 pkgdesc="Kingsoft Office (WPS Office) is an office productivity suite" arch=('i686' 'x86_64') license=("custom") url="http://wps-community.org/" -depends=('fontconfig' 'xorg-mkfontdir' 'libxrender' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu' 'openssl-1.0' 'sdl2' 'libpulse' 'hicolor-icon-theme') +depends=('fontconfig' 'xorg-mkfontdir' 'libxrender' 'gtk2' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu' 'openssl-1.0' 'sdl2' 'libpulse' 'hicolor-icon-theme') optdepends=('cups: for printing support' 'libjpeg-turbo: JPEG image codec support' 'pango: for complex (right-to-left) text support' @@ -23,17 +23,23 @@ conflicts=('kingsoft-office') options=('!emptydirs') install=${pkgname}.install [[ "$CARCH" = "i686" ]] && _archext=x86 || _archext=x86_64 -source_i686=("http://kdl.cc.ksosoft.com/wps-community/download/${pkgver##*.}/wps-office-${pkgver}-${_pkgrel}.i686.rpm") -source_x86_64=("http://kdl.cc.ksosoft.com/wps-community/download/${pkgver##*.}/wps-office-${pkgver}-${_pkgrel}.x86_64.rpm") -sha1sums_i686=('9deb3908d8edad310258de0e31bcafdb5ff6bc5c') -sha1sums_x86_64=('d3abdfe94a579083c8bd5e0c817de877e7531e48') +source_i686=("http://kdl.cc.ksosoft.com/wps-community/download/${pkgver##*.}/wps-office-${pkgver}-${_pkgrel}.i686.rpm" + 'add_no_kdialog_variable.patch') +source_x86_64=("http://kdl.cc.ksosoft.com/wps-community/download/${pkgver##*.}/wps-office-${pkgver}-${_pkgrel}.x86_64.rpm" + 'add_no_kdialog_variable.patch') +sha1sums_i686=('9deb3908d8edad310258de0e31bcafdb5ff6bc5c' + 'dd8b5283ee17a88a3eb0531976abccd6e5e08c48') +sha1sums_x86_64=('d3abdfe94a579083c8bd5e0c817de877e7531e48' + 'dd8b5283ee17a88a3eb0531976abccd6e5e08c48') prepare() { cd "${srcdir}/usr/bin" - sed -i 's|/opt/kingsoft/wps-office|/usr/lib|' wps wpp et # sed -i 's|/office6/${gApp} ${gOptExt}|/office6/${gApp} -style gtk+ ${gOptExt}|' wps # sed -i 's|/office6/${gApp} ${gOptExt}|/office6/${gApp} -style gtk+ ${gOptExt}|' wpp et + + cd "${srcdir}" + patch -Np1 -i "${srcdir}/add_no_kdialog_variable.patch" } package() { diff --git a/add_no_kdialog_variable.patch b/add_no_kdialog_variable.patch new file mode 100644 index 000000000000..5843cd6aa9ae --- /dev/null +++ b/add_no_kdialog_variable.patch @@ -0,0 +1,63 @@ +--- a/usr/bin/et 2019-04-15 13:40:47.535249626 +0800 ++++ b/usr/bin/et 2019-04-15 13:48:33.159393790 +0800 +@@ -1,6 +1,7 @@ + #!/bin/bash + + gOpt= ++export WPS_NO_KDE_NATIVE_DIALOG=1 + #gOptExt=-multiply + gTemplateExt=("ett" "xlt" "xltx" "xltm") + gBinPath=$(dirname "$0") +--- a/usr/bin/wpp 2019-04-15 13:40:47.535249626 +0800 ++++ b/usr/bin/wpp 2019-04-15 13:48:32.152732577 +0800 +@@ -1,6 +1,7 @@ + #!/bin/bash + + gOpt= ++export WPS_NO_KDE_NATIVE_DIALOG=1 + #gOptExt=-multiply + gTemplateExt=("dpt" "pot" "potx" "potm") + gBinPath=$(dirname "$0") +--- a/usr/bin/wps 2019-04-15 13:40:47.535249626 +0800 ++++ b/usr/bin/wps 2019-04-15 14:20:19.505732892 +0800 +@@ -1,6 +1,7 @@ + #!/bin/bash + + gOpt= ++export WPS_NO_KDE_NATIVE_DIALOG=1 + #gOptExt=-multiply + gTemplateExt=("wpt" "dot" "dotx" "dotm") + gBinPath=$(dirname "$0") +--- a/usr/share/applications/wps-office-et.desktop 2019-03-31 23:16:22.000000000 +0800 ++++ b/usr/share/applications/wps-office-et.desktop 2019-04-15 14:20:24.319040150 +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=env WPS_NO_KDE_NATIVE_DIALOG=1 /usr/bin/et %f + GenericName=WPS Spreadsheets + GenericName[zh_CN]=WPS 表格 + MimeType=application/wps-office.et;application/wps-office.ett;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; +--- a/usr/share/applications/wps-office-wpp.desktop 2019-03-31 23:16:22.000000000 +0800 ++++ b/usr/share/applications/wps-office-wpp.desktop 2019-04-15 14:20:23.342378774 +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=env WPS_NO_KDE_NATIVE_DIALOG=1 /usr/bin/wpp %f + GenericName=WPS Presentation + GenericName[zh_CN]=WPS 演示 + MimeType=application/wps-office.dps;application/wps-office.dpt;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; +--- a/usr/share/applications/wps-office-wps.desktop 2019-03-31 23:16:22.000000000 +0800 ++++ b/usr/share/applications/wps-office-wps.desktop 2019-04-15 14:20:25.279034949 +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=env WPS_NO_KDE_NATIVE_DIALOG=1 /usr/bin/wps %f + GenericName=WPS Writer + GenericName[zh_CN]=WPS 文字 + MimeType=application/wps-office.wps;application/wps-office.wpt;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; |