Update SerialTool

5 files changed, 12 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2409d5e6653e..5d19d3389f02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = serialtool-git
 	pkgdesc = A practical Serial-Port/TCP/UDP debugging tool.
-	pkgver = 1.4.0alpha.0.1.g20896fb
-	pkgrel = 2
+	pkgver = 1.4.0alpha.0.21.gf25f840
+	pkgrel = 1
 	url = https://github.com/Skiars/SerialTool
 	install = serialtool-git.install
 	arch = any
@@ -22,15 +22,7 @@ pkgbase = serialtool-git
 	conflicts = serialtool
 	options = !strip
 	source = SerialTool::git+https://github.com/Skiars/SerialTool.git
-	source = serialtool.desktop
-	source = 20-usb-serial.rules
-	source = serialtool-git.install
-	source = io.github.skiars.serialtool.metainfo.xml
 	sha256sums = SKIP
-	sha256sums = f646db8d3d577589da15a555653a91ae725be626c933e384ba07db8b9bdc30c8
-	sha256sums = bd504256698f7e7b1a74fbc6490276f0c096c2e6b5e7199049766b7ba7c860a7
-	sha256sums = 303f34246c0d341e1093d6e486e2cbfdbbb0d122d751de649f562ebac37777b4
-	sha256sums = 41a8f888c8bccdd06a808469a2d37183879b1244b822b397e14bf1b2a013bdc7
 
 pkgname = serialtool-git
 
diff --git a/20-usb-serial.rules b/20-usb-serial.rules
deleted file mode 100644
index b2a413a86720..000000000000
--- a/20-usb-serial.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="ttyUSB*",MODE="0666" 
-KERNEL=="ttyS*",MODE="0666"
diff --git a/PKGBUILD b/PKGBUILD
index 243dbe9c53af..147706046058 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 _pkgname=SerialTool
 pkgname=serialtool-git
 _softname=serialtool
-pkgver=1.4.0alpha.0.1.g20896fb
-pkgrel=2
+pkgver=1.4.0alpha.0.21.gf25f840
+pkgrel=1
 pkgdesc="A practical Serial-Port/TCP/UDP debugging tool."
 arch=('any')
 url="https://github.com/Skiars/SerialTool"
@@ -16,16 +16,8 @@ makedepends=('git' 'qscintilla-qt5' 'qt5-serialport' 'qt5-charts' 'qt5-script' '
 backup=()
 options=('!strip')
 install=${pkgname}.install
-source=("${_pkgname}::git+https://github.com/Skiars/${_pkgname}.git"
-        "${_softname}.desktop"
-        "20-usb-serial.rules"
-        "${pkgname}.install"
-        "io.github.skiars.serialtool.metainfo.xml")
-sha256sums=('SKIP'
-            'f646db8d3d577589da15a555653a91ae725be626c933e384ba07db8b9bdc30c8'
-            'bd504256698f7e7b1a74fbc6490276f0c096c2e6b5e7199049766b7ba7c860a7'
-            '303f34246c0d341e1093d6e486e2cbfdbbb0d122d751de649f562ebac37777b4'
-            '41a8f888c8bccdd06a808469a2d37183879b1244b822b397e14bf1b2a013bdc7')
+source=("${_pkgname}::git+https://github.com/Skiars/${_pkgname}.git")
+sha256sums=('SKIP')
 
 pkgver() {
     cd "${srcdir}/${_pkgname}/${_pkgname}"
@@ -33,10 +25,6 @@ pkgver() {
 }
 
 build() {
-    cp -r "${srcdir}/${_pkgname}/${_pkgname}/resource/images/logo.ico" "${srcdir}/${_pkgname}/${_softname}.ico"
-    cd "${srcdir}/${_pkgname}/"
-    icotool -x "${_softname}.ico"
-    
     cd ${srcdir}/${_pkgname}/${_pkgname}/
     qmake ${_pkgname}.pro
     make
@@ -49,18 +37,13 @@ package() {
 
     cd ${srcdir}/${_pkgname}/${_pkgname}/
     cp --preserve=mode -r ${_pkgname} language config themes slave  "${pkgdir}/usr/share/${_softname}/"
+    
+    cd pkg/
+    cp --preserve=mode -r icons "${pkgdir}/usr/share/"
 
     ln -sf  "/usr/share/${_softname}/${_pkgname}" "${pkgdir}/usr/bin/${_softname}"
     install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_softname}/LICENSE"
-    install -Dm644 "${srcdir}/${_softname}.desktop" "${pkgdir}/usr/share/applications/${_softname}.desktop"
-    install -Dm644 "${srcdir}/20-usb-serial.rules" "${pkgdir}/etc/udev/rules.d/20-usb-serial.rules"
-    install -Dm644 "${srcdir}/io.github.skiars.serialtool.metainfo.xml" "${pkgdir}/usr/share/metainfo/io.github.skiars.serialtool.metainfo.xml"
-
-    install -Dm644 "${srcdir}/${_pkgname}/${_softname}_7_16x16x32.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${_softname}.png"
-    install -Dm644 "${srcdir}/${_pkgname}/${_softname}_6_20x20x32.png" "${pkgdir}/usr/share/icons/hicolor/20x20/apps/${_softname}.png"
-    install -Dm644 "${srcdir}/${_pkgname}/${_softname}_5_24x24x32.png" "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${_softname}.png"
-    install -Dm644 "${srcdir}/${_pkgname}/${_softname}_4_32x32x32.png" "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${_softname}.png"
-    install -Dm644 "${srcdir}/${_pkgname}/${_softname}_3_64x64x32.png" "${pkgdir}/usr/share/icons/hicolor/64x64/apps/${_softname}.png"
-    install -Dm644 "${srcdir}/${_pkgname}/${_softname}_2_128x128x32.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${_softname}.png"
-    install -Dm644 "${srcdir}/${_pkgname}/${_softname}_1_256x256x32.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_softname}.png"
+    install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/pkg/io.github.skiars.${_softname}.desktop" "${pkgdir}/usr/share/applications/io.github.skiars.${_softname}.desktop"
+    install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/pkg/20-usb-serial.rules" "${pkgdir}/etc/udev/rules.d/20-usb-serial.rules"
+    install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/pkg/io.github.skiars.${_softname}.metainfo.xml" "${pkgdir}/usr/share/metainfo/io.github.skiars.${_softname}.metainfo.xml"
 }
diff --git a/io.github.skiars.serialtool.metainfo.xml b/io.github.skiars.serialtool.metainfo.xml
deleted file mode 100644
index 6cef131c2b90..000000000000
--- a/io.github.skiars.serialtool.metainfo.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>io.github.skiars.serialtool</id>
-  
-  <name>serialtool</name>
-  <summary>serialtool</summary>
-  
-  <metadata_license>CC-BY-SA-4.0</metadata_license>
-  <project_license>AGPL-3.0-only</project_license>
-  
-  <description>
-    <p>
-      A practical Serial-Port/TCP/UDP debugging tool.
-    </p>
-  </description>
-  
-  <launchable type="desktop-id">io.github.skiars.serialtool.desktop</launchable>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://github.com/Skiars/SerialTool/raw/master/screenshot/shot_001.gif</image>
-    </screenshot>
-  </screenshots>
-</component>
diff --git a/serialtool.desktop b/serialtool.desktop
deleted file mode 100644
index 6eb04b05592d..000000000000
--- a/serialtool.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=SerialTool
-Name[en_US]=serialtool
-Name[zh_CN]=serialtool
-Exec=serialtool
-Terminal=false
-Type=Application
-Icon=serialtool.png
-Comment=A practical Serial-Port/TCP/UDP debugging tool.
-Comment[zh_CN]=一个实用的串口/ TCP / UDP 调试工具。
-Categories=Development;Debugger;