diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-libs/telepathy-qt/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'net-libs/telepathy-qt/files')
| -rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch | 21 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch | 17 |
2 files changed, 38 insertions, 0 deletions
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 new file mode 100644 index 000000000000..a14e1da1a658 --- /dev/null +++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch @@ -0,0 +1,21 @@ +Ensure that the correct version of Qt is always used. + +With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to +/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. + +There is no guarantee to which version of Qt these symlinks might point, so it +is necessary to find the correct version explicitly. + +Once qmake is found, it is queried for the correct location of all other items. + +--- a/cmake/modules/FindQt.cmake ++++ b/cmake/modules/FindQt.cmake +@@ -19,7 +19,7 @@ + IF(NOT QT5_INSTALLED) + IF(NOT QT_QMAKE_EXECUTABLE) + FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5 +- PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") ++ PATHS /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin /usr/bin NO_DEFAULT_PATH) + SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") + ENDIF(NOT QT_QMAKE_EXECUTABLE) + diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch new file mode 100644 index 000000000000..97a880c72ca7 --- /dev/null +++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake +index d34b24d..eb51454 100644 +--- a/cmake/modules/TelepathyDefaults.cmake ++++ b/cmake/modules/TelepathyDefaults.cmake +@@ -59,11 +59,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(DEPRECATED_DECLARATIONS_FLAGS) + endif (CXX_DEPRECATED_DECLARATIONS) + +- if(${TP_QT_NANO_VERSION} EQUAL 0) +- set(NOT_RELEASE 0) +- else(${TP_QT_NANO_VERSION} EQUAL 0) +- set(NOT_RELEASE 1) +- endif(${TP_QT_NANO_VERSION} EQUAL 0) ++ set(NOT_RELEASE 0) + + set(desired + all |