commit: dd9e90e9fc44ed949327503f5bab75600eefe3c1 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Thu Sep 10 11:32:50 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Sep 10 11:33:25 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9e90e9
kde-apps/solid-runtime: fix build with net-misc/networkmanager-1.0.6 Gentoo-bug: 559892 Package-Manager: portage-2.2.20.1 .../solid-runtime-4.14.3-networkmanager-1.0.6.patch | 19 +++++++++++++++++++ ...lid-runtime-4.14.3-networkmanager-1.0.6.patch.save | 18 ++++++++++++++++++ kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild | 2 ++ kde-apps/solid-runtime/solid-runtime-4.14.3.ebuild | 2 ++ 4 files changed, 41 insertions(+) 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 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 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 d06ffe4..3e47bc9 100644 --- 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 cd6e521..62c70d3 100644 --- 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" )
