From fdd400178a776fe4bc93b32f48d8eb7bf10a3acb Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Sat, 23 Jan 2016 02:04:31 +1100 Subject: [PATCH] x11-misc/qterm: ensure that qcollectiongenerator is called from the correct directory Gentoo-bug: 544108 Package-Manager: portage-2.2.27 --- x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch | 16 ++++++++++++++++ x11-misc/qterm/qterm-0.5.12-r1.ebuild | 1 + 2 files changed, 17 insertions(+) create mode 100644 x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch diff --git a/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch b/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch new file mode 100644 index 000000000000..f23af67c2013 --- /dev/null +++ b/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch @@ -0,0 +1,16 @@ +Ensure that qcollectiongenerator is called from the correct directory. + +Even though QT_BINARY_DIR is specified, cmake will try PATH first. + +Gentoo-bug: 544108 + +--- a/src/doc/CMakeLists.txt ++++ b/src/doc/CMakeLists.txt +@@ -9,6 +9,7 @@ + FIND_PROGRAM(QT_HELP_COLLECTION_GENERATOR + qcollectiongenerator + PATHS "${QT_BINARY_DIR}" ++ NO_DEFAULT_PATH + DOC "qcollectiongenerator used to compile Qt help collection project files") + + ADD_CUSTOM_COMMAND( diff --git a/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild index ba001304bcf1..5c0a75f4c56c 100644 --- a/x11-misc/qterm/qterm-0.5.12-r1.ebuild +++ b/x11-misc/qterm/qterm-0.5.12-r1.ebuild @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}/${P}-qt4.patch" "${FILESDIR}/${P}-glibc216.patch" "${FILESDIR}/${P}-duplicatetarget.patch" + "${FILESDIR}/${P}-qtbindir.patch" ) src_install() { -- 2.26.2