update to 23.2.3.4

2 files changed, 21 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e542ca97d80a..7cbd35dd3177 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zwcad-bin
 	pkgdesc = ZWSOFT研发的二维CAD软件，可满足看图、审图、打印工作需要
-	pkgver = 23.1.3.4
+	pkgver = 23.2.3.4
 	pkgrel = 1
 	epoch = 1
 	url = https://www.zwcad.com
@@ -12,16 +12,14 @@ pkgbase = zwcad-bin
 	depends = qrencode
 	depends = freetype2
 	depends = python
-	depends = openssl
 	depends = log4cpp
-	depends = gmp
 	provides = zwcad
 	options = !strip
 	source = zwcad.sh
 	sha512sums = 3f978fc46a39c8e65551a8e581f234526183b6b811b1e857fb17903549b10442b676713c342880d144a47fc5da76882152901533abd898a24588b7e9bbbc207c
-	source_x86_64 = zwcad-23.1.3.4-x86_64.deb::https://dl.zwsoft.cn/zwcad/cad_linux/2023/SP1/zwcad2023_23.1.3.4_amd64.deb?auth_key=1664192656-0-0-eb3fc495266d480071161e6b7ac270f4
-	sha512sums_x86_64 = 7a3e85de6f61023ce91664e8ce795dd69e640f2a9a636c15e161c34c1bdf8dc4a0c660c544ab951087d9a609e1dbcd70456bd70002eef4820a3aae6ad6eb2374
-	source_aarch64 = zwcad-23.1.3.4-aarch64.deb::https://dl.zwsoft.cn/zwcad/cad_linux/2023/SP1/zwcad2023_23.1.3.4_arm64.deb?auth_key=1664192656-0-0-b2587d6066ca3b7ac1940cf4f135a7aa
-	sha512sums_aarch64 = 355ce8181fef73ca60bcd86941f2c32d3bcd3397e42a89dbd0df5d96621830fdeffc6e761b6dadb9c2338df7c60c25354f113c6253ff679817b712cde5aeb35c
+	source_x86_64 = zwcad-23.2.3.4-x86_64.deb::https://dl.zwsoft.cn/zwcad/cad_linux/2023/SP2/zwcad2023_23.2.3.4_amd64.deb?auth_key=1677250795-0-0-6b84b2d9fef19aed29d558b343c20d50
+	sha512sums_x86_64 = 47c52811cf396e81a94ab2877cce0591c8b0a98e12df48d8bf02b634a123f7be68f32f0b03a05e3b89d9995cb6f0738f8ff1e0cce2af396571cd352d395b2c37
+	source_aarch64 = zwcad-23.2.3.4-aarch64.deb::https://dl.zwsoft.cn/zwcad/cad_linux/2023/SP2/zwcad2023_23.2.3.4_arm64.deb?auth_key=1677250795-0-0-7af64a3a729cfdb1f9dad2e2c94da7f3
+	sha512sums_aarch64 = 2e511a7374f06d5d6d0519f90bacedb9cc15c05f6c6d129b680745eb418f7e6a99f6c7857ec5c12b42023327d5d3c71f2f7019afa7ba036ee1c3bf1fe949942a
 
 pkgname = zwcad-bin
diff --git a/PKGBUILD b/PKGBUILD
index 07eaffeb956a..e3ef84c6a231 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='zwcad-bin'
 _pkgname='zwcad'
-pkgver=23.1.3.4
+pkgver=23.2.3.4
 _year=20${pkgver:0:2}
 pkgrel=1
 epoch=1
@@ -11,14 +11,14 @@ arch=('x86_64' 'aarch64')
 license=('unknown')
 url="https://www.zwcad.com"
 provides=("zwcad")
-depends=('freeimage' 'qrencode'  'freetype2' 'python' 'openssl' 'log4cpp' 'gmp')
+depends=('freeimage' 'qrencode'  'freetype2' 'python' 'log4cpp')
 makedepends=('patchelf')
 source=('zwcad.sh')
-source_x86_64=("${_pkgname}-${pkgver}-x86_64.deb::https://dl.zwsoft.cn/zwcad/cad_linux/${_year}/SP1/zwcad${_year}_${pkgver}_amd64.deb?auth_key=1664192656-0-0-eb3fc495266d480071161e6b7ac270f4")
-source_aarch64=("${_pkgname}-${pkgver}-aarch64.deb::https://dl.zwsoft.cn/zwcad/cad_linux/${_year}/SP1/zwcad${_year}_${pkgver}_arm64.deb?auth_key=1664192656-0-0-b2587d6066ca3b7ac1940cf4f135a7aa")
+source_x86_64=("${_pkgname}-${pkgver}-x86_64.deb::https://dl.zwsoft.cn/zwcad/cad_linux/2023/SP2/zwcad2023_23.2.3.4_amd64.deb?auth_key=1677250795-0-0-6b84b2d9fef19aed29d558b343c20d50")
+source_aarch64=("${_pkgname}-${pkgver}-aarch64.deb::https://dl.zwsoft.cn/zwcad/cad_linux/2023/SP2/zwcad2023_23.2.3.4_arm64.deb?auth_key=1677250795-0-0-7af64a3a729cfdb1f9dad2e2c94da7f3")
 sha512sums=('3f978fc46a39c8e65551a8e581f234526183b6b811b1e857fb17903549b10442b676713c342880d144a47fc5da76882152901533abd898a24588b7e9bbbc207c')
-sha512sums_x86_64=('7a3e85de6f61023ce91664e8ce795dd69e640f2a9a636c15e161c34c1bdf8dc4a0c660c544ab951087d9a609e1dbcd70456bd70002eef4820a3aae6ad6eb2374')
-sha512sums_aarch64=('355ce8181fef73ca60bcd86941f2c32d3bcd3397e42a89dbd0df5d96621830fdeffc6e761b6dadb9c2338df7c60c25354f113c6253ff679817b712cde5aeb35c')
+sha512sums_x86_64=('47c52811cf396e81a94ab2877cce0591c8b0a98e12df48d8bf02b634a123f7be68f32f0b03a05e3b89d9995cb6f0738f8ff1e0cce2af396571cd352d395b2c37')
+sha512sums_aarch64=('2e511a7374f06d5d6d0519f90bacedb9cc15c05f6c6d129b680745eb418f7e6a99f6c7857ec5c12b42023327d5d3c71f2f7019afa7ba036ee1c3bf1fe949942a')
 options=(!strip)
 # no need to strip, it only decreases the installed size by 24.44 MiB.
 
@@ -32,19 +32,14 @@ prepare(){
 
     cd $srcdir/opt/apps/zwcad${_year}
     #system qt
-    rm -rf lib/{libQt*,libpng*} plugins libpng* qt.conf
+    rm -rf lib/libQt* plugins  qt.conf
 
     #system python
     cd ZwPyRuntime
-    _pyver=$(python -V | cut -d' ' -f2)
+    local _pyver=$(python -V | cut -d' ' -f2)
     test -d python${_pyver%.*} || mkdir python${_pyver%.*}
-    cp python3.7/ZwPyRuntime.so python${_pyver%.*}
-    rm -rf python3.{4,5,6,7}
-
-    cd $srcdir/opt/apps/zwcad${_year}
-    rm -rf libZwPythonLoad{4,5,6}.so
-    _midver=$(echo ${_pyver} |cut  -d'.' -f2)
-    mv libZwPythonLoad7.so libZwPythonLoad${_midver}.so
+    cp python3.8/ZwPyRuntime.so python${_pyver%.*}
+    rm -rf python3.{4,5,6,7,8}
 }
 build(){
 
@@ -78,7 +73,12 @@ package(){
     install -Dm644 sense4_usb.rules  ${pkgdir}/etc/udev/rules.d/sense4_usb.rules
 
     # patch rpath
-    for lib in ${pkgdir}/opt/zwcad/lib*.so
+    for lib in ${pkgdir}/opt/zwcad/{lib*.so,*.zrx}
+    do
+        echo patching $lib
+        patchelf --set-rpath '$ORIGIN:/usr/lib/zwcad' $lib
+    done;
+    for lib in ${pkgdir}/opt/zwcad/zh-CN/lib*.so
     do
         echo patching $lib
         patchelf --set-rpath '$ORIGIN:/usr/lib/zwcad' $lib
@@ -91,9 +91,6 @@ package(){
     mkdir -p ${pkgdir}/usr/lib/zwcad
     mv "$pkgdir"/opt/zwcad/{lib/libSpaA*,libdwf*,libsw*,libfsdk*}  ${pkgdir}/usr/lib/zwcad
 
-    # Cheat ZwPyRuntime.so to use libpython3.10.so as libpython3.7m.so.1.0
-    ln -s /usr/lib/libpython${_pyver%.*}.so ${pkgdir}/usr/lib/zwcad/libpython3.7m.so.1.0
-
 
 
     # remove unused files