From: Michael Palimaka Date: Fri, 11 Sep 2015 15:19:02 +0000 (+1000) Subject: kde-misc/plasma-nm: fix build with net-misc/networkmanager-1.0.6 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd7dad9ddb35e1e3e68ad43176c5e48fbb25338d;p=gentoo.git kde-misc/plasma-nm: fix build with net-misc/networkmanager-1.0.6 Package-Manager: portage-2.2.20.1 --- diff --git a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch new file mode 100644 index 000000000000..1151763886c3 --- /dev/null +++ b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch @@ -0,0 +1,14 @@ +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}) + diff --git a/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild b/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild index e143557c7bc1..6bdcc223fa08 100644 --- a/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild +++ b/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild @@ -39,6 +39,8 @@ DEPEND="${RDEPEND} sys-devel/gettext " +PATCHES=( "${FILESDIR}/${P}-networkmanager-1.0.6.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT)