eva 14/09/27 16:06:31
Added: gnet-2.0.8-unittest-service.patch
gnet-2.0.8-test-existing-domain.patch
gnet-2.0.8-fix-pkgconfig-abuse.patch
gnet-2.0.8-unittest-build.patch
Log:
Fix build with recent check version, bug #498046. Apply a fix to pkgconfig
from Debian. Update to EAPI=5 and team guidelines.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
C6085806)
Revision Changes Path
1.1 net-libs/gnet/files/gnet-2.0.8-unittest-service.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch?rev=1.1&content-type=text/plain
Index: gnet-2.0.8-unittest-service.patch
===================================================================
Disable unittests requiring a running HTTP server on port 80.
--- a/tests/check/gnet/gnetinetaddr.c.old 2014-09-27 17:56:51.130350306
+0200
+++ b/tests/check/gnet/gnetinetaddr.c 2014-09-27 17:57:23.396114568 +0200
@@ -443,7 +443,7 @@
GNET_START_TEST (test_inetaddr_list_async)
{
- do_test_inetaddr_list_async ("localhost");
+/* do_test_inetaddr_list_async ("localhost"); */
/* FIXME: these might not work right yet because of the timings in the test
#ifdef GNET_ENABLE_NETWORK_TESTS
do_test_inetaddr_list_async ("www.google.com");
@@ -573,7 +573,7 @@
GNET_START_TEST (test_inetaddr_name_async)
{
- do_test_inetaddr_name_async ("localhost");
+/* do_test_inetaddr_name_async ("localhost"); */
/* FIXME: these might not work right yet because of the timings in the test
#ifdef GNET_ENABLE_NETWORK_TESTS
@@ -798,7 +798,7 @@
GNET_START_TEST (test_inetaddr_reverse_async)
{
- do_test_inetaddr_reverse_async ("localhost");
+/* do_test_inetaddr_reverse_async ("localhost"); */
#ifdef GNET_ENABLE_NETWORK_TESTS
do_test_inetaddr_reverse_async ("gabe.freedesktop.org");
1.1 net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch?rev=1.1&content-type=text/plain
Index: gnet-2.0.8-test-existing-domain.patch
===================================================================
>From 1825f69b1a149cd3f2daa5f6c3333a32f0470f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.mul...@collabora.co.uk>
Date: Sat, 16 Oct 2010 23:10:15 +0100
Subject: tests: update GConnHttp unit test to not use inactive domains
www.gnetlibrary.org has been abandoned.
diff --git a/tests/check/gnet/gnetconnhttp.c b/tests/check/gnet/gnetconnhttp.c
index b1cecce..4316f74 100644
--- a/tests/check/gnet/gnetconnhttp.c
+++ b/tests/check/gnet/gnetconnhttp.c
@@ -487,7 +487,7 @@ GNET_END_TEST;
GNET_START_TEST (test_gnet_http_get)
{
- const gchar *urls[] = {"http://www.gnetlibrary.org/src/";,
+ const gchar *urls[] = {"http://www.gnome.org/";,
"http://www.heise.de"; };
guint i;
@@ -514,7 +514,7 @@ GNET_END_TEST;
GNET_START_TEST (test_get_binary)
{
- gchar *uris[] = { "http://www.gnetlibrary.org/gnet.png"; };
+ gchar *uris[] = { "http://www.gnome.org/img/logo/foot-16.png"; };
guint i;
for (i = 0; i < G_N_ELEMENTS (uris); ++i) {
--
cgit v0.10.1
1.1 net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch?rev=1.1&content-type=text/plain
Index: gnet-2.0.8-fix-pkgconfig-abuse.patch
===================================================================
Bug-Debian: http://bugs.debian.org/652165
Author: Julien Cristau <jcris...@debian.org>
use pkg-config to get the glib include path, not hardcode it.
--- gnet-2.0.8.orig/gnet-2.0.pc.in
+++ gnet-2.0.8/gnet-2.0.pc.in
@@ -6,5 +6,6 @@
Name: Gnet
Description: A network compatibility layer library
Version: @VERSION@
-Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ @GLIB_LIBS@
@GTHREAD_LIBS@
-Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@
-I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/
@GLIB_CFLAGS@ @GTHREAD_CFLAGS@
+Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@
+Requires.private: glib-2.0 gthread-2.0
+Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@
-I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/
1.1 net-libs/gnet/files/gnet-2.0.8-unittest-build.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch?rev=1.1&content-type=text/plain
Index: gnet-2.0.8-unittest-build.patch
===================================================================
Fix build failure with newer releases of check library.
--- a/tests/check/gnetcheck.h 2014-09-27 15:32:17.088312230 +0200
+++ b/tests/check/gnetcheck.h 2014-09-27 15:32:35.728239492 +0200
@@ -281,7 +281,7 @@
_gnet_check_expecting_log = TRUE; \
_gnet_check_raised_critical = FALSE; \
code; \
- _fail_unless (_gnet_check_raised_critical, __FILE__, __LINE__, \
+ (_gnet_check_raised_critical) ? _mark_point(__FILE__, __LINE__) :
_ck_assert_failed (__FILE__, __LINE__, \
"Expected g_critical, got nothing", NULL); \
_gnet_check_expecting_log = FALSE; \
} G_STMT_END
@@ -291,7 +291,7 @@
_gnet_check_expecting_log = TRUE; \
_gnet_check_raised_warning = FALSE; \
code; \
- _fail_unless (_gnet_check_raised_warning, __FILE__, __LINE__, \
+ (_gnet_check_raised_warning) ? _mark_point(__FILE__, __LINE__) :
_ck_assert_failed (__FILE__, __LINE__, \
"Expected g_warning, got nothing", NULL); \
_gnet_check_expecting_log = FALSE; \
} G_STMT_END
![http://www.gnetlibrary.org/gnet.png"](http://www.gnetlibrary.org/gnet.png"){kind=link}
![http://www.gnome.org/img/logo/foot-16.png"](http://www.gnome.org/img/logo/foot-16.png"){kind=link}