commit: adbefd1cb35098889a18e5fb9d0fbc8cfca9333c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Oct 26 16:32:06 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Oct 26 16:32:06 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=adbefd1c
net-libs/telepathy-qt: EAPI-7 bump, drop bogus (and failing test) deps Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/telepathy-qt-0.9.6.1-qtpath.patch | 21 +++++++++++ .../files/telepathy-qt-0.9.7-deps.patch | 37 +++++++++++++++++++ .../files/telepathy-qt-0.9.8-yes-release.patch | 17 +++++++++ net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 42 +++++++++------------- 4 files changed, 91 insertions(+), 26 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 00000000..a14e1da1 --- /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.7-deps.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch new file mode 100644 index 00000000..033ece79 --- /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/files/telepathy-qt-0.9.8-yes-release.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-yes-release.patch new file mode 100644 index 00000000..07cf43f3 --- /dev/null +++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-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 () + +- if(${TP_QT_NANO_VERSION} EQUAL 0) +- set(NOT_RELEASE 0) +- else() +- set(NOT_RELEASE 1) +- endif() ++ set(NOT_RELEASE 0) + + set(desired + all diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild index 699f4ab1..0a7192d6 100644 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" ) -inherit python-any-r1 cmake-utils virtualx git-r3 +inherit python-any-r1 cmake-utils git-r3 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" HOMEPAGE="https://telepathy.freedesktop.org/" @@ -13,9 +13,12 @@ HOMEPAGE="https://telepathy.freedesktop.org/" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="debug farstream test" +IUSE="debug farstream" -RDEPEND=" +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig +" +DEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 @@ -26,16 +29,13 @@ RDEPEND=" >=net-libs/telepathy-glib-0.18.0 ) " -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - test? ( - dev-libs/dbus-glib - dev-libs/glib:2 - dev-python/dbus-python - dev-qt/qttest:5 - ) -" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.8-yes-release.patch" + "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch" + "${FILESDIR}/${PN}-0.9.7-deps.patch" +) # bug 549448 - last checked with 0.9.7 RESTRICT="test" @@ -49,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 -}