* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/
@ 2012-04-18 20:35 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2012-04-18 20:35 UTC (permalink / raw
To: gentoo-commits
commit: a1f14de568e7eecbd6f78b6ce7d477da034264c8
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Wed Apr 18 20:34:33 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed Apr 18 20:34:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a1f14de5
[net-libs/telepathy-qt] Add package.
(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)
---
.../files/telepathy-qt-9999-automagicness.patch | 109 ++++++++++++++++++++
net-libs/telepathy-qt/metadata.xml | 9 ++
net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 63 +++++++++++
3 files changed, 181 insertions(+), 0 deletions(-)
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-9999-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-9999-automagicness.patch
new file mode 100644
index 0000000..b34adb3
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-9999-automagicness.patch
@@ -0,0 +1,109 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b61c12f..7110d51 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,6 +73,13 @@ include(TpQtMacros)
+
+ include(MacroLogFeature)
+
++# options
++option(WITH_Farsight "Enable building with farsight features" ON)
++option(WITH_Farstream "Enable building with farstream features" ON)
++option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON)
++option(ENABLE_EXAMPLES "Enable building of examples" ON)
++option(ENABLE_TEST "Enable test suite" ON)
++
+ # external dependencies
+
+ # Required dependencies
+@@ -122,7 +129,6 @@ include_directories(${CMAKE_SOURCE_DIR}
+
+ add_definitions(-DQT_NO_CAST_FROM_ASCII)
+
+-set(ENABLE_DEBUG_OUTPUT ON CACHE BOOL "If activated, compiles support for printing debug output to stderr")
+ if (ENABLE_DEBUG_OUTPUT)
+ add_definitions(-DENABLE_DEBUG)
+ endif (ENABLE_DEBUG_OUTPUT)
+@@ -176,7 +182,9 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python"
+ "Needed to build some additional unit tests")
+
+ # Find GLib2, GObject, DBus and LibXml2
+-# Those are needed for the insane include dir dependency hell
++# These packages are not actually required by telepathy-qt
++# Rather, we call these macros to get the include dir required
++# to compile the dependencies of our actual dependencies
+ find_package(GLIB2)
+ find_package(GObject)
+ find_package(GIO)
+@@ -185,29 +193,33 @@ find_package(DBus)
+ find_package(DBusGLib)
+ find_package(LibXml2)
+
+-# Find tp-farsight
+-set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
+-find_package(TelepathyFarsight)
+-macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
+- "A Framework for dealing with audio/video conferencing protocols"
+- "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}"
+- "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
+-
+-# Find tp-farsight
+-set(FARSTREAM_MIN_VERSION "0.1.0")
+-find_package(Farstream)
+-macro_log_feature(FARSTREAM_FOUND "Farstream"
+- "A Framework for dealing with audio/video conferencing protocols"
+- "http://www.freedesktop.org/wiki/Software/Farstream" FALSE "${FARSTREAM_MIN_VERSION}"
+- "Needed, together with GStreamer and Telepathy-Farstream, to build telepathy-qt-farstream")
+-
+-# Find tp-farsight
+-set(TELEPATHY_FARSTREAM_MIN_VERSION "0.2.2")
+-find_package(TelepathyFarstream)
+-macro_log_feature(TELEPATHYFARSTREAM_FOUND "Telepathy-Farstream"
+- "A Framework for dealing with audio/video conferencing protocols"
+- "http://telepathy.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSTREAM_MIN_VERSION}"
+- "Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream")
++if(WITH_Farsight)
++ # Find tp-farsight
++ set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
++ find_package(TelepathyFarsight)
++ macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
++ "A Framework for dealing with audio/video conferencing protocols"
++ "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}"
++ "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
++endif(WITH_Farsight)
++
++if(WITH_Farstream)
++ # Find farstream
++ set(FARSTREAM_MIN_VERSION "0.1.0")
++ find_package(Farstream)
++ macro_log_feature(FARSTREAM_FOUND "Farstream"
++ "A Framework for dealing with audio/video conferencing protocols"
++ "http://www.freedesktop.org/wiki/Software/Farstream" FALSE "${FARSTREAM_MIN_VERSION}"
++ "Needed, together with GStreamer and Telepathy-Farstream, to build telepathy-qt-farstream")
++
++ # Find tp-farstream
++ set(TELEPATHY_FARSTREAM_MIN_VERSION "0.2.2")
++ find_package(TelepathyFarstream)
++ macro_log_feature(TELEPATHYFARSTREAM_FOUND "Telepathy-Farstream"
++ "A Framework for dealing with audio/video conferencing protocols"
++ "http://telepathy.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSTREAM_MIN_VERSION}"
++ "Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream")
++endif(WITH_Farstream)
+
+ # Find GStreamer
+ find_package(GStreamer)
+@@ -258,8 +270,12 @@ endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+
+ # Add the source subdirectories
+ add_subdirectory(TelepathyQt)
+-add_subdirectory(examples)
+-add_subdirectory(tests)
++if(ENABLE_EXAMPLES)
++ add_subdirectory(examples)
++endif(ENABLE_EXAMPLES)
++if(ENABLE_TEST)
++ add_subdirectory(tests)
++endif(ENABLE_TEST)
+ add_subdirectory(tools)
+
+ # Generate config.h and config-version.h
diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
new file mode 100644
index 0000000..c971a11
--- /dev/null
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <use>
+ <flag name='farsight'>Enable support for farsight connection manager</flag>
+ <flag name='farstream'>Enable support for audio/video calls via farstream</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
new file mode 100644
index 0000000..faa569b
--- /dev/null
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.5"
+EGIT_REPO_URI="git://anongit.freedesktop.org/telepathy/${PN}"
+
+inherit python base cmake-utils git-2
+
+DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="http://telepathy.freedesktop.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug farsight farstream test"
+
+RDEPEND="
+ x11-libs/qt-core:4
+ x11-libs/qt-dbus:4
+ farsight? (
+ net-libs/telepathy-farsight
+ )
+ farstream? (
+ net-libs/telepathy-farstream
+ >=net-libs/telepathy-glib-0.17.5
+ )
+ !net-libs/telepathy-qt4
+"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ farsight? (
+ >=net-libs/telepathy-glib-0.17.5
+ )
+ test? (
+ dev-libs/dbus-glib
+ dev-libs/glib
+ dev-python/dbus-python
+ )
+"
+
+REQUIRED_USE="farsight? ( !farstream )"
+
+PATCHES=( "${FILESDIR}/${P}-automagicness.patch" )
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with farsight)
+ $(cmake-utils_use_with farstream)
+ $(cmake-utils_use_enable debug DEBUG_OUTPUT)
+ $(cmake-utils_use_enable test)
+ -DENABLE_EXAMPLES=OFF
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/
@ 2012-07-11 23:43 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2012-07-11 23:43 UTC (permalink / raw
To: gentoo-commits
commit: e3eb717dccd828e0c133540d3501b8b814c581f4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 23:42:51 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 23:43:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e3eb717d
[net-libs/telepathy-qt] Remove patch, applied upstream.
(Portage version: 2.2.0_alpha116/git/Linux x86_64, unsigned Manifest commit)
---
.../files/telepathy-qt-9999-automagicness.patch | 109 --------------------
net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 1 -
2 files changed, 0 insertions(+), 110 deletions(-)
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-9999-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-9999-automagicness.patch
deleted file mode 100644
index b34adb3..0000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-9999-automagicness.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b61c12f..7110d51 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,6 +73,13 @@ include(TpQtMacros)
-
- include(MacroLogFeature)
-
-+# options
-+option(WITH_Farsight "Enable building with farsight features" ON)
-+option(WITH_Farstream "Enable building with farstream features" ON)
-+option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON)
-+option(ENABLE_EXAMPLES "Enable building of examples" ON)
-+option(ENABLE_TEST "Enable test suite" ON)
-+
- # external dependencies
-
- # Required dependencies
-@@ -122,7 +129,6 @@ include_directories(${CMAKE_SOURCE_DIR}
-
- add_definitions(-DQT_NO_CAST_FROM_ASCII)
-
--set(ENABLE_DEBUG_OUTPUT ON CACHE BOOL "If activated, compiles support for printing debug output to stderr")
- if (ENABLE_DEBUG_OUTPUT)
- add_definitions(-DENABLE_DEBUG)
- endif (ENABLE_DEBUG_OUTPUT)
-@@ -176,7 +182,9 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python"
- "Needed to build some additional unit tests")
-
- # Find GLib2, GObject, DBus and LibXml2
--# Those are needed for the insane include dir dependency hell
-+# These packages are not actually required by telepathy-qt
-+# Rather, we call these macros to get the include dir required
-+# to compile the dependencies of our actual dependencies
- find_package(GLIB2)
- find_package(GObject)
- find_package(GIO)
-@@ -185,29 +193,33 @@ find_package(DBus)
- find_package(DBusGLib)
- find_package(LibXml2)
-
--# Find tp-farsight
--set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
--find_package(TelepathyFarsight)
--macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
-- "A Framework for dealing with audio/video conferencing protocols"
-- "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}"
-- "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
--
--# Find tp-farsight
--set(FARSTREAM_MIN_VERSION "0.1.0")
--find_package(Farstream)
--macro_log_feature(FARSTREAM_FOUND "Farstream"
-- "A Framework for dealing with audio/video conferencing protocols"
-- "http://www.freedesktop.org/wiki/Software/Farstream" FALSE "${FARSTREAM_MIN_VERSION}"
-- "Needed, together with GStreamer and Telepathy-Farstream, to build telepathy-qt-farstream")
--
--# Find tp-farsight
--set(TELEPATHY_FARSTREAM_MIN_VERSION "0.2.2")
--find_package(TelepathyFarstream)
--macro_log_feature(TELEPATHYFARSTREAM_FOUND "Telepathy-Farstream"
-- "A Framework for dealing with audio/video conferencing protocols"
-- "http://telepathy.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSTREAM_MIN_VERSION}"
-- "Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream")
-+if(WITH_Farsight)
-+ # Find tp-farsight
-+ set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
-+ find_package(TelepathyFarsight)
-+ macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
-+ "A Framework for dealing with audio/video conferencing protocols"
-+ "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}"
-+ "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
-+endif(WITH_Farsight)
-+
-+if(WITH_Farstream)
-+ # Find farstream
-+ set(FARSTREAM_MIN_VERSION "0.1.0")
-+ find_package(Farstream)
-+ macro_log_feature(FARSTREAM_FOUND "Farstream"
-+ "A Framework for dealing with audio/video conferencing protocols"
-+ "http://www.freedesktop.org/wiki/Software/Farstream" FALSE "${FARSTREAM_MIN_VERSION}"
-+ "Needed, together with GStreamer and Telepathy-Farstream, to build telepathy-qt-farstream")
-+
-+ # Find tp-farstream
-+ set(TELEPATHY_FARSTREAM_MIN_VERSION "0.2.2")
-+ find_package(TelepathyFarstream)
-+ macro_log_feature(TELEPATHYFARSTREAM_FOUND "Telepathy-Farstream"
-+ "A Framework for dealing with audio/video conferencing protocols"
-+ "http://telepathy.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSTREAM_MIN_VERSION}"
-+ "Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream")
-+endif(WITH_Farstream)
-
- # Find GStreamer
- find_package(GStreamer)
-@@ -258,8 +270,12 @@ endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-
- # Add the source subdirectories
- add_subdirectory(TelepathyQt)
--add_subdirectory(examples)
--add_subdirectory(tests)
-+if(ENABLE_EXAMPLES)
-+ add_subdirectory(examples)
-+endif(ENABLE_EXAMPLES)
-+if(ENABLE_TEST)
-+ add_subdirectory(tests)
-+endif(ENABLE_TEST)
- add_subdirectory(tools)
-
- # Generate config.h and config-version.h
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index f884a50..926b4f3 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -44,7 +44,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="farsight? ( !farstream )"
-PATCHES=( "${FILESDIR}/${P}-automagicness.patch" )
DOCS=( AUTHORS ChangeLog HACKING NEWS README )
pkg_setup() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/
@ 2019-11-20 21:18 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-11-20 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 4cab07fd3c65516ca728ac778a78d13bf7060582
Author: Alexander Akulich <akulichalexander <AT> gmail <DOT> com>
AuthorDate: Mon Nov 11 19:32:03 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 21:17:36 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4cab07fd
net-libs/telepathy-qt: python3 support, re-add tests
Closes: https://github.com/gentoo/qt/pull/200
Signed-off-by: Alexander Akulich <akulichalexander <AT> gmail.com>
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 | 49 +++++++++++++---------
4 files changed, 30 insertions(+), 94 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
deleted file mode 100644
index a14e1da1..00000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 033ece79..00000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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
deleted file mode 100644
index 07cf43f3..00000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-yes-release.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 0a7192d6..64f32659 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -3,9 +3,9 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7} )
EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
-inherit python-any-r1 cmake-utils git-r3
+inherit python-any-r1 cmake-utils git-r3 virtualx
DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
HOMEPAGE="https://telepathy.freedesktop.org/"
@@ -13,12 +13,9 @@ HOMEPAGE="https://telepathy.freedesktop.org/"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="debug farstream"
+IUSE="debug farstream test"
-BDEPEND="${PYTHON_DEPS}
- virtual/pkgconfig
-"
-DEPEND="
+RDEPEND="
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
@@ -29,28 +26,42 @@ DEPEND="
>=net-libs/telepathy-glib-0.18.0
)
"
-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"
-)
+DEPEND="${RDEPEND}
+ test? (
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ dev-qt/qttest:5
+ $(python_gen_any_dep '
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ ')
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+"
+RESTRICT="!test? ( test )"
-# bug 549448 - last checked with 0.9.7
-RESTRICT="test"
+python_check_deps() {
+ has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
pkg_setup() {
- python-any-r1_pkg_setup
+ use test && 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_TESTS=$(usex test)
-DENABLE_EXAMPLES=OFF
)
cmake-utils_src_configure
}
+
+src_test() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ virtx cmake-utils_src_test
+ popd > /dev/null || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-20 21:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-11 23:43 [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2019-11-20 21:18 Andreas Sturmlechner
2012-04-18 20:35 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox