diff options
author | 2014-04-13 16:06:43 +0000 | |
---|---|---|
committer | 2014-04-13 16:06:43 +0000 | |
commit | 0da108e3e44fd4a92bcde5fab7be417f8d82041e (patch) | |
tree | 25f02840f3c5206c7d2f04a2b0c8a5f8ef60ccaa /net-libs/telepathy-qt | |
parent | amd64/x86 stable, bug #489220 (diff) | |
download | historical-0da108e3e44fd4a92bcde5fab7be417f8d82041e.tar.gz historical-0da108e3e44fd4a92bcde5fab7be417f8d82041e.tar.bz2 historical-0da108e3e44fd4a92bcde5fab7be417f8d82041e.zip |
Remove old.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'net-libs/telepathy-qt')
-rw-r--r-- | net-libs/telepathy-qt/ChangeLog | 9 | ||||
-rw-r--r-- | net-libs/telepathy-qt/Manifest | 38 | ||||
-rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.8.0-automagicness.patch | 190 | ||||
-rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.1-automagicness.patch | 109 | ||||
-rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.1-gcc-4.7.patch | 52 | ||||
-rw-r--r-- | net-libs/telepathy-qt/metadata.xml | 1 | ||||
-rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild | 70 | ||||
-rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild | 59 | ||||
-rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild | 67 |
9 files changed, 23 insertions, 572 deletions
diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog index 24a0505c9b44..b43019278720 100644 --- a/net-libs/telepathy-qt/ChangeLog +++ b/net-libs/telepathy-qt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-libs/telepathy-qt # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.25 2014/04/13 16:03:18 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.26 2014/04/13 16:06:40 johu Exp $ + + 13 Apr 2014; Johannes Huber <johu@gentoo.org> + -files/telepathy-qt-0.8.0-automagicness.patch, + -files/telepathy-qt-0.9.1-automagicness.patch, + -files/telepathy-qt-0.9.1-gcc-4.7.patch, -telepathy-qt-0.8.0.ebuild, + -telepathy-qt-0.9.2.ebuild, -telepathy-qt-0.9.3.ebuild, metadata.xml: + Remove old. 13 Apr 2014; Johannes Huber <johu@gentoo.org> telepathy-qt-0.9.3-r1.ebuild: amd64/x86 stable, bug #489220 diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest index 4bc1dd4c622c..81f1fbf15c3f 100644 --- a/net-libs/telepathy-qt/Manifest +++ b/net-libs/telepathy-qt/Manifest @@ -1,35 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX telepathy-qt-0.8.0-automagicness.patch 7516 SHA256 c37d92e8fe846a914a652c4db170ddbd5a9dd2f6899bc240cb89eed4797c182b SHA512 556a11aae6f65d1eec4599ab6c48b69ab5ee35cb13667a0559a4c4675a5b4e68e6519a8254f218b1eae917191818c75dea97c7aa8952cddf77834066dc97bbc7 WHIRLPOOL df31807c563ff0de48974e43164f3c14e8a5677d4630ac49669e7962ba783b55e00723d6cdb903c9b24fa7cfb7f25b987e5bb78286b594846f55c58c47f1b1e3 -AUX telepathy-qt-0.9.1-automagicness.patch 4801 SHA256 e1c931affeb6bd8b9118b605866c067f48bfc9ecc611c2bd92b9d37d627ba353 SHA512 66e341bac067e89a431c97047048fd36579f43662a2239fb8eb9ebbf878e2c0885a292102df31893f4f3096560a97b405559ea026f323c83c5e4acd3a4d50497 WHIRLPOOL a56cdbd39ac96707a650992e99c9bb334562e5859c430ab73fc3a308cb15ae5d62e4e945dd61a37dcf23dbfe75391b8e8511e2b0995c88afee53b16c2696a005 -AUX telepathy-qt-0.9.1-gcc-4.7.patch 2305 SHA256 034e0074c695c9334f26c865d3ab85e1e3bf6d580a80b2fd2947d99ceb7aece5 SHA512 225e75bfbbc993f2df0dc348e04995aaf305010e75a8a72b6612ddf9c42c01426661f783f3f2bb7b10967427757c27c2a98e0a8237511f59d31067ca21d365ba WHIRLPOOL e35580119d498b2582e139656fcc65d6ebb40211b927b9d75190dab3c72362621737013b0b07215130c0a350dff372c24e2ac18a33d698e9d23a8810dbf43d35 AUX telepathy-qt-0.9.3-avatar-duplication.patch 2762 SHA256 67fa532ebc18acaffd1d0d73af2e5a147e01686f00fde79a0ab109c708a29eff SHA512 18e6b24ae829dd52f41e9331ced909b79c69cb79f45541bd031c29771a2ac1e29784aa0485cdbf8922d50a125d85f4f01068d1459649d80556d246db340b35c4 WHIRLPOOL 770bf58592f4f856f170c5a3b0b21c883dc67b1a04e82f6a07f5449990be5312ab9b96b8bccb67d4b14c69d1eb64d073e282aee6e352896f031b57421daa83e7 AUX telepathy-qt-0.9.3-cmake-2.8.12.patch 1716 SHA256 b62e24035bacf2cd859e65f21125a35f0660aa79aca414014b6fc748ea8494e6 SHA512 8ee23ab379e3b9bfde33c8ad3cdeb6df2008aad3218b49cc60aafacec5f620d48b8f074c20251f00fbd0d5859cd6157b67aeedb139d8d6975eaf8019c47579ed WHIRLPOOL 63264a40f00b685ca48c4644741247701dbf5edeccc49f1ed0552f01767d5863809013d87b8dc15c8f327cc620edce5a397c047e59bbda68aff30efa1ace99e6 AUX telepathy-qt-0.9.3-tp-glib-0.18-tests.patch 1456 SHA256 17d77ffe834908b6bd91fdce90d85fa0f5e6e33110c601509df729322aa0a46e SHA512 b28186c81f2c6a46c35bfa1f1f8ebcd1b47e85b0660bd53acd0df582ee1d90e9cfce6f1d5e6170ea7f4466cc08d3a42d10986f666523c5d3beef0077b9f7aaef WHIRLPOOL 85976481237eb43216e0a818f391fe5c0aed4579e2f50ec7bb5af04a926a8c07acd19503fbeb5ed8a6f7d279153454c908ff030d1a8aac9dc2115ef543229918 -DIST telepathy-qt-0.9.2.tar.gz 4402089 SHA256 260b044680663c7057d700fd2bd1aafce2babe917063929777d169bdf9801d01 SHA512 8fcf55512d3733248763327dbf9d7a990cc4855ad3ee2b91c22e0266f80c989920d8622cfe2e77b546d33d5696d2562363b3f8271f538b5795aee43e660a4823 WHIRLPOOL 384e1543b1bbe8a439d5cb89fd5747a27ac3cdee1d479feb807c114edfe49afbf8f905a3fbe12f56d22ff2d54728e295a5a950bd6460fb727d5ee5a549fe7d70 DIST telepathy-qt-0.9.3.tar.gz 4414599 SHA256 c0ff57bea79b86ad343e184c16941d05f6d6d7dfd03876b44502f11935f44bf9 SHA512 46e370c9a2b8ee486cd99e5226a0098e8d04d2db105434097d617eda106e9f6f70b7de349646f46480792ed374984b8d3adff28b6d18f6ef6c979d4282902cb2 WHIRLPOOL d0bd45a772782dfaf2362a42265ee55ef47e4c80279b88d5ab2e2ef30dc9dc40b8423ff80ef451a33dc782253e53af9594f60d6e3299dadd8b073671200f0ed2 -DIST telepathy-qt4-0.8.0.tar.gz 4014194 SHA256 e4a4dee2a2fb88bebfdac50ed7341b5c927b0411b4df93209cd9291915a0e1dc SHA512 3f4c9d17190abfb372d7ba43ca9de86ea91dad646d64047a16cd158503acf54a6fb1ae0942adf869c4ce32c7eb7a95523b4de6692db1ae0be0759a89b5f39453 WHIRLPOOL 25839d0903f5551f34733cbba07f751b9cedcafbc35fb5c6e9b2b79edaa4b4769d9c10db32f112d76364a5918a8c72c831a7d3a16542371eba416a67079abe28 -EBUILD telepathy-qt-0.8.0.ebuild 1537 SHA256 79e469a82cef24173b58c6a7d65aeb1f871897db2b9a5fde2e8544c77878b29d SHA512 f142a6fb7d601eddf1a5a84377d58b248985d5919a74923c56937b039944bcc4dd90818a1767cd0538dcf405fbc9156a77917256d6cf1ceed7a3e84460dfa491 WHIRLPOOL 3d13d8e004c46bbce076298a324808da588dfb50077246866e94d2b1202ebeefecfdafe18e94eeafa1c6f0dfdc7f04dc8b2ba000c067ac4e1221c90dfb45001b -EBUILD telepathy-qt-0.9.2.ebuild 1308 SHA256 048c6973202ea25f12fd1612ecb9c8b25a7274fff2add07b420179c0bbc68de8 SHA512 c74cce15cc898489681f482c6169f00bb42ead6d33d942d32e54c8e348a30527859e3fc8eda6a8d540a089d9ffda3c6dd121b45de78ad977f0fb00c0a653a71a WHIRLPOOL 06e1fa2f4e41c5cdbd58f15ff3e112bce67034cb7b7db536e4588eb1e3357ed89ae2ee1fd1ddbff21ce27b64205932718c7f656462cf63d5c2a713b9d1344fa6 EBUILD telepathy-qt-0.9.3-r1.ebuild 1644 SHA256 47cb9335571ed293f4d0e5a5f3ba9402242d5c97392903fcc5ef966780fe8df1 SHA512 20721c23225a2fad78e261deda2ad4adbdb7a754c9d0cc4061904c4b70f33bd279d744fffa16529233af1d903b2d31fcd33d7a43e1f3bb2251ea7f7b284528a9 WHIRLPOOL a2a19af1884fe1eb1cfce04ef506b0c96ba8da15e5399861210c9513eb0b03f980435a62c18845276760797d1ec516a41f315d4d6e54d4aba0d444ab005d591c -EBUILD telepathy-qt-0.9.3.ebuild 1488 SHA256 c4145cef4eb24ca5998efee23c239249c611b014c3ed768fbb07151411489c19 SHA512 bfcc00ef888bdf7206d5c104b7fd9a452e1f7b5ca76352640d33492009f5ec3881dcc810e9a33d1895c7c00c570a41e49c8be515c6ac2016588c179f4e5a4146 WHIRLPOOL 1623d08abafbfd57cd8c4d44084d61516a77afd9b2a8916e8c3881df9a5305da7c65e046d85d8d802c31685912a96321b1073e720d7c531af623f49c880549ef -MISC ChangeLog 6027 SHA256 5a16563bac985b0258e73699009a7098f9d74d985b28ed91c687fe2801588893 SHA512 2356d7fc6ff0bc20bee0b42b0b13bfc02a4a731391874d084e6caf28ce8348d3dfb4a83e14a61f84c679df8f2cd25017a364819f69fc40589588f9a740aca5c8 WHIRLPOOL 91755ee3c52f5daccd3783b36850b95878653ddf3bfc34ff413408ee2634acd082d5ef9c26e401f949ff7e9a857422bc9c3357ab9b7c30ad9c0e0752f1e8adf2 -MISC metadata.xml 436 SHA256 fb4dfbe0b7a6a44f451a39e7fa5aa36972bc7ec8b1c47b4b83f3aeeedfee8de7 SHA512 66385c85f4de89ad5aea9d24f0cf59596d7d01ba86619c3e19589e7064e55de2b611b869ebaba8e47b694e7d8686b30a40f65392fb367170e3746ba0fb60289f WHIRLPOOL c7cb7f060036ac4a552168142d00f59e9193f6c962f1a208c2697375eb8daeb5dd8d5d8f75c739df5cb00f0ad0f890c053fd472d4c36d93262cf16ddba906958 +MISC ChangeLog 6331 SHA256 8c76a8f26ec8d8e9e19de514bc2a9fadb871cd0b1a5f33cd291f79eba3927a8e SHA512 e0db15f1f20110ae450611f2bacac52d2ed1160b19e0027990ae827030c46ef0f6c235c92ae5f32515849d465ce354eb7d2be1cc7ea13c2fcfa1cc6e07b4040c WHIRLPOOL cbf5e37965a2d9ecaee254ad13d36aa468f2e7efe52cfb83c544d934e3ee6f2cc5058866bd565374bcd796dd1f75f0653a93d622da3cbb7008daa370ff162708 +MISC metadata.xml 350 SHA256 9c2fc1dd1971474aade6aba0fed43bd78767268396740f47ea18e506ce2970c2 SHA512 6898f4d144d358cb4e2443c0bfa367fb9be7309d8909ffbb8376ebc571216dac5947e50653f6e9f35186730adb6c1cf0d81003ea46a7328d03f2b968111146b1 WHIRLPOOL c48b72893626087d4695a4f62b94a0ad9ceaeb451a5f33283b1814e10ff0ae56431421478c1002a133ae3fb3b9d8db7c1f8f71a0d10bc77b65a22e43d7954eca -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJTSrVHAAoJEGVpnaTzz9K9e6YP/RVnDhF2WxH5UCOdaJxsbGvR -h5S13WA7NYudR+lzblrMOFgMIsNfXoo1wKeGXtyJDxjBHx9Kst8zjiIqLvfSSUjC -zLghdqj+QMhzDVyiNxlTEfrhcFD8Kbe4UWDYSH/neX4GABTUg0K+hiLdcVznzzrJ -FURYfT99MItssR3HoWvx9JaeZcxDFI0XWRVhkbX8r1rogHwkOrRtG0h61Pk+WoEa -HpQbNe3g5TZR9ytZzCq9wi1I63MYM0bRbmK/7ukjyO3mn+9ocG1ezcXK0aGOUocx -/UH80jFtzsLZzjkH368hdPKmuGLqYIgIQUC3oAw/WCIGPie8mlcxZB6Na3Wnldw7 -iz2kyI1J2PWQaEtcdD0o+62UGzrsbfA/Oj8SfdJYAO35ss4XCgaW26H9XKqgJETn -pUddcXjMa3dQRKKBerNT5QXtx+qL1M+6Hhgx2i0COU3mMrX7r1YxuGvPnzypGdVQ -IOvCbkRwB+5Z5mlsY+DBL0Lz2O+J8YhrXG+cnSK0WVj8esvD1ukVZRt78zB8/qzy -hq+gxd0dU4Hwb1jrYV6Dd/LYXm4NyuZYJ0b+XKFz00r0AdQ7P+WVQFg1r6+oNK/G -9FnixW/feywEG3RsLd5T86xh25cj0Eo7b+1GgXEQ6aay6GBvBPBHeBUhE9OEAE8X -BrXBmoVC5g4UEGw/++zc -=fW0v +iQIcBAEBCAAGBQJTSrYRAAoJEGVpnaTzz9K9+lkQAMd3QSNRTTrFn9/tU7ATPbAo +VB26NZpvgAsi2/U+KuTSjZ2wA85BIg3kywjrylvVJgAB9f0xkjmZJC1RT2Vv8Num +E3qy2YJJHGyY3Lo/eiHQMWTrSSl94terZwEO5RKun5fh9IXe2jwWeupruBmuGsAo +cKYxu4sdHGjVYu8MjNc9CJ4BvShI+eDXw3sWJhtyKZgEUc67w7+NPL0TMC3zNDbt +iqlN6nbQ7IMmAEsmfmb3j24upBz54mzsr081vRtYhxJemIBnAbPAoFOm5HCMxqb4 +KIt2pGueOfwKXeABLbs2NVVNlzzhzwEeLFHdPHYfxNoPedyrOK1qpDKmPwsZgFEw +2BSAiQ1DNOBHFb2bgjBqxmR+5vuVoGL3i23nCujeDiBeE08ZIHVC9TviV7Dh4J/q +cASe9ZChLsqmGzaEQnL6byfmBEci1OvklBeJbDSqFFawxHPgxMCfQUiw7h45tLSw +O9dVG2jL3sAAylq2Q01eYPF4f9zn7nXUrWkmlOgkkcZwUEjLxusjGPaiE0hE7eyz +fJX2xkkGmGCPbsL3D6EHn4nKJBTt3t1k8lIe/Z/hX879yKtrU3gBxK6Wfy67gHNw +Qrt7hQ7R/d7j8tdnYjgVwBq23xOFAkKTKKDQqId9l/WrW7pyny8R6aa1TeQtxPc1 +cNsEeED00CERgmzsyhpT +=i+AM -----END PGP SIGNATURE----- diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.8.0-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.8.0-automagicness.patch deleted file mode 100644 index bac928d43e8e..000000000000 --- a/net-libs/telepathy-qt/files/telepathy-qt-0.8.0-automagicness.patch +++ /dev/null @@ -1,190 +0,0 @@ ---- telepathy-qt4-0.8.0.orig/CMakeLists.txt 2011-12-03 19:26:01.265996011 +0100 -+++ telepathy-qt4-0.8.0/CMakeLists.txt 2011-12-03 19:54:29.233643477 +0100 -@@ -84,6 +84,11 @@ - - 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 -@@ -100,31 +105,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 Qt4 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; --}" --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") -+endif(ENABLE_DEBUG_OUTPUT) - - # Find python version >= 2.5 - find_package(PythonLibrary REQUIRED) -@@ -150,58 +133,91 @@ - - # 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-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.15.1) --find_package(TelepathyGlib) --macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" -- "Glib bindings for Telepathy" -- "http://telepathy.freedesktop.org/" FALSE "0.15.1" -- "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) -- 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(QT4_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(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -+if(WITH_Glib) -+ # Check for Qt4 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; -+ }" -+ 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(GIO) -+ find_package(GIOUnix) -+ find_package(DBus REQUIRED) -+ -+ set(TELEPATHY_GLIB_MIN_VERSION 0.15.1) -+ find_package(TelepathyGlib REQUIRED) -+ macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" -+ "Glib bindings for Telepathy" -+ "http://telepathy.freedesktop.org/" FALSE "0.15.1" -+ "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) -+ 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(QT4_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(QT4_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(WITH_Glib) -+ - - # Add the source subdirectories - add_subdirectory(TelepathyQt4) diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-automagicness.patch deleted file mode 100644 index b34adb3fc971..000000000000 --- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-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/files/telepathy-qt-0.9.1-gcc-4.7.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-gcc-4.7.patch deleted file mode 100644 index 248e0d5a0d88..000000000000 --- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-gcc-4.7.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b2632998374b45af488b6c3a5a6fe330d23bb799 Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis <george.kiagiadakis@collabora.com> -Date: Wed, 02 May 2012 14:34:47 +0000 -Subject: Use quintptr instead of intptr_t. - -This fixes FTBFS with gcc-4.7, which requires <stdint.h> to be -included for intptr_t to be available. However, since stdint.h -is not part of the C++03 standard, it is better to use Qt's types. - -Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> - -diff --git a/TelepathyQt/client-registrar.cpp b/TelepathyQt/client-registrar.cpp -index 1b6c1e4..6ed9932 100644 ---- a/TelepathyQt/client-registrar.cpp -+++ b/TelepathyQt/client-registrar.cpp -@@ -888,7 +888,7 @@ bool ClientRegistrar::registerClient(const AbstractClientPtr &client, - .arg(mPriv->bus.baseService() - .replace(QLatin1String(":"), QLatin1String("_")) - .replace(QLatin1String("."), QLatin1String("_"))) -- .arg((intptr_t) client.data(), 0, 16)); -+ .arg((quintptr) client.data(), 0, 16)); - } - - if (mPriv->services.contains(busName) || -diff --git a/TelepathyQt/stream-tube-client.cpp b/TelepathyQt/stream-tube-client.cpp -index f22384c..9716a34 100644 ---- a/TelepathyQt/stream-tube-client.cpp -+++ b/TelepathyQt/stream-tube-client.cpp -@@ -211,7 +211,7 @@ struct TP_QT_NO_EXPORT StreamTubeClient::Private - .arg(registrar->dbusConnection().baseService() - .replace(QLatin1Char(':'), QLatin1Char('_')) - .replace(QLatin1Char('.'), QLatin1Char('_'))) -- .arg((intptr_t) this, 0, 16); -+ .arg((quintptr) this, 0, 16); - } - } - -diff --git a/TelepathyQt/stream-tube-server.cpp b/TelepathyQt/stream-tube-server.cpp -index e1791df..8aaaff4 100644 ---- a/TelepathyQt/stream-tube-server.cpp -+++ b/TelepathyQt/stream-tube-server.cpp -@@ -307,7 +307,7 @@ struct StreamTubeServer::Private - .arg(registrar->dbusConnection().baseService() - .replace(QLatin1Char(':'), QLatin1Char('_')) - .replace(QLatin1Char('.'), QLatin1Char('_'))) -- .arg((intptr_t) this, 0, 16); -+ .arg((quintptr) this, 0, 16); - } - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml index 5041aecd4fbd..dabc844f3d48 100644 --- a/net-libs/telepathy-qt/metadata.xml +++ b/net-libs/telepathy-qt/metadata.xml @@ -4,7 +4,6 @@ <herd>qt</herd> <herd>kde</herd> <use> - <flag name='glib'>Enable support for various telepathy/glib related packages</flag> <flag name='farsight'>Enable support for farsight connection manager</flag> <flag name='farstream'>Enable support for audio/video calls via farstream</flag> </use> diff --git a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild deleted file mode 100644 index 6ce19432d245..000000000000 --- a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2013 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.9 2013/03/02 22:58:30 hwoarang Exp $ - -EAPI=4 - -PYTHON_DEPEND="2:2.5" -MY_PN=${PN}4 -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" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug farsight glib test" - -RESTRICT="test" #423089 - -RDEPEND=" - dev-python/dbus-python - dev-qt/qtcore:4[glib?] - dev-qt/qtdbus:4 - farsight? ( - dev-libs/dbus-glib - dev-libs/libxml2 - media-libs/gstreamer - >=net-libs/telepathy-glib-0.15.1 - net-libs/telepathy-farsight - ) - glib? ( dev-libs/glib:2 ) - !net-libs/telepathy-qt4 -" -DEPEND="${RDEPEND} - dev-libs/libxslt - virtual/pkgconfig - test? ( dev-qt/qttest:4 ) -" - -PATCHES=( "${FILESDIR}/${P}-automagicness.patch" ) - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -S=${WORKDIR}/${MY_PN}-${PV} - -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 - - if ! use test ; then - sed -i -e '/^add_subdirectory(tests)$/d' CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable debug DEBUG_OUTPUT) - $(cmake-utils_use_with glib) - $(cmake-utils_use_with farsight) - ) - cmake-utils_src_configure -} diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild deleted file mode 100644 index 5bef72bccc87..000000000000 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 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.9.2.ebuild,v 1.3 2013/03/02 22:58:30 hwoarang Exp $ - -EAPI=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/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug farsight farstream test" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - farsight? ( - net-libs/telepathy-farsight - ) - farstream? ( - >=net-libs/telepathy-farstream-0.2.2 - >=net-libs/telepathy-glib-0.17.5 - ) - !net-libs/telepathy-qt4 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - dev-libs/dbus-glib - dev-libs/glib - dev-python/dbus-python - dev-qt/qttest:4 - ) -" - -REQUIRED_USE="farsight? ( !farstream )" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable farsight) - $(cmake-utils_use_enable farstream) - $(cmake-utils_use_enable debug DEBUG_OUTPUT) - $(cmake-utils_use_enable test TESTS) - -DENABLE_EXAMPLES=OFF - ) - cmake-utils_src_configure -} diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild deleted file mode 100644 index 2f60b05339f2..000000000000 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2013 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.9.3.ebuild,v 1.6 2013/03/02 22:58:30 hwoarang Exp $ - -EAPI=4 - -PYTHON_DEPEND="2:2.5" -inherit python base cmake-utils virtualx - -DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol" -HOMEPAGE="http://telepathy.freedesktop.org/" -SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="debug farsight farstream test" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - farsight? ( - net-libs/telepathy-farsight - ) - farstream? ( - >=net-libs/telepathy-farstream-0.2.2 - >=net-libs/telepathy-glib-0.18.0 - ) - !net-libs/telepathy-qt4 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - dev-libs/dbus-glib - dev-libs/glib - dev-python/dbus-python - dev-qt/qttest:4 - ) -" - -REQUIRED_USE="farsight? ( !farstream )" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -PATCHES=( "${FILESDIR}/${P}-tp-glib-0.18-tests.patch" ) - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable farsight) - $(cmake-utils_use_enable farstream) - $(cmake-utils_use_enable debug DEBUG_OUTPUT) - $(cmake-utils_use_enable test TESTS) - -DENABLE_EXAMPLES=OFF - ) - cmake-utils_src_configure -} - -src_test() { - pushd "${CMAKE_BUILD_DIR}" > /dev/null - Xemake test || die "tests failed" - popd > /dev/null -} |