File Support-NetworkManager-1.20.patch of Package kdelibs4

Overview Repositories Revisions Requests Users Attributes Meta

File Support-NetworkManager-1.20.patch of Package kdelibs4

From ec475441f61efabf0730ae9b8a1c00184a2348bc Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Sun, 22 Sep 2019 16:26:48 +0200
Subject: Support NetworkManager 1.20 and do actually compile the NM backend

NetworkManager.pc and libnm-util.pc are no longer available in 1.20. The only header that kdelibs4support is using is NetworkManager.h, which is found in the include path of libnm.

Also make this actually work. The code was guarded by a never-defined if(NM_0_7)

Differential Revision: https://phabricator.kde.org/D24020
---
 cmake/modules/FindNetworkManager.cmake | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'cmake/modules/FindNetworkManager.cmake')

diff --git a/cmake/modules/FindNetworkManager.cmake b/cmake/modules/FindNetworkManager.cmake
index ced2017..a82d43d 100644
--- a/cmake/modules/FindNetworkManager.cmake
+++ b/cmake/modules/FindNetworkManager.cmake
@@ -14,29 +14,27 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 
-IF (NETWORKMANAGER_INCLUDE_DIRS AND NM-UTIL_INCLUDE_DIRS)
+IF (NETWORKMANAGER_INCLUDE_DIRS)
    # in cache already
    SET(NetworkManager_FIND_QUIETLY TRUE)
-ENDIF (NETWORKMANAGER_INCLUDE_DIRS AND NM-UTIL_INCLUDE_DIRS)
+ENDIF (NETWORKMANAGER_INCLUDE_DIRS)
 
 IF (NOT WIN32)
    # use pkg-config to get the directories and then use these values
    # in the FIND_PATH() and FIND_LIBRARY() calls
    find_package(PkgConfig)
-   PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager )
-   PKG_SEARCH_MODULE( NM-UTIL libnm-util )
+   PKG_SEARCH_MODULE( NETWORKMANAGER libnm )
 ENDIF (NOT WIN32)
 
-IF (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND)
+IF (NETWORKMANAGER_FOUND)
    IF (NOT NetworkManager_FIND_QUIETLY)
       MESSAGE(STATUS "Found NetworkManager ${NETWORKMANAGER_VERSION}: ${NETWORKMANAGER_LIBRARY_DIRS}")
-      MESSAGE(STATUS "Found libnm-util: ${NM-UTIL_LIBRARY_DIRS}")
    ENDIF (NOT NetworkManager_FIND_QUIETLY)
-ELSE (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND)
+ELSE (NETWORKMANAGER_FOUND)
    IF (NetworkManager_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could NOT find NetworkManager or libnm-util, check FindPkgConfig output above!")
+      MESSAGE(FATAL_ERROR "Could NOT find NetworkManager, check FindPkgConfig output above!")
    ENDIF (NetworkManager_FIND_REQUIRED)
-ENDIF (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND)
+ENDIF (NETWORKMANAGER_FOUND)
 
-MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS NM-UTIL_INCLUDE_DIRS)
+MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS)
 
-- 
cgit v1.1

Places

File Support-NetworkManager-1.20.patch of Package kdelibs4

Places