diff options
| -rw-r--r-- | net-libs/telepathy-qt/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/Manifest | 25 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.3-tp-glib-0.18-tests.patch | 41 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild | 14 |
4 files changed, 68 insertions, 19 deletions
diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog index ca18017442d3..f1e1eff76f3e 100644 --- a/net-libs/telepathy-qt/ChangeLog +++ b/net-libs/telepathy-qt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/telepathy-qt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.15 2012/07/31 08:38:50 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.16 2012/09/11 23:02:04 johu Exp $ + + 11 Sep 2012; Johannes Huber <johu@gentoo.org> + +files/telepathy-qt-0.9.3-tp-glib-0.18-tests.patch, telepathy-qt-0.9.3.ebuild: + Make tests working with tp-glib-0.18 by adding upstream patch spotted by + Alexandre Rostovtsev <tetromino@gentoo.org> and usage of virtualx.eclass. *telepathy-qt-0.8.0 (31 Jul 2012) diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest index 5e534ec76213..7d0838878850 100644 --- a/net-libs/telepathy-qt/Manifest +++ b/net-libs/telepathy-qt/Manifest @@ -4,28 +4,23 @@ 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-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 1547 SHA256 a727ca2a253becd193e64021fe788fd68bdefba1afea0433abf8909f9e98c3b3 SHA512 5c03fec13679eae362e6fdd610ec490d6061804fb0c9e412b41da8e33a99a2b5fb95790980eee58c504c5c685f8d814ed12a200028cfd670d51e6381bf1be76f WHIRLPOOL 5ab486ebc707199daea6f94c30372ea9f7751114207c2467b7e8ae85a6c8f6d7b59e752b6f4d22ff307474e168052f4caada3bdf4309009f9745260e711c3ad6 EBUILD telepathy-qt-0.9.2.ebuild 1318 SHA256 67de9fc4d54d7a9243dd319616de17781af03bca14b3d5932fd0fbfe1beaa470 SHA512 38ef158dc7d5b12576cb8c730c0c614daf12f4d9e75047d8c824eec5539dcf4ecc902edf396ea9f35a88196302542fe9c593f69bb590d3e4f84ac1aecbadd3d7 WHIRLPOOL 9d9daec6ae16a44a9e845c3d902ca0114fd648554391b80b4a4bfea0a573cfbe35300cecf5ead6f9ef8007aa7a91978a4d559d56f574b02dcebdcc5868832fca -EBUILD telepathy-qt-0.9.3.ebuild 1315 SHA256 c072ec630988edb9128c9e30633b17acacc7631177c6d2d727fc99f047dd78c6 SHA512 7df07d4df254c7a7da7684f209656fdc7af1a6aa47872e33489359a09353d2508b296b80f6734dfed9e2af2d59e34d438b885dbc85b1001cb111afbb584f0a72 WHIRLPOOL c222d074dc8e72f7916bccfff6f04e6233f9f5ac93099114fb08b0d9d762ab713abefac07651cb5252bb9414c8437f970ca71b2aa4111f9154f9b23b5827a9bc -MISC ChangeLog 4291 SHA256 3cb5725da76b1b817479a97dab66c4ab9165a6a29bab6b8af1fbdcd868fd0de7 SHA512 cc8950f76ac620894c2204967376db561738918269932aaf25228dba0b0437f4ff30d6ed03e84cc77bea72f1713be1adda5a57e2ed783c9bdbe6147edf87f1d9 WHIRLPOOL 061a8e6ed8fbb7aa885a2c851a8fd09cd700c4a8e75bc67248560b0b90aaf6387fdb0d09152a1cc18170ef4bc5082737e9f14cc7cc4720727ab769411fc8a7ab +EBUILD telepathy-qt-0.9.3.ebuild 1490 SHA256 53346474d42ca7b780a4da5dc12f05f3b65871e806572005610d090123a829f2 SHA512 09974aa762fcf58ecbe8114e9b8beb039041deec4c9d847717b010cb8d690b2b729609a98c77d46983e613f3adfbf928b89741e71dbd1ca58a80f75c25fb25f8 WHIRLPOOL 571f6132b25247b2c05dffaf3566639bcd6b7bfe7935a95c786b0f6118715475a6d3658c98e49cf3c4b739e7b7b02489818165bd9dc1d7e42ddce94068f57dba +MISC ChangeLog 4567 SHA256 2ccf3a7003a2e9715577dcd2afa01a2473a27614660056d26a4b2d5cf1130711 SHA512 b52da5dff6d45f608837875e7532915a50cae352e23c8e9dab75350160e43d33ef781ad7161fd53588c595e158a1285f0db88ee031ed4d28310b8801d13d1f6d WHIRLPOOL 1c5f51ee52c7a3a3e5e07a4c272fb64aad45ad53834d81c15245ec3965d8dbdee14fdf6677e6e0cc7b7dc8a2022e266b93aab7471378c5abd9121d2460683a24 MISC metadata.xml 436 SHA256 fb4dfbe0b7a6a44f451a39e7fa5aa36972bc7ec8b1c47b4b83f3aeeedfee8de7 SHA512 66385c85f4de89ad5aea9d24f0cf59596d7d01ba86619c3e19589e7064e55de2b611b869ebaba8e47b694e7d8686b30a40f65392fb367170e3746ba0fb60289f WHIRLPOOL c7cb7f060036ac4a552168142d00f59e9193f6c962f1a208c2697375eb8daeb5dd8d5d8f75c739df5cb00f0ad0f890c053fd472d4c36d93262cf16ddba906958 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQF5mjAAoJEOSiRoyO7jvov+wQAJF5zbteqBHF1tmHDvj/fWjm -4txfHJ5x6Xilxb4ydmDvB2a8LMKc5lE+NeLmLv9jqikx6FJd82MLUwB+RK4SSFZX -UUlC+3oDk4GodEFr5TA0s8P2SnJFILwsF6GjFPPoEi2U39duM4Pjxc5n+JUoCVKi -P/VsU28SMfgTCb+l2eDUQc/3UfVd7Qy/PcLWj5AMMZhhQXnmwKhWJg6N349+/fX+ -dIPUjWAj4W0ojlYQgfPUxRSihz4RZfU/y2e0bRefP5GfRYcFfeLpgKoTbzzj582V -zfAyqVtTXHJzJuUCQBfTNWv+90Yvwcb3cBGMPtdU0KalnBL4SeDZDj6eiddzh1gg -1Swx50cB5E8L2UubX4rPjLT891s+7SoTbhf2KMxKASWiyWjymFS7wTEHbWBRdg5Z -3hFAFEdYSElqSS1Q+O7gQ9BIrCaiLLU3CHlHhnsNlkgJ3Zdwn7b7lKnI2XPPq/tR -lUBmB6hKRvSNnCPTvLJoLx12ZH7bv+AzgYVrWlV+IA35Ai2uWM+XP0fUYl1JoCG7 -CHnGexTYkd9r51CNn52z01e02BevDDZlgkVgmneHkU+4SlmUX2MOSam+73KVksiX -Ey5FMr8Qx6ooS7sbxvAYDC05wEfCXzHb7YZMxLkTzELjc380EYm4s7DM6fD9yQ1k -wqnGNjNau3nIFYYEX3Nc -=C+Wq +iQEcBAEBCAAGBQJQT8L2AAoJEO+t9ga+3I3a5JwIAI3SJ8DNOC3IqaVuCtEQVAmn +0Fen5jEh9SZQYx7EyTUfFXbFLh4Wi81XVfj4c8rljWnbcRNGxdZoinmflQtiuCMg +Xf/BoEIh03R9y+5DcUOwLX6KvRiE33miZxdpV2vH43bDQo5rZImGrng1bia5UT78 +0NfjXp/WPHaogOybCuLfBakQfpCiWe9K4FpCQx5YUc7czWXZZfROW2eXgHVRYCjU +TuPbr6kE7k5zyaf3zgdQHNmKWyLKGrlodM7xH8N1Mb/pSUCwiOql9vgXLCHA+9Pj +u0LCZOztV5TWgNXFWKsD9HYXO5xmeFzy3PdVkjW2SGupSVIAypbuY8xvJlu+Lb4= +=156j -----END PGP SIGNATURE----- diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-tp-glib-0.18-tests.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-tp-glib-0.18-tests.patch new file mode 100644 index 000000000000..d53c7de0f2c6 --- /dev/null +++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-tp-glib-0.18-tests.patch @@ -0,0 +1,41 @@ +From 145e58636b130502adf0bd0ad5d5551aae2e2932 Mon Sep 17 00:00:00 2001 +From: Dario Freddi <dario.freddi@collabora.com> +Date: Mon, 27 Aug 2012 17:37:49 +0000 +Subject: Merge branch 'tp-glib-0.18' + +Reviewed-by: George Kiagiadakis <george.kiagiadakis@collabora.com> +--- +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 574cb60..2e52f27 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,7 +185,7 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python" + + if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT) + # Find telepathy-glib +- set(TELEPATHY_GLIB_MIN_VERSION 0.17.5) ++ set(TELEPATHY_GLIB_MIN_VERSION 0.18.0) + find_package(TelepathyGlib) + macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" + "Glib bindings for Telepathy" +diff --git a/tests/lib/glib/util.c b/tests/lib/glib/util.c +index 21d3855..f0bcd96 100644 +--- a/tests/lib/glib/util.c ++++ b/tests/lib/glib/util.c +@@ -431,6 +431,9 @@ tp_tests_connection_assert_disconnect_succeeds (TpConnection *connection) + g_object_unref (result); + } + ++/* The following blocks require tp-glib 0.19 to compile. However, tp_tests_connection_run_until_contact_by_id ++ is never used in our code, so we simply disable its compilation. */ ++#if 0 + static void + one_contact_cb (GObject *object, + GAsyncResult *result, +@@ -463,3 +466,4 @@ tp_tests_connection_run_until_contact_by_id (TpConnection *connection, + + return contact; + } ++#endif +-- +cgit v0.9.0.2-2-gbebe diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild index 32d90b0e0825..7b4a4b1d3db5 100644 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild @@ -1,11 +1,11 @@ # 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.9.3.ebuild,v 1.1 2012/07/15 16:55:51 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild,v 1.2 2012/09/11 23:02:04 johu Exp $ EAPI=4 PYTHON_DEPEND="2:2.5" -inherit python base cmake-utils +inherit python base cmake-utils virtualx DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol" HOMEPAGE="http://telepathy.freedesktop.org/" @@ -24,7 +24,7 @@ RDEPEND=" ) farstream? ( >=net-libs/telepathy-farstream-0.2.2 - >=net-libs/telepathy-glib-0.17.5 + >=net-libs/telepathy-glib-0.18.0 ) !net-libs/telepathy-qt4 " @@ -42,6 +42,8 @@ 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 @@ -57,3 +59,9 @@ src_configure() { ) cmake-utils_src_configure } + +src_test() { + pushd "${CMAKE_BUILD_DIR}" > /dev/null + Xemake test || die "tests failed" + popd > /dev/null +} |