1 |
commit: a3c1b3670569a188e52972d940eba64e4f4d5ace |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Sep 2 00:50:55 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Fri Sep 2 00:50:55 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a3c1b367 |
7 |
|
8 |
net-libs/telepathy-glib: 0.15.5 → 0.15.5-r1 |
9 |
|
10 |
Add upstream patches to check for a NULL pointer and to avoid warnings |
11 |
with newer gobject-introspection warnings. Also, it appears that to |
12 |
build with USE=vala and newer gobject-introspection versions, vala:0.14 |
13 |
is required; thanks to shiznix in #gentoo-desktop for reporting. |
14 |
|
15 |
--- |
16 |
...lepathy-glib-0.15.5-gobject-introspection.patch | 31 ++++++++++++++++++++ |
17 |
...glib-0.15.5-tpbasechannelclass-close-null.patch | 22 ++++++++++++++ |
18 |
...15.5.ebuild => telepathy-glib-0.15.5-r1.ebuild} | 12 +++++-- |
19 |
3 files changed, 61 insertions(+), 4 deletions(-) |
20 |
|
21 |
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 |
22 |
new file mode 100644 |
23 |
index 0000000..3244d5c |
24 |
--- /dev/null |
25 |
+++ b/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-gobject-introspection.patch |
26 |
@@ -0,0 +1,31 @@ |
27 |
+From 7f465e4a7d2d552f8ded3fd58e537f84b6b9f3a2 Mon Sep 17 00:00:00 2001 |
28 |
+From: Xavier Claessens <xclaesse@×××××.com> |
29 |
+Date: Wed, 17 Aug 2011 13:31:15 +0000 |
30 |
+Subject: Hide tp_g_value_slice_new_foo() from g-i scanner |
31 |
+ |
32 |
+This is a workaround for GNOME bug #656743 |
33 |
+--- |
34 |
+diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h |
35 |
+index de33e5a..bee7019 100644 |
36 |
+--- a/telepathy-glib/dbus.h |
37 |
++++ b/telepathy-glib/dbus.h |
38 |
+@@ -53,6 +53,9 @@ gboolean tp_dbus_check_valid_member_name (const gchar *name, |
39 |
+ gboolean tp_dbus_check_valid_object_path (const gchar *path, |
40 |
+ GError **error); |
41 |
+ |
42 |
++/* The scanner warns about these, but they're skipped anyway. |
43 |
++ * See GNOME bug#656743 */ |
44 |
++#ifndef __GI_SCANNER__ |
45 |
+ GValue *tp_g_value_slice_new_bytes (guint length, gconstpointer bytes) |
46 |
+ G_GNUC_WARN_UNUSED_RESULT; |
47 |
+ GValue *tp_g_value_slice_new_take_bytes (GArray *bytes) |
48 |
+@@ -63,6 +66,7 @@ GValue *tp_g_value_slice_new_static_object_path (const gchar *path) |
49 |
+ G_GNUC_WARN_UNUSED_RESULT; |
50 |
+ GValue *tp_g_value_slice_new_take_object_path (gchar *path) |
51 |
+ G_GNUC_WARN_UNUSED_RESULT; |
52 |
++#endif /* __GI_SCANNER__ */ |
53 |
+ |
54 |
+ #define tp_asv_size(asv) _tp_asv_size_inline (asv) |
55 |
+ |
56 |
+-- |
57 |
+cgit v0.9.0.2-2-gbebe |
58 |
|
59 |
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 |
60 |
new file mode 100644 |
61 |
index 0000000..6d7e5b0 |
62 |
--- /dev/null |
63 |
+++ b/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-tpbasechannelclass-close-null.patch |
64 |
@@ -0,0 +1,22 @@ |
65 |
+From 0b7e9eab27502bbafc3f097c5c4496de9a24c3ca Mon Sep 17 00:00:00 2001 |
66 |
+From: Will Thompson <will.thompson@××××××××××××.uk> |
67 |
+Date: Wed, 17 Aug 2011 10:33:33 +0000 |
68 |
+Subject: tp_base_channel_close: check vfunc is not NULL |
69 |
+ |
70 |
+Reviewed-by: Jonny Lamb <jonny.lamb@××××××××××××.uk> |
71 |
+--- |
72 |
+diff --git a/telepathy-glib/base-channel.c b/telepathy-glib/base-channel.c |
73 |
+index b6ce453..43c1734 100644 |
74 |
+--- a/telepathy-glib/base-channel.c |
75 |
++++ b/telepathy-glib/base-channel.c |
76 |
+@@ -378,6 +378,8 @@ tp_base_channel_close (TpBaseChannel *chan) |
77 |
+ { |
78 |
+ TpBaseChannelClass *klass = TP_BASE_CHANNEL_GET_CLASS (chan); |
79 |
+ |
80 |
++ g_return_if_fail (klass->close != NULL); |
81 |
++ |
82 |
+ if (!tp_base_channel_is_destroyed (chan)) |
83 |
+ klass->close (chan); |
84 |
+ } |
85 |
+-- |
86 |
+cgit v0.9.0.2-2-gbebe |
87 |
|
88 |
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 |
89 |
similarity index 83% |
90 |
rename from net-libs/telepathy-glib/telepathy-glib-0.15.5.ebuild |
91 |
rename to net-libs/telepathy-glib/telepathy-glib-0.15.5-r1.ebuild |
92 |
index 4e36880..dc5d401 100644 |
93 |
--- a/net-libs/telepathy-glib/telepathy-glib-0.15.5.ebuild |
94 |
+++ b/net-libs/telepathy-glib/telepathy-glib-0.15.5-r1.ebuild |
95 |
@@ -5,7 +5,7 @@ |
96 |
EAPI="3" |
97 |
PYTHON_DEPEND="2:2.5" |
98 |
|
99 |
-inherit python virtualx |
100 |
+inherit eutils python virtualx |
101 |
|
102 |
DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol." |
103 |
HOMEPAGE="http://telepathy.freedesktop.org" |
104 |
@@ -20,13 +20,17 @@ RDEPEND=">=dev-libs/glib-2.28:2 |
105 |
>=dev-libs/dbus-glib-0.82 |
106 |
introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) |
107 |
vala? ( |
108 |
- >=dev-lang/vala-0.11.2:0.12[vapigen] |
109 |
+ dev-lang/vala:0.14[vapigen] |
110 |
>=dev-libs/gobject-introspection-0.9.6 )" |
111 |
DEPEND="${RDEPEND} |
112 |
dev-libs/libxslt |
113 |
>=dev-util/pkgconfig-0.21" |
114 |
|
115 |
src_prepare() { |
116 |
+ # Important upstream patches, will be in next release |
117 |
+ epatch "${FILESDIR}/${P}-gobject-introspection.patch" |
118 |
+ epatch "${FILESDIR}/${P}-tpbasechannelclass-close-null.patch" |
119 |
+ |
120 |
python_convert_shebangs -r 2 examples tests tools |
121 |
default_src_prepare |
122 |
} |
123 |
@@ -36,8 +40,8 @@ src_configure() { |
124 |
|
125 |
if use vala; then |
126 |
myconf="--enable-introspection |
127 |
- VALAC=$(type -p valac-0.12) |
128 |
- VAPIGEN=$(type -p vapigen-0.12)" |
129 |
+ VALAC=$(type -p valac-0.14) |
130 |
+ VAPIGEN=$(type -p vapigen-0.14)" |
131 |
fi |
132 |
|
133 |
econf --disable-static \ |