| 1 |
commit: 892812b39d0554daee5eba923cde77e9ca96114d |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 22 17:46:09 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 22 17:48:19 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892812b3 |
| 7 |
|
| 8 |
net-libs/telepathy-qt: ensure correct version of Qt is used |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.25 |
| 11 |
|
| 12 |
.../files/telepathy-qt-0.9.6.1-qtpath.patch | 21 +++++++++++++++++++++ |
| 13 |
net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild | 1 + |
| 14 |
2 files changed, 22 insertions(+) |
| 15 |
|
| 16 |
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..3753b90 |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch |
| 21 |
@@ -0,0 +1,21 @@ |
| 22 |
+Ensure that the correct version of Qt is always used. |
| 23 |
+ |
| 24 |
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to |
| 25 |
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. |
| 26 |
+ |
| 27 |
+There is no guarantee to which version of Qt these symlinks might point, so it |
| 28 |
+is necessary to find the correct version explicitly. |
| 29 |
+ |
| 30 |
+Once qmake is found, it is queried for the correct location of all other items. |
| 31 |
+ |
| 32 |
+--- cmake/modules/FindQt.cmake |
| 33 |
++++ cmake/modules/FindQt.cmake |
| 34 |
+@@ -19,7 +19,7 @@ |
| 35 |
+ IF(NOT QT5_INSTALLED) |
| 36 |
+ IF(NOT QT_QMAKE_EXECUTABLE) |
| 37 |
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5 |
| 38 |
+- PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") |
| 39 |
++ PATHS /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin /usr/bin NO_DEFAULT_PATH) |
| 40 |
+ SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") |
| 41 |
+ ENDIF(NOT QT_QMAKE_EXECUTABLE) |
| 42 |
+ |
| 43 |
|
| 44 |
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild |
| 45 |
index d920d98..4beccda 100644 |
| 46 |
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild |
| 47 |
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild |
| 48 |
@@ -53,6 +53,7 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README ) |
| 49 |
PATCHES=( |
| 50 |
"${FILESDIR}/${PV}-default-source.patch" |
| 51 |
"${FILESDIR}/${PV}-yes-release.patch" |
| 52 |
+ "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch" |
| 53 |
) |
| 54 |
|
| 55 |
pkg_setup() { |
Archives