* [gentoo-commits] proj/gnome:master commit in: net-libs/telepathy-glib/, net-libs/telepathy-glib/files/
@ 2011-10-12 18:38 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-10-12 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 1d0de730b4d36369d6624a6afee635d77c9226b8
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Oct 12 18:29:54 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct 12 18:36:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1d0de730
net-libs/telepathy-glib: 0.15.5-r1 → 0.15.9
Bump with numerous new features and fixes for memory leaks, crashes, and
performance problems.
Also, fix USE="-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 => 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-introspection.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 6d7e5b0..0000000
--- a/net-libs/telepathy-glib/files/telepathy-glib-0.15.5-tpbasechannelclass-close-null.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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-r1.ebuild b/net-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="3"
PYTHON_DEPEND="2:2.5"
-inherit eutils python virtualx
+inherit python virtualx
DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
HOMEPAGE="http://telepathy.freedesktop.org"
@@ -27,10 +27,6 @@ DEPEND="${RDEPEND}
>=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
}
@@ -39,9 +35,13 @@ src_configure() {
local myconf
if use vala; then
+ use introspection ||
+ ewarn "Enabling introspection support; it is required for USE=vala"
myconf="--enable-introspection
VALAC=$(type -p valac-0.14)
VAPIGEN=$(type -p vapigen-0.14)"
+ else
+ myconf="$(use_enable introspection)"
fi
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}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/telepathy-glib/, net-libs/telepathy-glib/files/
@ 2012-08-11 21:18 Priit Laes
0 siblings, 0 replies; 3+ messages in thread
From: Priit Laes @ 2012-08-11 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 2156279ea154183cfbf98e45fd7ada03f2ddadee
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Aug 11 21:15:30 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Aug 11 21:15:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2156279e
net-libs/telepathy-glib: Add 0.19.6 to overlay
Required by dev-libs/folks-0.7.3
---
.../files/telepathy-glib-0.19.6-GCC-4.5.patch | 26 ++++++++
.../telepathy-glib/telepathy-glib-0.19.6.ebuild | 65 ++++++++++++++++++++
2 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/net-libs/telepathy-glib/files/telepathy-glib-0.19.6-GCC-4.5.patch b/net-libs/telepathy-glib/files/telepathy-glib-0.19.6-GCC-4.5.patch
new file mode 100644
index 0000000..cc42bac
--- /dev/null
+++ b/net-libs/telepathy-glib/files/telepathy-glib-0.19.6-GCC-4.5.patch
@@ -0,0 +1,26 @@
+From 6ae69437fec309e5f10d3d39a26e6ca628630ae3 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Sat, 11 Aug 2012 12:21:40 +0300
+Subject: [PATCH] Allow building with <GCC-4.5
+
+Starting with GCC-4.6 typedef redeclaration doesn't cause error anymore.
+https://bugs.freedesktop.org/show_bug.cgi?id=53367
+---
+ telepathy-glib/base-connection.h | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
+index b158328..1a31ab1 100644
+--- a/telepathy-glib/base-connection.h
++++ b/telepathy-glib/base-connection.h
+@@ -38,7 +38,6 @@
+
+ G_BEGIN_DECLS
+
+-typedef struct _TpBaseConnection TpBaseConnection;
+ typedef struct _TpBaseConnectionClass TpBaseConnectionClass;
+ typedef struct _TpBaseConnectionPrivate TpBaseConnectionPrivate;
+
+--
+1.7.8.6
+
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.19.6.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.19.6.ebuild
new file mode 100644
index 0000000..43c29c1
--- /dev/null
+++ b/net-libs/telepathy-glib/telepathy-glib-0.19.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild,v 1.2 2012/05/05 02:54:30 jdhore Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.5"
+
+inherit eutils python virtualx
+
+DESCRIPTION="GLib 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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug +introspection +vala"
+
+RDEPEND=">=dev-libs/glib-2.32.0:2
+ >=dev-libs/dbus-glib-0.90
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
+ vala? (
+ >=dev-lang/vala-0.16.0:0.16[vapigen]
+ >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ virtual/pkgconfig"
+
+src_prepare() {
+ python_convert_shebangs -r 2 examples tests tools
+ default_src_prepare
+ epatch "${FILESDIR}/${P}-GCC-4.5.patch"
+}
+
+src_configure() {
+ local myconf
+
+ if use vala; then
+ myconf="--enable-introspection
+ VALAC=$(type -p valac-0.16)
+ VAPIGEN=$(type -p vapigen-0.16)"
+ fi
+
+ econf --disable-static \
+ --disable-installed-tests \
+ PYTHON=$(PYTHON -2 -a) \
+ $(use_enable debug backtrace) \
+ $(use_enable debug debug-cache) \
+ $(use_enable introspection) \
+ $(use_enable vala vala-bindings) \
+ ${myconf}
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ # Needs dbus for tests (auto-launched)
+ Xemake -j1 check
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+ dodoc AUTHORS ChangeLog NEWS README
+
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/telepathy-glib/, net-libs/telepathy-glib/files/
@ 2012-09-09 0:39 Nirbheek Chauhan
0 siblings, 0 replies; 3+ messages in thread
From: Nirbheek Chauhan @ 2012-09-09 0:39 UTC (permalink / raw
To: gentoo-commits
commit: 7b8c41d6523723b73c4a80ec0ae771f2420982c2
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 9 00:32:20 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Sep 9 00:37:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7b8c41d6
net-libs/telepathy-glib: 0.19.6 → 0.19.8
---
.../files/telepathy-glib-0.19.6-GCC-4.5.patch | 26 --------------------
...-0.19.6.ebuild => telepathy-glib-0.19.8.ebuild} | 14 +++-------
2 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/net-libs/telepathy-glib/files/telepathy-glib-0.19.6-GCC-4.5.patch b/net-libs/telepathy-glib/files/telepathy-glib-0.19.6-GCC-4.5.patch
deleted file mode 100644
index cc42bac..0000000
--- a/net-libs/telepathy-glib/files/telepathy-glib-0.19.6-GCC-4.5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6ae69437fec309e5f10d3d39a26e6ca628630ae3 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Sat, 11 Aug 2012 12:21:40 +0300
-Subject: [PATCH] Allow building with <GCC-4.5
-
-Starting with GCC-4.6 typedef redeclaration doesn't cause error anymore.
-https://bugs.freedesktop.org/show_bug.cgi?id=53367
----
- telepathy-glib/base-connection.h | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
-index b158328..1a31ab1 100644
---- a/telepathy-glib/base-connection.h
-+++ b/telepathy-glib/base-connection.h
-@@ -38,7 +38,6 @@
-
- G_BEGIN_DECLS
-
--typedef struct _TpBaseConnection TpBaseConnection;
- typedef struct _TpBaseConnectionClass TpBaseConnectionClass;
- typedef struct _TpBaseConnectionPrivate TpBaseConnectionPrivate;
-
---
-1.7.8.6
-
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.19.6.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.19.8.ebuild
similarity index 84%
rename from net-libs/telepathy-glib/telepathy-glib-0.19.6.ebuild
rename to net-libs/telepathy-glib/telepathy-glib-0.19.8.ebuild
index 43c29c1..3932fd0 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.19.6.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.19.8.ebuild
@@ -15,13 +15,12 @@ LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="debug +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
RDEPEND=">=dev-libs/glib-2.32.0:2
>=dev-libs/dbus-glib-0.90
introspection? ( >=dev-libs/gobject-introspection-1.30 )
- vala? (
- >=dev-lang/vala-0.16.0:0.16[vapigen]
- >=dev-libs/gobject-introspection-1.30 )"
+ vala? ( dev-lang/vala:0.18[vapigen] )"
DEPEND="${RDEPEND}
dev-libs/libxslt
virtual/pkgconfig"
@@ -29,18 +28,11 @@ DEPEND="${RDEPEND}
src_prepare() {
python_convert_shebangs -r 2 examples tests tools
default_src_prepare
- epatch "${FILESDIR}/${P}-GCC-4.5.patch"
}
src_configure() {
local myconf
- if use vala; then
- myconf="--enable-introspection
- VALAC=$(type -p valac-0.16)
- VAPIGEN=$(type -p vapigen-0.16)"
- fi
-
econf --disable-static \
--disable-installed-tests \
PYTHON=$(PYTHON -2 -a) \
@@ -48,6 +40,8 @@ src_configure() {
$(use_enable debug debug-cache) \
$(use_enable introspection) \
$(use_enable vala vala-bindings) \
+ VALAC=$(type -p valac-0.18) \
+ VAPIGEN=$(type -p vapigen-0.18) \
${myconf}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-09 0:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-12 18:38 [gentoo-commits] proj/gnome:master commit in: net-libs/telepathy-glib/, net-libs/telepathy-glib/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2012-08-11 21:18 Priit Laes
2012-09-09 0:39 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox