-DIST telepathy-qt-0.9.7.tar.gz 6213405 BLAKE2B 13e2ae73bba74b4aedd55b46d0816744a4485a2a39faed610439fff40a65065a12606080012e220fc30a9d2642aba311aca6a24b540d8d22a140197911343eb8 SHA512 081daecb2509ea690079014bcc88eacbf2b3e4f4ac42aaf1b0cb264c01b801bc499a041482571d383f258cb3d3e2c6ffa5682fbe417fe807fcc25a06d2ead877
DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
+++ /dev/null
-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)
-
+++ /dev/null
-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
+++ /dev/null
---- 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})
+++ /dev/null
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 cmake-utils
-
-DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="debug farstream"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtxml:5
- farstream? (
- >=net-libs/telepathy-farstream-0.2.2
- >=net-libs/telepathy-glib-0.18.0
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-
-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
-RESTRICT="test"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDESIRED_QT_VERSION=5
- -DENABLE_DEBUG_OUTPUT=$(usex debug)
- -DENABLE_FARSTREAM=$(usex farstream)
- -DENABLE_TESTS=OFF
- -DENABLE_EXAMPLES=OFF
- )
- cmake-utils_src_configure
-}
projects / gentoo.git / commitdiff