summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwhriedplanck2020-06-25 22:31:53 +0800
committerwhriedplanck2020-06-25 22:31:53 +0800
commitc1d7e0bc386a7cc0662ca9de629a732ab1675d4a (patch)
tree32bee6687e9caa8fce53dd64440ccfefe390268a
parenta91c12f61ae4c5dbfa5a9f593f3d08fd1b6ad7e1 (diff)
downloadaur-c1d7e0bc386a7cc0662ca9de629a732ab1675d4a.tar.gz
modify PKGBUILD
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD20
-rw-r--r--yozo-office.install4
3 files changed, 13 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5053dd02e0cd..1e745c53f8d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,6 +18,7 @@ pkgname = yozo-office
depends = libxmu
depends = gtk2
depends = libglvnd
+ depends = vlc
optdepends = ttf-ms-fonts: Arial, Times, Courier etc.
optdepends = ttf-ms-win10-zh_cn: SimSun, SimHei, MSYH, Tahoma etc.
optdepends = yozo-office-fonts: UI Fonts
diff --git a/PKGBUILD b/PKGBUILD
index 29f2c096c6ce..592458cb43d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ source_x86_64=("http://www.yozosoft.com/portal-download/fileManager/PRODUCT/yozo
md5sums_x86_64=('cf22531071e607019c02a1a046f70e5c')
package_yozo-office() {
- depends=('java-runtime=8' 'libxt' 'libxmu' 'gtk2' 'libglvnd')
+ depends=('java-runtime=8' 'libxt' 'libxmu' 'gtk2' 'libglvnd' 'vlc')
optdepends=('ttf-ms-fonts: Arial, Times, Courier etc.'
'ttf-ms-win10-zh_cn: SimSun, SimHei, MSYH, Tahoma etc.'
'yozo-office-fonts: UI Fonts')
@@ -47,24 +47,24 @@ package_yozo-office() {
#Redirect Java bin
rm -rf "${pkgdir}"/opt/Yozosoft/Yozo_Office/Jre/bin
- ln -sf /usr/lib/jvm/default/bin "${pkgdir}"/opt/Yozosoft/Yozo_Office/Jre/bin
+ ln -sf /usr/lib/jvm/java-8-openjdk/jre/bin "${pkgdir}"/opt/Yozosoft/Yozo_Office/Jre/bin
cd $pkgdir/opt/Yozosoft/Yozo_Office/Jre/lib
for j in *; do
if [ "$j" != "ext" ]; then
rm -rf $j
fi
done
- #Move VLC plugin lib
- mkdir -p "${pkgdir}"/usr/lib/Yozo_Office/
- mv "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib/* "${pkgdir}"/usr/lib/Yozo_Office
- rm -rf "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib
- ln -sf /usr/lib/Yozo_Office "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib
+ #Redirect VLC lib
+ #mkdir -p "${pkgdir}"/usr/lib/Yozo_Office/
+ #mv "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib/* "${pkgdir}"/usr/lib/Yozo_Office
+ rm -rf "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib/media/vlc
+ ln -sf /usr/lib/vlc "${pkgdir}"/opt/Yozosoft/Yozo_Office/Lib/media/vlc
install -Dm644 "${pkgdir}"/opt/Yozosoft/Yozo_Office/thirdpartylicensereadme.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
- targetP="${pkgdir}/opt/Yozosoft/Yozo_Office"
- unpackP="${targetP}/Jre/bin/unpack200"
- libP="${targetP}/Jre/lib"
+# targetP="${pkgdir}/opt/Yozosoft/Yozo_Office"
+# unpackP="${targetP}/Jre/bin/unpack200"
+# libP="${targetP}/Jre/lib"
}
package_yozo-office-fonts() {
diff --git a/yozo-office.install b/yozo-office.install
index 6e44ac5e1f38..a49710bc231f 100644
--- a/yozo-office.install
+++ b/yozo-office.install
@@ -1,8 +1,8 @@
post_install() {
- cd /usr/lib/jvm/default/lib
+ cd /usr/lib/jvm/java-8-openjdk/jre/lib
for i in *; do
if [ "$i" != "ext" ]; then
- ln -sf /usr/lib/jvm/default/lib/$i /opt/Yozosoft/Yozo_Office/Jre/lib/$i
+ ln -sf /usr/lib/jvm/java-8-openjdk/jre/lib/$i /opt/Yozosoft/Yozo_Office/Jre/lib/$i
fi
done
echo "------------------- 温馨提示 --------------------"