kde-apps/solid-runtime: fix build with net-misc/networkmanager-1.0.6

Gentoo-bug: 559892

Package-Manager: portage-2.2.20.1

diff --git a/kde-apps/solid-runtime/files/solid-runtime-4.14.3-networkmanager-1.0.6.patch b/kde-apps/solid-runtime/files/solid-runtime-4.14.3-networkmanager-1.0.6.patch
new file mode 100644 (file)
index 0000000..d559b04
--- /dev/null
+++ b/kde-apps/solid-runtime/files/solid-runtime-4.14.3-networkmanager-1.0.6.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-apps/solid-runtime/files/solid-runtime-4.14.3-networkmanager-1.0.6.patch.save b/kde-apps/solid-runtime/files/solid-runtime-4.14.3-networkmanager-1.0.6.patch.save
new file mode 100644 (file)
index 0000000..75218bb
--- /dev/null
+++ b/kde-apps/solid-runtime/files/solid-runtime-4.14.3-networkmanager-1.0.6.patch.save
@@ -0,0 +1,18 @@
+Due to an upstream co 
+
+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-apps/solid-runtime/solid-runtime-15.08.0.ebuild b/kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild
index d06ffe46786b9415c81b286f0da225dbd42b3d6f..3e47bc9f44e284ba7b55456769a288dbc66cfe85 100644 (file)
--- a/kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild
+++ b/kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild
@@ -26,3 +26,5 @@ RDEPEND="${DEPEND}
        bluetooth? ( || ( net-wireless/bluedevil kde-plasma/bluedevil ) )
        networkmanager? ( || ( kde-misc/plasma-nm kde-misc/networkmanagement kde-plasma/plasma-nm ) )
 "
+
+PATCHES=( "${FILESDIR}/${PN}-4.14.3-networkmanager-1.0.6.patch" )

diff --git a/kde-apps/solid-runtime/solid-runtime-4.14.3.ebuild b/kde-apps/solid-runtime/solid-runtime-4.14.3.ebuild
index cd6e52118630e8068579cd0969e824a0baeb8122..62c70d33e33608ce2642e66bd3b8dd19e53ead3f 100644 (file)
--- a/kde-apps/solid-runtime/solid-runtime-4.14.3.ebuild
+++ b/kde-apps/solid-runtime/solid-runtime-4.14.3.ebuild
@@ -26,3 +26,5 @@ RDEPEND="${DEPEND}
        bluetooth? ( net-wireless/bluedevil:4 )
        networkmanager? ( || ( kde-misc/plasma-nm kde-misc/networkmanagement kde-plasma/plasma-nm ) )
 "
+
+PATCHES=( "${FILESDIR}/${PN}-4.14.3-networkmanager-1.0.6.patch" )