summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorUniversebenzene2023-09-28 13:03:02 +0800
committerUniversebenzene2023-09-28 13:03:02 +0800
commit41828ea9dbaf354c6c556946b0cd59895f2ba0ce (patch)
tree87ec43aca030d567f8e11bd9e9907e5db5e75c9f
parente547a86f28f4bec0e40ea534a3bb2ffa81a3d0db (diff)
downloadaur-41828ea9dbaf354c6c556946b0cd59895f2ba0ce.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 aa4af320cb4c..8d5daddbb92b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wps-office-cn
pkgdesc = Kingsoft Office (WPS Office) CN version - an office productivity suite
pkgver = 11.1.0.11704
- pkgrel = 1
+ pkgrel = 2
url = https://linux.wps.cn
arch = x86_64
arch = aarch64
@@ -32,6 +32,7 @@ pkgname = wps-office-cn
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 de226c6c1060..9f15743c23d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgbase=wps-office-cn
pkgname=('wps-office-cn' 'wps-office-mime-cn' 'wps-office-mui-zh-cn')
pkgver=11.1.0.11704
-pkgrel=1
+pkgrel=2
pkgdesc="Kingsoft Office (WPS Office) CN version - an office productivity suite"
arch=('x86_64' 'aarch64')
license=('custom')
@@ -41,7 +41,7 @@ prepare() {
}
package_wps-office-cn() {
- 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'
@@ -61,6 +61,8 @@ package_wps-office-cn() {
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*
[[ "$CARCH" = "aarch64" ]] && rm "${pkgdir}"/usr/lib/office6/libfreetype.so*
install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" office6/mui/default/*.html
rm -r "${pkgdir}/usr/lib/office6/mui/en_US/resource/help"