| 1 |
commit: b5bf27588b17fb6b87cfd300926b5ec5c8290cdd |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 25 16:11:22 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 12 14:53:55 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b5bf2758 |
| 7 |
|
| 8 |
net-libs/telepathy-qt: Cleanup bogus deps, cleanup failing test deps |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/653802 |
| 11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/telepathy-qt-0.9.7-deps.patch | 37 ++++++++++++++++++++++ |
| 15 |
net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 24 +++----------- |
| 16 |
2 files changed, 42 insertions(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000000..033ece79bb |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch |
| 23 |
@@ -0,0 +1,37 @@ |
| 24 |
+--- a/cmake/modules/FindQt5.cmake 2016-06-12 13:04:05.000000000 +0200 |
| 25 |
++++ b/cmake/modules/FindQt5.cmake 2018-04-25 18:04:28.351188748 +0200 |
| 26 |
+@@ -22,8 +22,6 @@ |
| 27 |
+ # QT_QTDBUS_LIBRARY The QtDBus library |
| 28 |
+ # QT_QTGUI_LIBRARY The QtGui library |
| 29 |
+ # QT_QTNETWORK_LIBRARY The QtNetwork library |
| 30 |
+-# QT_QTTEST_LIBRARY The QtTest library |
| 31 |
+-# QT_QTWIDGETS_LIBRARY The QtWidgets library |
| 32 |
+ # QT_QTXML_LIBRARY The QtXml library |
| 33 |
+ # |
| 34 |
+ # also defined, but NOT for general use are |
| 35 |
+@@ -65,23 +63,19 @@ |
| 36 |
+ find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED) |
| 37 |
+ find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED) |
| 38 |
+ find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED) |
| 39 |
+-find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED) |
| 40 |
+-find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED) |
| 41 |
+ find_package(Qt5Network ${REQUIRED_QT_VERSION} REQUIRED) |
| 42 |
+ find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED) |
| 43 |
+ |
| 44 |
+ # Copy includes and library names into the same style as pkgconfig used for Qt4 |
| 45 |
+-set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) |
| 46 |
++set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) |
| 47 |
+ |
| 48 |
+ set(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES}) |
| 49 |
+ set(QT_QTDBUS_LIBRARY ${Qt5DBus_LIBRARIES}) |
| 50 |
+ set(QT_QTGUI_LIBRARY ${Qt5Gui_LIBRARIES}) |
| 51 |
+ set(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES}) |
| 52 |
+-set(QT_QTTEST_LIBRARY ${Qt5Test_LIBRARIES}) |
| 53 |
+-set(QT_QTWIDGETS_LIBRARY ${Qt5Widgets_LIBRARIES}) |
| 54 |
+ set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES}) |
| 55 |
+ |
| 56 |
+-set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY}) |
| 57 |
++set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY}) |
| 58 |
+ |
| 59 |
+ SET(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR}) |
| 60 |
+ SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR}) |
| 61 |
|
| 62 |
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild |
| 63 |
index 926958c8fd..11042bbdaf 100644 |
| 64 |
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild |
| 65 |
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild |
| 66 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 67 |
|
| 68 |
PYTHON_COMPAT=( python2_7 ) |
| 69 |
EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" ) |
| 70 |
-inherit python-any-r1 cmake-utils virtualx git-r3 |
| 71 |
+inherit python-any-r1 cmake-utils git-r3 |
| 72 |
|
| 73 |
DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" |
| 74 |
HOMEPAGE="https://telepathy.freedesktop.org/" |
| 75 |
@@ -13,7 +13,7 @@ HOMEPAGE="https://telepathy.freedesktop.org/" |
| 76 |
LICENSE="LGPL-2.1" |
| 77 |
SLOT="0" |
| 78 |
KEYWORDS="" |
| 79 |
-IUSE="debug farstream test" |
| 80 |
+IUSE="debug farstream" |
| 81 |
|
| 82 |
RDEPEND=" |
| 83 |
dev-qt/qtcore:5 |
| 84 |
@@ -30,14 +30,10 @@ DEPEND="${RDEPEND}" |
| 85 |
BDEPEND=" |
| 86 |
${PYTHON_DEPS} |
| 87 |
virtual/pkgconfig |
| 88 |
- test? ( |
| 89 |
- dev-libs/dbus-glib |
| 90 |
- dev-libs/glib:2 |
| 91 |
- dev-python/dbus-python |
| 92 |
- dev-qt/qttest:5 |
| 93 |
- ) |
| 94 |
" |
| 95 |
|
| 96 |
+PATCHES=( "${FILESDIR}/${PN}-0.9.7-deps.patch" ) |
| 97 |
+ |
| 98 |
# bug 549448 - last checked with 0.9.7 |
| 99 |
RESTRICT="test" |
| 100 |
|
| 101 |
@@ -50,18 +46,8 @@ src_configure() { |
| 102 |
-DDESIRED_QT_VERSION=5 |
| 103 |
-DENABLE_DEBUG_OUTPUT=$(usex debug) |
| 104 |
-DENABLE_FARSTREAM=$(usex farstream) |
| 105 |
- -DENABLE_TESTS=$(usex test) |
| 106 |
+ -DENABLE_TESTS=OFF |
| 107 |
-DENABLE_EXAMPLES=OFF |
| 108 |
) |
| 109 |
cmake-utils_src_configure |
| 110 |
} |
| 111 |
- |
| 112 |
-src_test() { |
| 113 |
- _test_runner() { |
| 114 |
- ctest -E '(CallChannel)' |
| 115 |
- } |
| 116 |
- |
| 117 |
- pushd "${BUILD_DIR}" > /dev/null || die |
| 118 |
- virtx _test_runner |
| 119 |
- popd > /dev/null || die |
| 120 |
-} |
Archives