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/files
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/files')
-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
3 files changed, 99 insertions, 0 deletions
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
+