From f0b1934a413c873739e88730c590751d18ae596c Mon Sep 17 00:00:00 2001 From: flywm Date: Wed, 23 Aug 2023 05:56:57 +0000 Subject: [PATCH] update debian/changelog. Signed-off-by: flywm --- debian/changelog | 9 +++++ .../0017-update-debian-changelog.patch | 38 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 48 insertions(+) create mode 100644 debian/patches/0017-update-debian-changelog.patch diff --git a/debian/changelog b/debian/changelog index 37cbaf8..63b5b13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +kylin-app-manager (3.22.1.0-ok1.20) yangtze; urgency=medium + + * BugId：#I72CH2 【WPS】平板模式，无法关闭WPS应用 + * 需求号：无 + * 其他改动：无 + * 影响域：无 + + -- guopengfei Wed, 23 Aug 2023 13:51:43 +0800 + kylin-app-manager (3.22.1.0-ok1.19) yangtze; urgency=medium * BugId：无 diff --git a/debian/patches/0017-update-debian-changelog.patch b/debian/patches/0017-update-debian-changelog.patch new file mode 100644 index 0000000..daa2696 --- /dev/null +++ b/debian/patches/0017-update-debian-changelog.patch @@ -0,0 +1,38 @@ +From: flywm +Date: Wed, 23 Aug 2023 05:56:57 +0000 +Subject: update debian/changelog. + +Signed-off-by: flywm +--- + src/core/appcgroup.cpp | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/src/core/appcgroup.cpp b/src/core/appcgroup.cpp +index 12d08ac..5a055cb 100644 +--- a/src/core/appcgroup.cpp ++++ b/src/core/appcgroup.cpp +@@ -30,11 +30,7 @@ AppCGroup::AppCGroup(QObject *parent) + QString AppCGroup::createProcessCGroup(const QString &appId, const QList &pids) + { + auto reply = m_processManagerInterface->CreateProcessCGroup(appId, pids); +- qDebug() << "reply is finished. " << reply.isFinished(); +- while (!reply.isFinished()) { +- qApp->processEvents(); +- usleep(10); +- } ++ reply.waitForFinished(); + if (reply.isError()) { + qWarning() << "createProcessCGroup error, " << reply.error(); + return QString(); +@@ -76,10 +72,7 @@ bool AppCGroup::reclaimProcesses(const QString &cgroupName) + QString AppCGroup::cgroupNameWithPid(int pid) + { + auto reply = m_processManagerInterface->CGroupNameWithPid(pid); +- while (!reply.isFinished()) { +- qApp->processEvents(); +- usleep(1); +- } ++ reply.waitForFinished(); + if (reply.isError()) { + qWarning() << __FUNCTION__ << "error, " << reply.error(); + return QString(); diff --git a/debian/patches/series b/debian/patches/series index 0ce82a4..339f771 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,3 +14,4 @@ 0014-update-changelog-1-2-SESSION_MANAGER.patch 0015-Update-changelog-version-is-3.22.1.0-ok1.18.patch 0016-44-Update-changelog-peony-qt-desktop.patch +0017-update-debian-changelog.patch