Fix conflict with kdialog; add depends

1 files changed, 13 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7ca0f62bcb2e..a0d19c965b2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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() {