From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RE3mL-0005We-Lu for garchives@archives.gentoo.org; Wed, 12 Oct 2011 18:43:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2D0321C03A; Wed, 12 Oct 2011 18:40:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6DCDB21C03A for ; Wed, 12 Oct 2011 18:39:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A34F11B4009 for ; Wed, 12 Oct 2011 18:38:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AD4E880042 for ; Wed, 12 Oct 2011 18:38:57 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1d0de730b4d36369d6624a6afee635d77c9226b8.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/telepathy-glib/, net-libs/telepathy-glib/files/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/telepathy-glib/files/telepathy-glib-0.15.5-gobject-introspection.patch net-libs/telepathy-glib/files/telepathy-glib-0.15.5-tpbasechannelclass-close-null.patch net-libs/telepathy-glib/telepathy-glib-0.15.5-r1.ebuild net-libs/telepathy-glib/telepathy-glib-0.15.9.ebuild X-VCS-Directories: net-libs/telepathy-glib/ net-libs/telepathy-glib/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 1d0de730b4d36369d6624a6afee635d77c9226b8 Date: Wed, 12 Oct 2011 18:38:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 08b1334cbf45e8b2c3cffd9c1e153a40 commit: 1d0de730b4d36369d6624a6afee635d77c9226b8 Author: Alexandre Rostovtsev gmail com> AuthorDate: Wed Oct 12 18:29:54 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Oct 12 18:36:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D1d0de730 net-libs/telepathy-glib: 0.15.5-r1 =E2=86=92 0.15.9 Bump with numerous new features and fixes for memory leaks, crashes, and performance problems. Also, fix USE=3D"-introspection vala" handling. --- ...lepathy-glib-0.15.5-gobject-introspection.patch | 31 --------------= ------ ...glib-0.15.5-tpbasechannelclass-close-null.patch | 22 -------------- ...15.5-r1.ebuild =3D> telepathy-glib-0.15.9.ebuild} | 11 +++---- 3 files changed, 5 insertions(+), 59 deletions(-) diff --git a/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-gobject-= introspection.patch b/net-libs/telepathy-glib/files/telepathy-glib-0.15.5= -gobject-introspection.patch deleted file mode 100644 index 3244d5c..0000000 --- a/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-gobject-introsp= ection.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7f465e4a7d2d552f8ded3fd58e537f84b6b9f3a2 Mon Sep 17 00:00:00 2001 -From: Xavier Claessens -Date: Wed, 17 Aug 2011 13:31:15 +0000 -Subject: Hide tp_g_value_slice_new_foo() from g-i scanner - -This is a workaround for GNOME bug #656743 ---- -diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h -index de33e5a..bee7019 100644 ---- a/telepathy-glib/dbus.h -+++ b/telepathy-glib/dbus.h -@@ -53,6 +53,9 @@ gboolean tp_dbus_check_valid_member_name (const gchar = *name, - gboolean tp_dbus_check_valid_object_path (const gchar *path, - GError **error); -=20 -+/* The scanner warns about these, but they're skipped anyway. -+ * See GNOME bug#656743 */ -+#ifndef __GI_SCANNER__ - GValue *tp_g_value_slice_new_bytes (guint length, gconstpointer bytes) - G_GNUC_WARN_UNUSED_RESULT; - GValue *tp_g_value_slice_new_take_bytes (GArray *bytes) -@@ -63,6 +66,7 @@ GValue *tp_g_value_slice_new_static_object_path (const= gchar *path) - G_GNUC_WARN_UNUSED_RESULT; - GValue *tp_g_value_slice_new_take_object_path (gchar *path) - G_GNUC_WARN_UNUSED_RESULT; -+#endif /* __GI_SCANNER__ */ -=20 - #define tp_asv_size(asv) _tp_asv_size_inline (asv) -=20 --- -cgit v0.9.0.2-2-gbebe diff --git a/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-tpbasech= annelclass-close-null.patch b/net-libs/telepathy-glib/files/telepathy-gli= b-0.15.5-tpbasechannelclass-close-null.patch deleted file mode 100644 index 6d7e5b0..0000000 --- a/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-tpbasechannelcl= ass-close-null.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0b7e9eab27502bbafc3f097c5c4496de9a24c3ca Mon Sep 17 00:00:00 2001 -From: Will Thompson -Date: Wed, 17 Aug 2011 10:33:33 +0000 -Subject: tp_base_channel_close: check vfunc is not NULL - -Reviewed-by: Jonny Lamb ---- -diff --git a/telepathy-glib/base-channel.c b/telepathy-glib/base-channel= .c -index b6ce453..43c1734 100644 ---- a/telepathy-glib/base-channel.c -+++ b/telepathy-glib/base-channel.c -@@ -378,6 +378,8 @@ tp_base_channel_close (TpBaseChannel *chan) - { - TpBaseChannelClass *klass =3D TP_BASE_CHANNEL_GET_CLASS (chan); -=20 -+ g_return_if_fail (klass->close !=3D NULL); -+ - if (!tp_base_channel_is_destroyed (chan)) - klass->close (chan); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/net-libs/telepathy-glib/telepathy-glib-0.15.5-r1.ebuild b/ne= t-libs/telepathy-glib/telepathy-glib-0.15.9.ebuild similarity index 86% rename from net-libs/telepathy-glib/telepathy-glib-0.15.5-r1.ebuild rename to net-libs/telepathy-glib/telepathy-glib-0.15.9.ebuild index dc5d401..c438d78 100644 --- a/net-libs/telepathy-glib/telepathy-glib-0.15.5-r1.ebuild +++ b/net-libs/telepathy-glib/telepathy-glib-0.15.9.ebuild @@ -5,7 +5,7 @@ EAPI=3D"3" PYTHON_DEPEND=3D"2:2.5" =20 -inherit eutils python virtualx +inherit python virtualx =20 DESCRIPTION=3D"GLib bindings for the Telepathy D-Bus protocol." HOMEPAGE=3D"http://telepathy.freedesktop.org" @@ -27,10 +27,6 @@ DEPEND=3D"${RDEPEND} >=3Ddev-util/pkgconfig-0.21" =20 src_prepare() { - # Important upstream patches, will be in next release - epatch "${FILESDIR}/${P}-gobject-introspection.patch" - epatch "${FILESDIR}/${P}-tpbasechannelclass-close-null.patch" - python_convert_shebangs -r 2 examples tests tools default_src_prepare } @@ -39,9 +35,13 @@ src_configure() { local myconf =20 if use vala; then + use introspection || + ewarn "Enabling introspection support; it is required for USE=3Dvala" myconf=3D"--enable-introspection VALAC=3D$(type -p valac-0.14) VAPIGEN=3D$(type -p vapigen-0.14)" + else + myconf=3D"$(use_enable introspection)" fi =20 econf --disable-static \ @@ -49,7 +49,6 @@ src_configure() { $(use_enable debug backtrace) \ $(use_enable debug handle-leak-debug) \ $(use_enable debug debug-cache) \ - $(use_enable introspection) \ $(use_enable vala vala-bindings) \ ${myconf} }