diff options
| -rw-r--r-- | net-libs/telepathy-qt/ChangeLog | 11 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/Manifest | 24 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.5.12-automagicness.patch | 169 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch | 198 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild | 13 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild (renamed from net-libs/telepathy-qt/telepathy-qt-0.5.15.ebuild) | 30 |
6 files changed, 249 insertions, 196 deletions
diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog index e65a9406ee07..877e92219d28 100644 --- a/net-libs/telepathy-qt/ChangeLog +++ b/net-libs/telepathy-qt/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-libs/telepathy-qt4 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.2 2012/01/24 18:27:43 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.3 2012/01/25 08:49:10 johu Exp $ + +*telepathy-qt-0.9.0 (25 Jan 2012) + + 25 Jan 2012; Johannes Huber <johu@gentoo.org> + +files/telepathy-qt-0.9.0-automagicness.patch, +telepathy-qt-0.9.0.ebuild, + -files/telepathy-qt-0.5.12-automagicness.patch, -telepathy-qt-0.5.15.ebuild, + telepathy-qt-0.8.0.ebuild: + Version bump wrt bug #400669. Remove old. Make tests optional and add missing + dep, fixes bug #373955. 24 Jan 2012; Johannes Huber <johu@gentoo.org> Manifest: Fix manifest. diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest index c2f72c306651..bccb16c4a133 100644 --- a/net-libs/telepathy-qt/Manifest +++ b/net-libs/telepathy-qt/Manifest @@ -1,22 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -AUX telepathy-qt-0.5.12-automagicness.patch 6917 RMD160 e9dc8451123f82436f239a2adab436e2744d9b39 SHA1 2c9592cc749055736445969a97d3ffda2b26ca18 SHA256 74585bf7d2e746a66864deb1f3858f1c1aeb63bf4c9314310b1ae40890c15f2b AUX telepathy-qt-0.8.0-automagicness.patch 7516 RMD160 71daeee234927121c817a61e8f1acc1e50efaf8d SHA1 d5bd2b1b6db98b49db44d84ec409c39a322a662f SHA256 c37d92e8fe846a914a652c4db170ddbd5a9dd2f6899bc240cb89eed4797c182b -DIST telepathy-qt4-0.5.15.tar.gz 3327150 RMD160 10c684c7baffe41a185fee08e16d32c12ab85faa SHA1 13c0e94e1368e4f3ce8c540676296a5a60991883 SHA256 ee051b5a96f0812e8749433808673a75a049d1f97d3c035b8b2b08dce5db9b6a +AUX telepathy-qt-0.9.0-automagicness.patch 7761 RMD160 7c9fc4fc0d97ebaaace5fa3c14dd07b039870ec7 SHA1 a2dfedcd76d9ce688e24cac0c2f7be24e6f1048d SHA256 5f29287e0755e1dda72042ffb4809e90b05e5e8297564e7884237128ff0c315c +DIST telepathy-qt-0.9.0.tar.gz 4120044 RMD160 f9cf24c8ab0043f404f39ed46cdff54a9d5ec75d SHA1 6d977a76b9854ceec933444507c6a11a0333af39 SHA256 cf2ae8d2cf75c1cf40a3faff263d3f36b88d637eddfec0724a5fcc51ffb6706c DIST telepathy-qt4-0.8.0.tar.gz 4014194 RMD160 e6850de7d57c8c6bab57f381667209bfac4d3ea7 SHA1 ba34bf78b7e1b6d7bb087780d8e1709a3cf4775b SHA256 e4a4dee2a2fb88bebfdac50ed7341b5c927b0411b4df93209cd9291915a0e1dc -EBUILD telepathy-qt-0.5.15.ebuild 1262 RMD160 f1f8685c9ce72ceadd2dcfac31cc495b3e902bc6 SHA1 61993b2b3e9ec240fcd4f75ff9eeda597f81670c SHA256 a5322622480179e0adff51140e8b85715b57554a27278e2cb5afdfd03e93f730 -EBUILD telepathy-qt-0.8.0.ebuild 1409 RMD160 afcf06bb0b6519dc4930a7f1b5e05237a06525af SHA1 a200e72942c39db2a9ff34fe87358b6275b83b42 SHA256 c2dec87566d3df4215d252c2de5e0f6885285d26fded550bd35f6d71a0c3a766 -MISC ChangeLog 1991 RMD160 06f0a2d866ef781b1b9f626bdb1d5c55e523fb6d SHA1 314833f6132ac505f586d0490d5c81bf9e373a3a SHA256 4180ce17cf99a918504eb35cc44d44f3282529f07ba5b9699cea52efb4fc24eb +EBUILD telepathy-qt-0.8.0.ebuild 1520 RMD160 d9106467bca463094455693df8e2f24146db32db SHA1 08f746ac2030c6ec4eaeb25e28b805c17e0a6335 SHA256 7bfbb5080ae5614c2a0b03f5e463ccaadd681e6701acac1187148ed5dc2aba81 +EBUILD telepathy-qt-0.9.0.ebuild 1484 RMD160 405ca0930c61489bbdd11087deb464eb9d5c9f09 SHA1 e2cedd3013cffb514b19376eaa7dddbbd390859d SHA256 760f211527716bc3780d637ef77cd1ec577d5a1dec21ee580b3e8d7d0f9bbc1d +MISC ChangeLog 2366 RMD160 84e5a7afe6ce8f384f7010841f68d9cf4e413f8c SHA1 50a31c00640071a37744f1909d5cb7dfae6495fb SHA256 2357911d1ae4f36fb935f3b722272b6f60242ceb99dd42060e702be9959c2e88 MISC metadata.xml 335 RMD160 e68f892510261f37859207aab171783893e86e1f SHA1 756c52f911aa8c3c5487a53500828106ee6554d9 SHA256 f43ecaefe6736cbcadb34db002b505ec454ab7d0328de46c9a6795ff3c212970 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJPHvfnAAoJEO+t9ga+3I3asxgH+wQaGdAoHZspQxjm4ek4J/Ur -AOlF9P7hDOAhoZR4kX3jcQD/f5pOyxX1A5jBgs2oQg62FGFVagkukgXSmwpd3gwY -d3vrdUyMSX8wdT6I0v1nH6NbZmvQWYVzJx1fFOOTc2f/X8pLjg4f8O+zYbPlDn6R -Dey9SBntDDwQFIBJ/Ouc4y7JEKvVZ8V0pspSSoLInJfWBZtIKFg+rduU7fHzGorU -KdaWHNZbnwPhQY5iYY6CHCfmGSb32J6w5iGAOsv9cPKjusPyLCt+9+0BB2qKDcGT -GnCe81DnCGJF2XA6PlNfYM8oVJs+BNQsqYsMlsfP/d2Rh3shBHjo0wt+4aLH7MA= -=4QKb +iQEcBAEBCgAGBQJPH8HTAAoJEO+t9ga+3I3aOq0IAK5/GYZLwYb75WkiUqAcrN+E +rwkDQblYqGVj2k60nDl3FynVBSA5m+vKFc2LpE/B78fD5cePtDf+udIAaKCW2rGK +Gm0TdVlwaV/DPsXilqK1THuK9g5nrDDf00aXBpHrUtbDYlJ9FCo/GHLvOQdLznJf +/pKag3p/fiIagZF+mddpbNbvI0h3PvoFznLlZv+25WSljk7wOR7z16+ydlTiYJup +g908kWKxWR7P3gCHoYNO4C+US/Mo95iNL8PMxMyolYL+Tcuk9NHX6vOasYNN3Ztl +d8XqBn6T2GhR0OFCiFnb5T9r04V7SF977Vvf+T1TnrEEtEdAoYruGuNt3mpI0+8= +=XCC1 -----END PGP SIGNATURE----- diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.5.12-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.5.12-automagicness.patch deleted file mode 100644 index e4f0f11a3e64..000000000000 --- a/net-libs/telepathy-qt/files/telepathy-qt-0.5.12-automagicness.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff -urN telepathy-qt4-0.5.12.old/CMakeLists.txt telepathy-qt4-0.5.12/CMakeLists.txt ---- telepathy-qt4-0.5.12.old/CMakeLists.txt 2011-03-23 08:51:03.000000000 +0100 -+++ telepathy-qt4-0.5.12/CMakeLists.txt 2011-03-23 09:02:55.000000000 +0100 -@@ -85,6 +85,11 @@ - include(Doxygen) - include(MacroLogFeature) - -+# options -+option(WITH_Glib "Enable building with glib features" ON) -+option(WITH_Farsight "Enable building with farsight features" ON) -+option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON) -+ - # external dependencies - - # Required dependencies -@@ -98,10 +103,9 @@ - - 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) -+if(ENABLE_DEBUG_OUTPUT) - add_definitions(-DENABLE_DEBUG) --endif (ENABLE_DEBUG_OUTPUT) -+endif(ENABLE_DEBUG_OUTPUT) - - # Check for Qt4 Glib support - include(CheckCXXSourceCompiles) -@@ -109,21 +113,6 @@ - set(CMAKE_REQUIRED_DEFINITIONS "") - set(CMAKE_REQUIRED_FLAGS "") - --CHECK_CXX_SOURCE_COMPILES(" --#include <QtCore/QtGlobal> --int main() --{ --#if defined(QT_NO_GLIB) --#error \"Qt was compiled with Glib disabled\" --#endif --return 0; --}" --QT4_GLIB_SUPPORT) --macro_log_feature(QT4_GLIB_SUPPORT "Qt4 Glib Support" -- "QtCore library using Glib's main event loop" -- "http://qt.nokia.com/" FALSE "" -- "Needed, together with Telepathy-Glib, to build most of the unit tests") -- - # Check for operator== in QDBusVariant - SET(CMAKE_REQUIRED_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY}) - CHECK_CXX_SOURCE_COMPILES(" -@@ -172,50 +161,76 @@ - - # Find GLib2, GObject, DBus and LibXml2 - # Those are needed for the insane include dir dependency hell --find_package(GLIB2) --find_package(GObject) --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 "0.0.4" -- "Needed, together with GStreamer, to build telepathy-qt4-farsight and some additional examples") -- --# Find GStreamer --find_package(GStreamer) --macro_log_feature(GSTREAMER_FOUND "GStreamer" -- "An open source multimedia framework" -- "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples" -- "http://www.gstreamer.net/" FALSE) -- --# Build TelepathyQt4-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found --if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -- set (FARSIGHT_COMPONENTS_FOUND 1) --else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -- set (FARSIGHT_COMPONENTS_FOUND 0) --endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -+if(WITH_Farsight) -+ find_package(GLIB2 REQUIRED) -+ find_package(GObject REQUIRED) -+ find_package(DBus REQUIRED) -+ find_package(DBusGLib REQUIRED) -+ find_package(LibXml2 REQUIRED) -+ -+ # Find tp-farsight -+ set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4") -+ find_package(TelepathyFarsight REQUIRED) -+ macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight" -+ "A Framework for dealing with audio/video conferencing protocols" -+ "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4" -+ "Needed, together with GStreamer, to build telepathy-qt4-farsight and some additional examples") -+ -+ # Find GStreamer -+ find_package(GStreamer REQUIRED) -+ macro_log_feature(GSTREAMER_FOUND "GStreamer" -+ "An open source multimedia framework" -+ "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples" -+ "http://www.gstreamer.net/" FALSE) -+ -+ # Build TelepathyQt4-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found -+ if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -+ set (FARSIGHT_COMPONENTS_FOUND 1) -+ else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -+ set (FARSIGHT_COMPONENTS_FOUND 0) -+ endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -+else(WITH_Farsight) -+ set(FARSIGHT_COMPONENTS_FOUND 0) -+endif(WITH_Farsight) - - # Find telepathy-glib --set(TELEPATHY_GLIB_MIN_VERSION 0.13.10) --find_package(TelepathyGlib) --macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" -- "Glib bindings for Telepathy" -- "http://telepathy.freedesktop.org/" FALSE "0.13.0" -- "Needed, together with Qt Glib integration, to build most of the unit tests") -- --find_program(GLIB_GENMARSHAL glib-genmarshal) -- --# Enable glib-based tests only if Qt4 has GLib support and Telepathy-glib was found --if(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -- set(ENABLE_TP_GLIB_TESTS 1) --else(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -- set(ENABLE_TP_GLIB_TESTS 0) --endif(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -+if(WITH_Glib) -+ CHECK_CXX_SOURCE_COMPILES(" -+ #include <QtCore/QtGlobal> -+ int main() -+ { -+ #if defined(QT_NO_GLIB) -+ #error \"Qt was compiled with Glib disabled\" -+ #endif -+ return 0; -+ }" -+ QT4_GLIB_SUPPORT) -+ macro_log_feature(QT4_GLIB_SUPPORT "Qt4 Glib Support" -+ "QtCore library using Glib's main event loop" -+ "http://qt.nokia.com/" FALSE "" -+ "Needed, together with Telepathy-Glib, to build most of the unit tests") -+ -+ find_package(GLIB2 REQUIRED) -+ find_package(DBus REQUIRED) -+ -+ set(TELEPATHY_GLIB_MIN_VERSION 0.13.10) -+ find_package(TelepathyGlib REQUIRED) -+ macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" -+ "Glib bindings for Telepathy" -+ "http://telepathy.freedesktop.org/" FALSE "0.13.0" -+ "Needed, together with Qt Glib integration, to build most of the unit tests") -+ -+ find_program(GLIB_GENMARSHAL glib-genmarshal) -+ # Enable glib-based tests only if Qt4 has GLib support and Telepathy-glib was found -+ if(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -+ set(ENABLE_TP_GLIB_TESTS 1) -+ else(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -+ set(ENABLE_TP_GLIB_TESTS 0) -+ endif(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -+else(WITH_Glib) -+ set(ENABLE_TP_GLIB_TESTS 0) -+endif(WITH_Glib) -+ - - # Add the source subdirectories - add_subdirectory(TelepathyQt4) diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch new file mode 100644 index 000000000000..4b28be1722b1 --- /dev/null +++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch @@ -0,0 +1,198 @@ +--- telepathy-qt-0.9.0.orig/CMakeLists.txt 2011-12-20 21:33:46.000000000 +0100 ++++ telepathy-qt-0.9.0/CMakeLists.txt 2012-01-24 23:32:57.000000000 +0100 +@@ -73,6 +73,12 @@ + + include(MacroLogFeature) + ++# options ++option(WITH_Glib "Enable building with glib features" ON) ++option(WITH_Farsight "Enable building with farsight features" ON) ++option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON) ++option(WITH_Test "Enable test suite" ON) ++ + # external dependencies + + # Required dependencies +@@ -108,31 +114,9 @@ + + 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) ++if(ENABLE_DEBUG_OUTPUT) + add_definitions(-DENABLE_DEBUG) +-endif (ENABLE_DEBUG_OUTPUT) +- +-# Check for Qt Glib support +-include(CheckCXXSourceCompiles) +-set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES}) +-set(CMAKE_REQUIRED_DEFINITIONS "") +-set(CMAKE_REQUIRED_FLAGS "") +- +-CHECK_CXX_SOURCE_COMPILES(" +-#include <QtCore/QtGlobal> +-int main() +-{ +-#if defined(QT_NO_GLIB) +-#error \"Qt was compiled with Glib disabled\" +-#endif +-return 0; +-}" +-QT_GLIB_SUPPORT) +-macro_log_feature(QT_GLIB_SUPPORT "Qt Glib Support" +- "QtCore library using Glib's main event loop" +- "http://qt.nokia.com/" FALSE "" +- "Needed, together with Telepathy-Glib, to build most of the unit tests") ++endif(ENABLE_DEBUG_OUTPUT) + + # Find python version >= 2.5 + find_package(PythonLibrary REQUIRED) +@@ -158,63 +142,100 @@ + + # Find GLib2, GObject, DBus and LibXml2 + # Those are needed for the insane include dir dependency hell +-find_package(GLIB2) +-find_package(GObject) +-find_package(GIO) +-find_package(GIOUnix) +-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 "0.0.4" +- "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples") +- +-# Find GStreamer +-find_package(GStreamer) +-macro_log_feature(GSTREAMER_FOUND "GStreamer" +- "An open source multimedia framework" +- "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples" +- "http://www.gstreamer.net/" FALSE) +- +-# Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found +-if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) +- set (FARSIGHT_COMPONENTS_FOUND 1) +-else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) ++if (WITH_Farsight) ++ find_package(GLIB2) ++ find_package(GObject) ++ 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 "0.0.4" ++ "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples") ++ ++ # Find GStreamer ++ find_package(GStreamer) ++ macro_log_feature(GSTREAMER_FOUND "GStreamer" ++ "An open source multimedia framework" ++ "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples" ++ "http://www.gstreamer.net/" FALSE) ++ ++ # Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found ++ if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) ++ set (FARSIGHT_COMPONENTS_FOUND 1) ++ else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) ++ set (FARSIGHT_COMPONENTS_FOUND 0) ++ endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) ++else(WITH_Farsight) + set (FARSIGHT_COMPONENTS_FOUND 0) +-endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) ++endif(WITH_Farsight) + + # Find telepathy-glib +-set(TELEPATHY_GLIB_MIN_VERSION 0.17.2) +-find_package(TelepathyGlib) +-macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" +- "Glib bindings for Telepathy" +- "http://telepathy.freedesktop.org/" FALSE ${TELEPATHY_GLIB_MIN_VERSION} +- "Needed, together with Qt Glib integration, to build most of the unit tests") +- +-find_program(GLIB_GENMARSHAL glib-genmarshal) +- +-# Enable glib-based tests only if Qt has GLib support and Telepathy-glib was found +-if(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) +- set(ENABLE_TP_GLIB_TESTS 1) +- if(GIO_FOUND AND GIOUNIX_FOUND) +- set(ENABLE_TP_GLIB_GIO_TESTS 1) +- else(GIO_FOUND AND GIOUNIX_FOUND) +- set(ENABLE_TP_GLIB_GIO_TESTS 0) +- endif(GIO_FOUND AND GIOUNIX_FOUND) +-else(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) ++if(WITH_Glib) ++ # Check for Qt Glib support ++ include(CheckCXXSourceCompiles) ++ set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES}) ++ set(CMAKE_REQUIRED_DEFINITIONS "") ++ set(CMAKE_REQUIRED_FLAGS "") ++ ++ CHECK_CXX_SOURCE_COMPILES("E_TP ++ #include <QtCore/QtGlobal> ++ int main() ++ { ++ #if defined(QT_NO_GLIB) ++ #error \"Qt was compiled with Glib disabled\" ++ #endif ++ return 0; ++ }" ++ QT_GLIB_SUPPORT) ++ macro_log_feature(QT_GLIB_SUPPORT "Qt Glib Support" ++ "QtCore library using Glib's main event loop" ++ "http://qt.nokia.com/" FALSE "" ++ "Needed, together with Telepathy-Glib, to build most of the unit tests") ++ ++ find_package(GLIB2 REQUIRED) ++ find_package(GIO) ++ find_package(GIOUnix) ++ find_package(DBus REQUIRED) ++ ++ # Find telepathy-glib ++ set(TELEPATHY_GLIB_MIN_VERSION 0.17.2) ++ find_package(TelepathyGlib) ++ macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" ++ "Glib bindings for Telepathy" ++ "http://telepathy.freedesktop.org/" FALSE ${TELEPATHY_GLIB_MIN_VERSION} ++ "Needed, together with Qt Glib integration, to build most of the unit tests") ++ ++ find_program(GLIB_GENMARSHAL glib-genmarshal) ++ ++ # Enable glib-based tests only if Qt has GLib support and Telepathy-glib was found ++ if(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) ++ set(ENABLE_TP_GLIB_TESTS 1) ++ if(GIO_FOUND AND GIOUNIX_FOUND) ++ set(ENABLE_TP_GLIB_GIO_TESTS 1) ++ else(GIO_FOUND AND GIOUNIX_FOUND) ++ set(ENABLE_TP_GLIB_GIO_TESTS 0) ++ endif(GIO_FOUND AND GIOUNIX_FOUND) ++ else(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) ++ set(ENABLE_TP_GLIB_TESTS 0) ++ set(ENABLE_TP_GLIB_GIO_TESTS 0) ++ endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) ++else(WITH_Glib) + set(ENABLE_TP_GLIB_TESTS 0) + set(ENABLE_TP_GLIB_GIO_TESTS 0) +-endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) ++endif(WITH_Glib) ++ + + # Add the source subdirectories + add_subdirectory(TelepathyQt) + add_subdirectory(examples) +-add_subdirectory(tests) ++if(WITH_Test) ++ add_subdirectory(tests) ++endif(WITH_Test) + add_subdirectory(tools) + + # Generate config.h and config-version.h diff --git a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild index 47a9ce8f04c2..668838f23208 100644 --- a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild,v 1.1 2012/01/24 17:40:51 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild,v 1.2 2012/01/25 08:49:10 johu Exp $ EAPI=4 @@ -15,12 +15,12 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${MY_PN}/${MY_PN}-${PV}.tar.g LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug farsight glib" +IUSE="debug farsight glib test" RDEPEND=" dev-python/dbus-python - >=x11-libs/qt-core-4.6.0:4[glib?] - >=x11-libs/qt-dbus-4.6.0:4 + x11-libs/qt-core:4[glib?] + x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 @@ -34,6 +34,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/libxslt dev-util/pkgconfig + test? ( x11-libs/qt-test:4 ) " PATCHES=( "${FILESDIR}/${P}-automagicness.patch" ) @@ -51,6 +52,10 @@ src_prepare() { base_src_prepare sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die + + if ! use test ; then + sed -i -e '/^add_subdirectory(tests)$/d' CMakeLists.txt || die + fi } src_configure() { diff --git a/net-libs/telepathy-qt/telepathy-qt-0.5.15.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild index 8f218d0d625a..79f3a7e502c9 100644 --- a/net-libs/telepathy-qt/telepathy-qt-0.5.15.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild @@ -1,22 +1,23 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.5.15.ebuild,v 1.1 2012/01/24 17:40:51 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild,v 1.1 2012/01/25 08:49:10 johu Exp $ EAPI=4 -PYTHON_DEPEND="2" -MY_PN=${PN}4 +PYTHON_DEPEND="2:2.5" inherit python base cmake-utils DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol" HOMEPAGE="http://telepathy.freedesktop.org/" -SRC_URI="http://telepathy.freedesktop.org/releases/${MY_PN}/${MY_PN}-${PV}.tar.gz" +SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug farsight glib" +IUSE="debug farsight glib test" +# TODO raise dep if version is available: +# >=net-libs/telepathy-glib-0.17.2 RDEPEND=" dev-python/dbus-python x11-libs/qt-core:4[glib?] @@ -25,32 +26,41 @@ RDEPEND=" dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer - net-libs/telepathy-glib net-libs/telepathy-farsight ) + glib? ( + dev-libs/glib:2 + >=net-libs/telepathy-glib-0.15.1 + ) !net-libs/telepathy-qt4 " DEPEND="${RDEPEND} dev-libs/libxslt dev-util/pkgconfig + test? ( x11-libs/qt-test:4 ) " -PATCHES=( "${FILESDIR}/${PN}-0.5.12-automagicness.patch" ) - -DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO ) +PATCHES=( "${FILESDIR}/${P}-automagicness.patch" ) -S=${WORKDIR}/${MY_PN}-${PV} +DOCS=( AUTHORS ChangeLog HACKING NEWS README ) pkg_setup() { python_set_active_version 2 python_pkg_setup } +src_prepare() { + base_src_prepare + + sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_enable debug DEBUG_OUTPUT) $(cmake-utils_use_with glib) $(cmake-utils_use_with farsight) + $(cmake-utils_use_with test) ) cmake-utils_src_configure } |