update to 2021 ver

2 files changed, 43 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb5f649d6319..078f8e31a00f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = zwcad-bin
 	pkgdesc = ZWSOFT研发的二维CAD软件，可满足看图、审图、打印工作需要
-	pkgver = 5.0.1446
+	pkgver = 2021.0.2884
 	pkgrel = 1
 	url = https://www.zwcad.com
 	arch = x86_64
+	arch = aarch64
 	license = unknown
-	depends = libbsd
-	depends = qt5-svg
-	depends = gtk2
 	provides = zwcad
-	source = zwcad-bin-5.0.1446.deb::http://download.zwcad.com/zwcad/cad_linux/preinst/deb/x64/uos/com.zwsoft.zwcad_5.0.1446-1_amd64.deb
-	sha512sums = 3a8230b0d494bc59a7ce26d307305b7f52e3edef237da19e6344682607c452b31ecd4dae1061537418445bd02d40d9f56ed2a73ced1e1f2b9ab10f0d53cac26f
+	options = !strip
+	source_x86_64 = zwcad-bin-2021.0.2884.deb::http://download.zwcad.com/zwcad/cad_linux/2021/deb/x64/zwcad_2021.0.2884-1_zh-cn_amd64.deb
+	sha512sums_x86_64 = 1b2324eb487982e7b929f0cd2abd8ba14e3e6c2c7a89e5e554456d40d3a68608f125bf291dcb24803b9480b16ecb6f18952913b21bde50a4922aa88cc69eff76
+	source_aarch64 = zwcad-bin-2021.0.2884.deb::http://download.zwcad.com/zwcad/cad_linux/2021/deb/arm/zwcad_2021.0.2884-1_zh-cn_arm64.deb
+	sha512sums_aarch64 = b7333ed86e9e6e9bb8966116dc3ead34915b427050cd81b83184f789e6e041d5aca57d410d378962a71d07c0eece26e336ad729741e0eeafd45a1294faa8d6c5
 
 pkgname = zwcad-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 5dd47a047218..80fb6558dc2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,21 @@
 # Maintainer sukanka <su975853527 at gmail dot com>
 
 pkgname='zwcad-bin'
-pkgver=5.0.1446
+_pkgname='zwcad'
+pkgver=2021.0.2884
+_year=$(echo $pkgver | cut -d '.' -f1)
 pkgrel=1
 pkgdesc="ZWSOFT研发的二维CAD软件，可满足看图、审图、打印工作需要"
-arch=('x86_64')
+arch=('x86_64' 'aarch64')
 license=('unknown')
 url="https://www.zwcad.com"
 provides=("zwcad")
-depends=('libbsd' 'qt5-svg' 'gtk2')
-source=("${pkgname}-${pkgver}.deb::http://download.zwcad.com/zwcad/cad_linux/preinst/deb/x64/uos/com.zwsoft.zwcad_${pkgver}-1_amd64.deb")
-sha512sums=('3a8230b0d494bc59a7ce26d307305b7f52e3edef237da19e6344682607c452b31ecd4dae1061537418445bd02d40d9f56ed2a73ced1e1f2b9ab10f0d53cac26f')
+options=('!strip')
+source_x86_64=("${pkgname}-${pkgver}.deb::http://download.zwcad.com/zwcad/cad_linux/${_year}/deb/x64/zwcad_${pkgver}-1_zh-cn_amd64.deb")
+sha512sums_x86_64=('1b2324eb487982e7b929f0cd2abd8ba14e3e6c2c7a89e5e554456d40d3a68608f125bf291dcb24803b9480b16ecb6f18952913b21bde50a4922aa88cc69eff76')
+
+source_aarch64=("${pkgname}-${pkgver}.deb::http://download.zwcad.com/zwcad/cad_linux/${_year}/deb/arm/zwcad_${pkgver}-1_zh-cn_arm64.deb")
+sha512sums_aarch64=('b7333ed86e9e6e9bb8966116dc3ead34915b427050cd81b83184f789e6e041d5aca57d410d378962a71d07c0eece26e336ad729741e0eeafd45a1294faa8d6c5')
 
 prepare(){
     cd $srcdir
@@ -18,29 +23,40 @@ prepare(){
 }
 
 package(){
-    mkdir -p "$pkgdir"/usr/share/
-    mv "${srcdir}"/opt/apps/com.zwsoft.zwcad/entries/applications   "$pkgdir"/usr/share/applications
-    mv "${srcdir}"/opt/apps/com.zwsoft.zwcad/entries/icons          "$pkgdir"/usr/share/icons
-#     mv "${srcdir}"/opt/apps/com.zwsoft.zwcad/entries/mime       "$pkgdir"/usr/share/mime
+    mkdir -p "$pkgdir"/opt
+    mv "${srcdir}"/usr   "$pkgdir"
+    mkdir -p "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
+    mv "${srcdir}"/opt/ZWSOFT/ZWCAD2021 "${pkgdir}"/opt/zwcad
+    mv "${pkgdir}"/opt/zwcad/Icons/ZWCAD.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
     
-    sed -i '6c Exec=zwcad %F'   "$pkgdir"/usr/share/applications/com.zwsoft.zwcad.desktop
-    sed -i '9c Icon=ZWCAD'      "$pkgdir"/usr/share/applications/com.zwsoft.zwcad.desktop
     
-    mkdir -p "$pkgdir"/opt/zwcad/
-    mv "${srcdir}"/opt/apps/com.zwsoft.zwcad/files/*     "$pkgdir"/opt/zwcad/
+    sed -i '5c Exec=zwcad %F'   "$pkgdir/usr/share/applications/ZWCAD${_year}.desktop"
+    sed -i '21c Icon=ZWCAD'     "$pkgdir/usr/share/applications/ZWCAD${_year}.desktop"
     
+    sed -i '5c Exec=zwlmgr'     "$pkgdir/usr/share/applications/ZwLmgr${_year}.desktop"
     # create executable
     mkdir -p "$pkgdir"/usr/bin/
+    
     echo '''#!/bin/bash
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"/opt/zwcad":"/opt/zwcad/lib"
-/opt/zwcad/ZWCAD -platformpluginpath /opt/zwcad/plugins -platform xcb "$1"
-''' >"$pkgdir"/usr/bin/zwcad 
-    chmod 0755 "$pkgdir"/usr/bin/zwcad 
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/zwcad:/opt/zwcad/lib
+export QT_IM_MODULE=fcitx
+export QT_QPA_PLATFORM_PLUGIN_PATH=/opt/zwcad/plugins
+export QT_PLUGIN_PATH=/opt/zwcad/plugins
+export QT_QPA_PLATFORM=xcb
+cd /opt/zwcad/
+#./ZWCAD -platformpluginpath /opt/zwcad/plugins -platform xcb "$1"
+./ZWCAD "$1"
+
+''' >"$pkgdir"/opt/zwcad/zwcad 
+    chmod 0755 "$pkgdir"/opt/zwcad/zwcad 
+    
+    cp "$pkgdir"/opt/zwcad/zwcad  "$pkgdir"/opt/zwcad/zwlmgr
+    sed -i "s/ZWCAD/ZwLmgr/g" "$pkgdir"/opt/zwcad/zwlmgr
+    ln -s /opt/zwcad/zwcad "$pkgdir"/usr/bin/zwcad
+    ln -s /opt/zwcad/zwlmgr "$pkgdir"/usr/bin/zwlmgr
     
     # remove unused files
     rm -rf "$pkgdir"/opt/zwcad/Icons
-#     rm -rf "$pkgdir"/opt/zwcad/lib
-#     rm -rf "$pkgdir"/opt/zwcad/plugins
     rm -rf "$pkgdir"/opt/zwcad/ZWCADRUN.sh
-    rm -rf "$pkgdir"/opt/zwcad/qt.conf
+    rm -rf "$pkgdir"/opt/zwcad/ZWLMGRRUN.sh
 }