Control: tags -1 + patch Attached is a debdiff which is based on lubo's patch. Changes to the initial patch - Use Q_SLOTS instead of slots, instead of simply commenting it out - Use nm-dbus-interface.h include instead of NetworkManager.h, so we don't pull in any glib/gio related headers - Drop NM_CHECK_VERSION define, no longer needed. I've submitted the same patch upstream. I plan to NMU in a week or so and upload to DELAYED/10 unless I hear back from you. Regards, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru kdelibs4support-5.44.0/debian/changelog kdelibs4support-5.44.0/debian/changelog
--- kdelibs4support-5.44.0/debian/changelog 2018-03-23 08:19:17.000000000 +0100
+++ kdelibs4support-5.44.0/debian/changelog 2018-04-18 18:35:20.000000000 +0200
@@ -1,3 +1,10 @@
+kdelibs4support (5.44.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Port networkmanagerstatus to libnm. (Closes: #862877)
+
+ -- Michael Biebl <biebl@debian.org> Wed, 18 Apr 2018 18:35:20 +0200
+
kdelibs4support (5.44.0-2) sid; urgency=medium
* New revision
diff -Nru kdelibs4support-5.44.0/debian/control kdelibs4support-5.44.0/debian/control
--- kdelibs4support-5.44.0/debian/control 2018-03-23 08:19:17.000000000 +0100
+++ kdelibs4support-5.44.0/debian/control 2018-04-18 18:35:19.000000000 +0200
@@ -36,7 +36,7 @@
libssl1.0-dev,
liburi-perl,
libx11-dev,
- network-manager-dev (>= 0.7.0~) [linux-any],
+ libnm-dev (>= 1.0.0) [linux-any],
pkg-config,
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.7.0~),
diff -Nru kdelibs4support-5.44.0/debian/patches/networkmanagerstatus-port-to-libnm.patch kdelibs4support-5.44.0/debian/patches/networkmanagerstatus-port-to-libnm.patch
--- kdelibs4support-5.44.0/debian/patches/networkmanagerstatus-port-to-libnm.patch 1970-01-01 01:00:00.000000000 +0100
+++ kdelibs4support-5.44.0/debian/patches/networkmanagerstatus-port-to-libnm.patch 2018-04-18 18:35:20.000000000 +0200
@@ -0,0 +1,146 @@
+From 8a9345633319cfd97d42a6e7ef4bbd0d89c561a2 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Tue, 19 Dec 2017 18:58:14 +0100
+Subject: [PATCH] networkmanagerstatus: port to libnm
+
+libnm-util has been deprecated for three years and is eventually going
+to disappear.
+As libnm has been introduced in NetworkManager 1.0.0, the version checks
+are no longer necessary, so drop them.
+---
+ cmake/modules/FindNetworkManager.cmake | 20 +++++++++----------
+ src/solid-networkstatus/kded/CMakeLists.txt | 12 +++++------
+ .../kded/networkmanagerstatus.cpp | 12 +----------
+ .../kded/networkmanagerstatus.h | 2 +-
+ 4 files changed, 16 insertions(+), 30 deletions(-)
+
+diff --git a/cmake/modules/FindNetworkManager.cmake b/cmake/modules/FindNetworkManager.cmake
+index ced2017c..269bef6b 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}")
++ MESSAGE(STATUS "Found libnm ${NETWORKMANAGER_VERSION}: ${NETWORKMANAGER_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 libnm, 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)
+
+diff --git a/src/solid-networkstatus/kded/CMakeLists.txt b/src/solid-networkstatus/kded/CMakeLists.txt
+index 9fa30651..604209fa 100644
+--- a/src/solid-networkstatus/kded/CMakeLists.txt
++++ b/src/solid-networkstatus/kded/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(kded_networkstatus_PART_SRCS
+ wicdcustomtypes.cpp
+ )
+
+-find_package(NetworkManager 0.7.0)
++find_package(NetworkManager 1.0.0)
+ set_package_properties(NetworkManager PROPERTIES DESCRIPTION "The NetworkManager headers"
+ URL "http://projects.gnome.org/NetworkManager";
+ TYPE OPTIONAL
+@@ -16,12 +16,10 @@ set_package_properties(NetworkManager PROPERTIES DESCRIPTION "The NetworkManager
+ )
+
+ if(NETWORKMANAGER_FOUND)
+- if(NM_0_7)
+- message(STATUS "Adding in-process NetworkManager service-wart to kded module")
+- set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} networkmanagerstatus.cpp)
+- include_directories(${NETWORKMANAGER_INCLUDE_DIRS})
+- add_definitions(-DNM_BACKEND_ENABLED)
+- endif()
++ message(STATUS "Adding in-process NetworkManager service-wart to kded module")
++ set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} networkmanagerstatus.cpp)
++ include_directories(${NETWORKMANAGER_INCLUDE_DIRS})
++ add_definitions(-DNM_BACKEND_ENABLED)
+ endif()
+
+
+diff --git a/src/solid-networkstatus/kded/networkmanagerstatus.cpp b/src/solid-networkstatus/kded/networkmanagerstatus.cpp
+index 3d346068..55bae2d8 100644
+--- a/src/solid-networkstatus/kded/networkmanagerstatus.cpp
++++ b/src/solid-networkstatus/kded/networkmanagerstatus.cpp
+@@ -28,11 +28,7 @@
+
+ #include <QtDBus/QDBusReply>
+
+-#include <NetworkManager.h>
+-
+-#if !defined(NM_CHECK_VERSION)
+- #define NM_CHECK_VERSION(x,y,z) 0
+-#endif
++#include <nm-dbus-interface.h>
+
+ NetworkManagerStatus::NetworkManagerStatus( QObject *parent )
+ : SystemStatusInterface( parent ),
+@@ -85,23 +81,17 @@ Solid::Networking::Status NetworkManagerStatus::convertNmState( uint nmState )
+ case NM_STATE_CONNECTING:
+ status = Solid::Networking::Connecting;
+ break;
+-#if NM_CHECK_VERSION(0,8,992)
+ case NM_STATE_CONNECTED_LOCAL:
+ case NM_STATE_CONNECTED_SITE:
+ case NM_STATE_CONNECTED_GLOBAL:
+-#else
+- case NM_STATE_CONNECTED:
+-#endif
+ status = Solid::Networking::Connected;
+ break;
+ case NM_STATE_DISCONNECTED:
+ status = Solid::Networking::Unconnected;
+ break;
+-#if NM_CHECK_VERSION(0,8,992)
+ case NM_STATE_DISCONNECTING:
+ status = Solid::Networking::Disconnecting;
+ break;
+-#endif
+ }
+
+ return status;
+diff --git a/src/solid-networkstatus/kded/networkmanagerstatus.h b/src/solid-networkstatus/kded/networkmanagerstatus.h
+index 05d384dc..67f2ee65 100644
+--- a/src/solid-networkstatus/kded/networkmanagerstatus.h
++++ b/src/solid-networkstatus/kded/networkmanagerstatus.h
+@@ -38,7 +38,7 @@ public:
+ /* reimp */ bool isSupported() const;
+ /* reimp */ QString serviceName() const;
+
+-private slots:
++private Q_SLOTS:
+ void nmStateChanged( uint nmState );
+
+ private:
+--
+2.17.0
+
diff -Nru kdelibs4support-5.44.0/debian/patches/series kdelibs4support-5.44.0/debian/patches/series
--- kdelibs4support-5.44.0/debian/patches/series 2018-03-23 08:19:17.000000000 +0100
+++ kdelibs4support-5.44.0/debian/patches/series 2018-04-18 18:34:51.000000000 +0200
@@ -1,2 +1,3 @@
incomplete_header
standarddirs_test
+networkmanagerstatus-port-to-libnm.patch
Attachment:
signature.asc
Description: OpenPGP digital signature