0001-fix-coredump-of-kylin-nm.patch

@@ -1,40 +0,0 @@
-From 9c02a1d3ebee74fcaedfd892070694a846da81cc Mon Sep 17 00:00:00 2001
-From: peijiankang <peijiankang@kylinos.cn>
-Date: Fri, 9 Jun 2023 16:55:08 +0800
-Subject: [PATCH] fix coredump of kylin-nm
-
----
- src/main.cpp | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 63bbeba..d27f5d3 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -96,11 +96,8 @@ int main(int argc, char *argv[])
- 
-     QApplication::setQuitOnLastWindowClosed(false);
- 
--    QThread thread;
-     KyNetworkResourceManager *p_networkResource = KyNetworkResourceManager::getInstance();
--    p_networkResource->moveToThread(&thread);
--    QObject::connect(&thread, SIGNAL(started()), p_networkResource, SLOT(onInitNetwork()));
--    thread.start();
-+    p_networkResource->onInitNetwork();
- 
-     // Internationalization
-     QString locale = QLocale::system().name();
-@@ -123,10 +120,6 @@ int main(int argc, char *argv[])
-         qWarning() << "QtBase Translations load fail";
-     }
- 
--    while (!p_networkResource->NetworkManagerIsInited()) {
--        ::usleep(1000);
--    }
--
-     MainWindow w;
-     a.setActivationWindow(&w);
-     w.setProperty("useStyleWindowManager", false); //禁用拖动
--- 
-2.33.0
-

0001-fix-wrong-enum-values-used.patch

@@ -1,76 +0,0 @@
-From c01cdf3d3df8ceba7968817e87f5ab79edc9b355 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
-Date: Mon, 29 Apr 2024 10:59:50 +0800
-Subject: [PATCH] fix wrong enum values used
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
----
- src/backend/dbus-interface/kylinconnectresource.cpp |  2 +-
- src/frontend/list-items/lanlistitem.cpp             | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/backend/dbus-interface/kylinconnectresource.cpp b/src/backend/dbus-interface/kylinconnectresource.cpp
-index 00d0570..da4fc40 100644
---- a/src/backend/dbus-interface/kylinconnectresource.cpp
-+++ b/src/backend/dbus-interface/kylinconnectresource.cpp
-@@ -313,7 +313,7 @@ void KyConnectResourse::getConnectIp(
- 
-     NetworkManager::Ipv6Setting::Ptr ipv6Setting = settingPtr->setting(NetworkManager::Setting::Ipv6).dynamicCast<NetworkManager::Ipv6Setting>();
-     if (nullptr !=ipv6Setting
--            && NetworkManager::Ipv4Setting::Manual == ipv6Setting->method()) {
-+            && NetworkManager::Ipv6Setting::Manual == ipv6Setting->method()) {
-        QList<NetworkManager::IpAddress> ipv6AddressList = ipv6Setting->addresses();
-        NetworkManager::IpAddress settingIpv6Address = ipv6AddressList.at(0);
-        if (settingIpv6Address.isValid()) {
-diff --git a/src/frontend/list-items/lanlistitem.cpp b/src/frontend/list-items/lanlistitem.cpp
-index 18e8e4e..bfc8bf8 100644
---- a/src/frontend/list-items/lanlistitem.cpp
-+++ b/src/frontend/list-items/lanlistitem.cpp
-@@ -19,9 +19,9 @@ LanListItem::LanListItem(const KyConnectItem *lanConnectItem,
- 
-     qDebug() << "LanListItem init:" << m_lanConnectItem.m_connectName << m_lanConnectItem.m_connectState << m_lanConnectItem.m_ifaceName;
- 
--    if (Deactivated == m_lanConnectItem.m_connectState || Activated == m_lanConnectItem.m_connectState) {
-+    if (NetworkManager::ActiveConnection::Deactivated == m_lanConnectItem.m_connectState || NetworkManager::ActiveConnection::Activated == m_lanConnectItem.m_connectState) {
-         m_netButton->stopLoading();
--        if (m_lanConnectItem.m_connectState == Activated) {
-+        if (m_lanConnectItem.m_connectState == NetworkManager::ActiveConnection::Activated) {
-             setIcon(true);
-         } else {
-             setIcon(false);
-@@ -89,7 +89,7 @@ void LanListItem::onNetButtonClicked()
-         return;
-     }
- 
--    if (Deactivated == m_lanConnectItem.m_connectState) {
-+    if (NetworkManager::ActiveConnection::Deactivated == m_lanConnectItem.m_connectState) {
-         //断开的连接，点击激活连接
-         if (m_deviceResource->wiredDeviceIsCarriered(m_deviceName)) {
-             m_connectOperation->activateWiredConnection(m_lanConnectItem.m_connectUuid, m_deviceName);
-@@ -118,9 +118,9 @@ void LanListItem::onRightButtonClicked()
-     }
- 
-     m_menu->clear();
--    if (Activated == m_lanConnectItem.m_connectState || Activating == m_lanConnectItem.m_connectState) {
-+    if (NetworkManager::ActiveConnection::Activated == m_lanConnectItem.m_connectState || NetworkManager::ActiveConnection::Activating == m_lanConnectItem.m_connectState) {
-         m_menu->addAction(new QAction(tr("Disconnect"), this));
--    } else if (Deactivated == m_lanConnectItem.m_connectState) {
-+    } else if (NetworkManager::ActiveConnection::Deactivated == m_lanConnectItem.m_connectState) {
-         m_menu->addAction(new QAction(tr("Connect"), this));
-     } else {
-         return;
-@@ -162,7 +162,7 @@ void LanListItem::onInfoButtonClicked()
-             << "." <<Q_FUNC_INFO << __LINE__;
- 
-     bool isActivated = false;
--    if (Activated == m_lanConnectItem.m_connectState) {
-+    if (NetworkManager::ActiveConnection::Activated == m_lanConnectItem.m_connectState) {
-         isActivated = true;
-     }
- 
--- 
-2.43.0
-

0002-fix-coredump-of-kylin-nm.patch

@@ -1,67 +0,0 @@
-From 8d2bcb04f9277f409650197fd7b0f3a423bdc901 Mon Sep 17 00:00:00 2001
-From: peijiankang <peijiankang@kylinos.cn>
-Date: Mon, 17 Jul 2023 11:38:50 +0800
-Subject: [PATCH] fix coredump of kylin-nm
-
----
- .../kylinactiveconnectresource.cpp            | 26 ++++++++++---------
- .../dbus-interface/kywirelessnetresource.cpp  |  5 +++-
- 2 files changed, 18 insertions(+), 13 deletions(-)
-
-diff --git a/src/backend/dbus-interface/kylinactiveconnectresource.cpp b/src/backend/dbus-interface/kylinactiveconnectresource.cpp
-index e56de5a..b5f1bfb 100644
---- a/src/backend/dbus-interface/kylinactiveconnectresource.cpp
-+++ b/src/backend/dbus-interface/kylinactiveconnectresource.cpp
-@@ -173,19 +173,21 @@ void KyActiveConnectResourse::getActiveConnectionList(QString deviceName,
-             QString ifaceUni = interfaces.at(index);
-             NetworkManager::Device:: Ptr devicePtr =
-                         m_networkResourceInstance->findDeviceUni(ifaceUni);
--            if (devicePtr->interfaceName() == deviceName) {
--                KyConnectItem *activeConnectItem =
--                        getActiveConnectionItem(activeConnectPtr);
--                if (nullptr != activeConnectItem) {
--                    activeConnectItem->m_ifaceName = deviceName;
--                    activeConnectItem->m_itemType = connectionType;
--                    activeConnectItemList << activeConnectItem;
--                    //activeConnectItem->dumpInfo();
-+	    if(devicePtr){
-+                if (devicePtr->interfaceName() == deviceName) {
-+                    KyConnectItem *activeConnectItem =
-+                            getActiveConnectionItem(activeConnectPtr);
-+                    if (nullptr != activeConnectItem) {
-+                        activeConnectItem->m_ifaceName = deviceName;
-+                        activeConnectItem->m_itemType = connectionType;
-+                        activeConnectItemList << activeConnectItem;
-+                        //activeConnectItem->dumpInfo();
-+                    }
-+
-+                    activeConnectPtr = nullptr;
-+                    break;
-                 }
--
--                activeConnectPtr = nullptr;
--                break;
--            }
-+	    }
-         }
-     }
- 
-diff --git a/src/backend/dbus-interface/kywirelessnetresource.cpp b/src/backend/dbus-interface/kywirelessnetresource.cpp
-index 386f863..583d2a4 100644
---- a/src/backend/dbus-interface/kywirelessnetresource.cpp
-+++ b/src/backend/dbus-interface/kywirelessnetresource.cpp
-@@ -307,7 +307,10 @@ void KyWirelessNetResource::getDeviceByUuid(const QString uuid, QString &deviceN
-             QString ifaceUni = interfaces.at(0);
-             NetworkManager::Device:: Ptr devicePtr =
-                     m_networkResourceInstance->findDeviceUni(ifaceUni);
--            deviceName = devicePtr->interfaceName();
-+	    if(devicePtr)
-+                deviceName = devicePtr->interfaceName();
-+	    else
-+                qDebug() << LOG_FLAG << "get device of active is NULL";
-             return;
-         } else {
-             qDebug() << LOG_FLAG << "get device of active connection failed.";
--- 
-2.33.0
-

kylin-nm.spec

@@ -1,13 +1,10 @@
 Name:           kylin-nm
-Version:        3.1.1
+Version:        3.0.3
-Release:        5
+Release:        1
 Summary:        Gui Applet tool for display and edit network simply
 License:        GPL-3+
-URL:            http://www.ukui.org
+URL:            https://github.com/ukui/kylin-nm/
 Source0:        %{name}-%{version}.tar.gz
-Patch01:        0001-fix-coredump-of-kylin-nm.patch
-Patch02:        0002-fix-coredump-of-kylin-nm.patch
-Patch03:	0001-fix-wrong-enum-values-used.patch
 
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qtchooser
@@ -18,10 +15,9 @@ BuildRequires:  gsettings-qt-devel
 BuildRequires:  kf5-kwindowsystem-devel
 BuildRequires:  libX11-devel
 BuildRequires:  qt5-qtsvg-devel
-BuildRequires:  ethtool ukui-control-center glib2-devel libnma-devel libsecret-devel libcap-devel kf5-networkmanager-qt-devel libukcc-devel
+BuildRequires:  ethtool
 Requires: NetworkManager
 Requires: network-manager-applet
-Requires: libukcc-devel
 %description
  Kylin NM is a Applet tool for managing network settings simply.
  It has beautiful UI and very comfortable to use.
@@ -29,9 +25,6 @@ Requires: libukcc-devel
 
 %prep
 %setup -q
-%patch01 -p1
-%patch02 -p1
-%patch03 -p1
 
 %build
 %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default  kylin-nm.pro	
@@ -56,32 +49,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/kylin-nm/changelog.gz
 %{_datadir}/doc/kylin-nm/copyright
 %{_mandir}/man1/kylin-nm.1.gz
-%{_libdir}/ukui-control-center/*.so
+/etc/dbus-1/system.d/com.kylin.NetworkManager.qt.systemdbus.conf
-%{_datadir}/glib-2.0/schemas/org.ukui.kylin-nm.switch.gschema.xml
+/usr/share/dbus-1/system-services/com.kylin.NetworkManager.qt.systemdbus.service
-%{_datadir}/kylin-nm/mobilehotspot/*
-%{_datadir}/kylin-nm/netconnect/*
-%{_datadir}/kylin-nm/wlanconnect/*
 
 
 %changelog
-* Mon Apr 29 2024 houhongxun <houhongxun@kylinos.cn> - 3.1.1-5
-- fix wrong enumeration values used
-
-* Mon Jul 17 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-4
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: add 0002-fix-coredump-of-kylin-nm.patch 
-
-* Fri Jun 09 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-3
-- add 0001-fix-coredump-of-kylin-nm.patch 
-
-* Wed Mar 01 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-2
-- add libukcc-devel Requires
-
-* Mon Oct 24 2022 tanyulong <tanyulong@kylinos.cn> - 3.1.1-1
-- update upstream version 3.1.1
-
 * Tue Jan 25 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.3-1
 - update 3.0.3