update to 2023.09.27

3 files changed, 35 insertions, 82 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01ddae99c285..b2346b04af10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,75 +1,23 @@
 pkgbase = eusoft-eudic-bin
 	pkgdesc = 权威的英语词典软件,英语学习者必备的工具,支持学习笔记、生词本多平台同步,让你随时随地学英语.
-	pkgver = 2023.06.06
-	pkgrel = 2
+	pkgver = 2023.09.27
+	pkgrel = 1
 	url = https://www.eudic.net/v4/en/app/eudic
 	arch = x86_64
 	license = custom
-	depends = zlib
-	depends = glibc
-	depends = bzip2
-	depends = gcc-libs
-	depends = libraw1394
-	depends = libxv
-	depends = speex
-	depends = util-linux-libs
-	depends = libjpeg-turbo
-	depends = cairo
-	depends = cdparanoia
-	depends = libpulse
-	depends = libvorbis
-	depends = pango
-	depends = opus
-	depends = libx11
-	depends = libavc1394
-	depends = orc
-	depends = clutter-gst
-	depends = gst-plugins-base-libs
-	depends = mpg123
-	depends = gdk-pixbuf2
-	depends = libdv
-	depends = expat
+	makedepends = squashfuse
 	depends = bash
-	depends = freetype2
-	depends = libxcb
-	depends = clutter
-	depends = gst-plugins-bad-libs
-	depends = v4l-utils
-	depends = harfbuzz
-	depends = libgpg-error
-	depends = libpng
-	depends = libxdamage
-	depends = libdrm
-	depends = libxext
-	depends = pipewire-jack
-	depends = libthai
-	depends = mesa
-	depends = fontconfig
-	depends = libgudev
-	depends = lame
-	depends = libsoup
-	depends = gmp
-	depends = gtk3
-	depends = alsa-lib
-	depends = glib2
-	depends = libxfixes
-	depends = gstreamer
-	depends = graphene
-	depends = libtheora
-	depends = libglvnd
-	depends = libogg
-	depends = nss
-	depends = e2fsprogs
-	depends = taglib
-	depends = libiec61883
-	depends = libp11-kit
-	provides = eudic=2023.06.06
+	depends = glibc
+	depends = zlib
+	provides = eudic=2023.09.27
 	conflicts = eusoft-eudic
 	conflicts = eudic
 	options = !strip
-	source = eusoft-eudic-2023.06.06.deb::https://www.eudic.net/download/eudic.deb?v=2023-06-06
+	source = eusoft-eudic-2023.09.27.AppImage::https://www.eudic.net/download/eudic.AppImage?v=2023-09-27
 	source = LICENSE.html
-	sha256sums = 8e992161c4eb206cf9fda39772f5e2ec3cd1d11d344e3666f3f890e1ee330ba9
+	source = eusoft-eudic.sh
+	sha256sums = feb5c16a657533f2a28e34d2ac971b17c9cc4e56f6bf2e46a3e20a8da4c11db2
 	sha256sums = 8254fc6f96e7362405da60a8ece9d86ad26066b5edac10e775aca4e6d7c0979f
+	sha256sums = 16b06d11928ebbb45468f14a896ebb75424c6aa4a7ee9789b0db5fbc114ab95d
 
 pkgname = eusoft-eudic-bin
diff --git a/PKGBUILD b/PKGBUILD
index 1554766b42ee..9a45d209073a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 _pkgname=eudic
 pkgname="eusoft-${_pkgname}-bin"
-pkgver=2023.06.06
-pkgrel=2
+pkgver=2023.09.27
+pkgrel=1
 pkgdesc="权威的英语词典软件,英语学习者必备的工具,支持学习笔记、生词本多平台同步,让你随时随地学英语."
 arch=('x86_64')
 url="https://www.eudic.net/v4/en/app/eudic"
@@ -10,25 +10,26 @@ license=('custom')
 provides=("${_pkgname}=${pkgver}")
 conflicts=("${pkgname%-bin}" "${_pkgname}")
 options=('!strip')
-depends=('zlib' 'glibc' 'bzip2' 'gcc-libs' 'libraw1394' 'libxv' 'speex' 'util-linux-libs' 'libjpeg-turbo' 'cairo' 'cdparanoia' 'libpulse' \
-    'libvorbis' 'pango' 'opus' 'libx11' 'libavc1394' 'orc' 'clutter-gst' 'gst-plugins-base-libs' 'mpg123' 'gdk-pixbuf2' 'libdv' 'expat' 'bash' \
-    'freetype2' 'libxcb' 'clutter' 'gst-plugins-bad-libs' 'v4l-utils' 'harfbuzz' 'libgpg-error' 'libpng' 'libxdamage' 'libdrm' 'libxext' \
-    'pipewire-jack' 'libthai' 'mesa' 'fontconfig' 'libgudev' 'lame' 'libsoup' 'gmp' 'gtk3' 'alsa-lib' 'glib2' 'libxfixes' 'gstreamer' 'graphene' \
-    'libtheora' 'libglvnd' 'libogg' 'nss' 'e2fsprogs' 'taglib' 'libiec61883' 'libp11-kit')
-source=("${pkgname%-bin}-${pkgver}.deb::https://www.eudic.net/download/${_pkgname}.deb?v=${pkgver//./-}"
-    "LICENSE.html")
-sha256sums=('8e992161c4eb206cf9fda39772f5e2ec3cd1d11d344e3666f3f890e1ee330ba9'
-            '8254fc6f96e7362405da60a8ece9d86ad26066b5edac10e775aca4e6d7c0979f')
-prepare() {
-    bsdtar -xf "${srcdir}/data.tar.xz"
-    sed "s|/usr/share|/opt|g;s|com.eusoft.${_pkgname}|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
-    sed "s|/usr/share/${pkgname%-bin}/AppRun|${pkgname%-bin}|g;s|usr/share|opt|g" -i "${srcdir}/usr/share/${pkgname%-bin}/AppRun"
+depends=('bash' 'glibc' 'zlib')
+makedepends=('squashfuse')
+source=("${pkgname%-bin}-${pkgver}.AppImage::https://www.eudic.net/download/${_pkgname}.AppImage?v=${pkgver//./-}"
+    "LICENSE.html"
+    "${pkgname%-bin}.sh")
+sha256sums=('feb5c16a657533f2a28e34d2ac971b17c9cc4e56f6bf2e46a3e20a8da4c11db2'
+            '8254fc6f96e7362405da60a8ece9d86ad26066b5edac10e775aca4e6d7c0979f'
+            '16b06d11928ebbb45468f14a896ebb75424c6aa4a7ee9789b0db5fbc114ab95d')
+build() {
+    chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
+    "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
+    sed "s|/usr/share/${_pkgname}/AppRun %F|${pkgname%-bin}|g;s|com.eusoft.${_pkgname}|${pkgname%-bin}|g" \
+        -i "${srcdir}/squashfs-root/default.desktop"
 }
 package() {
-    install -Dm755 -d "${pkgdir}/"{opt,usr/bin}
-    cp -r "${srcdir}/usr/share/${pkgname%-bin}" "${pkgdir}/opt"
-    ln -sf "/opt/${pkgname%-bin}/AppRun" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/usr/share/pixmaps/com.eusoft.${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
+    install -Dm755 "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.AppImage"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    ln -sf "${pkgdir}/usr/lib/qt/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so" \
+        "${pkgdir}/opt/${pkgname%-bin}/libfcitxplatforminputcontextplugin.so"
+    install -Dm644 "${srcdir}/squashfs-root/com.eusoft.${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
+    install -Dm644 "${srcdir}/squashfs-root/default.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
     install -Dm644 "${srcdir}/LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/eusoft-eudic.sh b/eusoft-eudic.sh
new file mode 100644
index 000000000000..f382a7c62f4c
--- /dev/null
+++ b/eusoft-eudic.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+APPDIR="/opt/eusoft-eudic"
+export LD_LIBRARY_PATH="${APPDIR}/:$LD_LIBRARY_PATH}"
+exec "${APPDIR}/eusoft-eudic.AppImage" --no-sandbox %U
\ No newline at end of file