diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-01-23 02:04:31 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-01-23 02:05:31 +1100 |
| commit | fdd400178a776fe4bc93b32f48d8eb7bf10a3acb (patch) | |
| tree | 004ab6bfafc1b5aab49cbebf11a83669e806705c /x11-misc | |
| parent | x11-misc/qterm: fix build failure caused by duplicate target (diff) | |
| download | gentoo-fdd400178a776fe4bc93b32f48d8eb7bf10a3acb.tar.gz gentoo-fdd400178a776fe4bc93b32f48d8eb7bf10a3acb.tar.bz2 gentoo-fdd400178a776fe4bc93b32f48d8eb7bf10a3acb.zip | |
x11-misc/qterm: ensure that qcollectiongenerator is called from the correct directory
Gentoo-bug: 544108
Package-Manager: portage-2.2.27
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch | 16 | ||||
| -rw-r--r-- | x11-misc/qterm/qterm-0.5.12-r1.ebuild | 1 |
2 files changed, 17 insertions, 0 deletions
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() { |