diff options
Diffstat (limited to 'net-libs/telepathy-qt')
| -rw-r--r-- | net-libs/telepathy-qt/Manifest | 3 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch | 37 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild | 25 |
3 files changed, 44 insertions, 21 deletions
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest index c74cda5bdbff..2f5d5067f383 100644 --- a/net-libs/telepathy-qt/Manifest +++ b/net-libs/telepathy-qt/Manifest @@ -1,5 +1,6 @@ AUX telepathy-qt-0.9.6.1-qtpath.patch 935 BLAKE2B ee54f49734a52387c68c60ebd32d2adf189340d845eb9a4989bea45f79901bda3fbec6ffb32364527675882aca1ee4f972d6cca1c2131e8cac550b5d8e2f8de9 SHA512 8b1351e005db5b85e39bc56e666dff000f7acc1bf1cf1d1df9577b8da1f7fbde6ee4a0abd0c81ba757aa49c8a30efb9fa3e46561efd9e2c64d69ee818b80a42f AUX telepathy-qt-0.9.6.1-yes-release.patch 578 BLAKE2B fd8581e60b4f526681946c7c45638c85f3a5ad0448d71dbdfd2b4a8a5f72f423ae2d8514c2459f817c9b0aff35db8c257d827e6e25f75037fd867df18fcb3e36 SHA512 c0c3e3e6b698aa5410d33653f36a1dac044054fa03830f1c78c1a1d82aa74e24ef84d4ccfc8b3ce295e655f2618aa318c863b8b49303097d5774e789efb4cc80 +AUX telepathy-qt-0.9.7-deps.patch 2017 BLAKE2B f8f0d4eb3362b1b0d4fb628dfa773bced0eebaa359340f6b95d0d37077083f90979dd557775cc5a44b74c0b78f4741b5c03b589feedff0b0d32d51f3883b6513 SHA512 202974d14ee316e713138e5ee88a5b6ec4f613af567b83ac4dc4aec8bc39dcb6cd65d1be6724189e48cccfc526ad8bd7151a7a5420a5d5f44071ccd50a0ecae1 DIST telepathy-qt-0.9.7.tar.gz 6213405 BLAKE2B 13e2ae73bba74b4aedd55b46d0816744a4485a2a39faed610439fff40a65065a12606080012e220fc30a9d2642aba311aca6a24b540d8d22a140197911343eb8 SHA512 081daecb2509ea690079014bcc88eacbf2b3e4f4ac42aaf1b0cb264c01b801bc499a041482571d383f258cb3d3e2c6ffa5682fbe417fe807fcc25a06d2ead877 -EBUILD telepathy-qt-0.9.7-r1.ebuild 1366 BLAKE2B 4f60a78bd9ea064ce82db6a7bc7572ab883d37e1fc49458bf3c0d5adcd3b6255dac12731b55b569da67250a14ec2ae449d1de545371679292bab20868a8e8fa0 SHA512 b36569cfd407996fd924ff130b89a60b0241111cf07ddabc65a9a1469ff46bbfe89a88d40e3d14d28ce6209c76ff21ffd0618b4e1a9105f3de7a1c3921436fb8 +EBUILD telepathy-qt-0.9.7-r1.ebuild 1129 BLAKE2B ba893df8ca6ed5676a9c5944bb306ddca9e40d45f89190ce924de626a7cc82ae23595e9ee372156e75a5b0bd89cd154069bd96c175724c8d47814d47747f5de9 SHA512 2f302ed453dd1905a9b5181b5d670a333c3d9781a6493976f27467b828fc938f422ad0ddb559243a21dd939a9b79f8d4d3a48760e4dfb7d6a219ed704a87178f MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891 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 new file mode 100644 index 000000000000..033ece79bb5e --- /dev/null +++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch @@ -0,0 +1,37 @@ +--- a/cmake/modules/FindQt5.cmake 2016-06-12 13:04:05.000000000 +0200 ++++ b/cmake/modules/FindQt5.cmake 2018-04-25 18:04:28.351188748 +0200 +@@ -22,8 +22,6 @@ + # QT_QTDBUS_LIBRARY The QtDBus library + # QT_QTGUI_LIBRARY The QtGui library + # QT_QTNETWORK_LIBRARY The QtNetwork library +-# QT_QTTEST_LIBRARY The QtTest library +-# QT_QTWIDGETS_LIBRARY The QtWidgets library + # QT_QTXML_LIBRARY The QtXml library + # + # also defined, but NOT for general use are +@@ -65,23 +63,19 @@ + find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED) + find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED) + find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED) +-find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED) +-find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED) + find_package(Qt5Network ${REQUIRED_QT_VERSION} REQUIRED) + find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED) + + # Copy includes and library names into the same style as pkgconfig used for Qt4 +-set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) ++set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) + + set(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES}) + set(QT_QTDBUS_LIBRARY ${Qt5DBus_LIBRARIES}) + set(QT_QTGUI_LIBRARY ${Qt5Gui_LIBRARIES}) + set(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES}) +-set(QT_QTTEST_LIBRARY ${Qt5Test_LIBRARIES}) +-set(QT_QTWIDGETS_LIBRARY ${Qt5Widgets_LIBRARIES}) + set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES}) + +-set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY}) ++set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY}) + + SET(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR}) + SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR}) diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild index 9aaa8c5aa7c1..97dc81e956dd 100644 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 cmake-utils virtualx +inherit python-any-r1 cmake-utils DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" HOMEPAGE="https://telepathy.freedesktop.org/" @@ -13,7 +13,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~arm x86" -IUSE="debug farstream test" +IUSE="debug farstream" RDEPEND=" dev-qt/qtcore:5 @@ -29,17 +29,12 @@ RDEPEND=" DEPEND="${RDEPEND} ${PYTHON_DEPS} virtual/pkgconfig - test? ( - dev-libs/dbus-glib - dev-libs/glib:2 - dev-python/dbus-python - dev-qt/qttest:5 - ) " PATCHES=( "${FILESDIR}/${PN}-0.9.6.1-yes-release.patch" "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch" + "${FILESDIR}/${P}-deps.patch" ) # bug 549448 - last checked with 0.9.7 @@ -54,18 +49,8 @@ src_configure() { -DDESIRED_QT_VERSION=5 -DENABLE_DEBUG_OUTPUT=$(usex debug) -DENABLE_FARSTREAM=$(usex farstream) - -DENABLE_TESTS=$(usex test) + -DENABLE_TESTS=OFF -DENABLE_EXAMPLES=OFF ) cmake-utils_src_configure } - -src_test() { - _test_runner() { - ctest -E '(CallChannel)' - } - - pushd "${BUILD_DIR}" > /dev/null || die - virtx _test_runner - popd > /dev/null || die -} |