[gentoo-commits] proj/gnome:gnome-next commit in: net-libs/telepathy-glib/, net-libs/telepathy-glib/files/

[gentoo-commits] proj/gnome:gnome-next commit in: net-libs/telepathy-glib/, net-libs/telepathy-glib/files/

[Alexandre Restovtsev]

commit:     a3c1b3670569a188e52972d940eba64e4f4d5ace
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Sep  2 00:50:55 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Sep  2 00:50:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a3c1b367

net-libs/telepathy-glib: 0.15.5 → 0.15.5-r1

Add upstream patches to check for a NULL pointer and to avoid warnings
with newer gobject-introspection warnings. Also, it appears that to
build with USE=vala and newer gobject-introspection versions, vala:0.14
is required; thanks to shiznix in #gentoo-desktop for reporting.

---
 ...lepathy-glib-0.15.5-gobject-introspection.patch |   31 ++++++++++++++++++++
 ...glib-0.15.5-tpbasechannelclass-close-null.patch |   22 ++++++++++++++
 ...15.5.ebuild => telepathy-glib-0.15.5-r1.ebuild} |   12 +++++--
 3 files changed, 61 insertions(+), 4 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
new file mode 100644
index 0000000..3244d5c
--- /dev/null
+++ b/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-gobject-introspection.patch
@@ -0,0 +1,31 @@
+From 7f465e4a7d2d552f8ded3fd58e537f84b6b9f3a2 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xclaesse@gmail.com>
+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);
+ 
++/* 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__ */
+ 
+ #define tp_asv_size(asv) _tp_asv_size_inline (asv)
+ 
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-tpbasechannelclass-close-null.patch b/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-tpbasechannelclass-close-null.patch
new file mode 100644
index 0000000..6d7e5b0
--- /dev/null
+++ b/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-tpbasechannelclass-close-null.patch
@@ -0,0 +1,22 @@
+From 0b7e9eab27502bbafc3f097c5c4496de9a24c3ca Mon Sep 17 00:00:00 2001
+From: Will Thompson <will.thompson@collabora.co.uk>
+Date: Wed, 17 Aug 2011 10:33:33 +0000
+Subject: tp_base_channel_close: check vfunc is not NULL
+
+Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+---
+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 = TP_BASE_CHANNEL_GET_CLASS (chan);
+ 
++  g_return_if_fail (klass->close != 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.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.15.5-r1.ebuild
similarity index 83%
rename from net-libs/telepathy-glib/telepathy-glib-0.15.5.ebuild
rename to net-libs/telepathy-glib/telepathy-glib-0.15.5-r1.ebuild
index 4e36880..dc5d401 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.15.5.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.15.5-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
 
-inherit python virtualx
+inherit eutils python virtualx
 
 DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -20,13 +20,17 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=dev-libs/dbus-glib-0.82
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 	vala? (
-		>=dev-lang/vala-0.11.2:0.12[vapigen]
+		dev-lang/vala:0.14[vapigen]
 		>=dev-libs/gobject-introspection-0.9.6 )"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/pkgconfig-0.21"
 
 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
 }
@@ -36,8 +40,8 @@ src_configure() {
 
 	if use vala; then
 		myconf="--enable-introspection
-			VALAC=$(type -p valac-0.12)
-			VAPIGEN=$(type -p vapigen-0.12)"
+			VALAC=$(type -p valac-0.14)
+			VAPIGEN=$(type -p vapigen-0.14)"
 	fi
 
 	econf --disable-static \