From 0cb37439f64403daf814640249486a3ae5d3c08f Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 13 Sep 2015 13:31:27 +0200
Subject: Fix the compilation against NetworkManager 1.0.6

Patches were gratiously taken from Gentoo.
These allow kde-runtime (solid backend) and plasma-nm
  to compile properly against NetworkManager 1.0.6.
---
 kde/patch/kde-runtime.patch                           |  3 +++
 .../kde-runtime/kde-runtime_networkmanager.patch      | 19 +++++++++++++++++++
 kde/patch/plasma-nm.patch                             |  3 +++
 kde/patch/plasma-nm/plasma-nm_networkmanager.patch    | 17 +++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 kde/patch/kde-runtime/kde-runtime_networkmanager.patch
 create mode 100644 kde/patch/plasma-nm/plasma-nm_networkmanager.patch

diff --git a/kde/patch/kde-runtime.patch b/kde/patch/kde-runtime.patch
index 7d65729..d95ef54 100644
--- a/kde/patch/kde-runtime.patch
+++ b/kde/patch/kde-runtime.patch
@@ -2,3 +2,6 @@
 # - Minimize/maximize by clicking taskbar entries requires double click.
 #cat $CWD/patch/kde-runtime/kde-runtime.kdebug324470.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
+# Fix compilation against NetworkManager 1.0.6:
+cat $CWD/patch/kde-runtime/kde-runtime_networkmanager.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/kde-runtime/kde-runtime_networkmanager.patch b/kde/patch/kde-runtime/kde-runtime_networkmanager.patch
new file mode 100644
index 0000000..d559b04
--- /dev/null
+++ b/kde/patch/kde-runtime/kde-runtime_networkmanager.patch
@@ -0,0 +1,19 @@
+Fixes build with networkmanager-1.0.6.
+
+Triggered by http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?h=nm-1-0&id=6f616d4c4b04d5478f60d0311317bc84c5459ea4.
+
+https://bugs.gentoo.org/show_bug.cgi?id=559892
+
+diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt
+index 633c7f1..341a1ed 100644
+--- a/solid-networkstatus/kded/CMakeLists.txt
++++ b/solid-networkstatus/kded/CMakeLists.txt
+@@ -20,7 +20,7 @@ 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})
++        include_directories(${NETWORKMANAGER_INCLUDE_DIRS} ${NM-UTIL_INCLUDE_DIRS})
+         add_definitions(-DNM_BACKEND_ENABLED)
+     endif(NM_0_7)
+ endif(NETWORKMANAGER_FOUND)
diff --git a/kde/patch/plasma-nm.patch b/kde/patch/plasma-nm.patch
index d02e6b5..e86bcd1 100644
--- a/kde/patch/plasma-nm.patch
+++ b/kde/patch/plasma-nm.patch
@@ -5,3 +5,6 @@
 # frameworks 5.9.0. This patch is no longer needed for plasma-nm-5.3.0:
 #cat $CWD/patch/plasma-nm/plasma-nm_modemmanager-qt_api.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
+# Fix compilation against NetworkManager 1.0.6:
+cat $CWD/patch/plasma-nm/plasma-nm_networkmanager.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/plasma-nm/plasma-nm_networkmanager.patch b/kde/patch/plasma-nm/plasma-nm_networkmanager.patch
new file mode 100644
index 0000000..e635954
--- /dev/null
+++ b/kde/patch/plasma-nm/plasma-nm_networkmanager.patch
@@ -0,0 +1,17 @@
+Patch taken from gentoo:
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7dad9ddb35e1e3e68ad43176c5e48fbb25338d
+
+Fixes build with networkmanager-1.0.6.
+
+Triggered by http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?h=nm-1-0&id=6f616d4c4b04d5478f60d0311317bc84c5459ea4.
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -49,6 +49,7 @@
+                     ${CMAKE_CURRENT_SOURCE_DIR}/libs
+                     ${CMAKE_CURRENT_SOURCE_DIR}/libs/editor/
+                     ${NETWORKMANAGER_INCLUDE_DIRS}
++                    ${NM-UTIL_INCLUDE_DIRS}
+                     ${NETWORKMANAGERQT_INCLUDE_DIRS}
+                     ${KDE4_INCLUDES})
+ 
-- 
cgit v1.2.3