From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/
Date: Fri, 22 Jan 2016 15:05:47 +0000 (UTC) [thread overview]
Message-ID: <1453475131.fdd400178a776fe4bc93b32f48d8eb7bf10a3acb.kensington@gentoo> (raw)
commit: fdd400178a776fe4bc93b32f48d8eb7bf10a3acb
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 15:04:31 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 15:05:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd40017
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(+)
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 0000000..f23af67
--- /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 ba00130..5c0a75f 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() {
next reply other threads:[~2016-01-22 15:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 15:05 Michael Palimaka [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-04 5:25 [gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/ Michael Palimaka
2018-08-18 2:09 Akinori Hattori
2018-08-18 2:09 Akinori Hattori
2021-04-19 20:54 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453475131.fdd400178a776fe4bc93b32f48d8eb7bf10a3acb.kensington@gentoo \
--to=kensington@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox