diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-07-28 06:22:51 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-07-28 06:23:05 +1000 |
| commit | c85e4fe0bd7ef6a882eec0b698c09d74f83186e1 (patch) | |
| tree | 3c715e8a86349dddfff487ea936ec06ab7974ce5 /app-emulation/aqemu | |
| parent | net-p2p/syncting: fix init scripts for strelaysrv (diff) | |
| download | gentoo-c85e4fe0bd7ef6a882eec0b698c09d74f83186e1.tar.gz gentoo-c85e4fe0bd7ef6a882eec0b698c09d74f83186e1.tar.bz2 gentoo-c85e4fe0bd7ef6a882eec0b698c09d74f83186e1.zip | |
app-emulation/aqemu: add patch to ensure the correct rcc binary is called
Gentoo-bug: 589332
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-emulation/aqemu')
| -rw-r--r-- | app-emulation/aqemu/aqemu-0.9.2.ebuild | 1 | ||||
| -rw-r--r-- | app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/app-emulation/aqemu/aqemu-0.9.2.ebuild b/app-emulation/aqemu/aqemu-0.9.2.ebuild index cbe0aa57ee03..bdf8926c6a47 100644 --- a/app-emulation/aqemu/aqemu-0.9.2.ebuild +++ b/app-emulation/aqemu/aqemu-0.9.2.ebuild @@ -25,6 +25,7 @@ RDEPEND="app-emulation/qemu dev-qt/qtprintsupport:5" DOCS="AUTHORS CHANGELOG README TODO" +PATCHES=( "${FILESDIR}/${PN}-0.9.2-qtbindir.patch" ) src_configure() { local mycmakeargs=( diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch b/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch new file mode 100644 index 000000000000..5c5548058427 --- /dev/null +++ b/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch @@ -0,0 +1,15 @@ +Ensure the Qt 5 version of rcc is used instead of whatever is in $PATH. + +Gentoo-bug: 589332 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -285,7 +285,7 @@ + + SET( _out ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.rcc ) + +- ADD_CUSTOM_COMMAND( OUTPUT ${_out} COMMAND rcc ARGS ${_in} -binary -o ${_out} DEPENDS ${_in} ) ++ ADD_CUSTOM_COMMAND( OUTPUT ${_out} COMMAND ${Qt5Core_RCC_EXECUTABLE} ARGS ${_in} -binary -o ${_out} DEPENDS ${_in} ) + + SET( ${_sources} ${${_sources}} ${_out} ) + ENDFOREACH( curFile ) |