upgrade to version 5.5.182

(cherry picked from commit 26a55841168beb9e8f439ae5bb4f3ced5ddce26a)

0001-feat-root.patch

@@ -0,0 +1,31 @@
+From 427b261b78aedd9f04f690e20e773bbc9fd60432 Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Sun, 23 Apr 2023 10:14:14 +0800
+Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A7=E5=88=B6=E4=B8=AD=E5=BF=83roo?=
+ =?UTF-8?q?t=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9?=
+ =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=94=A8=E6=88=B7=E7=9A=84=E5=AF=86=E7=A0=81?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/frame/modules/accounts/accountsworker.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/frame/modules/accounts/accountsworker.cpp b/src/frame/modules/accounts/accountsworker.cpp
+index b57ad5d..a0654e1 100644
+--- a/src/frame/modules/accounts/accountsworker.cpp
++++ b/src/frame/modules/accounts/accountsworker.cpp
+@@ -532,7 +532,8 @@ void AccountsWorker::deleteUserIcon(User *user, const QString &iconPath)
+ 
+ void AccountsWorker::addUser(const QString &userPath)
+ {
+-    if (userPath.contains("User0", Qt::CaseInsensitive) || m_userModel->contains(userPath))
++    //服务器版本需要root用户信息及相关流程
++    if ((!IsServerSystem && userPath.contains("User0", Qt::CaseInsensitive)) || m_userModel->contains(userPath))
+         return;
+     AccountsUser *userInter = new AccountsUser(AccountsService, userPath, QDBusConnection::systemBus(), this);
+     userInter->setSync(false);
+-- 
+2.20.1
+

0002-hide-authorized.patch

@@ -1,636 +0,0 @@
-From cf9e61a42436a5eeea0aeccd702a477aa8ca3d9a Mon Sep 17 00:00:00 2001
-From: leeffo <loong_c@yeah.net>
-Date: Tue, 23 Aug 2022 16:33:21 +0800
-Subject: [PATCH] hide authorized
----
- src/frame/CMakeLists.txt                      |  1 +
- .../modules/systeminfo/systeminfomodel.cpp    |  5 ++++-
- .../modules/systeminfo/systeminfomodel.h      | 12 ++++++++++
- .../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        |  6 +++++
- src/frame/modules/update/updatework.cpp       |  4 ++++
- src/frame/modules/update/updatework.h         |  4 ++++
- .../modules/systeminfo/nativeinfowidget.cpp   | 14 ++++++++++++
- .../modules/systeminfo/nativeinfowidget.h     |  6 +++++
- .../modules/systeminfo/systeminfomodule.cpp   |  2 ++
- .../modules/update/updatectrlwidget.cpp       | 22 +++++++++++++++++++
- .../window/modules/update/updatectrlwidget.h  |  6 +++++
- .../window/modules/update/updatemodule.cpp    |  6 ++++-
- 15 files changed, 100 insertions(+), 2 deletions(-)
-diff --git a/src/frame/CMakeLists.txt b/src/frame/CMakeLists.txt
-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)
- endif ()
- 
- set(DEFINED_LIST
-+DISABLE_ACTIVATOR
- DISABLE_OPACITY_ANIMATION
- DISABLE_CLOUD_SYNC
- DISABLE_SYS_UPDATE
-diff --git a/src/frame/modules/systeminfo/systeminfomodel.cpp b/src/frame/modules/systeminfo/systeminfomodel.cpp
-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)
-     , m_themeEnabled(false)
-     , m_updating(false)
-     , m_type(64)
-+#ifndef DISABLE_ACTIVATOR
-     , m_licenseState(ActiveState::Unauthorized)
-+#endif
- {
- 
- }
-@@ -227,6 +229,7 @@ void SystemInfoModel::setKernel(const QString &kernel)
-     kernelChanged(kernel);
- }
- 
-+#ifndef DISABLE_ACTIVATOR
- void SystemInfoModel::setLicenseState(ActiveState state)
- {
-     if (m_licenseState != 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 7ae81e0..ce4dfb9 100644
---- a/src/frame/modules/systeminfo/systeminfomodel.h
-+++ b/src/frame/modules/systeminfo/systeminfomodel.h
-@@ -34,6 +34,7 @@ namespace systeminfo{
- 
- // !!! 不要用C++11的前置声明枚举类型，这里lupdate命令有个bug．具体见
- // https://stackoverflow.com/questions/6504902/lupdate-error-qualifying-with-unknown-namespace-class
-+#ifndef DISABLE_ACTIVATOR
- //授权状态
- enum ActiveState {
-     Unauthorized = 0,  //未授权
-@@ -42,6 +43,7 @@ enum ActiveState {
-     TrialAuthorized, //试用期已授权
-     TrialExpired //试用期已过期
- };
-+#endif
- 
- class SystemInfoModel : public QObject
- {
-@@ -65,7 +67,9 @@ public:
-     QString kernel() const { return m_kernel;}
-     QString hostName() const { return  m_hostName;}
- 
-+#ifndef DISABLE_ACTIVATOR
-     inline ActiveState licenseState() const { return m_licenseState; }
-+#endif
- 
-     bool bootDelay() const;
-     bool themeEnabled() const { return m_themeEnabled; }
-@@ -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);
-     void setHostNameChanged(const QString& hostName);
-     void setHostNameError(const QString& error);
-@@ -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:
-@@ -132,12 +140,16 @@ private:
-     QString m_disk;
-     QString m_kernel;
-     QString m_hostName;
-+#ifndef DISABLE_ACTIVATOR
-     ActiveState m_licenseState;
-+#endif
- };
- 
- }
- }
- 
-+#ifndef DISABLE_ACTIVATOR
- Q_DECLARE_METATYPE(dcc::systeminfo::ActiveState);
-+#endif
- 
- #endif // SYSTEMINFOMODEL_H
-diff --git a/src/frame/modules/systeminfo/systeminfowork.cpp b/src/frame/modules/systeminfo/systeminfowork.cpp
-index 4173622..a688706 100644
---- a/src/frame/modules/systeminfo/systeminfowork.cpp
-+++ b/src/frame/modules/systeminfo/systeminfowork.cpp
-@@ -111,12 +111,14 @@ SystemInfoWork::SystemInfoWork(SystemInfoModel *model, QObject *parent)
-     m_dbusGrubTheme->setSync(false, false);
-     m_dbusHostName->setSync(false, false);
- 
-+#ifndef DISABLE_ACTIVATOR
-     if (DSysInfo::isDeepin()) {
-         QDBusConnection::systemBus().connect("com.deepin.license", "/com/deepin/license/Info",
-                                              "com.deepin.license.Info", "LicenseStateChange",
-                                              this, SLOT(licenseStateChangeSlot()));
-         licenseStateChangeSlot();
-     }
-+#endif
- 
-     connect(m_dbusGrub, &GrubDbus::DefaultEntryChanged, m_model, &SystemInfoModel::setDefaultEntry);
-     connect(m_dbusGrub, &GrubDbus::EnableThemeChanged, m_model, &SystemInfoModel::setThemeEnabled);
-@@ -160,7 +162,9 @@ SystemInfoWork::SystemInfoWork(SystemInfoModel *model, QObject *parent)
- 
- void SystemInfoWork::activate()
- {
-+#ifndef DISABLE_ACTIVATOR
-     qRegisterMetaType<ActiveState>("ActiveState");
-+#endif
-     m_model->setDistroID(m_systemInfoInter->distroID());
-     m_model->setDistroVer(m_systemInfoInter->distroVer());
-     m_model->setDisk(m_systemInfoInter->diskCap());
-@@ -309,6 +313,7 @@ void SystemInfoWork::setBackground(const QString &path)
-     });
- }
- 
-+#ifndef DISABLE_ACTIVATOR
- void SystemInfoWork::showActivatorDialog()
- {
-     QDBusInterface activator("com.deepin.license.activator",
-@@ -327,6 +332,7 @@ void SystemInfoWork::licenseStateChangeSlot()
-     QFuture<void> future = QtConcurrent::run(this, &SystemInfoWork::getLicenseState);
-     watcher->setFuture(future);
- }
-+#endif
- 
- void SystemInfoWork::getEntryTitles()
- {
-diff --git a/src/frame/modules/systeminfo/systeminfowork.h b/src/frame/modules/systeminfo/systeminfowork.h
-index f092cdf..e3466f0 100644
---- a/src/frame/modules/systeminfo/systeminfowork.h
-+++ b/src/frame/modules/systeminfo/systeminfowork.h
-@@ -64,14 +64,18 @@ public Q_SLOTS:
-     void grubServerFinished();
-     void onBackgroundChanged();
-     void setBackground(const QString &path);
-+#ifndef DISABLE_ACTIVATOR
-     void showActivatorDialog();
-     void licenseStateChangeSlot();
-+#endif
-     void processChanged(QDBusMessage msg);
- 
- private:
-     void getEntryTitles();
-     void getBackgroundFinished(QDBusPendingCallWatcher *w);
-+#ifndef DISABLE_ACTIVATOR
-     void getLicenseState();
-+#endif
- 
- private:
-     SystemInfoModel* m_model;
-diff --git a/src/frame/modules/update/updatemodel.cpp b/src/frame/modules/update/updatemodel.cpp
-index 378f33d..4fcc591 100644
---- a/src/frame/modules/update/updatemodel.cpp
-+++ b/src/frame/modules/update/updatemodel.cpp
-@@ -69,7 +69,9 @@ UpdateModel::UpdateModel(QObject *parent)
-     , m_bRecoverRestoring(false)
-     , m_systemVersionInfo("")
-     , m_metaEnum(QMetaEnum::fromType<ModelUpdatesStatus>())
-+#ifndef DISABLE_ACTIVATOR
-     , m_bSystemActivation(UiActiveState::Unknown)
-+#endif
-     , m_autoCheckUpdateCircle(0)
-     , m_isUpdatablePackages(false)
- 
-@@ -353,6 +355,7 @@ void UpdateModel::setSystemVersionInfo(const QString &systemVersionInfo)
-     Q_EMIT systemVersionChanged(systemVersionInfo);
- }
- 
-+#ifndef DISABLE_ACTIVATOR
- void UpdateModel::setSystemActivation(const UiActiveState &systemactivation)
- {
-     if (m_bSystemActivation == systemactivation) {
-@@ -362,6 +365,7 @@ void UpdateModel::setSystemActivation(const UiActiveState &systemactivation)
- 
-     Q_EMIT systemActivationChanged(systemactivation);
- }
-+#endif
- 
- void UpdateModel::isUpdatablePackages(bool isUpdatablePackages)
- {
-diff --git a/src/frame/modules/update/updatemodel.h b/src/frame/modules/update/updatemodel.h
-index b268e09..036292c 100644
---- a/src/frame/modules/update/updatemodel.h
-+++ b/src/frame/modules/update/updatemodel.h
-@@ -158,8 +158,10 @@ public:
- 
-     bool getIsRecoveryBackingup(UpdatesStatus state) const;
- 
-+#ifndef DISABLE_ACTIVATOR
-     inline UiActiveState systemActivation() const {return m_bSystemActivation;}
-     void setSystemActivation(const UiActiveState &systemactivation);
-+#endif
- 
-     inline bool getUpdatablePackages() const {return m_isUpdatablePackages;}
-     void isUpdatablePackages(bool isUpdatablePackages);
-@@ -203,7 +205,9 @@ Q_SIGNALS:
-     void recoverConfigValidChanged(bool recoverConfigValid);
-     void recoverRestoringChanged(bool recoverRestoring);
-     void systemVersionChanged(QString version);
-+#ifndef DISABLE_ACTIVATOR
-     void systemActivationChanged(UiActiveState systemactivation);
-+#endif
-     void beginCheckUpdate();
-     void updateCheckUpdateTime();
-     void updateHistoryAppInfos();
-@@ -239,7 +243,9 @@ private:
-     bool m_bRecoverRestoring;
-     QString m_systemVersionInfo;
-     QMetaEnum m_metaEnum;
-+#ifndef DISABLE_ACTIVATOR
-     UiActiveState m_bSystemActivation;
-+#endif
- 
-     QString m_lastCheckUpdateTime; //上次检查更新时间
-     QList<AppUpdateInfo> m_historyAppInfos; //历史更新应用列表
-diff --git a/src/frame/modules/update/updatework.cpp b/src/frame/modules/update/updatework.cpp
-index 01e9a3f..71d889d 100644
---- a/src/frame/modules/update/updatework.cpp
-+++ b/src/frame/modules/update/updatework.cpp
-@@ -199,6 +199,7 @@ void UpdateWorker::init() {
- #endif
- }
- 
-+#ifndef DISABLE_ACTIVATOR
- void UpdateWorker::licenseStateChangeSlot()
- {
-     QFutureWatcher<void> *watcher = new QFutureWatcher<void>();
-@@ -226,6 +227,7 @@ void UpdateWorker::getLicenseState()
-     qDebug() << "Authorization State:" << reply;
-     m_model->setSystemActivation(reply);
- }
-+#endif
- 
- void UpdateWorker::activate()
- {
-@@ -260,11 +262,13 @@ void UpdateWorker::activate()
-     refreshMirrors();
- #endif
- 
-+#ifndef DISABLE_ACTIVATOR
-     licenseStateChangeSlot();
- 
-     QDBusConnection::systemBus().connect("com.deepin.license", "/com/deepin/license/Info",
-                                          "com.deepin.license.Info", "LicenseStateChange",
-                                          this, SLOT(licenseStateChangeSlot()));
-+#endif
- 
-     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 66cfbdb..4e4a65a 100644
---- a/src/frame/modules/update/updatework.h
-+++ b/src/frame/modules/update/updatework.h
-@@ -72,7 +72,9 @@ public:
-     void setOnBattery(bool onBattery);
-     void setBatteryPercentage(const BatteryPercentageInfo &info);
-     void setSystemBatteryPercentage(const double &value);
-+#ifndef DISABLE_ACTIVATOR
-     void getLicenseState();
-+#endif
- 
- Q_SIGNALS:
-     void requestInit();
-@@ -107,7 +109,9 @@ public Q_SLOTS:
-     void recoveryCanBackup();
-     void recoveryStartRestore();
-     void onNotifyDownloadInfoChanged();
-+#ifndef DISABLE_ACTIVATOR
-     void licenseStateChangeSlot();
-+#endif
-     void refreshHistoryAppsInfo();
-     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 184b2be..d7db8d6 100644
---- a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
-+++ b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
-@@ -92,7 +92,9 @@ NativeInfoWidget::NativeInfoWidget(SystemInfoModel *model, QWidget *parent)
- 
- NativeInfoWidget::~NativeInfoWidget()
- {
-+#ifndef DISABLE_ACTIVATOR
-     GSettingWatcher::instance()->erase("systeminfoNativeinfoAuthorized", m_authorized);
-+#endif
-     GSettingWatcher::instance()->erase("systeminfoNativeinfoKernel", m_kernel);
-     GSettingWatcher::instance()->erase("systeminfoNativeinfoProcessor", m_processor);
-     GSettingWatcher::instance()->erase("systeminfoNativeinfoMemory", m_memory);
-@@ -202,6 +204,7 @@ void NativeInfoWidget::initWidget()
-     //~ child_page About This PC
-     m_type->setTitle(tr("Type:"));
- 
-+#ifndef DISABLE_ACTIVATOR
-     m_authorized = new TitleAuthorizedItem(frame);
-     //~ contents_path /systeminfo/About This PC
-     //~ child_page About This PC
-@@ -214,6 +217,7 @@ void NativeInfoWidget::initWidget()
-     } else {
-         m_authorized->setVisable(true);
-     }
-+#endif
- 
-     m_kernel = new TitleValueItem(frame);
-     //~ contents_path /systeminfo/About This PC
-@@ -233,7 +237,9 @@ void NativeInfoWidget::initWidget()
-     m_memory->setTitle(tr("Memory:"));
-     m_memory->setValue(m_model->memory());
- 
-+#ifndef DISABLE_ACTIVATOR
-     GSettingWatcher::instance()->bind("systeminfoNativeinfoAuthorized", m_authorized);
-+#endif
-     GSettingWatcher::instance()->bind("systeminfoNativeinfoKernel", m_kernel);
-     GSettingWatcher::instance()->bind("systeminfoNativeinfoProcessor", m_processor);
-     GSettingWatcher::instance()->bind("systeminfoNativeinfoMemory", m_memory);
-@@ -246,9 +252,11 @@ void NativeInfoWidget::initWidget()
-     }
-     infoGroup->appendItem(m_version, SettingsGroup::ItemBackground);
-     infoGroup->appendItem(m_type);
-+#ifndef DISABLE_ACTIVATOR
-     if (!DSysInfo::isCommunityEdition())
-         infoGroup->appendItem(m_authorized);
-     m_authorized->setVisible(!DSysInfo::isCommunityEdition());
-+#endif
-     infoGroup->appendItem(m_kernel);
-     infoGroup->appendItem(m_processor);
-     infoGroup->appendItem(m_memory);
-@@ -279,13 +287,17 @@ void NativeInfoWidget::initWidget()
-     connect(m_model, &SystemInfoModel::processorChanged, this, &NativeInfoWidget::setProcessor);
-     connect(m_model, &SystemInfoModel::memoryChanged, this, &NativeInfoWidget::setMemory);
- 
-+#ifndef DISABLE_ACTIVATOR
-     //传递button的点击信号
-     connect(m_authorized, &TitleAuthorizedItem::clicked, this, &NativeInfoWidget::clickedActivator);
-     connect(m_model, &SystemInfoModel::licenseStateChanged, this, &NativeInfoWidget::setLicenseState);
-+#endif
- 
-     setType(m_model->type());
- 
-+#ifndef DISABLE_ACTIVATOR
-     setLicenseState(m_model->licenseState());
-+#endif
- }
- 
- void NativeInfoWidget::resizeEvent(QResizeEvent *event)
-@@ -328,6 +340,7 @@ void NativeInfoWidget::setMemory(const QString &memory)
-     m_memory->setValue(memory);
- }
- 
-+#ifndef DISABLE_ACTIVATOR
- void NativeInfoWidget::setLicenseState(ActiveState state)
- {
-     if (state == Authorized) {
-@@ -352,6 +365,7 @@ void NativeInfoWidget::setLicenseState(ActiveState state)
-         m_authorized->setButtonText(tr("Activate"));
-     }
- }
-+#endif
- 
- const QString NativeInfoWidget::systemCopyright() const
- {
-diff --git a/src/frame/window/modules/systeminfo/nativeinfowidget.h b/src/frame/window/modules/systeminfo/nativeinfowidget.h
-index 1849793..93e24ef 100644
---- a/src/frame/window/modules/systeminfo/nativeinfowidget.h
-+++ b/src/frame/window/modules/systeminfo/nativeinfowidget.h
-@@ -79,7 +79,9 @@ public Q_SLOTS:
-     void setType(const QString &type);
-     void setProcessor(const QString &processor);
-     void setMemory(const QString &memory);
-+#ifndef DISABLE_ACTIVATOR
-     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
- 
- protected:
-     void resizeEvent(QResizeEvent *event) override;
-@@ -108,7 +112,9 @@ private:
-     dcc::widgets::TitleValueItem *m_versionNumber;
-     dcc::widgets::TitleValueItem *m_version;
-     dcc::widgets::TitleValueItem *m_type;
-+#ifndef DISABLE_ACTIVATOR
-     dcc::widgets::TitleAuthorizedItem *m_authorized;
-+#endif
-     dcc::widgets::TitleValueItem *m_kernel;
-     dcc::widgets::TitleValueItem *m_processor;
-     dcc::widgets::TitleValueItem *m_memory;
-diff --git a/src/frame/window/modules/systeminfo/systeminfomodule.cpp b/src/frame/window/modules/systeminfo/systeminfomodule.cpp
-index 05fac20..563a3ee 100644
---- a/src/frame/window/modules/systeminfo/systeminfomodule.cpp
-+++ b/src/frame/window/modules/systeminfo/systeminfomodule.cpp
-@@ -129,7 +129,9 @@ void SystemInfoModule::onShowAboutNativePage()
-     m_frameProxy->pushWidget(this, w);
-     w->setVisible(true);
-     //showActivatorDialog
-+#ifndef DISABLE_ACTIVATOR
-     connect(w, &NativeInfoWidget::clickedActivator, m_work, &SystemInfoWork::showActivatorDialog);
-+#endif
- }
- 
- void SystemInfoModule::onVersionProtocolPage()
-diff --git a/src/frame/window/modules/update/updatectrlwidget.cpp b/src/frame/window/modules/update/updatectrlwidget.cpp
-index 158d6c4..415e89c 100644
---- a/src/frame/window/modules/update/updatectrlwidget.cpp
-+++ b/src/frame/window/modules/update/updatectrlwidget.cpp
-@@ -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)
-+#endif
-     , m_checkUpdateBtn(new QPushButton)
-     , m_lastCheckTimeTip(new TipsLabel)
- {
-@@ -85,11 +89,15 @@ UpdateCtrlWidget::UpdateCtrlWidget(UpdateModel *model, QWidget *parent)
-     m_fullProcess->setVisible(false);
-     m_fullProcess->setProcessValue(100);
- 
-+#ifndef DISABLE_ACTIVATOR
-     m_authorizationPrompt->setText(tr("Your system is not authorized, please activate first"));
-     m_authorizationPrompt->setAlignment(Qt::AlignHCenter);
-     m_authorizationPrompt->setVisible(false);
-+#endif
-     fullProcesslayout->addWidget(m_fullProcess);
-+#ifndef DISABLE_ACTIVATOR
-     fullProcesslayout->addWidget(m_authorizationPrompt);
-+#endif
- 
-     m_summaryGroup->setVisible(true);
- 
-@@ -172,7 +180,9 @@ void UpdateCtrlWidget::setShowInfo(const UiActiveState value)
-     }
- 
-     m_fullProcess->setEnabled(activation);
-+#ifndef DISABLE_ACTIVATOR
-     m_authorizationPrompt->setVisible(UpdatesStatus::UpdatesAvailable == m_model->status() && !activation);
-+#endif
- }
- 
- void UpdateCtrlWidget::loadAppList(const QList<AppUpdateInfo> &infos)
-@@ -253,9 +263,11 @@ void UpdateCtrlWidget::setStatus(const UpdatesStatus &status)
- {
-     m_status = status;
- 
-+#ifndef DISABLE_ACTIVATOR
-     if (m_model->systemActivation() == UiActiveState::Unauthorized || m_model->systemActivation() == UiActiveState::TrialExpired) {
-         m_status = NoAtive;
-     }
-+#endif
- 
-     Q_EMIT notifyUpdateState(m_status);
- 
-@@ -264,7 +276,9 @@ void UpdateCtrlWidget::setStatus(const UpdatesStatus &status)
-     m_resultItem->setVisible(false);
-     m_progress->setVisible(false);
-     m_fullProcess->setVisible(false);
-+#ifndef DISABLE_ACTIVATOR
-     m_authorizationPrompt->setVisible(false);
-+#endif
-     m_updateList->setVisible(false);
-     m_upgradeWarningGroup->setVisible(false);
-     m_reminderTip->setVisible(false);
-@@ -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());
-+#ifndef DISABLE_ACTIVATOR
-         setShowInfo(m_model->systemActivation());
-+#endif
-         setLowBattery(m_model->lowBattery());
-         break;
-     case UpdatesStatus::Downloading:
-@@ -457,10 +473,12 @@ void UpdateCtrlWidget::setLowBattery(const bool &lowBattery)
- {
-     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);
-+#ifndef DISABLE_ACTIVATOR
-     connect(m_model, &UpdateModel::systemActivationChanged, this, &UpdateCtrlWidget::setActiveState);
-+#endif
- 
- 
-     setUpdateProgress(m_model->updateProgress());
-diff --git a/src/frame/window/modules/update/updatectrlwidget.h b/src/frame/window/modules/update/updatectrlwidget.h
-index f54ee46..0e219f9 100644
---- a/src/frame/window/modules/update/updatectrlwidget.h
-+++ b/src/frame/window/modules/update/updatectrlwidget.h
-@@ -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;
-+#endif
- 
-     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 ef5529b..e84f643 100644
---- a/src/frame/window/modules/update/updatemodule.cpp
-+++ b/src/frame/window/modules/update/updatemodule.cpp
-@@ -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);
-+#ifndef DISABLE_ACTIVATOR
-     connect(m_work.get(), &UpdateWorker::requestRefreshLicenseState, m_work.get(), &UpdateWorker::licenseStateChangeSlot);
-+#endif
- 
- #ifndef DISABLE_SYS_UPDATE_MIRRORS
-     connect(m_work.get(), &UpdateWorker::requestRefreshMirrors, m_work.get(), &UpdateWorker::refreshMirrors);
-@@ -150,9 +152,11 @@ void UpdateModule::active()
- 
-     Q_EMIT m_work->requestRefreshLicenseState();
- 
-+#ifndef DISABLE_ACTIVATOR
-     if (m_model->systemActivation() == UiActiveState::Authorized || m_model->systemActivation() == UiActiveState::TrialAuthorized || m_model->systemActivation() == UiActiveState::AuthorizedLapse) {
-         m_updateWidget->setSystemVersion(m_model->systemVersionInfo());
-     }
-+#endif
-     m_updateWidget->setModel(m_model, m_work.get());
- 
-     connect(m_updateWidget, &UpdateWidget::pushMirrorsView, this, [=]() {
-@@ -186,7 +190,7 @@ void UpdateModule::active()
-         m_updateWidget->setSystemVersion(m_model->systemVersionInfo());
-     }
- #else
--    mainWidget->setSystemVersion(m_model->systemVersionInfo());
-+    m_updateWidget->setSystemVersion(m_model->systemVersionInfo());
- #endif
- 
-     m_frameProxy->pushWidget(this, m_updateWidget);
--- 
-2.20.1
-

0003-bugfix-for-no-check-newpassword-at-modifypwd.patch

@@ -1,38 +0,0 @@
-From 53dfbe39bdc60a54a7f6cd03fb4f4687c7c5d6ac Mon Sep 17 00:00:00 2001
-From: desert-sailor <dxwangk@isoftstone.com>
-Date: Tue, 11 Apr 2023 10:51:39 +0800
-Subject: [PATCH] [PATCH] bugfix for issue:I6QIOR modify passwd no check
- newpassword
-
----
- .../window/modules/accounts/modifypasswdpage.cpp   | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/frame/window/modules/accounts/modifypasswdpage.cpp b/src/frame/window/modules/accounts/modifypasswdpage.cpp
-index ff33149..e2f9d77 100644
---- a/src/frame/window/modules/accounts/modifypasswdpage.cpp
-+++ b/src/frame/window/modules/accounts/modifypasswdpage.cpp
-@@ -157,6 +157,20 @@ void ModifyPasswdPage::clickSaveBtn()
- {
-     //校验输入密码
-     if (judgeTextEmpty(m_oldPasswordEdit)) return;
-+    if (judgeTextEmpty(m_newPasswordEdit)) return;
-+
-+    if (m_newPasswordEdit->lineEdit()->text() == m_oldPasswordEdit->lineEdit()->text() ) {
-+        m_newPasswordEdit->setAlert(true);
-+        m_newPasswordEdit->showAlertMessage(tr("New password should differ from the current one"), m_oldPasswordEdit, 2000);
-+        return;
-+    }
-+
-+    if (judgeTextEmpty(m_repeatPasswordEdit)) return;
-+    if (m_newPasswordEdit->lineEdit()->text() != m_repeatPasswordEdit->lineEdit()->text()) {
-+        m_repeatPasswordEdit->setAlert(true);
-+        m_repeatPasswordEdit->showAlertMessage(tr("Passwords do not match"), m_repeatPasswordEdit, 2000);
-+        return;
-+    }
- 
-     Q_EMIT requestChangePassword(m_curUser, m_oldPasswordEdit->lineEdit()->text(), m_newPasswordEdit->lineEdit()->text(), m_repeatPasswordEdit->lineEdit()->text());
- }
--- 
-2.33.0
-

0003-dde-control-center-uos-open-activate-button-for-1050.patch

@@ -0,0 +1,31 @@
+From 8186e031531b6e09e2c633c57d632a73786c6953 Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Wed, 4 Jan 2023 13:27:37 +0800
+Subject: [PATCH] dde-control-center uos open activate button for 1050a
+
+---
+ src/frame/window/modules/systeminfo/nativeinfowidget.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
+index 754edd9..7c6c1b5 100644
+--- a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
++++ b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
+@@ -202,11 +202,12 @@ void NativeInfoWidget::initWidget()
+     m_authorized->setValue(tr("To be activated"));
+     m_authorized->setValueForegroundRole(QColor(255, 0, 0));
+     m_authorized->setButtonText(tr("Activate"));
+-    if (DSysInfo::uosEditionType() == DSysInfo::UosEnterpriseC) {
++    /*if (DSysInfo::uosEditionType() == DSysInfo::UosEnterpriseC) {
+         m_authorized->setVisable(false);
+     } else {
+         m_authorized->setVisable(true);
+-    }
++    }*/
++    m_authorized->setVisable(true);
+ 
+     m_kernel = new TitleValueItem(frame);
+     //~ contents_path /systeminfo/About This PC
+-- 
+2.20.1
+

0004-dde-control-center-disable-windowmoveswitch.patch

@@ -0,0 +1,50 @@
+From 263559ccfd3615ed1f7f733456f73c54ef364101 Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Wed, 1 Feb 2023 13:40:57 +0800
+Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3?=
+ =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=97=B6=E5=90=AF=E7=94=A8=E9=80=8F=E6=98=8E?=
+ =?UTF-8?q?=E7=89=B9=E6=95=88?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ .../window/modules/personalization/personalizationgeneral.cpp   | 2 ++
+ .../window/modules/personalization/personalizationgeneral.h     | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/frame/window/modules/personalization/personalizationgeneral.cpp b/src/frame/window/modules/personalization/personalizationgeneral.cpp
+index 13e7b65..137c165 100644
+--- a/src/frame/window/modules/personalization/personalizationgeneral.cpp
++++ b/src/frame/window/modules/personalization/personalizationgeneral.cpp
+@@ -493,11 +493,13 @@ void PersonalizationGeneral::paintEvent(QPaintEvent *event)
+     }
+ }
+ 
++#if 0
+ void PersonalizationGeneral::resizeEvent(QResizeEvent *event)
+ {
+     m_windowMovedLabel->setText(QFontMetrics(m_windowMovedLabel->font()).elidedText(m_displayData, Qt::ElideRight, event->size().width() >= 430 ? 500 : 280));
+     QWidget::resizeEvent(event);
+ }
++#endif
+ 
+ void PersonalizationGeneral::updateActiveColors(RoundColorWidget *selectedWidget)
+ {
+diff --git a/src/frame/window/modules/personalization/personalizationgeneral.h b/src/frame/window/modules/personalization/personalizationgeneral.h
+index b4856bb..00809fa 100644
+--- a/src/frame/window/modules/personalization/personalizationgeneral.h
++++ b/src/frame/window/modules/personalization/personalizationgeneral.h
+@@ -76,7 +76,9 @@ public:
+ 
+ protected:
+     void paintEvent(QPaintEvent *event);
++#if 0
+     void resizeEvent(QResizeEvent *event) override;
++#endif
+ 
+ private:
+     void updateActiveColors(RoundColorWidget *selectedWidget);
+-- 
+2.20.1
+

0004-fix.patch

@@ -1,56 +0,0 @@
-From 232b34bc0ae1e2fb3ea258d9e33a04fcbcf793b6 Mon Sep 17 00:00:00 2001
-From: leeffo <leeffo@yeah.net>
-Date: Thu, 8 Jun 2023 14:26:53 +0800
-Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?=
- =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF=E5=90=8E?=
- =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=B8=AD=E5=BF=83=E8=BF=9B=E5=85=A5=E7=B3=BB?=
- =?UTF-8?q?=E7=BB=9F=E4=BF=A1=E6=81=AF=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- .../window/modules/systeminfo/nativeinfowidget.cpp   | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
-index d7db8d6..7bfdfc8 100644
---- a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
-+++ b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
-@@ -85,6 +85,12 @@ NativeInfoWidget::NativeInfoWidget(SystemInfoModel *model, QWidget *parent)
-     , m_mainLayout(new QVBoxLayout(this))
-     , m_hostNameLayout(new QHBoxLayout(this))
-     , m_hostNameSettingItem(new SettingsItem(this))
-+    , m_hostNameTitleLabel(nullptr)
-+    , m_hostNameLabel(nullptr)
-+    , m_hostNameBtn(nullptr)
-+    , m_hostNameLineEdit(nullptr)
-+    , m_productName(nullptr)
-+    , m_versionNumber(nullptr)
-     , isContensServers(false)
- {
-     initWidget();
-@@ -304,7 +310,7 @@ void NativeInfoWidget::resizeEvent(QResizeEvent *event)
- {
-     ContentWidget::resizeEvent(event);
- 
--    if(m_hostNameLineEdit->isAlert()) {
-+    if(m_hostNameLineEdit && m_hostNameLineEdit->isAlert()) {
-         m_hostNameLineEdit->hideAlertMessage();
-         m_hostNameLineEdit->showAlertMessage(m_alertMessage,this);
-     }
-@@ -374,9 +380,9 @@ const QString NativeInfoWidget::systemCopyright() const
- 
-     if (oem_copyright.isEmpty()) {
-         if (DSysInfo::isCommunityEdition())
--            return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2011-%1 Deepin Community").arg(2022);
-+            return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2011-%1 Deepin Community").arg(QString(__DATE__).right(4));
-         else
--            return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2019-%1 UnionTech Software Technology Co., LTD").arg(2022);
-+            return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2019-%1 UnionTech Software Technology Co., LTD").arg(QString(__DATE__).right(4));
-     } else {
-         return oem_copyright;
-     }
--- 
-2.20.1
-

0005-dde-control-center-feat-add-setVersion.patch

@@ -0,0 +1,24 @@
+From d59f4e1bb7972884eff879f7be6810b2b3310c85 Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Thu, 2 Feb 2023 16:38:14 +0800
+Subject: [PATCH] feat: add setVersion
+
+---
+ src/frame/modules/systeminfo/systeminfowork.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/frame/modules/systeminfo/systeminfowork.cpp b/src/frame/modules/systeminfo/systeminfowork.cpp
+index 20b280c..5b1ce99 100644
+--- a/src/frame/modules/systeminfo/systeminfowork.cpp
++++ b/src/frame/modules/systeminfo/systeminfowork.cpp
+@@ -167,6 +167,7 @@ void SystemInfoWork::activate()
+         version = QString("%1 %2").arg(DSysInfo::productVersion())
+                                   .arg(DSysInfo::productTypeString());
+     }
++    m_model->setVersion(version);
+     m_model->setType(QSysInfo::WordSize);
+ 
+     if (m_systemInfo->isValid()) {
+-- 
+2.20.1
+

0006-dde-control-center-feat-hide-commoninfo.patch

@@ -0,0 +1,25 @@
+From ec9c7104aa14156e8ea1570980e1c7c486c9b1de Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Tue, 7 Feb 2023 09:13:32 +0800
+Subject: [PATCH] feat: hide commoninfo
+
+---
+ com.deepin.dde.control-center.gschema.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/com.deepin.dde.control-center.gschema.xml b/com.deepin.dde.control-center.gschema.xml
+index e4d2951..c6e1d49 100644
+--- a/com.deepin.dde.control-center.gschema.xml
++++ b/com.deepin.dde.control-center.gschema.xml
+@@ -39,7 +39,7 @@
+             <summary>Waiting for sound receipt Wait 1 second by default</summary>
+         </key>
+         <key name="hide-module" type="as">
+-            <default>[]</default>
++            <default>['commoninfo']</default>
+             <summary>The module to display</summary>
+         </key>
+         <key name="show-createuser" type="b">
+-- 
+2.20.1
+

0006-hide-commonifo-and-end-user-license-agreement.patch

@@ -1,14 +1,14 @@
-From 80e9d14a6f529fd3bccd0dd90fafb7b4fb82bb0b Mon Sep 17 00:00:00 2001
+From 1834aef3bac001345dc6fdf2629022088746f69b Mon Sep 17 00:00:00 2001
-From: leeffo <leeffo@yeah.net>
+From: leeffo <liweiganga@uniontech.com>
-Date: Thu, 8 Jun 2023 14:27:41 +0800
+Date: Wed, 2 Aug 2023 10:37:41 +0800
-Subject: [PATCH 2/2] fix: hide commoninfo and end-user-license-agreement
+Subject: [PATCH] hide commonifo and end-user-license-agreement
 
 ---
  com.deepin.dde.control-center.gschema.xml | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/com.deepin.dde.control-center.gschema.xml b/com.deepin.dde.control-center.gschema.xml
-index 5b2a70f..6b330d2 100644
+index b18fa11..784db01 100644
 --- a/com.deepin.dde.control-center.gschema.xml
 +++ b/com.deepin.dde.control-center.gschema.xml
 @@ -39,7 +39,7 @@
@@ -20,7 +20,7 @@ index 5b2a70f..6b330d2 100644
              <summary>The module to display</summary>
          </key>
          <key name="show-createuser" type="b">
-@@ -720,7 +720,7 @@
+@@ -748,7 +748,7 @@
              <description>default is true</description>
          </key>
          <key name="end-user-license-agreement" type="b">

0007-dde-control-center-uos-add-Free-license.patch

@@ -0,0 +1,129 @@
+From 778442f97f0af8631980f4dc75ee264c448b8d6e Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Thu, 16 Feb 2023 14:48:33 +0800
+Subject: [PATCH] dde-control-center uos add Free license
+
+---
+ include/widgets/utils.h                                  | 3 ++-
+ src/frame/modules/systeminfo/systeminfomodel.h           | 3 ++-
+ src/frame/window/modules/systeminfo/nativeinfowidget.cpp | 4 ++++
+ translations/dde-control-center_zh_CN.ts                 | 7 ++++++-
+ translations/dde-control-center_zh_HK.ts                 | 7 ++++++-
+ translations/dde-control-center_zh_TW.ts                 | 7 ++++++-
+ 6 files changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/include/widgets/utils.h b/include/widgets/utils.h
+index 1387ada..45debcc 100644
+--- a/include/widgets/utils.h
++++ b/include/widgets/utils.h
+@@ -39,7 +39,8 @@ enum UiActiveState {
+     Authorized,  //已授权
+     AuthorizedLapse,  //授权失效
+     TrialAuthorized, //试用期已授权
+-    TrialExpired //试用期已过期
++    TrialExpired, //试用期已过期
++    FreeLicenseAuthorized = 5 //商业免费授权
+ };
+ 
+ inline bool isFileExist(const QString &path){
+diff --git a/src/frame/modules/systeminfo/systeminfomodel.h b/src/frame/modules/systeminfo/systeminfomodel.h
+index 8cdb1fa..401c76f 100644
+--- a/src/frame/modules/systeminfo/systeminfomodel.h
++++ b/src/frame/modules/systeminfo/systeminfomodel.h
+@@ -19,7 +19,8 @@ enum ActiveState {
+     Authorized,  //已授权
+     AuthorizedLapse,  //授权失效
+     TrialAuthorized, //试用期已授权
+-    TrialExpired //试用期已过期
++    TrialExpired, //试用期已过期
++    FreeLicenseAuthorized = 5 //商业免费授权
+ };
+ 
+ class SystemInfoModel : public QObject
+diff --git a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
+index 7c6c1b5..771bb57 100644
+--- a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
++++ b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
+@@ -357,6 +357,10 @@ void NativeInfoWidget::setLicenseState(ActiveState state)
+         m_authorized->setValue(tr("Trial expired"));
+         m_authorized->setValueForegroundRole(QColor(255, 87, 54));
+         m_authorized->setButtonText(tr("Activate"));
++    } else if (state == FreeLicenseAuthorized) {
++        m_authorized->setValue(tr("Free license"));
++        m_authorized->setValueForegroundRole(QColor(21, 187, 24));
++        m_authorized->setButtonText(tr("View"));
+     }
+ }
+ 
+diff --git a/translations/dde-control-center_zh_CN.ts b/translations/dde-control-center_zh_CN.ts
+index 2ce90ac..3d5e66b 100644
+--- a/translations/dde-control-center_zh_CN.ts
++++ b/translations/dde-control-center_zh_CN.ts
+@@ -4511,6 +4511,11 @@
+         <source>Activate</source>
+         <translation>激活</translation>
+     </message>
++    <message>
++        <location filename="../src/frame/window/modules/systeminfo/nativeinfowidget.cpp" line="362"/>
++        <source>Free license</source>
++        <translation>免费授权</translation>
++    </message>
+     <message>
+         <location filename="../src/frame/window/modules/systeminfo/nativeinfowidget.cpp" line="214"/>
+         <source>Kernel</source>
+@@ -6488,4 +6493,4 @@ UnionTech Software is committed to research and improve the security, accuracy a
+         <translation>控制中心提供操作系统的所有设置选项。</translation>
+     </message>
+ </context>
+-</TS>
+\ No newline at end of file
++</TS>
+diff --git a/translations/dde-control-center_zh_HK.ts b/translations/dde-control-center_zh_HK.ts
+index 9ba8c3a..2adaccd 100644
+--- a/translations/dde-control-center_zh_HK.ts
++++ b/translations/dde-control-center_zh_HK.ts
+@@ -4511,6 +4511,11 @@
+         <source>Activate</source>
+         <translation>啟用</translation>
+     </message>
++    <message>
++        <location filename="../src/frame/window/modules/systeminfo/nativeinfowidget.cpp" line="362"/>
++        <source>Free license</source>
++        <translation>免費授權</translation>
++    </message>
+     <message>
+         <location filename="../src/frame/window/modules/systeminfo/nativeinfowidget.cpp" line="214"/>
+         <source>Kernel</source>
+@@ -6488,4 +6493,4 @@ UnionTech Software is committed to research and improve the security, accuracy a
+         <translation>控制中心提供操作系統的所有設置選項。</translation>
+     </message>
+ </context>
+-</TS>
+\ No newline at end of file
++</TS>
+diff --git a/translations/dde-control-center_zh_TW.ts b/translations/dde-control-center_zh_TW.ts
+index 23f6817..de875ec 100644
+--- a/translations/dde-control-center_zh_TW.ts
++++ b/translations/dde-control-center_zh_TW.ts
+@@ -4511,6 +4511,11 @@
+         <source>Activate</source>
+         <translation>啟用</translation>
+     </message>
++    <message>
++        <location filename="../src/frame/window/modules/systeminfo/nativeinfowidget.cpp" line="362"/>
++        <source>Free license</source>
++        <translation>免費授權</translation>
++    </message>
+     <message>
+         <location filename="../src/frame/window/modules/systeminfo/nativeinfowidget.cpp" line="214"/>
+         <source>Kernel</source>
+@@ -6488,4 +6493,4 @@ UnionTech Software is committed to research and improve the security, accuracy a
+         <translation>《控制中心》提供系統設定選項。</translation>
+     </message>
+ </context>
+-</TS>
+\ No newline at end of file
++</TS>
+-- 
+2.20.1
+

0008-dde-control-center-feat-hidden-power-press-powerbtn.patch

@@ -0,0 +1,25 @@
+From 9f8b031614a9c29a57dd0ad97ef672453c9e4442 Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Wed, 1 Mar 2023 14:19:19 +0800
+Subject: [PATCH] feat: hidden power-press-powerbtn
+
+---
+ com.deepin.dde.control-center.gschema.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/com.deepin.dde.control-center.gschema.xml b/com.deepin.dde.control-center.gschema.xml
+index c6e1d49..58bd4c1 100644
+--- a/com.deepin.dde.control-center.gschema.xml
++++ b/com.deepin.dde.control-center.gschema.xml
+@@ -212,7 +212,7 @@
+             <description>default is Enabled</description>
+         </key>
+         <key name="power-press-powerbtn" enum="com.deepin.dde.control-center.StatusMode">
+-            <default>'Enabled'</default>
++            <default>'Hidden'</default>
+             <summary>change power press powerbtn status</summary>
+             <description>default is Enabled</description>
+         </key>
+-- 
+2.20.1
+

0009-dde-control-center-feat-modify-copyright-read-current-year.patch

@@ -0,0 +1,28 @@
+From 77e3cdac535359ec5e6f013702653675ab448d80 Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Wed, 8 Mar 2023 11:21:10 +0800
+Subject: [PATCH] feat: modify copyright read current year
+
+---
+ src/frame/window/modules/systeminfo/nativeinfowidget.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
+index 771bb57..3ba9b1f 100644
+--- a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
++++ b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
+@@ -371,9 +371,9 @@ const QString NativeInfoWidget::systemCopyright() const
+ 
+     if (oem_copyright.isEmpty()) {
+         if (DSysInfo::isCommunityEdition())
+-            return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2011-%1 Deepin Community").arg(2022);
++            return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2011-%1 Deepin Community").arg(QString(__DATE__).right(4));
+         else
+-            return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2019-%1 UnionTech Software Technology Co., LTD").arg(2022);
++            return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2019-%1 UnionTech Software Technology Co., LTD").arg(QString(__DATE__).right(4));
+     } else {
+         return oem_copyright;
+     }
+-- 
+2.20.1
+

0010-fix-Array-out-of-bounds-causes-crash-handling.patch

@@ -0,0 +1,25 @@
+From d9f1a109f90f61dd917ad3ddce5894580086340e Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Mon, 12 Jun 2023 15:45:47 +0800
+Subject: [PATCH] fix: Array out of bounds causes crash handling
+
+---
+ src/frame/window/modules/systeminfo/systeminfowidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/frame/window/modules/systeminfo/systeminfowidget.cpp b/src/frame/window/modules/systeminfo/systeminfowidget.cpp
+index 6313841..0f06271 100644
+--- a/src/frame/window/modules/systeminfo/systeminfowidget.cpp
++++ b/src/frame/window/modules/systeminfo/systeminfowidget.cpp
+@@ -89,7 +89,7 @@ void SystemInfoWidget::initData()
+     if (IsServerSystem) {
+         connect(GSettingWatcher::instance(),
+                 &GSettingWatcher::requestShowSecondMenu, this, [this](int row) {
+-                    if (m_itemList[row].gsettingsName == "editionLicense") {
++                    if (m_itemList.size() > row && m_itemList[row].gsettingsName == "editionLicense") {
+                         m_listView->setRowHidden(row, true);
+                     }
+                 });
+-- 
+2.20.1
+

dde-control-center.spec

@@ -1,27 +1,48 @@
-%define specrelease 3%{?dist}
+%define specrelease 1
-%if 0%{?openeuler}
-%define specrelease 3
-%endif
 
 Name:           dde-control-center
-Version:        5.4.85.4
+Version:        5.5.182
 Release:        %{specrelease}
 Summary:        New control center for Linux Deepin
 License:        GPLv3
-URL:            https://github.com/linuxdeepin/%{name}
+URL:            https://github.com/linuxdeepin/dde-coptrol-center
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
-Patch0:         0002-hide-authorized.patch
+
-Patch1:         0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch
+#add by uos
-Patch2:         0003-bugfix-for-no-check-newpassword-at-modifypwd.patch
+Patch0001:      0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch
-Patch3:         0004-fix.patch
+# activate butten
-Patch4:         0005-fix-hide-commoninfo-and-end-user-license-agreement.patch
+Patch0003:      0003-dde-control-center-uos-open-activate-button-for-1050.patch
+# disable windowmoveswitch
+Patch0004:      0004-dde-control-center-disable-windowmoveswitch.patch
+# add setVersion
+Patch0005:      0005-dde-control-center-feat-add-setVersion.patch
+# uelc hide commoninfo
+Patch0006:      0006-hide-commonifo-and-end-user-license-agreement.patch
+# add Free-license
+Patch0007:      0007-dde-control-center-uos-add-Free-license.patch
+# hidden power-press-powerbtn
+Patch0008:      0008-dde-control-center-feat-hidden-power-press-powerbtn.patch
+# modify copyright read current year
+Patch0009:      0009-dde-control-center-feat-modify-copyright-read-current-year.patch
+Patch0010:      0001-feat-root.patch
+# pms 204145
+Patch0011:      0010-fix-Array-out-of-bounds-causes-crash-handling.patch
+#end
+
+#Patch0:         0002-hide-authorized.patch
+#Patch1:         0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch
+#Patch2:         0003-bugfix-for-no-check-newpassword-at-modifypwd.patch
+#Patch3:         0004-fix.patch
+#Patch4:         0005-fix-hide-commoninfo-and-end-user-license-agreement.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  desktop-file-utils
 BuildRequires:  dde-dock-devel
-BuildRequires:  pkgconfig(dde-network-utils)
+#BuildRequires:  dde-network-core-devel
+BuildRequires:  dde-network-utils-devel
 BuildRequires:  dtkwidget-devel
-BuildRequires:  dtkgui-devel dtkcore-devel
+BuildRequires:  dtkgui-devel
+BuildRequires:  dtkcore-devel
 BuildRequires:  dde-qt-dbus-factory-devel
 BuildRequires:  pkgconfig(gsettings-qt)
 BuildRequires:  pkgconfig(geoip)
@@ -40,14 +61,25 @@ BuildRequires:  gmock-devel
 BuildRequires:  polkit-qt5-1-devel
 BuildRequires:  deepin-pw-check
 BuildRequires:  deepin-pw-check-devel
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  kf5-kwayland-devel
+BuildRequires:  qt5-qtbase-static
+BuildRequires:  libxkbcommon-devel
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  kf5-kwayland-devel
+BuildRequires:  qt5-qtbase-static
+BuildRequires:  libxkbcommon-devel
+BuildRequires:  dareader-devel
+BuildRequires:  qt5-qtbase-private-devel
+
 Requires:       dde-account-faces
 Requires:       dde-api
 Requires:       dde-daemon
 Requires:       dde-qt5integration
-Requires:       dde-network-utils
+#Requires:       dde-network-core
 Requires:       startdde
 Requires:       dde-server-industry-config
-#Requires:       deepin-pw-check
+Requires:       deepin-pw-check
 Requires:       cracklib
 Recommends:     NetworkManager-l2tp
 
@@ -62,18 +94,29 @@ Summary:        %{summary}
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+%patch0001 -p1
-%patch1 -p1
+%patch0003 -p1
-%patch2 -p1
+%patch0004 -p1
-%patch3 -p1
+%patch0005 -p1
-%patch4 -p1
+%patch0006 -p1
+%patch0007 -p1
+%patch0008 -p1
+%patch0009 -p1
+%patch0010 -p1
+%patch0011 -p1
+
 sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
 sed -i -E '/add_compile_definitions/d' CMakeLists.txt
 
 %build
 %cmake . -DDCC_DISABLE_GRUB=YES \
+         -DDISABLE_AUTHENTICATION=YES \
+         -DDISABLE_ACCOUNT=YES \
          -DDISABLE_SYS_UPDATE=YES \
-         -DDISABLE_ACTIVATOR=YES
+         -DDISABLE_SYS_UPDATE_SOURCE_CHECK=YES \
+         -DDISABLE_SYS_UPDATE_MIRRORS=YES \
+         -DDISABLE_ACTIVATOR=YES \
+         -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}
 %make_build
 
 %post
@@ -91,8 +134,8 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/plugins
 # https://github.com/linuxdeepin/dde-control-center/issues/115
 # And we disabled SYS_UPDATE, so reboot-reminder-dialog is useless.
 #rm %{buildroot}%{_bindir}/reboot-reminder-dialog
-mkdir -p %{buildroot}/usr/lib64/cmake/DdeControlCenter
+#mkdir -p %{buildroot}/usr/lib64/cmake/DdeControlCenter
-mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}/usr/lib64/cmake/DdeControlCenter
+#mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}/usr/lib64/cmake/DdeControlCenter
 mv %{buildroot}/usr/lib/libdccwidgets.so %{buildroot}%{_libdir}/
 install -Dm644 com.deepin.controlcenter.addomain.policy %{buildroot}%{_datadir}/polkit-1/actions/
 
@@ -104,19 +147,22 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
 %files
 %doc README.md
 %license LICENSE
-%{_sysconfdir}/
 %{_bindir}/abrecovery
 %{_bindir}/dde-control-center
 %{_bindir}/dde-control-center-wapper
 %{_datadir}/
 %{_libdir}/libdccwidgets.so
-#/etc/xdg/autostart/deepin-ab-recovery.desktop
+%{_sysconfdir}/xdg/autostart/deepin-ab-recovery.desktop
+%{_prefix}/lib/dde-grand-search-daemon/
 
 %files devel
 %{_includedir}/dde-control-center
 %{_libdir}/cmake/DdeControlCenter/
 
 %changelog
+* Wed Aug 02 2023 leeffo <liweiganga@uniontech.com> - 5.5.182-1
+- upgrade to version 5.5.182
+
 * Thu Jun 08 2023 lee <liweiganga@uniontech.com> - 5.4.85.4-3
 - fix: control-center core and hide commoninfo