update 22.2.3.5

2 files changed, 72 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49749c6444c9..b2e4e75c2005 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,21 @@
 pkgbase = zwcad-bin
 	pkgdesc = ZWSOFT研发的二维CAD软件，可满足看图、审图、打印工作需要
-	pkgver = 22.1.2.3
+	pkgver = 22.2.3.5
 	pkgrel = 1
 	epoch = 1
 	url = https://www.zwcad.com
 	arch = x86_64
 	arch = aarch64
 	license = unknown
+	depends = freeimage
+	depends = qrencode
+	depends = freetype2
+	depends = python
 	provides = zwcad
 	options = !strip
-	source_x86_64 = zwcad-bin-22.1.2.3-x86_64.deb::https://download.zwcad.com/zwcad/cad_linux/2022/zwcad_22_zh-cn_amd64.deb
-	sha512sums_x86_64 = 0a0393e94804a4537e314cc6d04a1e6e3da60c193071bb8fdf9bac220a77e6682c4faafe69de6ccb40a7a8e1c97ac174ff2bb4e99732f42ab53e4c650a97900c
-	source_aarch64 = zwcad-bin-22.1.2.3-x86_64.deb::https://download.zwcad.com/zwcad/cad_linux/2022/zwcad_22_zh-cn_arm64.deb
-	sha512sums_aarch64 = 22a56b93504178d2fe13fecfb37b368747c24cc64174231aff3735257434da95e3dd0e8aaa895301a7da9d751d4ca7a38ab14acd66ec1c6aabbfb28498b723fa
+	source_x86_64 = zwcad-22.2.3.5-x86_64.deb::https://download.zwcad.com/zwcad/cad_linux/2022/SP2/zwcad2022_22.2.3.5_zh-cn_amd64.deb
+	sha512sums_x86_64 = 445b0039355faa6516395492db6cc2f65e0e71b8e9ee5610aa96b08222b06aa918415b60492d3e7e5ae364ac39cf02f511611592a7d80eb3f8d3d960078744f8
+	source_aarch64 = zwcad-22.2.3.5-x86_64.deb::https://download.zwcad.com/zwcad/cad_linux/2022/SP2/zwcad2022_22.2.3.5_zh-cn_arm64.deb
+	sha512sums_aarch64 = 445b0039355faa6516395492db6cc2f65e0e71b8e9ee5610aa96b08222b06aa918415b60492d3e7e5ae364ac39cf02f511611592a7d80eb3f8d3d960078744f8
 
 pkgname = zwcad-bin
diff --git a/PKGBUILD b/PKGBUILD
index ad0df28182db..0069c62c2aa5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='zwcad-bin'
 _pkgname='zwcad'
-pkgver=22.1.2.3
+pkgver=22.2.3.5
 _year=20${pkgver:0:2}
 pkgrel=1
 epoch=1
@@ -11,53 +11,88 @@ arch=('x86_64' 'aarch64')
 license=('unknown')
 url="https://www.zwcad.com"
 provides=("zwcad")
-options=('!strip')
-source_x86_64=("${pkgname}-${pkgver}-${arch}.deb::https://download.zwcad.com/zwcad/cad_linux/${_year}/zwcad_${pkgver:0:2}_zh-cn_amd64.deb")
-source_aarch64=("${pkgname}-${pkgver}-${arch}.deb::https://download.zwcad.com/zwcad/cad_linux/${_year}/zwcad_${pkgver:0:2}_zh-cn_arm64.deb")
-sha512sums_x86_64=('0a0393e94804a4537e314cc6d04a1e6e3da60c193071bb8fdf9bac220a77e6682c4faafe69de6ccb40a7a8e1c97ac174ff2bb4e99732f42ab53e4c650a97900c')
-sha512sums_aarch64=('22a56b93504178d2fe13fecfb37b368747c24cc64174231aff3735257434da95e3dd0e8aaa895301a7da9d751d4ca7a38ab14acd66ec1c6aabbfb28498b723fa')
+depends=('freeimage' 'qrencode'  'freetype2' 'python')
+source_x86_64=("${_pkgname}-${pkgver}-${arch}.deb::https://download.zwcad.com/zwcad/cad_linux/${_year}/SP2/zwcad${_year}_${pkgver}_zh-cn_amd64.deb")
+source_aarch64=("${_pkgname}-${pkgver}-${arch}.deb::https://download.zwcad.com/zwcad/cad_linux/${_year}/SP2/zwcad${_year}_${pkgver}_zh-cn_arm64.deb")
+sha512sums_x86_64=('445b0039355faa6516395492db6cc2f65e0e71b8e9ee5610aa96b08222b06aa918415b60492d3e7e5ae364ac39cf02f511611592a7d80eb3f8d3d960078744f8')
+sha512sums_aarch64=('445b0039355faa6516395492db6cc2f65e0e71b8e9ee5610aa96b08222b06aa918415b60492d3e7e5ae364ac39cf02f511611592a7d80eb3f8d3d960078744f8')
+options=(!strip)
 
 prepare(){
     cd $srcdir
     tar -xJf data.tar.xz -C "${srcdir}"
-}
-
-package(){
-    mkdir -p "$pkgdir"/opt
-    mv "${srcdir}"/usr   "$pkgdir"
-    mkdir -p "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
-    mv "${srcdir}"/opt/ZWSOFT/ZWCAD${_year} "${pkgdir}"/opt/zwcad
-    mv "${pkgdir}"/opt/zwcad/Icons/ZWCAD.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
+    cd $srcdir/opt/ZWSOFT/ZWCAD${_year}
+    #system qt
+    rm -rf lib/{libQt*,libpng*} plugins libpng*
+    sed -i "4c Prefix = /usr/lib/qt" qt.conf
     
+    #system python
+    cd ZwPyRuntime
+    _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 python${_pyver%.*}
+    sed -i "s|libpython3.7m.so.1.0|libpython${_pyver%.*}.so.1.0|g" ZwPyRuntime.so
     
-    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/
-    
+    cd $srcdir/opt/ZWSOFT/ZWCAD${_year}
+    rm -rf libZwPythonLoad{4,5,6}.so
+    _midver=$(echo ${_pyver} |cut  -d'.' -f2)
+    mv libZwPythonLoad7.so libZwPythonLoad${_midver}.so
+    sed -i 's|libpython3.7m.so.1.0|libpython${_pyver%.*}.so.1.0|g' libZwPythonLoad${_midver}.so
+}
+build(){
+    cd $srcdir/opt/ZWSOFT/ZWCAD${_year}
     echo '''#!/bin/bash
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/zwcad:/opt/zwcad/lib:/opt/zwcad/lib/mono/lib
 export MONO_PATH=$MONO_PATH:/opt/zwcad/lib/mono/lib/mono/4.5
 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_PLUGIN_PATH=/usr/lib/qt/plugins
+export QT_PLUGIN_PATH=/usr/lib/qt/plugins
 export QT_QPA_PLATFORM=xcb
+export GDAL_ALLOW_LARGE_LIBJPEG_MEM_ALLOC=1
 cd /opt/zwcad/
 #./ZWCAD -platformpluginpath /opt/zwcad/plugins -platform xcb "$1"
 ./ZWCAD "$1" "$2"
 
-''' >"$pkgdir"/opt/zwcad/zwcad 
-    chmod 0755 "$pkgdir"/opt/zwcad/zwcad 
+''' >zwcad 
+    chmod 0755 zwcad 
+    
+    cp zwcad zwlmgr
+    sed -i '$d' zwlmgr
+    echo './ZwLmgr /language zh-CN /language zh-CN' >>zwlmgr
+    
+    # Fix ./ZWLMGRRUN.sh and ./ZWCADRUN.sh not found
+    sed -i 's|ZWLMGRRUN.sh|zwlmgr\x0\x0\x0\x0\x0\x0|g' ZWCAD
+    sed -i 's|ZWCADRUN.sh|zwcad\x0\x0\x0\x0\x0\x0|g' ZwLmgr
+    
+    # Fix desktop
+    cd $srcdir/usr/share/applications/
+    sed -i 's|^Exec=.*|Exec=zwcad %F|g;s|^Icon=.*|Icon=ZWCAD|g'   "ZWCAD${_year}.desktop"
+    sed -i 's|^Exec=.*|Exec=zwlmgr|g;s|^Icon=.*|Icon=ZWCAD|g'   "ZwLmgr${_year}.desktop"
+    
+}
+
+package(){
+    mkdir -p "$pkgdir"/opt
+    mv "${srcdir}"/usr   "$pkgdir"
+    mkdir -p "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
+    mv "${srcdir}"/opt/ZWSOFT/ZWCAD${_year} "${pkgdir}"/opt/zwcad
+    mv "${pkgdir}"/opt/zwcad/Icons/ZWCAD.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
     
+    # create executable
     cp "$pkgdir"/opt/zwcad/zwcad  "$pkgdir"/opt/zwcad/zwlmgr
     sed -i "s/ZWCAD/ZwLmgr/g" "$pkgdir"/opt/zwcad/zwlmgr
+    mkdir -p "$pkgdir"/usr/bin/
     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/ZWCADRUN.sh
-    rm -rf "$pkgdir"/opt/zwcad/ZWLMGRRUN.sh
+    rm -rf "$pkgdir"/opt/zwcad/{Icons,ZWCADRUN.sh,ZWLMGRRUN.sh}
+    rm -rf ${pkgdir}/opt/zwcad/{libfree*,libqren*}
+    
+    cd "$pkgdir"/opt/zwcad
+    install -Dm644 sense4_usb.rules  ${pkgdir}/etc/udev/rules.d/sense4_usb.rules
+    
 }