Update metainfo

4 files changed, 51 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 588d60e6c4e0..2409d5e6653e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = serialtool-git
 	pkgdesc = A practical Serial-Port/TCP/UDP debugging tool.
 	pkgver = 1.4.0alpha.0.1.g20896fb
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Skiars/SerialTool
 	install = serialtool-git.install
 	arch = any
 	license = GPL3
 	makedepends = git
-	makedepends = coreutils
 	makedepends = qscintilla-qt5
 	makedepends = qt5-serialport
 	makedepends = qt5-charts
@@ -17,6 +16,7 @@ pkgbase = serialtool-git
 	depends = qt5-serialport
 	depends = qt5-charts
 	depends = qt5-script
+	depends = icoutils
 	provides = serialtool-git
 	conflicts = serialtool-git
 	conflicts = serialtool
@@ -25,10 +25,12 @@ pkgbase = serialtool-git
 	source = serialtool.desktop
 	source = 20-usb-serial.rules
 	source = serialtool-git.install
+	source = io.github.skiars.serialtool.metainfo.xml
 	sha256sums = SKIP
-	sha256sums = 0fc47631291ea6b1d5d62af0a709a1a234fa354cc807b4a368f9fa93b7f97bbe
+	sha256sums = f646db8d3d577589da15a555653a91ae725be626c933e384ba07db8b9bdc30c8
 	sha256sums = bd504256698f7e7b1a74fbc6490276f0c096c2e6b5e7199049766b7ba7c860a7
 	sha256sums = 303f34246c0d341e1093d6e486e2cbfdbbb0d122d751de649f562ebac37777b4
+	sha256sums = 41a8f888c8bccdd06a808469a2d37183879b1244b822b397e14bf1b2a013bdc7
 
 pkgname = serialtool-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6a7f09bb222b..243dbe9c53af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _pkgname=SerialTool
 pkgname=serialtool-git
 _softname=serialtool
 pkgver=1.4.0alpha.0.1.g20896fb
-pkgrel=1
+pkgrel=2
 pkgdesc="A practical Serial-Port/TCP/UDP debugging tool."
 arch=('any')
 url="https://github.com/Skiars/SerialTool"
@@ -11,19 +11,21 @@ license=('GPL3')
 provides=(${pkgname})
 conflicts=(${pkgname} 'serialtool')
 #replaces=(${pkgname})
-depends=('qscintilla-qt5' 'qt5-serialport' 'qt5-charts' 'qt5-script')
-makedepends=('git' 'coreutils' 'qscintilla-qt5' 'qt5-serialport' 'qt5-charts' 'qt5-script' 'qt5-tools')
+depends=('qscintilla-qt5' 'qt5-serialport' 'qt5-charts' 'qt5-script' 'icoutils')
+makedepends=('git' 'qscintilla-qt5' 'qt5-serialport' 'qt5-charts' 'qt5-script' 'qt5-tools')
 backup=()
 options=('!strip')
 install=${pkgname}.install
 source=("${_pkgname}::git+https://github.com/Skiars/${_pkgname}.git"
         "${_softname}.desktop"
         "20-usb-serial.rules"
-        "${pkgname}.install")
+        "${pkgname}.install"
+        "io.github.skiars.serialtool.metainfo.xml")
 sha256sums=('SKIP'
-            '0fc47631291ea6b1d5d62af0a709a1a234fa354cc807b4a368f9fa93b7f97bbe'
+            'f646db8d3d577589da15a555653a91ae725be626c933e384ba07db8b9bdc30c8'
             'bd504256698f7e7b1a74fbc6490276f0c096c2e6b5e7199049766b7ba7c860a7'
-            '303f34246c0d341e1093d6e486e2cbfdbbb0d122d751de649f562ebac37777b4')
+            '303f34246c0d341e1093d6e486e2cbfdbbb0d122d751de649f562ebac37777b4'
+            '41a8f888c8bccdd06a808469a2d37183879b1244b822b397e14bf1b2a013bdc7')
 
 pkgver() {
     cd "${srcdir}/${_pkgname}/${_pkgname}"
@@ -31,6 +33,10 @@ 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
@@ -46,7 +52,15 @@ package() {
 
     ln -sf  "/usr/share/${_softname}/${_pkgname}" "${pkgdir}/usr/bin/${_softname}"
     install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_softname}/LICENSE"
-    install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/resource/images/logo.ico" "${pkgdir}/usr/share/pixmaps/${_softname}.ico"
     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"
 }
diff --git a/io.github.skiars.serialtool.metainfo.xml b/io.github.skiars.serialtool.metainfo.xml
new file mode 100644
index 000000000000..6cef131c2b90
--- /dev/null
+++ b/io.github.skiars.serialtool.metainfo.xml
@@ -0,0 +1,23 @@
+<?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
index a91353f5fe80..6eb04b05592d 100644
--- a/serialtool.desktop
+++ b/serialtool.desktop
@@ -5,7 +5,7 @@ Name[zh_CN]=serialtool
 Exec=serialtool
 Terminal=false
 Type=Application
-Icon=serialtool.ico
+Icon=serialtool.png
 Comment=A practical Serial-Port/TCP/UDP debugging tool.
 Comment[zh_CN]=一个实用的串口/ TCP / UDP 调试工具。
-Categories=Development;Tool;Serial;
+Categories=Development;Debugger;