diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-09-10 21:32:50 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-09-10 21:33:25 +1000 |
| commit | dd9e90e9fc44ed949327503f5bab75600eefe3c1 (patch) | |
| tree | f0f5f7167ae73a97c7dadd73a8c49bab68651374 /kde-apps | |
| parent | dev-python/pdoc: New package, ebuild written by me (diff) | |
| download | gentoo-dd9e90e9fc44ed949327503f5bab75600eefe3c1.tar.gz gentoo-dd9e90e9fc44ed949327503f5bab75600eefe3c1.tar.bz2 gentoo-dd9e90e9fc44ed949327503f5bab75600eefe3c1.zip | |
kde-apps/solid-runtime: fix build with net-misc/networkmanager-1.0.6
Gentoo-bug: 559892
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'kde-apps')
4 files changed, 41 insertions, 0 deletions
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 000000000000..d559b04f543e --- /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 000000000000..75218bbed41c --- /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 d06ffe46786b..3e47bc9f44e2 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 cd6e52118630..62c70d33e336 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" ) |