From 5bd6ad939907bf8ecdcd144136085e177d4f68ca Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 10 Nov 2024 03:43:10 +0000 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E5=8C=85=E5=90=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=BB=8D=E7=84=B6=E5=B1=95=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E5=B7=B2=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shenmo --- tool/store-helper/check-is-installed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/store-helper/check-is-installed b/tool/store-helper/check-is-installed index 4ce5f0f1..febb4ce2 100755 --- a/tool/store-helper/check-is-installed +++ b/tool/store-helper/check-is-installed @@ -1,2 +1,2 @@ #!/bin/bash -dpkg -l | grep "^ii" | grep -w "$1" > /dev/null +dpkg -l | grep "^ii $1 " > /dev/null -- Gitee From 29ddef300f0b121c006de534bef3f7b67a76c0dc Mon Sep 17 00:00:00 2001 From: zty199 <46324746+zty199@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:34:28 +0800 Subject: [PATCH 2/7] fix: crash when installation complete if MainWindow is closed Installation finished signal is triggered in child thread, which may cause crash when handling in AppInfoPage slot Log: use Qt::ConnectionType::QueuedConnection when connecting with installation finished signal --- src/pages/appintopage.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index dbf3db76..63b02351 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -287,8 +287,10 @@ void AppIntoPage::setDownloadWidget(DownloadListWidget *w) } dw = w; - connect(w, &DownloadListWidget::downloadFinished, [=]() - { isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString()); }); + connect(w, &DownloadListWidget::downloadFinished, this, [=]() { + isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString()); + }, + Qt::QueuedConnection); } void AppIntoPage::initUI() @@ -486,7 +488,10 @@ void AppIntoPage::on_downloadButton_clicked() return; } - connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); }); + connect(item, &DownloadItem::finished, this, [=]() { + isDownloading(downloadUrl); + }, + Qt::QueuedConnection); item->install(0); isDownloading(downloadUrl); @@ -507,7 +512,10 @@ void AppIntoPage::on_downloadButton_clicked() item->reinstall = true; } ui->downloadButton->setEnabled(false); - connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); }); + connect(item, &DownloadItem::finished, this, [=]() { + isDownloading(downloadUrl); + }, + Qt::QueuedConnection); isDownloading(downloadUrl); } -- Gitee From 8a93d4dd06ab1d7afc69d266bf6d06456d295b86 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 12 Nov 2024 10:04:42 +0000 Subject: [PATCH 3/7] update dtk-build-release-tag-20220425.yml --- .workflow/dtk-build-release-tag-20220425.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.workflow/dtk-build-release-tag-20220425.yml b/.workflow/dtk-build-release-tag-20220425.yml index e7631b10..7b8cdc64 100644 --- a/.workflow/dtk-build-release-tag-20220425.yml +++ b/.workflow/dtk-build-release-tag-20220425.yml @@ -18,7 +18,7 @@ stages: name: execute_by_docker displayName: 基于镜像的DTK构建 certificate: '' - image: docker.io/debian:buster + image: docker.jianmuhub.com/library/debian:buster command: - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list - '# 换源' -- Gitee From ef36a92c7c0f1970bf32a0e457743e886d9ebee1 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 12 Nov 2024 10:16:22 +0000 Subject: [PATCH 4/7] update dtk-build-release-tag-20220425.yml --- .workflow/dtk-build-release-tag-20220425.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.workflow/dtk-build-release-tag-20220425.yml b/.workflow/dtk-build-release-tag-20220425.yml index 7b8cdc64..97a25a75 100644 --- a/.workflow/dtk-build-release-tag-20220425.yml +++ b/.workflow/dtk-build-release-tag-20220425.yml @@ -24,15 +24,17 @@ stages: - '# 换源' - apt update - export DEBIAN_FRONTEND=noninteractive - - echo "安装git devscripts equivs curl..." - - 'apt install git devscripts equivs curl -y ' + - echo "安装依赖..." + - 'apt install libgsettings-qt-dev -y ' + - 'apt install debhelper git curl fakeroot qtbase5-dev zlib1g-dev qt5-default -y ' - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git - cd dtk-old-bundle - apt install ./*.deb -y - cd .. - rm -rf dtk-old-bundle - '' - - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" ' + - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" ' + - apt build-dep . - dpkg-buildpackage -j2 -b -us -uc - cd .. - ls -all -- Gitee From 09c1d50bd223ce582752e4f9bc8d401671e5471f Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 12 Nov 2024 10:25:47 +0000 Subject: [PATCH 5/7] update dtk-build-release-tag-20220425.yml --- .workflow/dtk-build-release-tag-20220425.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.workflow/dtk-build-release-tag-20220425.yml b/.workflow/dtk-build-release-tag-20220425.yml index 97a25a75..79e9acbe 100644 --- a/.workflow/dtk-build-release-tag-20220425.yml +++ b/.workflow/dtk-build-release-tag-20220425.yml @@ -35,6 +35,8 @@ stages: - '' - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" ' - apt build-dep . + - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 + - uname -a - dpkg-buildpackage -j2 -b -us -uc - cd .. - ls -all -- Gitee From 4c05c181987c3d587279bd11941afccd6401dbea Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 12 Nov 2024 10:32:37 +0000 Subject: [PATCH 6/7] update dtk-build-release-tag-20220425.yml --- .workflow/dtk-build-release-tag-20220425.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.workflow/dtk-build-release-tag-20220425.yml b/.workflow/dtk-build-release-tag-20220425.yml index 79e9acbe..acd33ab9 100644 --- a/.workflow/dtk-build-release-tag-20220425.yml +++ b/.workflow/dtk-build-release-tag-20220425.yml @@ -34,7 +34,7 @@ stages: - rm -rf dtk-old-bundle - '' - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" ' - - apt build-dep . + - apt build-dep . -y - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 - uname -a - dpkg-buildpackage -j2 -b -us -uc -- Gitee From d86efc642aa47c7a539f3f6b347539b50952b2aa Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 12 Nov 2024 10:38:54 +0000 Subject: [PATCH 7/7] update dtk-build-release-tag-20220425.yml --- .workflow/dtk-build-release-tag-20220425.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.workflow/dtk-build-release-tag-20220425.yml b/.workflow/dtk-build-release-tag-20220425.yml index acd33ab9..39f96db5 100644 --- a/.workflow/dtk-build-release-tag-20220425.yml +++ b/.workflow/dtk-build-release-tag-20220425.yml @@ -37,7 +37,7 @@ stages: - apt build-dep . -y - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 - uname -a - - dpkg-buildpackage -j2 -b -us -uc + - dpkg-buildpackage -j1 -b -us -uc - cd .. - ls -all - pwd -- Gitee