!27 update to 5.4.85.4

From: @leeffo 
Reviewed-by: @HelloWorld_lvcongqing 
Signed-off-by: @HelloWorld_lvcongqing

0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch

@@ -0,0 +1,26 @@
+From 2195d2302d073b10a09f1c9c65c02a6bb3ff16fd Mon Sep 17 00:00:00 2001
+From: liweigang <liweiganga@uniontech.com>
+Date: Thu, 23 Jun 2022 17:22:20 +0800
+Subject: [PATCH] fix: modify eulerServerEnduserAgreement_new path
+
+---
+ src/frame/window/protocolfile.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/frame/window/protocolfile.cpp b/src/frame/window/protocolfile.cpp
+index 5a03939..c1a5a39 100644
+--- a/src/frame/window/protocolfile.cpp
++++ b/src/frame/window/protocolfile.cpp
+@@ -30,7 +30,7 @@ DCORE_USE_NAMESPACE
+ 
+ const static QString serverEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Server-CN-%1.txt";
+ const static QString serverEnduserAgreement_old = "/usr/share/deepin-deepinid-client/privacy/End-User-License-Agreement-Server/End-User-License-Agreement-Server-CN-%1.txt";
+-const static QString eulerServerEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Server-Euler-%1.txt";
++const static QString eulerServerEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Server-CN-%1.txt";
+ const static QString eulerServerEnduserAgreement_old = "/usr/share/deepin-deepinid-client/privacy/End-User-License-Agreement-Server/End-User-License-Agreement-Server-Euler-%1.txt";
+ const static QString homeEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Home-CN-%1.txt";
+ const static QString homeEnduserAgreement_old = "/usr/share/deepin-deepinid-client/privacy/End-User-License-Agreement-Home/End-User-License-Agreement-Home-CN-%1.txt";
+ const static QString professionalEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Professional-CN-%1.txt";
+-- 
+2.20.1
+

0002-Repair-user-name-related-prompt-information.patch

@@ -1,39 +0,0 @@
-From 73f60aa7739376cbcc638a505fa153233c705761 Mon Sep 17 00:00:00 2001
-From: yangxianzhao <yangxianzhao@uniontech.com>
-Date: Thu, 6 Apr 2023 16:19:59 +0800
-Subject: [PATCH] Repair user name related prompt information
-
----
- src/frame/window/modules/accounts/accountsdetailwidget.cpp | 2 +-
- src/frame/window/modules/accounts/createaccountpage.cpp    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/frame/window/modules/accounts/accountsdetailwidget.cpp b/src/frame/window/modules/accounts/accountsdetailwidget.cpp
-index b8ad19c..6239de9 100644
---- a/src/frame/window/modules/accounts/accountsdetailwidget.cpp
-+++ b/src/frame/window/modules/accounts/accountsdetailwidget.cpp
-@@ -297,7 +297,7 @@ void AccountsDetailWidget::initUserInfo(QVBoxLayout *layout)
-             for (User *user : userList) {
-                 if (userFullName == user->fullname()) {
-                     m_inputLineEdit->setAlert(true);
--                    m_inputLineEdit->showAlertMessage(tr("The username already exists"), m_inputLineEdit, 2000);
-+		    m_inputLineEdit->showAlertMessage(tr("The name already exists"), m_inputLineEdit, 2000);
-                     m_inputLineEdit->lineEdit()->selectAll();
-                     return;
-                 }
-diff --git a/src/frame/window/modules/accounts/createaccountpage.cpp b/src/frame/window/modules/accounts/createaccountpage.cpp
-index 2a43c85..26b623d 100644
---- a/src/frame/window/modules/accounts/createaccountpage.cpp
-+++ b/src/frame/window/modules/accounts/createaccountpage.cpp
-@@ -477,7 +477,7 @@ bool CreateAccountPage::checkFullname()
-         for (User *user : userList) {
-             if (userFullName == user->fullname()) {
-                 m_fullnameEdit->setAlert(true);
--                m_fullnameEdit->showAlertMessage(tr("The username already exists"), m_fullnameEdit, 2000);
-+		m_fullnameEdit->showAlertMessage(tr("The name already exists"), m_fullnameEdit, 2000);
-                 m_fullnameEdit->lineEdit()->selectAll();
-                 return false;
-             }
--- 
-2.18.4
-

0002-hide-authorized.patch

@@ -1,28 +1,26 @@
-From 6f75016b635f0bdd4867bcad46bdf618f4321a2c Mon Sep 17 00:00:00 2001
+From cf9e61a42436a5eeea0aeccd702a477aa8ca3d9a Mon Sep 17 00:00:00 2001
-From: loong ci <loong_c@yeah.net>
+From: leeffo <loong_c@yeah.net>
-Date: Thu, 4 Aug 2022 17:39:05 +0800
+Date: Tue, 23 Aug 2022 16:33:21 +0800
 Subject: [PATCH] hide authorized
-
 ---
  src/frame/CMakeLists.txt                      |  1 +
- src/frame/modules/systeminfo/systeminfomodel.cpp |  4 ++++
+ .../modules/systeminfo/systeminfomodel.cpp    |  5 ++++-
- src/frame/modules/systeminfo/systeminfomodel.h   | 12 ++++++++++++
+ .../modules/systeminfo/systeminfomodel.h      | 12 ++++++++++
- src/frame/modules/systeminfo/systeminfowork.cpp  |  6 ++++++
+ .../modules/systeminfo/systeminfowork.cpp     |  6 +++++
  src/frame/modules/systeminfo/systeminfowork.h |  4 ++++
  src/frame/modules/update/updatemodel.cpp      |  4 ++++
- src/frame/modules/update/updatemodel.h           |  7 +++++++
+ src/frame/modules/update/updatemodel.h        |  6 +++++
  src/frame/modules/update/updatework.cpp       |  4 ++++
  src/frame/modules/update/updatework.h         |  4 ++++
- .../modules/systeminfo/nativeinfowidget.cpp      | 14 ++++++++++++++
+ .../modules/systeminfo/nativeinfowidget.cpp   | 14 ++++++++++++
- .../window/modules/systeminfo/nativeinfowidget.h |  6 ++++++
+ .../modules/systeminfo/nativeinfowidget.h     |  6 +++++
  .../modules/systeminfo/systeminfomodule.cpp   |  2 ++
- .../window/modules/update/updatectrlwidget.cpp   | 16 ++++++++++++++++
+ .../modules/update/updatectrlwidget.cpp       | 22 +++++++++++++++++++
- .../window/modules/update/updatectrlwidget.h     |  2 ++
+ .../window/modules/update/updatectrlwidget.h  |  6 +++++
- src/frame/window/modules/update/updatemodule.cpp |  6 +++++-
+ .../window/modules/update/updatemodule.cpp    |  6 ++++-
- 15 files changed, 91 insertions(+), 1 deletion(-)
+ 15 files changed, 100 insertions(+), 2 deletions(-)
-
 diff --git a/src/frame/CMakeLists.txt b/src/frame/CMakeLists.txt
-index d391e05..02cced1 100644
+index 319ca1d..9b7638b 100644
 --- a/src/frame/CMakeLists.txt
 +++ b/src/frame/CMakeLists.txt
 @@ -30,6 +30,7 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -34,7 +32,7 @@ index d391e05..02cced1 100644
  DISABLE_CLOUD_SYNC
  DISABLE_SYS_UPDATE
 diff --git a/src/frame/modules/systeminfo/systeminfomodel.cpp b/src/frame/modules/systeminfo/systeminfomodel.cpp
-index af539b1..78ecebc 100644
+index c890183..20da279 100644
 --- a/src/frame/modules/systeminfo/systeminfomodel.cpp
 +++ b/src/frame/modules/systeminfo/systeminfomodel.cpp
 @@ -60,7 +60,9 @@ SystemInfoModel::SystemInfoModel(QObject *parent)
@@ -47,7 +45,7 @@ index af539b1..78ecebc 100644
  {
  
  }
-@@ -218,6 +220,7 @@ void SystemInfoModel::setKernel(const QString &kernel)
+@@ -227,6 +229,7 @@ void SystemInfoModel::setKernel(const QString &kernel)
      kernelChanged(kernel);
  }
  
@@ -55,16 +53,16 @@ index af539b1..78ecebc 100644
  void SystemInfoModel::setLicenseState(ActiveState state)
  {
      if (m_licenseState != state) {
-@@ -225,6 +228,7 @@ void SystemInfoModel::setLicenseState(ActiveState state)
+@@ -234,6 +237,6 @@ void SystemInfoModel::setLicenseState(ActiveState state)
          Q_EMIT licenseStateChanged(state);
      }
  }
+-
 +#endif
- 
  }
  }
 diff --git a/src/frame/modules/systeminfo/systeminfomodel.h b/src/frame/modules/systeminfo/systeminfomodel.h
-index 30a648e..84c17be 100644
+index 7ae81e0..ce4dfb9 100644
 --- a/src/frame/modules/systeminfo/systeminfomodel.h
 +++ b/src/frame/modules/systeminfo/systeminfomodel.h
 @@ -34,6 +34,7 @@ namespace systeminfo{
@@ -83,9 +81,9 @@ index 30a648e..84c17be 100644
  
  class SystemInfoModel : public QObject
  {
-@@ -64,7 +66,9 @@ public:
+@@ -65,7 +67,9 @@ public:
-     QString disk() const { return m_disk;}
      QString kernel() const { return m_kernel;}
+     QString hostName() const { return  m_hostName;}
  
 +#ifndef DISABLE_ACTIVATOR
      inline ActiveState licenseState() const { return m_licenseState; }
@@ -93,30 +91,30 @@ index 30a648e..84c17be 100644
  
      bool bootDelay() const;
      bool themeEnabled() const { return m_themeEnabled; }
-@@ -89,7 +93,9 @@ Q_SIGNALS:
+@@ -90,7 +94,9 @@ Q_SIGNALS:
      void memoryChanged(const QString& memory);
      void diskChanged(const QString& disk);
      void kernelChanged(const QString& kernel);
 +#ifndef DISABLE_ACTIVATOR
      void licenseStateChanged(ActiveState state);
 +#endif
- 
+     void hostNameChanged(const QString& hostName);
- public Q_SLOTS:
+     void setHostNameChanged(const QString& hostName);
-     void setBootDelay(bool bootDelay);
+     void setHostNameError(const QString& error);
-@@ -106,7 +112,9 @@ public Q_SLOTS:
+@@ -110,7 +116,9 @@ public Q_SLOTS:
      void setMemory(qulonglong totalMemory, qulonglong installedMemory);
      void setDisk(qulonglong disk);
      void setKernel(const QString &kernel);
 +#ifndef DISABLE_ACTIVATOR
      void setLicenseState(ActiveState state);
 +#endif
+     void setHostName(const QString& hostName);
  
  private:
-     bool m_bootDelay;
+@@ -132,12 +140,16 @@ private:
-@@ -126,12 +134,16 @@ private:
-     QString m_memory;
      QString m_disk;
      QString m_kernel;
+     QString m_hostName;
 +#ifndef DISABLE_ACTIVATOR
      ActiveState m_licenseState;
 +#endif
@@ -131,12 +129,12 @@ index 30a648e..84c17be 100644
  
  #endif // SYSTEMINFOMODEL_H
 diff --git a/src/frame/modules/systeminfo/systeminfowork.cpp b/src/frame/modules/systeminfo/systeminfowork.cpp
-index 39e9d11..d12c82a 100644
+index 4173622..a688706 100644
 --- a/src/frame/modules/systeminfo/systeminfowork.cpp
 +++ b/src/frame/modules/systeminfo/systeminfowork.cpp
-@@ -98,12 +98,14 @@ SystemInfoWork::SystemInfoWork(SystemInfoModel *model, QObject *parent)
+@@ -111,12 +111,14 @@ SystemInfoWork::SystemInfoWork(SystemInfoModel *model, QObject *parent)
-     m_dbusGrub->setSync(false, false);
      m_dbusGrubTheme->setSync(false, false);
+     m_dbusHostName->setSync(false, false);
  
 +#ifndef DISABLE_ACTIVATOR
      if (DSysInfo::isDeepin()) {
@@ -149,7 +147,7 @@ index 39e9d11..d12c82a 100644
  
      connect(m_dbusGrub, &GrubDbus::DefaultEntryChanged, m_model, &SystemInfoModel::setDefaultEntry);
      connect(m_dbusGrub, &GrubDbus::EnableThemeChanged, m_model, &SystemInfoModel::setThemeEnabled);
-@@ -136,7 +138,9 @@ SystemInfoWork::SystemInfoWork(SystemInfoModel *model, QObject *parent)
+@@ -160,7 +162,9 @@ SystemInfoWork::SystemInfoWork(SystemInfoModel *model, QObject *parent)
  
  void SystemInfoWork::activate()
  {
@@ -159,7 +157,7 @@ index 39e9d11..d12c82a 100644
      m_model->setDistroID(m_systemInfoInter->distroID());
      m_model->setDistroVer(m_systemInfoInter->distroVer());
      m_model->setDisk(m_systemInfoInter->diskCap());
-@@ -285,6 +289,7 @@ void SystemInfoWork::setBackground(const QString &path)
+@@ -309,6 +313,7 @@ void SystemInfoWork::setBackground(const QString &path)
      });
  }
  
@@ -167,7 +165,7 @@ index 39e9d11..d12c82a 100644
  void SystemInfoWork::showActivatorDialog()
  {
      QDBusInterface activator("com.deepin.license.activator",
-@@ -303,6 +308,7 @@ void SystemInfoWork::licenseStateChangeSlot()
+@@ -327,6 +332,7 @@ void SystemInfoWork::licenseStateChangeSlot()
      QFuture<void> future = QtConcurrent::run(this, &SystemInfoWork::getLicenseState);
      watcher->setFuture(future);
  }
@@ -176,10 +174,10 @@ index 39e9d11..d12c82a 100644
  void SystemInfoWork::getEntryTitles()
  {
 diff --git a/src/frame/modules/systeminfo/systeminfowork.h b/src/frame/modules/systeminfo/systeminfowork.h
-index f95b719..9a996be 100644
+index f092cdf..e3466f0 100644
 --- a/src/frame/modules/systeminfo/systeminfowork.h
 +++ b/src/frame/modules/systeminfo/systeminfowork.h
-@@ -62,14 +62,18 @@ public Q_SLOTS:
+@@ -64,14 +64,18 @@ public Q_SLOTS:
      void grubServerFinished();
      void onBackgroundChanged();
      void setBackground(const QString &path);
@@ -229,7 +227,7 @@ index 378f33d..4fcc591 100644
  void UpdateModel::isUpdatablePackages(bool isUpdatablePackages)
  {
 diff --git a/src/frame/modules/update/updatemodel.h b/src/frame/modules/update/updatemodel.h
-index b268e09..76e7778 100644
+index b268e09..036292c 100644
 --- a/src/frame/modules/update/updatemodel.h
 +++ b/src/frame/modules/update/updatemodel.h
 @@ -158,8 +158,10 @@ public:
@@ -253,11 +251,10 @@ index b268e09..76e7778 100644
      void beginCheckUpdate();
      void updateCheckUpdateTime();
      void updateHistoryAppInfos();
-@@ -239,7 +243,10 @@ private:
+@@ -239,7 +243,9 @@ private:
      bool m_bRecoverRestoring;
      QString m_systemVersionInfo;
      QMetaEnum m_metaEnum;
-+
 +#ifndef DISABLE_ACTIVATOR
      UiActiveState m_bSystemActivation;
 +#endif
@@ -265,10 +262,10 @@ index b268e09..76e7778 100644
      QString m_lastCheckUpdateTime; //上次检查更新时间
      QList<AppUpdateInfo> m_historyAppInfos; //历史更新应用列表
 diff --git a/src/frame/modules/update/updatework.cpp b/src/frame/modules/update/updatework.cpp
-index 1f07732..d7a9573 100644
+index 01e9a3f..71d889d 100644
 --- a/src/frame/modules/update/updatework.cpp
 +++ b/src/frame/modules/update/updatework.cpp
-@@ -200,6 +200,7 @@ void UpdateWorker::init() {
+@@ -199,6 +199,7 @@ void UpdateWorker::init() {
  #endif
  }
  
@@ -276,7 +273,7 @@ index 1f07732..d7a9573 100644
  void UpdateWorker::licenseStateChangeSlot()
  {
      QFutureWatcher<void> *watcher = new QFutureWatcher<void>();
-@@ -227,6 +228,7 @@ void UpdateWorker::getLicenseState()
+@@ -226,6 +227,7 @@ void UpdateWorker::getLicenseState()
      qDebug() << "Authorization State:" << reply;
      m_model->setSystemActivation(reply);
  }
@@ -299,7 +296,7 @@ index 1f07732..d7a9573 100644
      QFutureWatcher<QStringList> *packagesWatcher = new QFutureWatcher<QStringList>();
      connect(packagesWatcher, &QFutureWatcher<QStringList>::finished, this, [=] {
 diff --git a/src/frame/modules/update/updatework.h b/src/frame/modules/update/updatework.h
-index 977091b..a100c28 100644
+index 66cfbdb..4e4a65a 100644
 --- a/src/frame/modules/update/updatework.h
 +++ b/src/frame/modules/update/updatework.h
 @@ -72,7 +72,9 @@ public:
@@ -323,10 +320,10 @@ index 977091b..a100c28 100644
      void refreshLastTimeAndCheckCircle();
      void setUpdateNotify(const bool notify);
 diff --git a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
-index e1c1fb7..82e5640 100644
+index 184b2be..d7db8d6 100644
 --- a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
 +++ b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
-@@ -54,7 +54,9 @@ NativeInfoWidget::NativeInfoWidget(SystemInfoModel *model, QWidget *parent)
+@@ -92,7 +92,9 @@ NativeInfoWidget::NativeInfoWidget(SystemInfoModel *model, QWidget *parent)
  
  NativeInfoWidget::~NativeInfoWidget()
  {
@@ -336,15 +333,15 @@ index e1c1fb7..82e5640 100644
      GSettingWatcher::instance()->erase("systeminfoNativeinfoKernel", m_kernel);
      GSettingWatcher::instance()->erase("systeminfoNativeinfoProcessor", m_processor);
      GSettingWatcher::instance()->erase("systeminfoNativeinfoMemory", m_memory);
-@@ -104,6 +106,7 @@ void NativeInfoWidget::initWidget()
+@@ -202,6 +204,7 @@ void NativeInfoWidget::initWidget()
-     //~ contents_path /systeminfo/About This PC
+     //~ child_page About This PC
      m_type->setTitle(tr("Type:"));
  
 +#ifndef DISABLE_ACTIVATOR
      m_authorized = new TitleAuthorizedItem(frame);
-     m_authorized->setTitle(tr("Authorization") + ':');
+     //~ contents_path /systeminfo/About This PC
-     m_authorized->setValue(tr("To be activated"));
+     //~ child_page About This PC
-@@ -114,6 +117,7 @@ void NativeInfoWidget::initWidget()
+@@ -214,6 +217,7 @@ void NativeInfoWidget::initWidget()
      } else {
          m_authorized->setVisable(true);
      }
@@ -352,7 +349,7 @@ index e1c1fb7..82e5640 100644
  
      m_kernel = new TitleValueItem(frame);
      //~ contents_path /systeminfo/About This PC
-@@ -130,7 +134,9 @@ void NativeInfoWidget::initWidget()
+@@ -233,7 +237,9 @@ void NativeInfoWidget::initWidget()
      m_memory->setTitle(tr("Memory:"));
      m_memory->setValue(m_model->memory());
  
@@ -362,7 +359,7 @@ index e1c1fb7..82e5640 100644
      GSettingWatcher::instance()->bind("systeminfoNativeinfoKernel", m_kernel);
      GSettingWatcher::instance()->bind("systeminfoNativeinfoProcessor", m_processor);
      GSettingWatcher::instance()->bind("systeminfoNativeinfoMemory", m_memory);
-@@ -143,9 +149,11 @@ void NativeInfoWidget::initWidget()
+@@ -246,9 +252,11 @@ void NativeInfoWidget::initWidget()
      }
      infoGroup->appendItem(m_version, SettingsGroup::ItemBackground);
      infoGroup->appendItem(m_type);
@@ -374,7 +371,7 @@ index e1c1fb7..82e5640 100644
      infoGroup->appendItem(m_kernel);
      infoGroup->appendItem(m_processor);
      infoGroup->appendItem(m_memory);
-@@ -175,13 +183,17 @@ void NativeInfoWidget::initWidget()
+@@ -279,13 +287,17 @@ void NativeInfoWidget::initWidget()
      connect(m_model, &SystemInfoModel::processorChanged, this, &NativeInfoWidget::setProcessor);
      connect(m_model, &SystemInfoModel::memoryChanged, this, &NativeInfoWidget::setMemory);
  
@@ -391,8 +388,8 @@ index e1c1fb7..82e5640 100644
 +#endif
  }
  
- void NativeInfoWidget::setProductName(const QString &edition)
+ void NativeInfoWidget::resizeEvent(QResizeEvent *event)
-@@ -214,6 +226,7 @@ void NativeInfoWidget::setMemory(const QString &memory)
+@@ -328,6 +340,7 @@ void NativeInfoWidget::setMemory(const QString &memory)
      m_memory->setValue(memory);
  }
  
@@ -400,7 +397,7 @@ index e1c1fb7..82e5640 100644
  void NativeInfoWidget::setLicenseState(ActiveState state)
  {
      if (state == Authorized) {
-@@ -238,6 +251,7 @@ void NativeInfoWidget::setLicenseState(ActiveState state)
+@@ -352,6 +365,7 @@ void NativeInfoWidget::setLicenseState(ActiveState state)
          m_authorized->setButtonText(tr("Activate"));
      }
  }
@@ -409,10 +406,10 @@ index e1c1fb7..82e5640 100644
  const QString NativeInfoWidget::systemCopyright() const
  {
 diff --git a/src/frame/window/modules/systeminfo/nativeinfowidget.h b/src/frame/window/modules/systeminfo/nativeinfowidget.h
-index cca4b19..50e1555 100644
+index 1849793..93e24ef 100644
 --- a/src/frame/window/modules/systeminfo/nativeinfowidget.h
 +++ b/src/frame/window/modules/systeminfo/nativeinfowidget.h
-@@ -58,10 +58,14 @@ public Q_SLOTS:
+@@ -79,7 +79,9 @@ public Q_SLOTS:
      void setType(const QString &type);
      void setProcessor(const QString &processor);
      void setMemory(const QString &memory);
@@ -420,14 +417,19 @@ index cca4b19..50e1555 100644
      void setLicenseState(dcc::systeminfo::ActiveState state);
 +#endif
  
+     void onToolButtonButtonClicked();
+     void onFocusChanged(const bool onFocus);
+@@ -90,7 +92,9 @@ public Q_SLOTS:
+     void onSetHostNameError(const QString &error);
+ 
  Q_SIGNALS:
 +#ifndef DISABLE_ACTIVATOR
      void clickedActivator();
 +#endif
  
- private:
+ protected:
-     dcc::systeminfo::SystemInfoModel *m_model;
+     void resizeEvent(QResizeEvent *event) override;
-@@ -70,7 +74,9 @@ private:
+@@ -108,7 +112,9 @@ private:
      dcc::widgets::TitleValueItem *m_versionNumber;
      dcc::widgets::TitleValueItem *m_version;
      dcc::widgets::TitleValueItem *m_type;
@@ -452,12 +454,16 @@ index 05fac20..563a3ee 100644
  
  void SystemInfoModule::onVersionProtocolPage()
 diff --git a/src/frame/window/modules/update/updatectrlwidget.cpp b/src/frame/window/modules/update/updatectrlwidget.cpp
-index 7f294e5..ed39906 100644
+index 158d6c4..415e89c 100644
 --- a/src/frame/window/modules/update/updatectrlwidget.cpp
 +++ b/src/frame/window/modules/update/updatectrlwidget.cpp
-@@ -65,7 +65,9 @@ UpdateCtrlWidget::UpdateCtrlWidget(UpdateModel *model, QWidget *parent)
+@@ -63,9 +63,13 @@ UpdateCtrlWidget::UpdateCtrlWidget(UpdateModel *model, QWidget *parent)
+     , m_bRecoverBackingUp(false)
+     , m_bRecoverConfigValid(false)
      , m_bRecoverRestoring(false)
++#ifndef DISABLE_ACTIVATOR
      , m_activeState(UiActiveState::Unknown)
++#endif
      , m_updateList(new ContentWidget)
 +#ifndef DISABLE_ACTIVATOR
      , m_authorizationPrompt(new TipsLabel)
@@ -465,7 +471,7 @@ index 7f294e5..ed39906 100644
      , m_checkUpdateBtn(new QPushButton)
      , m_lastCheckTimeTip(new TipsLabel)
  {
-@@ -81,11 +83,15 @@ UpdateCtrlWidget::UpdateCtrlWidget(UpdateModel *model, QWidget *parent)
+@@ -85,11 +89,15 @@ UpdateCtrlWidget::UpdateCtrlWidget(UpdateModel *model, QWidget *parent)
      m_fullProcess->setVisible(false);
      m_fullProcess->setProcessValue(100);
  
@@ -481,7 +487,7 @@ index 7f294e5..ed39906 100644
  
      m_summaryGroup->setVisible(true);
  
-@@ -167,7 +173,9 @@ void UpdateCtrlWidget::setShowInfo(const UiActiveState value)
+@@ -172,7 +180,9 @@ void UpdateCtrlWidget::setShowInfo(const UiActiveState value)
      }
  
      m_fullProcess->setEnabled(activation);
@@ -491,7 +497,7 @@ index 7f294e5..ed39906 100644
  }
  
  void UpdateCtrlWidget::loadAppList(const QList<AppUpdateInfo> &infos)
-@@ -248,9 +256,11 @@ void UpdateCtrlWidget::setStatus(const UpdatesStatus &status)
+@@ -253,9 +263,11 @@ void UpdateCtrlWidget::setStatus(const UpdatesStatus &status)
  {
      m_status = status;
  
@@ -503,7 +509,7 @@ index 7f294e5..ed39906 100644
  
      Q_EMIT notifyUpdateState(m_status);
  
-@@ -259,7 +269,9 @@ void UpdateCtrlWidget::setStatus(const UpdatesStatus &status)
+@@ -264,7 +276,9 @@ void UpdateCtrlWidget::setStatus(const UpdatesStatus &status)
      m_resultItem->setVisible(false);
      m_progress->setVisible(false);
      m_fullProcess->setVisible(false);
@@ -513,17 +519,46 @@ index 7f294e5..ed39906 100644
      m_updateList->setVisible(false);
      m_upgradeWarningGroup->setVisible(false);
      m_reminderTip->setVisible(false);
-@@ -307,7 +319,9 @@ void UpdateCtrlWidget::setStatus(const UpdatesStatus &status)
+@@ -312,7 +326,9 @@ void UpdateCtrlWidget::setStatus(const UpdatesStatus &status)
+         //~ child_page Updates
          m_fullProcess->setMessage(tr("Download and install updates"));
          setDownloadInfo(m_model->downloadInfo());
-         setLowBattery(m_model->lowBattery());
 +#ifndef DISABLE_ACTIVATOR
          setShowInfo(m_model->systemActivation());
 +#endif
+         setLowBattery(m_model->lowBattery());
          break;
      case UpdatesStatus::Downloading:
-         m_progress->setVisible(true);
+@@ -457,10 +473,12 @@ void UpdateCtrlWidget::setLowBattery(const bool &lowBattery)
-@@ -512,7 +526,9 @@ void UpdateCtrlWidget::setModel(UpdateModel *model)
+ {
+     if (m_status == UpdatesStatus::Downloaded || m_status == UpdatesStatus::UpdatesAvailable) {
+         bool activation = false;
++#ifndef DISABLE_ACTIVATOR
+         const UiActiveState value = m_model->systemActivation();
+         if (UiActiveState::Authorized == value || UiActiveState::TrialAuthorized == value || UiActiveState::AuthorizedLapse == value) {
+             activation = true;
+         }
++#endif
+         if (lowBattery) {
+             m_powerTip->setText(tr("Your battery is lower than 50%, please plug in to continue"));
+         } else {
+@@ -502,6 +520,7 @@ void UpdateCtrlWidget::setRecoverRestoring(const bool value)
+     }
+ }
+ 
++#ifndef DISABLE_ACTIVATOR
+ void UpdateCtrlWidget::setActiveState(const UiActiveState &activestate)
+ {
+     if (m_activeState != activestate) {
+@@ -515,6 +534,7 @@ void UpdateCtrlWidget::setActiveState(const UiActiveState &activestate)
+     }
+ 
+ }
++#endif
+ 
+ void UpdateCtrlWidget::setModel(UpdateModel *model)
+ {
+@@ -528,7 +548,9 @@ void UpdateCtrlWidget::setModel(UpdateModel *model)
      connect(m_model, &UpdateModel::recoverBackingUpChanged, this, &UpdateCtrlWidget::setRecoverBackingUp);
      connect(m_model, &UpdateModel::recoverConfigValidChanged, this, &UpdateCtrlWidget::setRecoverConfigValid);
      connect(m_model, &UpdateModel::recoverRestoringChanged, this, &UpdateCtrlWidget::setRecoverRestoring);
@@ -534,12 +569,26 @@ index 7f294e5..ed39906 100644
  
      setUpdateProgress(m_model->updateProgress());
 diff --git a/src/frame/window/modules/update/updatectrlwidget.h b/src/frame/window/modules/update/updatectrlwidget.h
-index f54ee46..c9bb1ac 100644
+index f54ee46..0e219f9 100644
 --- a/src/frame/window/modules/update/updatectrlwidget.h
 +++ b/src/frame/window/modules/update/updatectrlwidget.h
-@@ -109,7 +109,9 @@ private:
+@@ -86,7 +86,9 @@ private:
+     void setRecoverConfigValid(const bool value);
+     void setRecoverRestoring(const bool value);
+     void setShowInfo(const UiActiveState value);
++#ifndef DISABLE_ACTIVATOR
+     void setActiveState(const UiActiveState &activestate);
++#endif
+ 
+ private:
+     dcc::update::UpdateModel *m_model;
+@@ -107,9 +109,13 @@ private:
+     bool m_bRecoverBackingUp;
+     bool m_bRecoverConfigValid;
      bool m_bRecoverRestoring;
++#ifndef DISABLE_ACTIVATOR
      UiActiveState m_activeState;
++#endif
      dcc::ContentWidget *m_updateList;
 +#ifndef DISABLE_ACTIVATOR
      dcc::widgets::TipsLabel *m_authorizationPrompt;
@@ -548,10 +597,10 @@ index f54ee46..c9bb1ac 100644
      QPushButton *m_checkUpdateBtn;
      dcc::widgets::TipsLabel *m_lastCheckTimeTip;
 diff --git a/src/frame/window/modules/update/updatemodule.cpp b/src/frame/window/modules/update/updatemodule.cpp
-index e8b5a86..b545a7b 100644
+index ef5529b..e84f643 100644
 --- a/src/frame/window/modules/update/updatemodule.cpp
 +++ b/src/frame/window/modules/update/updatemodule.cpp
-@@ -79,7 +79,9 @@ void UpdateModule::preInitialize(bool sync, FrameProxyInterface::PushType pushty
+@@ -77,7 +77,9 @@ void UpdateModule::preInitialize(bool sync, FrameProxyInterface::PushType pushty
  
      connect(m_work.get(), &UpdateWorker::requestInit, m_work.get(), &UpdateWorker::init);
      connect(m_work.get(), &UpdateWorker::requestActive, m_work.get(), &UpdateWorker::activate);
@@ -561,7 +610,7 @@ index e8b5a86..b545a7b 100644
  
  #ifndef DISABLE_SYS_UPDATE_MIRRORS
      connect(m_work.get(), &UpdateWorker::requestRefreshMirrors, m_work.get(), &UpdateWorker::refreshMirrors);
-@@ -157,9 +159,11 @@ void UpdateModule::active()
+@@ -150,9 +152,11 @@ void UpdateModule::active()
  
      Q_EMIT m_work->requestRefreshLicenseState();
  
@@ -573,7 +622,7 @@ index e8b5a86..b545a7b 100644
      m_updateWidget->setModel(m_model, m_work.get());
  
      connect(m_updateWidget, &UpdateWidget::pushMirrorsView, this, [=]() {
-@@ -193,7 +197,7 @@ void UpdateModule::active()
+@@ -186,7 +190,7 @@ void UpdateModule::active()
          m_updateWidget->setSystemVersion(m_model->systemVersionInfo());
      }
  #else

dde-control-center.spec

@@ -1,17 +1,17 @@
 %define specrelease 1%{?dist}
 %if 0%{?openeuler}
-%define specrelease 5
+%define specrelease 1
 %endif
 
 Name:           dde-control-center
-Version:        5.4.43.27
+Version:        5.4.85.4
 Release:        %{specrelease}
 Summary:        New control center for Linux Deepin
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/%{name}
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         0001-hide-authorized.patch
+Patch0:         0002-hide-authorized.patch
-Patch1:		0002-Repair-user-name-related-prompt-information.patch
+Patch1:		0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  desktop-file-utils
@@ -104,13 +104,16 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
 %{_bindir}/dde-control-center-wapper
 %{_datadir}/
 %{_libdir}/libdccwidgets.so
-/etc/xdg/autostart/deepin-ab-recovery.desktop
+#/etc/xdg/autostart/deepin-ab-recovery.desktop
 
 %files devel
 %{_includedir}/dde-control-center
 %{_libdir}/cmake/DdeControlCenter/
 
 %changelog
+* Mon Apr 10 2023 liweiganga <liweiganga@uniontech.com> - 5.4.85.4-1
+- update: update to 5.4.85.4
+
 * Thu Apr 06 2023 yangxianzhao <yangxianzhao@uniontech.com> - 5.4.43.27-5
 - Repair user name related prompt information