update to 9.7.1

3 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf5df316dd91..e043348c3a55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = eusoft-ting-en-bin
 	pkgdesc = 听力统计、笔记同步、语音高亮跟随，让您轻松愉快学英语
-	pkgver = 9.6.2.114
-	pkgrel = 2
+	pkgver = 9.7.1
+	pkgrel = 1
 	url = http://dict.eudic.net/ting
 	arch = x86_64
 	license = custom
-	makedepends = asar
 	depends = bash
 	depends = electron13
 	depends = hicolor-icon-theme
 	conflicts = eusoft-ting-en
 	conflicts = eudic-ting_en
-	source = eusoft-ting-en-9.6.2.114.deb::https://static.frdic.com/pkg/ting_en/ting_en.deb
+	source = eusoft-ting-en-9.7.1.deb::https://static.frdic.com/pkg/ting_en/ting_en.deb
 	source = LICENSE.html
 	source = eusoft-ting-en.sh
 	sha256sums = 47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c
 	sha256sums = 17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b
-	sha256sums = d45e14c72d6b0369e835f65435df5804334c50ea5d2d518244e0ca72fc09daaf
+	sha256sums = 7134a5a09adf082ce8f0e78cc658c705131e50667da2b6d20304fa11864aec1a
 
 pkgname = eusoft-ting-en-bin
diff --git a/PKGBUILD b/PKGBUILD
index 8999469a215f..2f072e969ae8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,36 @@
 _appname=ting_en
 pkgname="eusoft-${_appname//_/-}-bin"
 _zhname="每日英语听力"
-pkgver=9.6.2.114
-pkgrel=2
+pkgver=9.7.1
+pkgrel=1
 pkgdesc="听力统计、笔记同步、语音高亮跟随，让您轻松愉快学英语"
 arch=('x86_64')
 url="http://dict.eudic.net/ting"
 license=('custom')
 conflicts=("${pkgname%-bin}" "eudic-${_appname}")
-depends=('bash' 'electron13' 'hicolor-icon-theme')
-makedepends=('asar')
-source=("${pkgname%-bin}-${pkgver}.deb::https://static.frdic.com/pkg/${_appname}/${_appname}.deb"
+depends=(
+    'bash'
+    'electron13'
+    'hicolor-icon-theme'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::https://static.frdic.com/pkg/${_appname}/${_appname}.deb"
     "LICENSE.html"
-    "${pkgname%-bin}.sh")
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('47b4bd3aa25299fa835f7141e370aa679f938ce573a367418ad2d4ac2aa3a99c'
             '17651cf7ae49b0372b6b6812d8b3b066203892c9fbe0b04b25efec0ab038c12b'
-            'd45e14c72d6b0369e835f65435df5804334c50ea5d2d518244e0ca72fc09daaf')
-prepare() {
+            '7134a5a09adf082ce8f0e78cc658c705131e50667da2b6d20304fa11864aec1a')
+build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
-    asar e "${srcdir}/opt/${_zhname}/resources/app.asar" "${srcdir}/app.asar.unpacked"
-    cp -r "${srcdir}/opt/${_zhname}/resources/app.asar.unpacked" "${srcdir}"
-    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/${pkgname%-bin}.asar"
     sed "s|\"/opt/${_zhname}/${_appname}\" %U|${pkgname%-bin}|g;s|Icon=${_appname}|Icon=${pkgname%-bin}|g" \
         -i "${srcdir}/usr/share/applications/${_appname}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/${pkgname%-bin}.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${_zhname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/${_zhname}/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${_zhname}/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/swiftshader"
     install -Dm644 "${srcdir}/usr/share/applications/${_appname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
     for _icons in 32x32 128x128 256x256;do
         install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${_appname}.png" \
diff --git a/eusoft-ting-en.sh b/eusoft-ting-en.sh
index 97c7bd3aa552..e40d93ea9acf 100644
--- a/eusoft-ting-en.sh
+++ b/eusoft-ting-en.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron13
-_ASAR="/opt/eusoft-ting-en/eusoft-ting-en.asar"
+APPDIR="/usr/lib/eusoft-ting-en"
+export PATH="${APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else