update 1.0.0.r24.g82ace07-1

2 files changed, 47 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c3b1b98d7c5..32b47285b3cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rtools-git
 	pkgdesc = RTools(米饭工具集)是开发工具集桌面悬浮窗软件，每一个子功能如同一颗米粒组成一碗米饭。
-	pkgver = 1.0.0.r7.g8733560
+	pkgver = 1.0.0.r24.g82ace07
 	pkgrel = 1
 	url = https://gitee.com/RiceChen0/rtools
 	arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = rtools-git
 	depends = qt5-charts
 	depends = qt5-serialport
 	depends = qt5-networkauth
+	depends = qt5-mqtt
 	optdepends = jlink-software-and-documentation: Segger JLink software & documentation pack for Linux
 	provides = RTools
 	conflicts = rtools
diff --git a/PKGBUILD b/PKGBUILD
index 7771df0f0651..907336f28d05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=RTools
 pkgname=rtools-git
-pkgver=1.0.0.r7.g8733560
+pkgver=1.0.0.r24.g82ace07
 pkgrel=1
 pkgdesc="RTools(米饭工具集)是开发工具集桌面悬浮窗软件，每一个子功能如同一颗米粒组成一碗米饭。"
 arch=('x86_64' 'aarch64')
@@ -11,7 +11,7 @@ license=('Apache-2.0')
 provides=(${_pkgname})
 conflicts=(${pkgname%-git})
 #replaces=(${pkgname})
-depends=('qt5-charts' 'qt5-serialport' 'qt5-networkauth')
+depends=('qt5-charts' 'qt5-serialport' 'qt5-networkauth' 'qt5-mqtt')
 makedepends=('qt5-tools' 'git')
 optdepends=('jlink-software-and-documentation: Segger JLink software & documentation pack for Linux')
 backup=()
@@ -26,7 +26,12 @@ pkgver() {
 }
 
 prepare() {
-    sed -i "s|JLinkARM.dll|/opt/SEGGER/JLink/libjlinkarm.so|g" "$srcdir"/rtools/RTools/RJLink/rjlinkview.cpp
+    sed -i 's|Widgets\\ComboBoxIP\\comboboxip.h|Widgets/ComboBoxIP/comboboxip.h|g' "$srcdir"/${pkgname%-git}/${_pkgname}/PageView/WebServerTool/webservertool.ui
+    sed -i 's|PageView\\JlinkTool\\jlinktool.h|PageView/JlinkTool/jlinktool.h|g;s|PageView\\WebServerTool\\webservertool.h|PageView/WebServerTool/webservertool.h|g;s|Image/米饭.png|image/logo.png|g' "$srcdir"/${pkgname%-git}/${_pkgname}/${pkgname%-git}.ui
+    sed -i "s|Image|image|g" "$srcdir"/${pkgname%-git}/${_pkgname}/${pkgname%-git}.cpp
+    sed -i "s|Image|image|g;s|IconFont|iconfont|g" "$srcdir"/${pkgname%-git}/${_pkgname}/resource/image.qrc
+    sed -i "s|Qss|qss|g" "$srcdir"/${pkgname%-git}/${_pkgname}/resource/qss.qrc
+    sed -i "s|Component|component|g;s|Resource|resource|g" "$srcdir"/${pkgname%-git}/${_pkgname}/${pkgname%-git}.pro
 }
 
 build() {
@@ -36,7 +41,42 @@ build() {
 }
 
 package() {
-    install -Dm0755 "${srcdir}/${pkgname%-git}/${_pkgname}/${_pkgname%s}" "${pkgdir}/usr/bin/${pkgname%-git}"
-    cp -rv "${srcdir}/${pkgname%-git}/${_pkgname}/linux/usr" "${pkgdir}/"
+    cd "$srcdir/${pkgname%-git}/${_pkgname}/"
+    install -Dm0755 "${pkgname%-git}" "${pkgdir}/usr/bin/${pkgname%-git}"
     install -Dm0644 "${srcdir}/${pkgname%-git}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname%-git}/LICENSE"
+
+    install -Dm644 /dev/stdin "${pkgdir}"/usr/share/applications/com.gitee.ricechen0.rtools.desktop << EOF
+[Desktop Entry]
+Version=1.0
+Type=Application
+
+Name=RTools
+Comment=RTools
+Categories=Development;Electronics;
+
+Icon=rtools
+Exec=rtools
+Terminal=false
+EOF
+    install -Dm644 /dev/stdin "${pkgdir}"/usr/share/metainfo/com.gitee.ricechen0.rtools.metainfo.xml << EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>com.gitee.ricechen0.rtools</id>
+
+  <name>RTools</name>
+  <summary>RTools</summary>
+
+  <metadata_license>MIT</metadata_license>
+  <project_license>Apache-2.0</project_license>
+
+  <description>
+    <p>
+      RTools(米饭工具集)是开发工具集桌面悬浮窗软件，每一个子功能如同一颗米粒组成一碗米饭。
+    </p>
+  </description>
+
+  <launchable type="desktop-id">com.gitee.ricechen0.rtools.desktop</launchable>
+</component>
+EOF
+    install -Dm644 "$srcdir/${pkgname%-git}/${_pkgname}"/resource/image/logo.png "${pkgdir}"/usr/share/pixmaps/rtools.png
 }