summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorUniversebenzene2023-09-28 13:02:53 +0800
committerUniversebenzene2023-09-28 13:02:53 +0800
commit2145b297f4d54ffd62c47d0a55bba34ed9b5643c (patch)
tree9db8a580257b7bf7072cb755bf7f1a149cb41f3e
parentba1633887a4f7653b0badd12a38fdaf4c74df0cc (diff)
downloadaur-2145b297f4d54ffd62c47d0a55bba34ed9b5643c.tar.gz
Switch to system libjpeg to fix cef issue
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 45aee2ab0020..ee757431526b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wps-office
pkgdesc = Kingsoft Office (WPS Office) - an office productivity suite
pkgver = 11.1.0.11704
- pkgrel = 1
+ pkgrel = 2
url = http://wps-community.org
arch = x86_64
license = custom
@@ -29,6 +29,7 @@ pkgname = wps-office
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
diff --git a/PKGBUILD b/PKGBUILD
index 9628d1a3cd45..a20e41ff3ec9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgbase=wps-office
pkgname=('wps-office' 'wps-office-mime')
pkgver=11.1.0.11704
#_pkgver=8372
-pkgrel=1
+pkgrel=2
#_pkgrel=1
pkgdesc="Kingsoft Office (WPS Office) - an office productivity suite"
arch=('x86_64')
@@ -50,7 +50,7 @@ prepare() {
}
package_wps-office() {
- 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')
+ 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'
@@ -70,6 +70,8 @@ package_wps-office() {
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/*.html