diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-09-10 22:08:47 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-09-10 22:09:07 +1000 |
| commit | 6065d16d88a1a0ce0d5638935e89a5f34b58ac3e (patch) | |
| tree | 51026bb89480032a83c3bb2880567db62a000229 /kde-misc | |
| parent | kde-misc/kdeconnect: remove old. (diff) | |
| download | gentoo-6065d16d88a1a0ce0d5638935e89a5f34b58ac3e.tar.gz gentoo-6065d16d88a1a0ce0d5638935e89a5f34b58ac3e.tar.bz2 gentoo-6065d16d88a1a0ce0d5638935e89a5f34b58ac3e.zip | |
kde-misc/kdeconnect: backport patch from upstream fixing build with dev-util/ninja.
Gentoo-bug: 559904
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch | 36 | ||||
| -rw-r--r-- | kde-misc/kdeconnect/kdeconnect-0.8.ebuild | 2 |
2 files changed, 38 insertions, 0 deletions
diff --git a/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch b/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch new file mode 100644 index 000000000000..d482549dab52 --- /dev/null +++ b/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch @@ -0,0 +1,36 @@ +From d9e0c61185a5ecbd9b013740fe73d21ba5adaa44 Mon Sep 17 00:00:00 2001 +From: Michael Palimaka <kensington@gentoo.org> +Date: Thu, 10 Sep 2015 21:56:39 +1000 +Subject: [PATCH] Fix make with ninja. + +The custom command name must differ from the name of the generated file. + +REVIEW: 125137 +--- + cmake/DbusInterfaceMacros.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake +index 9d4810d..801452a 100644 +--- a/cmake/DbusInterfaceMacros.cmake ++++ b/cmake/DbusInterfaceMacros.cmake +@@ -12,7 +12,7 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu + OPTIONS ${qdbus_options} + ) + add_custom_target( +- ${output_xml_file} ++ ${output_xml_file}_target + SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} + ) + install( +@@ -21,6 +21,6 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu + ) + add_dependencies( + ${main_project_target} +- ${output_xml_file} ++ ${output_xml_file}_target + ) + endmacro (generate_and_install_dbus_interface) +-- +2.4.6 + diff --git a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild index 07e7568b6a7f..e27ce0c50a16 100644 --- a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild @@ -42,6 +42,8 @@ DEPEND="${COMMON_DEPEND} [[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}/${P}-ninja.patch" ) + pkg_postinst(){ elog elog "Optional dependency:" |