diff --git a/0001-Revert-feat.patch b/0001-Revert-feat.patch new file mode 100644 index 0000000000000000000000000000000000000000..61df4ab1e18daad1c6f33778ca3320847f10e6c5 --- /dev/null +++ b/0001-Revert-feat.patch @@ -0,0 +1,307 @@ +From df648120eb8961e074c49d2b7cebd26caa636dbb Mon Sep 17 00:00:00 2001 +From: liweigang +Date: Mon, 28 Oct 2024 15:10:38 +0800 +Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=E6=B5=99=E5=95=86=E9=93=B6?= + =?UTF-8?q?=E8=A1=8C=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD"?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 70b165df32326d38d4a9a6eb39687dcc1216db9f. +--- + config/org.deepin.dde.network.json | 26 ++--------------- + dcc-network-plugin/connectioneditpage.cpp | 4 --- + .../sections/secret8021xsection.cpp | 21 +------------- + .../sections/secret8021xsection.h | 5 +--- + .../sections/secretwiredsection.cpp | 2 +- + .../sections/secretwirelesssection.cpp | 2 +- + src/configsetting.cpp | 28 ------------------- + src/configsetting.h | 8 ------ + 8 files changed, 6 insertions(+), 90 deletions(-) + +diff --git a/config/org.deepin.dde.network.json b/config/org.deepin.dde.network.json +index bd10df6a..8bfa276b 100644 +--- a/config/org.deepin.dde.network.json ++++ b/config/org.deepin.dde.network.json +@@ -61,30 +61,8 @@ + "description": "控制中心-无线网络模块安全选项-WPA3 企业版，默认不显示", + "permissions": "readwrite", + "visibility": "private" +- }, +- "supportCertifiedEscape":{ +- "value": false, +- "serial": 0, +- "flags":[], +- "name":"supportCertifiedEscape", +- "name[zh_CN]":"是否回退到未经授权的网络", +- "description[zh_CN]":"当设置为true时，默认勾选是否回退到未经授权的网络，反之亦然", +- "description":"true: Fallback to Unauthorized Network Access", +- "permissions":"readwrite", +- "visibility":"private" +- }, +- "showUnauthorizedSwitch":{ +- "value": false, +- "serial": 0, +- "flags":[], +- "name":"showUnauthorizedSwitch", +- "name[zh_CN]":"是否显示回退到未经授权的网络的开关", +- "description[zh_CN]":"当设置为true时，显示回退到未经授权的网络的开关，反之亦然", +- "description":"true: show the switch of Unauthorized Switcher", +- "permissions":"readwrite", +- "visibility":"private" +- }, +- "reconnectIfIpConflicted":{ ++ }, ++ "reconnectIfIpConflicted":{ + "value": false, + "serial": 0, + "flags":["global"], +diff --git a/dcc-network-plugin/connectioneditpage.cpp b/dcc-network-plugin/connectioneditpage.cpp +index cb0c6a61..27c94913 100644 +--- a/dcc-network-plugin/connectioneditpage.cpp ++++ b/dcc-network-plugin/connectioneditpage.cpp +@@ -481,10 +481,6 @@ void ConnectionEditPage::createConnSettings() + switch (m_connType) { + case ConnectionSettings::ConnectionType::Wired: { + connName = tr("Wired Connection %1"); +- Security8021xSetting::Ptr securitySettings = m_connectionSettings->setting(Setting::Security8021x).dynamicCast(); +- if (securitySettings) { +- securitySettings->setSupportCertifiedEscape(dde::network::ConfigSetting::instance()->supportCertifiedEscape()); +- } + break; + } + case ConnectionSettings::ConnectionType::Wireless: { +diff --git a/dcc-network-plugin/sections/secret8021xsection.cpp b/dcc-network-plugin/sections/secret8021xsection.cpp +index f836aab6..ac2a43c2 100644 +--- a/dcc-network-plugin/sections/secret8021xsection.cpp ++++ b/dcc-network-plugin/sections/secret8021xsection.cpp +@@ -22,17 +22,15 @@ + using namespace NetworkManager; + using namespace dcc::widgets; + +-Secret8021xSection::Secret8021xSection(Security8021xSetting::Ptr sSetting, bool showAuthEscapeSwitch, QFrame *parent) ++Secret8021xSection::Secret8021xSection(Security8021xSetting::Ptr sSetting, QFrame *parent) + : AbstractSection(tr("Security"), parent) + , m_passwordFlagsChooser(new ComboxWidget(this)) + , m_currentPasswordType(Setting::AgentOwned) +- , m_supportCertifiedEscape(new SwitchWidget(this)) + , m_eapMethodChooser(new ComboxWidget(this)) + , m_identity(new LineEditWidget(this)) + , m_password(new PasswdLineEditWidget(this)) + , m_enableWatcher(nullptr) + , m_secretSetting(std::move(sSetting)) +- , m_showAuthEscapeSwitch(showAuthEscapeSwitch) + { + initStrMaps(); + +@@ -63,12 +61,6 @@ Secret8021xSection::Secret8021xSection(Security8021xSetting::Ptr sSetting, bool + if (str.isEmpty()) + dynamic_cast(m_password->dTextEdit())->setEchoButtonIsVisible(true); + }); +- if (m_showAuthEscapeSwitch) { +- connect(dde::network::ConfigSetting::instance(), &dde::network::ConfigSetting::showUnAuthorizeSwitchChanged, +- this, [ this ](bool showUnAuthorize) { +- m_supportCertifiedEscape->setVisible(m_showAuthEscapeSwitch && showUnAuthorize && m_enableWatcher->secretEnabled()); +- }); +- } + } + + Secret8021xSection::~Secret8021xSection() +@@ -213,12 +205,6 @@ void Secret8021xSection::initStrMaps() + + void Secret8021xSection::initUI() + { +- m_supportCertifiedEscape->setTitle(tr("Fallback to Unauthorized Network Access")); +- if (m_secretSetting->toMap().isEmpty()) { +- m_supportCertifiedEscape->setChecked(dde::network::ConfigSetting::instance()->supportCertifiedEscape()); +- } else { +- m_supportCertifiedEscape->setChecked(m_secretSetting->supportCertifiedEscape()); +- } + m_eapMethodChooser->setTitle(tr("EAP Auth")); + QStringList eapComboxOptions; + QString eapOptionText; +@@ -311,7 +297,6 @@ void Secret8021xSection::initConnection() + + connect(m_eapMethodChooser, &ComboxWidget::onIndexChanged, this, &Secret8021xSection::editClicked); + connect(m_passwordFlagsChooser, &ComboxWidget::onIndexChanged, this, &Secret8021xSection::editClicked); +- connect(m_supportCertifiedEscape, &SwitchWidget::checkedChanged, this, &Secret8021xSection::editClicked); + } + + void Secret8021xSection::initEapItems(Security8021xSetting::EapMethod method) +@@ -350,7 +335,6 @@ void Secret8021xSection::initEapItems(Security8021xSetting::EapMethod method) + break; + } + +- appendItem(m_supportCertifiedEscape); + m_eapMethodItemsMap.insert(method, itemList); + } + +@@ -534,7 +518,6 @@ void Secret8021xSection::initEapMethodPeapItems(QList *itemList) + + void Secret8021xSection::onSecretEnableChanged(const bool enable) + { +- m_supportCertifiedEscape->setVisible(m_showAuthEscapeSwitch && dde::network::ConfigSetting::instance()->showUnAuthorizeSwitch() && enable); + m_eapMethodChooser->setVisible(enable); + m_identity->setVisible(enable); + m_passwordFlagsChooser->setVisible(enable && !ConfigWatcher::instance()->enableAccountNetwork()); +@@ -686,8 +669,6 @@ void Secret8021xSection::saveCommonItems() + m_secretSetting->setEapMethods(QList() << m_currentEapMethod); + m_secretSetting->setIdentity(m_identity->text()); + +- m_secretSetting->setSupportCertifiedEscape(m_supportCertifiedEscape->isVisible() && m_supportCertifiedEscape->checked()); +- + if (m_currentEapMethod == Security8021xSetting::EapMethodTls) { + m_secretSetting->setPrivateKeyPasswordFlags(m_currentPasswordType); + if (m_currentPasswordType != Setting::NotSaved) +diff --git a/dcc-network-plugin/sections/secret8021xsection.h b/dcc-network-plugin/sections/secret8021xsection.h +index 594a2b80..dd546542 100644 +--- a/dcc-network-plugin/sections/secret8021xsection.h ++++ b/dcc-network-plugin/sections/secret8021xsection.h +@@ -13,7 +13,6 @@ namespace dcc { + namespace widgets { + class ComboxWidget; + class LineEditWidget; +- class SwitchWidget; + } + } + +@@ -60,7 +59,7 @@ public: + void saveSettings() Q_DECL_OVERRIDE; + + protected: +- explicit Secret8021xSection(Security8021xSetting::Ptr sSetting, bool showAuthEscapeSwitch, QFrame *parent = nullptr); ++ explicit Secret8021xSection(Security8021xSetting::Ptr sSetting, QFrame *parent = nullptr); + // This method must be called by subclass after initialization + void init(Secret8021xEnableWatcher *watcher, const QList &eapMethodsSupportList); + ComboxWidget *m_passwordFlagsChooser; +@@ -105,7 +104,6 @@ private: + QList> PeapVersionStrMap; + QList> AuthMethodStrMapPeap; + +- SwitchWidget *m_supportCertifiedEscape; + ComboxWidget *m_eapMethodChooser; + LineEditWidget *m_identity; + PasswdLineEditWidget *m_password; +@@ -113,7 +111,6 @@ private: + + Security8021xSetting::EapMethod m_currentEapMethod; + Security8021xSetting::Ptr m_secretSetting; +- bool m_showAuthEscapeSwitch; + + QList m_eapMethodsWantedList; + QMap> m_eapMethodItemsMap; +diff --git a/dcc-network-plugin/sections/secretwiredsection.cpp b/dcc-network-plugin/sections/secretwiredsection.cpp +index 6a45f256..1d4eeaed 100644 +--- a/dcc-network-plugin/sections/secretwiredsection.cpp ++++ b/dcc-network-plugin/sections/secretwiredsection.cpp +@@ -9,7 +9,7 @@ + using namespace dcc::widgets; + + SecretWiredSection::SecretWiredSection(const Security8021xSetting::Ptr &sSetting, QFrame *parent) +- : Secret8021xSection(sSetting, true, parent) ++ : Secret8021xSection(sSetting, parent) + , m_secretEnable(new SwitchWidget(this)) + , m_enableWatcher(new Secret8021xEnableWatcher(this)) + { +diff --git a/dcc-network-plugin/sections/secretwirelesssection.cpp b/dcc-network-plugin/sections/secretwirelesssection.cpp +index c5f99671..fd7706c9 100644 +--- a/dcc-network-plugin/sections/secretwirelesssection.cpp ++++ b/dcc-network-plugin/sections/secretwirelesssection.cpp +@@ -23,7 +23,7 @@ SecretWirelessSection::SecretWirelessSection(WirelessSecuritySetting::Ptr wsSett + const Security8021xSetting::Ptr &sSetting, + ParametersContainer::Ptr parameter, + QFrame *parent) +- : Secret8021xSection(sSetting, false, parent) ++ : Secret8021xSection(sSetting, parent) + , m_keyMgmtChooser(new ComboxWidget(this)) + , m_passwdEdit(new PasswdLineEditWidget(this)) + , m_enableWatcher(new Secret8021xEnableWatcher(this)) +diff --git a/src/configsetting.cpp b/src/configsetting.cpp +index 6d154cb1..721cd0a6 100644 +--- a/src/configsetting.cpp ++++ b/src/configsetting.cpp +@@ -19,8 +19,6 @@ ConfigSetting::ConfigSetting(QObject *parent) + , m_loadServiceFromNM(false) + , m_enableConnectivity(false) + , m_checkPortal(false) +- , m_supportCertifiedEscape(false) +- , m_showUnAuthorizeSwitch(true) + , m_connectivityCheckInterval(30000) + , m_wirelessScanInterval(10000) + , m_wpaEapAuthen("peap") +@@ -85,22 +83,6 @@ void ConfigSetting::onValueChanged(const QString &key) + } else if (key == "networkAirplaneMode") { + m_networkAirplaneMode = dConfig->value("networkAirplaneMode").toBool(); + emit enableAirplaneModeChanged(m_networkAirplaneMode); +- } else if (key == "supportCertifiedEscape") { +- m_supportCertifiedEscape = dConfig->value("supportCertifiedEscape").toBool(); +- emit supportCertifiedEscapeChanged(m_supportCertifiedEscape); +- } else if (key == "showUnauthorizedSwitch") { +- m_showUnAuthorizeSwitch = dConfig->value("showUnauthorizedSwitch").toBool(); +- emit showUnAuthorizeSwitchChanged(m_showUnAuthorizeSwitch); +- } else if (key == "enableEapInput") { +- m_enableEapInput = dConfig->value("enableEapInput").toBool(); +- } else if (key == "showBrowserLink") { +- m_showBrowserLink = dConfig->value("showBrowserLink").toBool(); +- emit showBrowserLinkChanged(m_showBrowserLink); +- } else if (key == QString("browserUrl")) { +- m_browserUrl = dConfig->value(key).toString(); +- emit browserUrlChanged(m_browserUrl); +- } else if (key == "NobindEthernetMacDefault") { +- m_nobindEthernetMacDefault = dConfig->value("NobindEthernetMacDefault").toBool(); + } + } + +@@ -140,16 +122,6 @@ bool ConfigSetting::checkPortal() const + return m_checkPortal; + } + +-bool ConfigSetting::supportCertifiedEscape() const +-{ +- return m_supportCertifiedEscape; +-} +- +-bool ConfigSetting::showUnAuthorizeSwitch() const +-{ +- return m_showUnAuthorizeSwitch; +-} +- + int ConfigSetting::connectivityCheckInterval() const + { + return m_connectivityCheckInterval; +diff --git a/src/configsetting.h b/src/configsetting.h +index d7d665c4..09020b05 100644 +--- a/src/configsetting.h ++++ b/src/configsetting.h +@@ -22,8 +22,6 @@ public: + QStringList networkCheckerUrls() const; // 网络检测地址，用于检测网络连通性 + bool enableConnectivity() const; // 是否开启或者禁用前端检测网络连通性的功能 + bool checkPortal() const; // 是否检测网络认证信息 +- bool supportCertifiedEscape() const; // 默认是否支持是否回退到未经授权的网络 +- bool showUnAuthorizeSwitch() const; // 是否显示回退到未经授权的网络的开关 + int connectivityCheckInterval() const; // 网络连通性检测时间间隔 + int wirelessScanInterval() const; // 无线扫描间隔(ms) + QString wpaEapAuthen() const; // 企业网EAP认证方式 +@@ -45,10 +43,6 @@ signals: + void wpaEapAuthenChanged(const QString &); + void wpaEapAuthmethodChanged(const QString &); + void enableAirplaneModeChanged(bool); +- void supportCertifiedEscapeChanged(bool); +- void showUnAuthorizeSwitchChanged(bool); +- void showBrowserLinkChanged(bool); +- void browserUrlChanged(const QString &); + + private: + explicit ConfigSetting(QObject *parent = nullptr); +@@ -62,8 +56,6 @@ private: + bool m_loadServiceFromNM; + bool m_enableConnectivity; + bool m_checkPortal; +- bool m_supportCertifiedEscape; +- bool m_showUnAuthorizeSwitch; + int m_connectivityCheckInterval; + int m_wirelessScanInterval; + QStringList m_networkUrls; +-- +2.45.2 + diff --git a/0001-feat-add-activateConnection2.patch b/0001-feat-add-activateConnection2.patch new file mode 100644 index 0000000000000000000000000000000000000000..2257485a72bd9068022bff6607d9ab0c035b32c2 --- /dev/null +++ b/0001-feat-add-activateConnection2.patch @@ -0,0 +1,107 @@ +From 8075b9cb66ddf752a0f2732a6e9a88ca876e6505 Mon Sep 17 00:00:00 2001 +From: liweigang +Date: Sat, 26 Oct 2024 11:06:31 +0000 +Subject: [PATCH] feat: add activateConnection2 + +Signed-off-by: liweigang +--- + dcc-network-plugin/connectioneditpage.cpp | 1 + + .../operation/private/netwirelessconnect.cpp | 1 + + .../networkmanager/devicemanagerrealize.cpp | 1 + + src/impl/networkmanager/nmnetworkmanager.cpp | 28 +++++++++++++++++++ + src/impl/networkmanager/nmnetworkmanager.h | 12 ++++++++ + 5 files changed, 43 insertions(+) + create mode 100644 src/impl/networkmanager/nmnetworkmanager.cpp + create mode 100644 src/impl/networkmanager/nmnetworkmanager.h + +diff --git a/dcc-network-plugin/connectioneditpage.cpp b/dcc-network-plugin/connectioneditpage.cpp +index cb0c6a6..db64b47 100644 +--- a/dcc-network-plugin/connectioneditpage.cpp ++++ b/dcc-network-plugin/connectioneditpage.cpp +@@ -10,6 +10,7 @@ + #include "sections/abstractsection.h" + #include "networkconst.h" + #include "configsetting.h" ++#include "impl/networkmanager/nmnetworkmanager.h" + + #include + #include +diff --git a/net-view/operation/private/netwirelessconnect.cpp b/net-view/operation/private/netwirelessconnect.cpp +index ce2ea47..f6d45e2 100644 +--- a/net-view/operation/private/netwirelessconnect.cpp ++++ b/net-view/operation/private/netwirelessconnect.cpp +@@ -5,6 +5,7 @@ + #include "netwirelessconnect.h" + + #include "configsetting.h" ++#include "impl/networkmanager/nmnetworkmanager.h" + + #include + #include +diff --git a/src/impl/networkmanager/devicemanagerrealize.cpp b/src/impl/networkmanager/devicemanagerrealize.cpp +index b5194f2..3560e84 100644 +--- a/src/impl/networkmanager/devicemanagerrealize.cpp ++++ b/src/impl/networkmanager/devicemanagerrealize.cpp +@@ -9,6 +9,7 @@ + #include "accesspointproxynm.h" + #include "configsetting.h" + #include "ipmanager.h" ++#include "impl/networkmanager/nmnetworkmanager.h" + + #include + #include +diff --git a/src/impl/networkmanager/nmnetworkmanager.cpp b/src/impl/networkmanager/nmnetworkmanager.cpp +new file mode 100644 +index 0000000..c77c46c +--- /dev/null ++++ b/src/impl/networkmanager/nmnetworkmanager.cpp +@@ -0,0 +1,28 @@ ++// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd. ++// ++// SPDX-License-Identifier: GPL-3.0-or-later ++#include "nmnetworkmanager.h" ++ ++#include ++ ++namespace NetworkManager { ++ ++QDBusPendingReply activateConnection2(const QString &connectionUni, const QString &interfaceUni, const QString &connectionParameter, const QVariantMap &options) ++{ ++ QString extra_interface_parameter = interfaceUni; ++ QString extra_connection_parameter = connectionParameter; ++ if (extra_interface_parameter.isEmpty()) { ++ extra_interface_parameter = QLatin1String("/"); ++ } ++ if (extra_connection_parameter.isEmpty()) { ++ extra_connection_parameter = QLatin1String("/"); ++ } ++ // TODO store error code ++ QDBusObjectPath connPath(connectionUni); ++ QDBusObjectPath interfacePath(interfaceUni); ++ ++ QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager", "ActivateConnection2"); ++ msg << connPath << QDBusObjectPath(extra_interface_parameter) << QDBusObjectPath(extra_connection_parameter) << options; ++ return QDBusConnection::systemBus().asyncCall(msg); ++} ++} // namespace NetworkManager +diff --git a/src/impl/networkmanager/nmnetworkmanager.h b/src/impl/networkmanager/nmnetworkmanager.h +new file mode 100644 +index 0000000..eb4955f +--- /dev/null ++++ b/src/impl/networkmanager/nmnetworkmanager.h +@@ -0,0 +1,12 @@ ++// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd. ++// ++// SPDX-License-Identifier: GPL-3.0-or-later ++ ++#ifndef NETWORKMANAGER_H ++#define NETWORKMANAGER_H ++#include ++ ++namespace NetworkManager { ++QDBusPendingReply activateConnection2(const QString &connectionUni, const QString &interfaceUni, const QString &connectionParameter, const QVariantMap &options); ++} // namespace NetworkManager ++#endif // NETWORKMANAGER_H +-- +2.47.0 + diff --git a/0001-feat-add-missing-include.patch b/0001-feat-add-missing-include.patch new file mode 100644 index 0000000000000000000000000000000000000000..16b19cca1e6616743661feb0ec43758655133c44 --- /dev/null +++ b/0001-feat-add-missing-include.patch @@ -0,0 +1,84 @@ +From f940e52b693b6ebf244a857c7596c69c019d7353 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Mon, 22 Dec 2025 15:43:38 +0800 +Subject: [PATCH] add missing include + +--- + net-view/operation/private/netsecretagent.cpp | 1 + + .../session/accountnetwork/activeaccoutnetwork.cpp | 6 ++++++ + .../session/accountnetwork/networkactivator.cpp | 1 + + network-service-plugin/session/sessioncontainer.cpp | 3 +++ + network-service-plugin/system/connectivitychecker.cpp | 2 ++ + 5 files changed, 13 insertions(+) + +diff --git a/net-view/operation/private/netsecretagent.cpp b/net-view/operation/private/netsecretagent.cpp +index 2d526f7..4629d20 100644 +--- a/net-view/operation/private/netsecretagent.cpp ++++ b/net-view/operation/private/netsecretagent.cpp +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + static const QString NetworkDialogApp = "dde-network-dialog"; // 网络列表执行文件 + +diff --git a/network-service-plugin/accountnetwork/session/accountnetwork/activeaccoutnetwork.cpp b/network-service-plugin/accountnetwork/session/accountnetwork/activeaccoutnetwork.cpp +index 8405b0e..aa72a97 100644 +--- a/network-service-plugin/accountnetwork/session/accountnetwork/activeaccoutnetwork.cpp ++++ b/network-service-plugin/accountnetwork/session/accountnetwork/activeaccoutnetwork.cpp +@@ -13,6 +13,12 @@ + #include + #include + #include ++#include ++#include ++#include ++#include ++#include ++#include + + #include + #include +diff --git a/network-service-plugin/accountnetwork/session/accountnetwork/networkactivator.cpp b/network-service-plugin/accountnetwork/session/accountnetwork/networkactivator.cpp +index 599fc9f..bb3e120 100644 +--- a/network-service-plugin/accountnetwork/session/accountnetwork/networkactivator.cpp ++++ b/network-service-plugin/accountnetwork/session/accountnetwork/networkactivator.cpp +@@ -9,6 +9,7 @@ + #include "constants.h" + + #include ++#include + + #include + #include +diff --git a/network-service-plugin/session/sessioncontainer.cpp b/network-service-plugin/session/sessioncontainer.cpp +index addf84d..f37dda9 100755 +--- a/network-service-plugin/session/sessioncontainer.cpp ++++ b/network-service-plugin/session/sessioncontainer.cpp +@@ -9,6 +9,9 @@ + #include "settingconfig.h" + + #include ++#include ++#include ++#include + + using namespace network::sessionservice; + +diff --git a/network-service-plugin/system/connectivitychecker.cpp b/network-service-plugin/system/connectivitychecker.cpp +index 3c7db8a..d5d7be2 100755 +--- a/network-service-plugin/system/connectivitychecker.cpp ++++ b/network-service-plugin/system/connectivitychecker.cpp +@@ -12,6 +12,8 @@ + #include + + #include ++#include ++#include + + // 当没有进行配置的时候, 则访问我们官网 + static const QStringList CheckUrls{ +-- +2.43.0 + diff --git a/0004-fix-build-error.patch b/0004-fix-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..862bfe26d7c527e56b2dcbd2d5d1ca5cb08f9c34 --- /dev/null +++ b/0004-fix-build-error.patch @@ -0,0 +1,25 @@ +diff --git a/dcc-network-plugin/wiredpage.cpp b/dcc-network-plugin/wiredpage.cpp +index f070a37..b432f61 100644 +--- a/dcc-network-plugin/wiredpage.cpp ++++ b/dcc-network-plugin/wiredpage.cpp +@@ -17,6 +17,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 56631e1..c8c13e2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -79,6 +79,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE + ${KF5_QT_LIBRARIES} + ${DtkCore_LIBRARIES} + PkgConfig::LibNM ++ udev + ) + + configure_file(dde-network-core.pc.in ../dde-network-core.pc @ONLY) diff --git a/dde-network-core-1.0.74.tar.gz b/dde-network-core-1.0.74.tar.gz deleted file mode 100644 index 1df71e8244eccb60fcd5c8847be1dc9a9d29f5c1..0000000000000000000000000000000000000000 Binary files a/dde-network-core-1.0.74.tar.gz and /dev/null differ diff --git a/dde-network-core.spec b/dde-network-core.spec index bed0a3765700371556940a40e669d08400e81738..725156dd80e6e2b2d3af395f0dc25c658556c74d 100644 --- a/dde-network-core.spec +++ b/dde-network-core.spec @@ -1,35 +1,51 @@ -%define anolis_release 2 -%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} Name: dde-network-core -Version: 1.0.74 -Release: 5.%{anolis_release}%{?dist} -Summary: Deepin desktop-environment - network core files -License: GPLv3 +Version: 1.2.35.2 +Release: 1%{?dist} +Summary: DDE network library and plugins +License: GPL-3.0-or-later URL: https://github.com/linuxdeepin/dde-network-core -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: dde-network-core_1.2.35.2.orig.tar.xz +Patch0: 0001-feat-add-missing-include.patch +Patch1: 0001-Revert-feat.patch +Patch2: 0001-feat-add-activateConnection2.patch +Patch3: 0004-fix-build-error.patch BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 - -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtbase-private-devel -BuildRequires: qt5-linguist +BuildRequires: ninja-build + +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5Help) + +BuildRequires: cmake(KF5NetworkManagerQt) + +BuildRequires: cmake(DtkWidget) +BuildRequires: cmake(DtkCore) +BuildRequires: cmake(DdeControlCenter) +BuildRequires: cmake(DdeDock) +BuildRequires: cmake(DdeSessionShell) +BuildRequires: cmake(DFrameworkdbus) +BuildRequires: cmake(GTest) +BuildRequires: gmock + +BuildRequires: pkgconfig(libnm) +BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gsettings-qt) -BuildRequires: qt5-qttools-devel -BuildRequires: qt5-qtsvg-devel - -BuildRequires: kf5-networkmanager-qt-devel -BuildRequires: dtkwidget-devel -BuildRequires: dde-control-center -BuildRequires: dde-control-center-devel -BuildRequires: dde-dock-devel -BuildRequires: dde-qt-dbus-factory-devel +BuildRequires: systemd-devel +BuildRequires: libcurl-devel +BuildRequires: dde-session-shell BuildRequires: dde-session-shell-devel -BuildRequires: gtest-devel +Requires: dde-common >= 2026 +# provides %%{_var}/lib/polkit-1/localauthority/10-vendor.d +Requires: polkit-pkla-compat + Obsoletes: dde-network-utils <= 5.4.15 %description @@ -44,7 +60,7 @@ Obsoletes: dde-network-utils-devel <= 5.4.15 Header files and libraries for %{name}. %prep -%autosetup +%autosetup -p1 sed -i 's|lib/|%{_lib}/|' dock-network-plugin/CMakeLists.txt @@ -60,28 +76,56 @@ cd build %files %doc README.md -%{_bindir}/dde-network-dialog %{_prefix}/lib/dde-control-center/ %{_libdir}/dde-dock/ %{_prefix}/lib/dde-session-shell/ %{_libdir}/libdde-network-core.so* %{_datadir}/dsg/ %{_datadir}/dcc-network-plugin/ -%{_datadir}/dde-network-dialog/ %{_datadir}/dock-network-plugin/ %{_datadir}/dss-network-plugin/ +%{_datadir}/dde-network-core/translations/*.qm /var/lib/polkit-1/localauthority/10-vendor.d/10-network-manager.pkla +%{_libdir}/deepin-service-manager/libnetwork-service.so +%{_datadir}/dbus-1/system.d/org.deepin.service.SessionNetwork.conf +%{_datadir}/dbus-1/system.d/org.deepin.service.SystemNetwork.conf +%{_datadir}/dde-dock/icons/dcc-setting/network.svg +%{_datadir}/deepin-service-manager/network-service/translations/ +%{_datadir}/deepin-service-manager/system/plugin-system-network.json +%{_datadir}/deepin-service-manager/user/plugin-session-network.json %files devel %{_includedir}/libddenetworkcore/ %{_libdir}/pkgconfig/*.pc %changelog -* Tue Nov 07 2023 yangxianzhao - 1.0.74-5.2 -- rebuild for qt +* Mon Dec 22 2025 liweigang - 1.2.35.2-1 +- update: update to version 1.2.35.2 + +* Mon Aug 25 2025 maqi - 1.2.31.1-1.01 +- spec: update license + +* Tue Dec 10 2024 liweigang - 1.2.31.1-1 +- update: Bump to version 1.2.31.1 +- fix: fix network check(bugid:282327) + +* Tue Dec 03 2024 liweigang - 1.2.26.2-1.02 +- rebuild: rebuild for sw64 mips64el + +* Mon Oct 14 2024 liweigang - 1.2.26.2-1.01 +- spec: del require dde-network-core-lib + +* Mon Oct 14 2024 liweigang - 1.2.26.2-1 +- update: update to version 1.2.26.2 + +* Mon Oct 09 2023 liweigang - 1.1.28.1-1 +- update: update to version 1.1.28.1 + +* Mon Sep 18 2023 liuzhilin - 1.1.18.4-1.01 +- spec: add buildrequires gmock -* Wed Nov 01 2023 yangxianzhao - 1.0.74-5.1 -- fix build error +* Wed Aug 16 2023 liuzhilin - 1.1.18.4-1 +- update: update to 1.1.18.4 * Fri Mar 31 2023 mahailiang - 1.0.74-5 - rebuild diff --git a/dde-network-core_1.2.35.2.orig.tar.xz b/dde-network-core_1.2.35.2.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..f3ee26aadc3ddf656cc1abd2ab18ef6a6b5dfc18 Binary files /dev/null and b/dde-network-core_1.2.35.2.orig.tar.xz differ