From 3c8ee6417295a48a492275bfab488b06ef88bfa2 Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinsec.com.cn>
Date: Mon, 24 Feb 2025 14:35:13 +0800
Subject: [PATCH 1/2] fix(pkgconfig): Fix wrong shared library paths and header
 file directories in pc files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复pc文件中错误的共享库路径以及头文件目录
---
 CMakeLists.txt           | 9 +++++----
 data/kiran-desktop.pc.in | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5c6959..55964cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,13 +55,14 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     Qt5::Network
     KF5::NetworkManagerQt)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/)
+set(KIRAN_DESKTOP_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${KIRAN_DESKTOP_LIB_DIR})
 
 file(GLOB_RECURSE HEADERS_FILE "./include/*.h")
-install(FILES ${HEADERS_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+set(KIRAN_DESKTOP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/)
+set(KIRAN_DESKTOP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/)
+install(FILES ${HEADERS_FILE} DESTINATION ${KIRAN_DESKTOP_INCLUDE_DIR})
 
-set(KIRAN_DESKTOP_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/)
-set(KIRAN_DESKTOP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/kiran-desktop.pc.in kiran-desktop.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kiran-desktop.pc
         DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
diff --git a/data/kiran-desktop.pc.in b/data/kiran-desktop.pc.in
index 2892194..22dbb59 100644
--- a/data/kiran-desktop.pc.in
+++ b/data/kiran-desktop.pc.in
@@ -6,5 +6,5 @@ Name: kiran-desktop
 Description: kiran-desktop Shared API library
 Requires: Qt5Core Qt5Gui Qt5Widgets Qt5DBus Qt5Svg Qt5Network klog-qt5
 Version: @KIRAN_DESKTOP_VERSION@
-Libs: -L${libdir} -lkiran-desktop
-Cflags: -I${includedir}/kiran-desktop
+Libs: -L${libdir} -l@PROJECT_NAME@
+Cflags: -I${includedir}
-- 
Gitee


From c33e3d087151723ab596deb0e4a7638106cb9452 Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinsec.com.cn>
Date: Mon, 24 Feb 2025 14:35:58 +0800
Subject: [PATCH 2/2] fix(wireless): Fix active connection failure issue under
 disconnected wireless card
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复断开无线网卡下活跃连接失效问题
---
 lib/network/wireless-network-manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/network/wireless-network-manager.cpp b/lib/network/wireless-network-manager.cpp
index d21f53a..615d629 100644
--- a/lib/network/wireless-network-manager.cpp
+++ b/lib/network/wireless-network-manager.cpp
@@ -139,7 +139,7 @@ void WirelessNetworkManager::removeNetworkConnection(const QString &ssid)
 
 void WirelessNetworkManager::deactivateConnection()
 {
-    ActiveConnection::Ptr activeConnection = NetworkManager::findActiveConnection(d_ptr->m_device->uni());
+    auto activeConnection = d_ptr->m_device->activeConnection();
     if (activeConnection.isNull())
     {
         KLOG_WARNING(qLcNetwork) << interfaceName() << "deactivate connecion failed, no active connection";
-- 
Gitee