summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-11-16 20:54:50 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-11-16 20:54:50 +0000
commitab2c0514d1c2e570a8b7c0fcd7c3a18cd95d624e (patch)
tree76f90e12036b8d37001736b302a70d02bec0f9fa /net-libs/gnet
parentMoving to virtual/jpeg. (diff)
downloadhistorical-ab2c0514d1c2e570a8b7c0fcd7c3a18cd95d624e.tar.gz
historical-ab2c0514d1c2e570a8b7c0fcd7c3a18cd95d624e.tar.bz2
historical-ab2c0514d1c2e570a8b7c0fcd7c3a18cd95d624e.zip
Version bump. Fix usage of check test framework, bug #296849. Do not enable and build network tests, bug #320759. Disable -Werror in configure, bug #320759. Fix homepage URL.
Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64
Diffstat (limited to 'net-libs/gnet')
-rw-r--r--net-libs/gnet/ChangeLog10
-rw-r--r--net-libs/gnet/Manifest17
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch35
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-context-leak.patch32
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-network-tests.patch32
-rw-r--r--net-libs/gnet/gnet-2.0.8-r1.ebuild34
-rw-r--r--net-libs/gnet/gnet-2.0.8.ebuild6
7 files changed, 144 insertions, 22 deletions
diff --git a/net-libs/gnet/ChangeLog b/net-libs/gnet/ChangeLog
index 84e101e89363..fd0713293377 100644
--- a/net-libs/gnet/ChangeLog
+++ b/net-libs/gnet/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-libs/gnet
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.68 2010/01/10 16:36:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.69 2010/11/16 20:54:50 eva Exp $
+
+ 16 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> gnet-2.0.8.ebuild,
+ gnet-2.0.8-r1.ebuild, +files/gnet-2.0.8-check-usage-update.patch,
+ +files/gnet-2.0.8-context-leak.patch,
+ +files/gnet-2.0.8-network-tests.patch:
+ Version bump. Fix usage of check test framework, bug #296849. Do not
+ enable and build network tests, bug #320759. Disable -Werror in configure,
+ bug #320759. Fix homepage URL.
10 Jan 2010; Christian Faulhammer <fauli@gentoo.org> gnet-2.0.8-r1.ebuild:
Transfer Prefix keywords
diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest
index aa58e6f162bf..6e87401ad85a 100644
--- a/net-libs/gnet/Manifest
+++ b/net-libs/gnet/Manifest
@@ -1,16 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX gnet-2.0.8-check-usage-update.patch 1256 RMD160 cf8d22d1675303936c9f250b14ec9fec6fa4f24f SHA1 088a7ca8bb97d1ef10e790864c0306db20fe9514 SHA256 f6013b797ba9f5e0bf0bcf9f0d3686d672b29e059bd1c1d99b244288d40a16d5
+AUX gnet-2.0.8-context-leak.patch 838 RMD160 c0f122ee9addc440cedec3d2f2645e10fbf9f45c SHA1 6a4f0c90d76be164b3189a4b22dfd317244f5717 SHA256 ff68ff73a8b46d6b78713aacb47ae558671dc241a01019b63fd0638c9fe102f8
AUX gnet-2.0.8-define-location.patch 519 RMD160 f1ea07a68a0d90ebb6d83fda68b2e478871e3ca9 SHA1 4c44374694ff25336f7acbe3e93536e6291fa475 SHA256 65824a271eb64d34d227c8f5865586790fe3a3c943fef65ae71f8f94ef471fe2
+AUX gnet-2.0.8-network-tests.patch 811 RMD160 487f936617c1cf8d691b90d4ff1665428d973a43 SHA1 401cd24d0cf88abdc584939d0ce5185a0dc4ce5e SHA256 0883e4a0d6c19e96f2f168b201966fe33ced2f17462fcd0231c682b2fdfd7b76
DIST gnet-2.0.8.tar.bz2 514019 RMD160 e66c66d72ffda20b3b213506448b58c45a4d3093 SHA1 74a33dd25cc594b874e3a5171795efd99e567387 SHA256 14034c7ef571a93f2aca21b2280fa86b35ef5730541d3eb57557dd42d7cc506b
-EBUILD gnet-2.0.8-r1.ebuild 856 RMD160 a3c77c94f39b90188e8516c6990e8c3ae9ef13f9 SHA1 6a266194382c21b8340282e93cb6376a5481c464 SHA256 d1c7815552482065522354731afc51511191558d25961caf90b26a22dd14ef7b
-EBUILD gnet-2.0.8.ebuild 662 RMD160 910075c5b1e74167ade586c1f4b46fa9e559224b SHA1 624dfc9c27957cc9b105e07540f60442fe95cdc3 SHA256 1ad6b045a8072d9780f1d4870b1708701e01b081a9ceb2d9a863ce483f526a2b
-MISC ChangeLog 8342 RMD160 026abbf67b58cafe82aa0c669ea36102246d4a69 SHA1 a22cd101ca83f11db84b7d078979a9fd3482afa4 SHA256 5cdfdc9b5aefda066c77537fd1b35a5f358d6329212df691c79b23d665db327b
+EBUILD gnet-2.0.8-r1.ebuild 1369 RMD160 ecb6a82c1b9530738c10d37d00e0430d1db5f73c SHA1 1d428b06540d30845c4ca4af8122949cf2ea4e70 SHA256 8a56a0bc25a1368bb13c1c67b53efbec6024193c709e71c44e59877cfc2bbdf1
+EBUILD gnet-2.0.8.ebuild 663 RMD160 bc97178fc32d7a246f2de53e55d2b04b8c39fde4 SHA1 fe078007e3f9c88394f9955221722f661a1b6e18 SHA256 4e4fa374b02d7ed0bd7dc0b98c08ba1423fad0c2eb1d82ac680a45c6495c1ffa
+MISC ChangeLog 8744 RMD160 6d7ee5766487c156c63e5107d1cac46444136fa7 SHA1 c2597e198d3bdafed8e2112d95902af34f1966d2 SHA256 47e32a1aadb95a44f6983cc572b6ff48949f0af0f5549170adf27dabe74e5484
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAktKAhkACgkQNQqtfCuFneP8+wCgi9MToPdJ90heiPa3J///MkDm
-NUoAnje7OptzPVoNhsdq4vTJ/IO1QpeA
-=biEp
+iEYEARECAAYFAkzi76kACgkQ1fmVwcYIWAbP/wCgu5MS5HuJzrtDZQh8ZzkBl79q
+IN4AoJjxAHqyQOZ0hrMlvWer1oKs+oqB
+=u4rN
-----END PGP SIGNATURE-----
diff --git a/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch b/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch
new file mode 100644
index 000000000000..0ca2156b791d
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch
@@ -0,0 +1,35 @@
+From a61601a487394cbd5970c3b736aea71bf277ecc1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
+Date: Sat, 16 Oct 2010 20:13:52 +0100
+Subject: [PATCH] tests: require check >= 0.9.7 for unit tests, and fix for new API
+
+The check API changed slightly. Fix things for the new API.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=632258
+---
+ tests/check/gnetcheck.h | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/check/gnetcheck.h b/tests/check/gnetcheck.h
+index aeb9f68..14b6c28 100644
+--- a/tests/check/gnetcheck.h
++++ b/tests/check/gnetcheck.h
+@@ -311,11 +311,11 @@ int main (int argc, char **argv) \
+ gboolean _gnet_check_run_test_func (const gchar * func_name);
+
+ static inline void
+-__gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name,
+- int sig, int start, int end)
++__gnet_tcase_add_test (TCase * tc, TFun tf, const char * fname, int signal,
++ int allowed_exit_value, int start, int end)
+ {
+- if (_gnet_check_run_test_func (func_name)) {
+- _tcase_add_test (tc, tf, func_name, sig, start, end);
++ if (_gnet_check_run_test_func (fname)) {
++ _tcase_add_test (tc, tf, fname, signal, allowed_exit_value, start, end);
+ }
+ }
+
+--
+1.7.3.1
+
diff --git a/net-libs/gnet/files/gnet-2.0.8-context-leak.patch b/net-libs/gnet/files/gnet-2.0.8-context-leak.patch
new file mode 100644
index 000000000000..a56e549edccf
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-context-leak.patch
@@ -0,0 +1,32 @@
+From d6997987ce7f3e84d1125715b17502452d085073 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tpm@src.gnome.org>
+Date: Tue, 13 May 2008 07:10:28 +0000
+Subject: [PATCH] Don't leak main context ref when one was set. Spotted by Kuang-Chun Cheng.
+
+ * src/conn.c: (gnet_conn_unref):
+ Don't leak main context ref when one was set.
+ Spotted by Kuang-Chun Cheng.
+
+
+svn path=/trunk/; revision=495
+---
+ src/conn.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/conn.c b/src/conn.c
+index f4de415..9d41fa6 100644
+--- a/src/conn.c
++++ b/src/conn.c
+@@ -305,6 +305,9 @@ gnet_conn_unref (GConn* conn)
+ if (conn->inetaddr)
+ gnet_inetaddr_delete (conn->inetaddr);
+
++ if (conn->context)
++ g_main_context_unref (conn->context);
++
+ g_free (conn->buffer);
+
+ g_free (conn);
+--
+1.7.3.1
+
diff --git a/net-libs/gnet/files/gnet-2.0.8-network-tests.patch b/net-libs/gnet/files/gnet-2.0.8-network-tests.patch
new file mode 100644
index 000000000000..7bb7cefd133c
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-network-tests.patch
@@ -0,0 +1,32 @@
+From 576f6de12bf4a509882af0bbe4727e27e8bc9373 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 16 Nov 2010 14:18:08 +0100
+Subject: [PATCH] Do not build network related tests if not enabled
+
+---
+ tests/check/gnet/gnetconn.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/tests/check/gnet/gnetconn.c b/tests/check/gnet/gnetconn.c
+index 739b467..0558e28 100644
+--- a/tests/check/gnet/gnetconn.c
++++ b/tests/check/gnet/gnetconn.c
+@@ -25,6 +25,7 @@
+
+ #include <string.h>
+
++#ifdef GNET_ENABLE_NETWORK_TESTS
+ static void
+ conn_fail_cb (GConn * conn, GConnEvent * event, gpointer data)
+ {
+@@ -243,6 +244,7 @@ GNET_START_TEST (test_conn_new_socket)
+ g_main_loop_unref (loop);
+ }
+ GNET_END_TEST;
++#endif
+
+ static Suite *
+ gnetconn_suite (void)
+--
+1.7.3.1
+
diff --git a/net-libs/gnet/gnet-2.0.8-r1.ebuild b/net-libs/gnet/gnet-2.0.8-r1.ebuild
index 476839893d1d..b605ee866b7f 100644
--- a/net-libs/gnet/gnet-2.0.8-r1.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r1.ebuild
@@ -1,33 +1,45 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.8-r1.ebuild,v 1.2 2010/01/10 16:36:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.8-r1.ebuild,v 1.3 2010/11/16 20:54:50 eva Exp $
EAPI="2"
+GCONF_DEBUG="yes"
-inherit gnome2 eutils
+inherit eutils gnome2
DESCRIPTION="A simple network library."
-HOMEPAGE="http://www.gnetlibrary.org/"
+HOMEPAGE="http://live.gnome.org/GNetLibrary"
LICENSE="LGPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
IUSE="doc test"
-# FIXME: network-tests & use of valgrind
-
-RDEPEND=">=dev-libs/glib-2.6"
+# FIXME: automagic use of valgrind
+RDEPEND=">=dev-libs/glib-2.6:2"
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( >=dev-util/gtk-doc-1.2 )
- test? ( >=dev-libs/check-0.9.4 )"
+ test? ( >=dev-libs/check-0.9.7 )"
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO"
+pkg_setup() {
+ DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO"
+ # Do not enable network tests in an ebuild environment
+ G2CONF="${G2CONF} --disable-network-tests"
+}
src_prepare() {
gnome2_src_prepare
- # Fix #define location
- epatch "${FILESDIR}/${P}-define-location.patch"
+ # Do not leak main context reference, from master
+ epatch "${FILESDIR}/${PN}-2.0.8-context-leak.patch"
+
+ # Fix usage of check framework, bug #296849, from master
+ epatch "${FILESDIR}/${PN}-2.0.8-check-usage-update.patch"
+
+ # ifdef around network tests code, refs. bug #320759
+ epatch "${FILESDIR}/${PN}-2.0.8-network-tests.patch"
+
+ # Do not pass silly cflags with USE=debug, bug #320759
+ sed 's/-Werror//' -i configure.ac configure || die "sed failed"
}
diff --git a/net-libs/gnet/gnet-2.0.8.ebuild b/net-libs/gnet/gnet-2.0.8.ebuild
index 74ad7a3cb4f6..782639a658ab 100644
--- a/net-libs/gnet/gnet-2.0.8.ebuild
+++ b/net-libs/gnet/gnet-2.0.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.8.ebuild,v 1.7 2009/06/27 11:49:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.8.ebuild,v 1.8 2010/11/16 20:54:50 eva Exp $
inherit gnome2 eutils
DESCRIPTION="A simple network library."
-HOMEPAGE="http://www.gnetlibrary.org/"
+HOMEPAGE="http://live.gnome.org/GNetLibrary"
LICENSE="LGPL-2"
SLOT="2"