diff --git a/0001-hide-authorized.patch b/0001-hide-authorized.patch new file mode 100644 index 0000000000000000000000000000000000000000..348714ead4c49621747163a18563997a7357a8e6 --- /dev/null +++ b/0001-hide-authorized.patch @@ -0,0 +1,587 @@ +From 6f75016b635f0bdd4867bcad46bdf618f4321a2c Mon Sep 17 00:00:00 2001 +From: loong ci +Date: Thu, 4 Aug 2022 17:39:05 +0800 +Subject: [PATCH] hide authorized + +--- + src/frame/CMakeLists.txt | 1 + + src/frame/modules/systeminfo/systeminfomodel.cpp | 4 ++++ + src/frame/modules/systeminfo/systeminfomodel.h | 12 ++++++++++++ + src/frame/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/updatework.cpp | 4 ++++ + src/frame/modules/update/updatework.h | 4 ++++ + .../modules/systeminfo/nativeinfowidget.cpp | 14 ++++++++++++++ + .../window/modules/systeminfo/nativeinfowidget.h | 6 ++++++ + .../modules/systeminfo/systeminfomodule.cpp | 2 ++ + .../window/modules/update/updatectrlwidget.cpp | 16 ++++++++++++++++ + .../window/modules/update/updatectrlwidget.h | 2 ++ + src/frame/window/modules/update/updatemodule.cpp | 6 +++++- + 15 files changed, 91 insertions(+), 1 deletion(-) + +diff --git a/src/frame/CMakeLists.txt b/src/frame/CMakeLists.txt +index d391e05..02cced1 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 af539b1..78ecebc 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 + { + + } +@@ -218,6 +220,7 @@ void SystemInfoModel::setKernel(const QString &kernel) + kernelChanged(kernel); + } + ++#ifndef DISABLE_ACTIVATOR + void SystemInfoModel::setLicenseState(ActiveState state) + { + if (m_licenseState != state) { +@@ -225,6 +228,7 @@ 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 +--- 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 + { +@@ -64,7 +66,9 @@ public: + QString disk() const { return m_disk;} + QString kernel() const { return m_kernel;} + ++#ifndef DISABLE_ACTIVATOR + inline ActiveState licenseState() const { return m_licenseState; } ++#endif + + bool bootDelay() const; + bool themeEnabled() const { return m_themeEnabled; } +@@ -89,7 +93,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 + + public Q_SLOTS: + void setBootDelay(bool bootDelay); +@@ -106,7 +112,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 + + private: + bool m_bootDelay; +@@ -126,12 +134,16 @@ private: + QString m_memory; + QString m_disk; + QString m_kernel; ++#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 39e9d11..d12c82a 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) + m_dbusGrub->setSync(false, false); + m_dbusGrubTheme->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); +@@ -136,7 +138,9 @@ SystemInfoWork::SystemInfoWork(SystemInfoModel *model, QObject *parent) + + void SystemInfoWork::activate() + { ++#ifndef DISABLE_ACTIVATOR + qRegisterMetaType("ActiveState"); ++#endif + 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) + }); + } + ++#ifndef DISABLE_ACTIVATOR + void SystemInfoWork::showActivatorDialog() + { + QDBusInterface activator("com.deepin.license.activator", +@@ -303,6 +308,7 @@ void SystemInfoWork::licenseStateChangeSlot() + QFuture 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 f95b719..9a996be 100644 +--- a/src/frame/modules/systeminfo/systeminfowork.h ++++ b/src/frame/modules/systeminfo/systeminfowork.h +@@ -62,14 +62,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()) ++#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..76e7778 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,10 @@ private: + bool m_bRecoverRestoring; + QString m_systemVersionInfo; + QMetaEnum m_metaEnum; ++ ++#ifndef DISABLE_ACTIVATOR + UiActiveState m_bSystemActivation; ++#endif + + QString m_lastCheckUpdateTime; //上次检查更新时间 + QList m_historyAppInfos; //历史更新应用列表 +diff --git a/src/frame/modules/update/updatework.cpp b/src/frame/modules/update/updatework.cpp +index 1f07732..d7a9573 100644 +--- a/src/frame/modules/update/updatework.cpp ++++ b/src/frame/modules/update/updatework.cpp +@@ -200,6 +200,7 @@ void UpdateWorker::init() { + #endif + } + ++#ifndef DISABLE_ACTIVATOR + void UpdateWorker::licenseStateChangeSlot() + { + QFutureWatcher *watcher = new QFutureWatcher(); +@@ -227,6 +228,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 *packagesWatcher = new QFutureWatcher(); + connect(packagesWatcher, &QFutureWatcher::finished, this, [=] { +diff --git a/src/frame/modules/update/updatework.h b/src/frame/modules/update/updatework.h +index 977091b..a100c28 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 e1c1fb7..82e5640 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) + + 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); +@@ -104,6 +106,7 @@ void NativeInfoWidget::initWidget() + //~ contents_path /systeminfo/About This PC + m_type->setTitle(tr("Type:")); + ++#ifndef DISABLE_ACTIVATOR + m_authorized = new TitleAuthorizedItem(frame); + m_authorized->setTitle(tr("Authorization") + ':'); + m_authorized->setValue(tr("To be activated")); +@@ -114,6 +117,7 @@ void NativeInfoWidget::initWidget() + } else { + m_authorized->setVisable(true); + } ++#endif + + m_kernel = new TitleValueItem(frame); + //~ contents_path /systeminfo/About This PC +@@ -130,7 +134,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); +@@ -143,9 +149,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); +@@ -175,13 +183,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::setProductName(const QString &edition) +@@ -214,6 +226,7 @@ void NativeInfoWidget::setMemory(const QString &memory) + m_memory->setValue(memory); + } + ++#ifndef DISABLE_ACTIVATOR + void NativeInfoWidget::setLicenseState(ActiveState state) + { + if (state == Authorized) { +@@ -238,6 +251,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 cca4b19..50e1555 100644 +--- a/src/frame/window/modules/systeminfo/nativeinfowidget.h ++++ b/src/frame/window/modules/systeminfo/nativeinfowidget.h +@@ -58,10 +58,14 @@ 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 + + Q_SIGNALS: ++#ifndef DISABLE_ACTIVATOR + void clickedActivator(); ++#endif + + private: + dcc::systeminfo::SystemInfoModel *m_model; +@@ -70,7 +74,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 7f294e5..ed39906 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) + , m_bRecoverRestoring(false) + , m_activeState(UiActiveState::Unknown) + , m_updateList(new ContentWidget) ++#ifndef DISABLE_ACTIVATOR + , m_authorizationPrompt(new TipsLabel) ++#endif + , m_checkUpdateBtn(new QPushButton) + , m_lastCheckTimeTip(new TipsLabel) + { +@@ -81,11 +83,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); + +@@ -167,7 +173,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 &infos) +@@ -248,9 +256,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); + +@@ -259,7 +269,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); +@@ -307,7 +319,9 @@ void UpdateCtrlWidget::setStatus(const UpdatesStatus &status) + m_fullProcess->setMessage(tr("Download and install updates")); + setDownloadInfo(m_model->downloadInfo()); + setLowBattery(m_model->lowBattery()); ++#ifndef DISABLE_ACTIVATOR + setShowInfo(m_model->systemActivation()); ++#endif + break; + case UpdatesStatus::Downloading: + m_progress->setVisible(true); +@@ -512,7 +526,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..c9bb1ac 100644 +--- a/src/frame/window/modules/update/updatectrlwidget.h ++++ b/src/frame/window/modules/update/updatectrlwidget.h +@@ -109,7 +109,9 @@ private: + bool m_bRecoverRestoring; + UiActiveState m_activeState; + 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 e8b5a86..b545a7b 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 + + 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); +@@ -157,9 +159,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, [=]() { +@@ -193,7 +197,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 + diff --git a/dde-control-center-5.3.0.54.4.tar.gz b/dde-control-center-5.4.43.27.tar.gz similarity index 96% rename from dde-control-center-5.3.0.54.4.tar.gz rename to dde-control-center-5.4.43.27.tar.gz index 02c46493f8b454c122088e357f85435163f2a33e..2576590359829f325116b514a723c12e28b4cfec 100644 Binary files a/dde-control-center-5.3.0.54.4.tar.gz and b/dde-control-center-5.4.43.27.tar.gz differ diff --git a/dde-control-center.spec b/dde-control-center.spec index d8b171d118bf9970f998c2f4ca5dc2c6bfa20138..c4e6fd8effb185dacf6d95f744dda3ecc3b5802c 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,11 +1,16 @@ +%define specrelease 1%{?dist} +%if 0%{?openeuler} +%define specrelease 4 +%endif + Name: dde-control-center -Version: 5.3.0.54.4 -Release: 2 +Version: 5.4.43.27 +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: modify-QPainterPath-error.patch +Patch0: 0001-hide-authorized.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -26,6 +31,11 @@ BuildRequires: qt5-linguist BuildRequires: cmake BuildRequires: libXext-devel BuildRequires: qt5-qtbase-private-devel +BuildRequires: gtest-devel +BuildRequires: gmock-devel +BuildRequires: polkit-qt5-1-devel +BuildRequires: deepin-pw-check +BuildRequires: deepin-pw-check-devel Requires: dde-account-faces Requires: dde-api Requires: dde-daemon @@ -33,13 +43,15 @@ Requires: dde-qt5integration Requires: dde-network-utils Requires: startdde Requires: dde-server-industry-config +#Requires: deepin-pw-check +Requires: cracklib +Recommends: NetworkManager-l2tp %description New control center for Linux Deepin. %package devel Summary: %{summary} -BuildArch: noarch %description devel %{summary}. @@ -52,12 +64,25 @@ sed -i -E '/add_compile_definitions/d' CMakeLists.txt %build %cmake . -DDCC_DISABLE_GRUB=YES \ - -DDISABLE_SYS_UPDATE=YES + -DDISABLE_SYS_UPDATE=YES \ + -DDISABLE_ACTIVATOR=YES %make_build +%post +#create-cracklib-dict /usr/share/dict/MainEnglishDictionary_ProbWL.txt + +%postun +#if [ "$1" = "0" ] ; then +# create-cracklib-dict /usr/share/dict/MainEnglishDictionary_ProbWL.txt +#fi + %install %make_install INSTALL_ROOT=%{buildroot} +# place holder plugins dir 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 mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}/usr/lib64/cmake/DdeControlCenter mv %{buildroot}/usr/lib/libdccwidgets.so %{buildroot}%{_libdir}/ @@ -74,6 +99,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_sysconfdir}/ %{_bindir}/abrecovery %{_bindir}/dde-control-center +%{_bindir}/dde-control-center-wapper %{_datadir}/ %{_libdir}/libdccwidgets.so /etc/xdg/autostart/deepin-ab-recovery.desktop @@ -83,6 +109,18 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_libdir}/cmake/DdeControlCenter/ %changelog +* Wed Aug 10 2022 liweiganga - 5.4.43.27-4 +- fix: issue#I5LI5A + +* Fri Aug 05 2022 liweiganga - 5.4.43.27-3 +- hide authorized + +* Tue Aug 02 2022 liweiganga - 5.4.43.27-2 +- Remove installation dependencies + +* Mon Jul 18 2022 konglidong - 5.4.43.27-1 +- Update to 5.4.43.27 + * Sun Jan 30 2022 liweigang - 5.3.0.54.4-2 - fix build error @@ -92,7 +130,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: * Fri Sep 4 2020 chenbo pan 5.1.0.19-3 - fix compile fail -* Fri Jul 3 2020 uniontech - 5.1.0.19-2 +* Fri Jul 03 2020 uniontech - 5.1.0.19-2 - Add dde.sh to profile.d * Mon Jun 15 2020 uniontech - 5.1.0.19 @@ -100,3 +138,4 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: * Fri May 29 2020 uniontech - 5.0.30 - Project init. + diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch deleted file mode 100644 index 6eaaf3880b0c39b9c136b46b53e4213a131d04f1..0000000000000000000000000000000000000000 --- a/modify-QPainterPath-error.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --color -Naur a/src/frame/modules/display/recognizedialog.cpp b/src/frame/modules/display/recognizedialog.cpp ---- a/src/frame/modules/display/recognizedialog.cpp 2022-02-07 09:13:05.486670717 +0800 -+++ b/src/frame/modules/display/recognizedialog.cpp 2022-02-07 09:13:59.994251626 +0800 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - using namespace dcc::display; -