[gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/files/, app-emulation/aqemu/

[Michael Palimaka]

commit:     c85e4fe0bd7ef6a882eec0b698c09d74f83186e1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 20:22:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 20:23:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85e4fe0

app-emulation/aqemu: add patch to ensure the correct rcc binary is called

Gentoo-bug: 589332

Package-Manager: portage-2.3.0

 app-emulation/aqemu/aqemu-0.9.2.ebuild               |  1 +
 app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app-emulation/aqemu/aqemu-0.9.2.ebuild b/app-emulation/aqemu/aqemu-0.9.2.ebuild
index cbe0aa5..bdf8926 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 0000000..5c55480
--- /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 )