Update 6.91J

3 files changed, 38 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30818f91e65b..09617579405a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = stc-isp-wine
-	pkgver = 6.91F
-	pkgrel = 1
+	pkgver = 6.91J
+	pkgrel = 0
 	url = http://www.stcmcudata.com
 	install = stc-isp-wine.install
 	arch = x86_64
@@ -16,14 +16,16 @@ pkgbase = stc-isp-wine
 	conflicts = stc-isp-bin
 	replaces = stc-isp-bin
 	options = !strip
-	source = stc-isp-v6.91F.zip::http://www.stcmcudata.com/STCISP/stc-isp-15xx-v6.91F.zip
-	source = stc-isp-tiny-v6.91F.zip::http://www.stcmcudata.com/STCISP/stc-isp-15xx-v6.91F-tiny.zip
+	source = stc-isp-v6.91J.zip::http://www.stcmcudata.com/STCISP/stc-isp-15xx-v6.91J.zip
+	source = stc-isp-tiny-v6.91J.zip::http://www.stcmcudata.com/STCISP/stc-isp-15xx-v6.91J-tiny.zip
 	source = stc-isp-wine.install
 	source = stc-isp-tiny-wine.install
-	sha256sums = ea1f559b6bafb79f70fb81e8cb816e60184376074aab8ffefe08a121e6f3f093
-	sha256sums = 8cc5b4b906bfa84d114d69f159ef2343021e04f8d5318e3f3bdd6affd69eafa1
+	source = icon.svg
+	sha256sums = 80984a6e42a3783fc5224cbb5152d23c44c95549255edd4493f912f3f0cf9018
+	sha256sums = 8cfd4a7b633b49ba1243fd0252c0da1f1d20a0b38e1b9ff23d5a847b19c8ba42
 	sha256sums = b2a93211b74f6e23a9c4dd508c65bf374c0a03c11174092f6ccec3e9194e47a6
 	sha256sums = b2a93211b74f6e23a9c4dd508c65bf374c0a03c11174092f6ccec3e9194e47a6
+	sha256sums = c04d3cf704c9055e4b0bb010d946c5e90710677c459def826f762c8e9d717538
 
 pkgname = stc-isp-wine
 	pkgdesc = Wine STC-ISP 下载编程烧录软件
diff --git a/PKGBUILD b/PKGBUILD
index 73a5e0a74c52..bee54573b2e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=stc-isp-wine
 pkgname=(stc-isp{,-tiny}-wine)
-pkgver=6.91F
-pkgrel=1
+pkgver=6.91J
+pkgrel=0
 arch=('x86_64')
 url="http://www.stcmcudata.com"
 license=('unknow')
@@ -19,11 +19,13 @@ install=${pkgname}.install
 source=("${pkgname%-wine}-v${pkgver}.zip::${url}/STCISP/${pkgname%-wine}-15xx-v${pkgver}.zip"
         "${pkgname%-wine}-tiny-v${pkgver}.zip::${url}/STCISP/${pkgname%-wine}-15xx-v${pkgver}-tiny.zip"
         "stc-isp-wine.install"
-        "stc-isp-tiny-wine.install")
-sha256sums=('ea1f559b6bafb79f70fb81e8cb816e60184376074aab8ffefe08a121e6f3f093'
-            '8cc5b4b906bfa84d114d69f159ef2343021e04f8d5318e3f3bdd6affd69eafa1'
+        "stc-isp-tiny-wine.install"
+        "icon.svg")
+sha256sums=('80984a6e42a3783fc5224cbb5152d23c44c95549255edd4493f912f3f0cf9018'
+            '8cfd4a7b633b49ba1243fd0252c0da1f1d20a0b38e1b9ff23d5a847b19c8ba42'
             'b2a93211b74f6e23a9c4dd508c65bf374c0a03c11174092f6ccec3e9194e47a6'
-            'b2a93211b74f6e23a9c4dd508c65bf374c0a03c11174092f6ccec3e9194e47a6')
+            'b2a93211b74f6e23a9c4dd508c65bf374c0a03c11174092f6ccec3e9194e47a6'
+            'c04d3cf704c9055e4b0bb010d946c5e90710677c459def826f762c8e9d717538')
 # noextract=("${pkgname%-wine}-v${pkgver}.zip"
 #             "${pkgname%-wine}-tiny-v${pkgver}.zip")
 
@@ -43,6 +45,7 @@ package_stc-isp-wine() {
     _ftname="wqy-microhei.ttc"
 
     install -dm0755 "${pkgdir}/${_stc}/${pkgname%-wine}"
+    install -Dm6644 "${srcdir}/icon.svg" "${pkgdir}/usr/share/pixmaps/${pkgname%-wine}.svg"
 
 #     cp -ra "${srcdir}/${pkgname%-wine}-v${pkgver}/${pkgname%-wine}-v${pkgver}.exe" "${pkgdir}/${_stc}/${pkgname%-wine}"
     cp -ra "${srcdir}/${pkgname%-wine}-v${pkgver}.exe" "${pkgdir}/${_stc}/${pkgname%-wine}"
@@ -90,9 +93,9 @@ REGEDIT4
 
 [HKEY_CURRENT_USER\Control Panel\Desktop]
 "FontSmoothing"="2"
+"FontSmoothingOrientation"=dword:00000001
 "FontSmoothingType"=dword:00000002
 "FontSmoothingGamma"=dword:00000578
-"FontSmoothingOrientation"=dword:00000001
 
 [HKEY_LOCAL_MACHINE\Software\Wine\Ports]
 "COM1"="/dev/ttyUSB0"
@@ -120,6 +123,7 @@ EOF
 #!/bin/bash
 export LC_CTYPE="zh_CN.UTF-8"
 export WINEARCH=win32 WINEPREFIX="$HOME/.${pkgname%-wine}/wine"
+export WINEDLLOVERRIDES="mscoree,mshtml="
 
 if [ ! -d "$HOME"/.${pkgname%-wine} ] ; then
     mkdir -p "$HOME"/.${pkgname%-wine}/wine || exit 1
@@ -148,7 +152,7 @@ Exec=${pkgname%-wine} %f
 Type=Application
 Categories=Development;Tool;
 Terminal=false
-Icon=${pkgname%-wine}.png
+Icon=${pkgname%-wine}.svg
 Version=${pkgver}
 EOF
 }
@@ -162,6 +166,7 @@ package_stc-isp-tiny-wine() {
     _ftname="wqy-microhei.ttc"
 
     install -dm0755 "${pkgdir}/${_stc}/${pkgname%-wine}"
+    install -Dm6644 "${srcdir}/icon.svg" "${pkgdir}/usr/share/pixmaps/${pkgname%-wine}.svg"
 
 #     cp -ra "${srcdir}/${pkgname%-wine}-v${pkgver}/${pkgname%-tiny-wine}-v${pkgver}-tiny.exe" "${pkgdir}/${_stc}/${pkgname%-wine}/${pkgname%-wine}-${pkgver}.exe"
     cp -ra "${srcdir}/${pkgname%-tiny-wine}-v${pkgver}-tiny.exe" "${pkgdir}/${_stc}/${pkgname%-wine}/${pkgname%-wine}-${pkgver}.exe"
@@ -209,9 +214,9 @@ REGEDIT4
 
 [HKEY_CURRENT_USER\Control Panel\Desktop]
 "FontSmoothing"="2"
+"FontSmoothingOrientation"=dword:00000001
 "FontSmoothingType"=dword:00000002
 "FontSmoothingGamma"=dword:00000578
-"FontSmoothingOrientation"=dword:00000001
 
 [HKEY_LOCAL_MACHINE\Software\Wine\Ports]
 "COM1"="/dev/ttyUSB0"
@@ -239,6 +244,7 @@ EOF
 #!/bin/bash
 export LC_CTYPE="zh_CN.UTF-8"
 export WINEARCH=win32 WINEPREFIX="$HOME/.${pkgname%-wine}/wine"
+export WINEDLLOVERRIDES="mscoree,mshtml="
 
 if [ ! -d "$HOME"/.${pkgname%-wine} ] ; then
     mkdir -p "$HOME"/.${pkgname%-wine}/wine || exit 1
@@ -267,7 +273,7 @@ Exec=${pkgname%-wine} %f
 Type=Application
 Categories=Development;Tool;
 Terminal=false
-Icon=${pkgname%-wine}.png
+Icon=${pkgname%-wine}.svg
 Version=${pkgver}
 EOF
 }
diff --git a/icon.svg b/icon.svg
new file mode 100644
index 000000000000..d4dce35bb269
--- /dev/null
+++ b/icon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">  <image id="image0" width="32" height="32" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAHlBMVEUAAADvfaXnMGPOSWve
+QWtjJDEAns4AAP8xAHv///8TCuGcAAAAAXRSTlMAQObYZgAAAAFiS0dECfHZpewAAAAHdElNRQfn
+ARwLIQqAJVMRAAAAuklEQVQoz4WROw7CMBBEN5YSWmdPkKzYniNwBGSJT0uTtFA5Zehy7KwdG2wL
+wXR+ep4pFuB/2pD4riLQkVBIW/xUvS7IW4mdig5ZqQbaZ6VOOXpw9jH9R/GpE2WLoaiEkZoIFCcr
+onSVAyqM6JpOHmwrRjoxgDDCOQBTAvwFmkGCPODlzoMDo5UgW7w+2T5EsIsEecHbixcnTHPWIQJk
+HY2dmzHtEDDatMOBKe8oAEywkxnVgQLovtx+Bf0dN7TVTvPSAAAAJXRFWHRkYXRlOmNyZWF0ZQAy
+MDIzLTAxLTI4VDExOjMzOjEwKzAwOjAwu8+hDQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMy0wMS0y
+OFQxMTozMzoxMCswMDowMMqSGbEAAAAodEVYdGRhdGU6dGltZXN0YW1wADIwMjMtMDEtMjhUMTE6
+MzM6MTArMDA6MDCdhzhuAAAAAElFTkSuQmCC" />
+</svg>