diff --git a/.workflow/dtk-build-release-tag-20220425.yml b/.workflow/dtk-build-release-tag-20220425.yml index e7631b1027cd954b5f6c7b5132d657493eeeb603..39f96db56f954cb27292f4c23beb16a0d0ffd1c6 100644 --- a/.workflow/dtk-build-release-tag-20220425.yml +++ b/.workflow/dtk-build-release-tag-20220425.yml @@ -18,22 +18,26 @@ 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 - '# 换源' - 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" ' - - dpkg-buildpackage -j2 -b -us -uc + - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" ' + - apt build-dep . -y + - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 + - uname -a + - dpkg-buildpackage -j1 -b -us -uc - cd .. - ls -all - pwd diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index dbf3db769b044dc6877d45ca474cb2ef75609690..63b02351d0349091b35d6e64735f96d7b92155e6 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); } diff --git a/tool/store-helper/check-is-installed b/tool/store-helper/check-is-installed index 4ce5f0f1b69b80954c437217895c9be1b5625ec1..febb4ce2e6222244046156c1dd3ce1a2ffad11ee 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