diff options
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/gnet/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/gnet/Manifest | 23 | ||||
| -rw-r--r-- | net-libs/gnet/files/gnet-2.0.7-amd64-fixes.patch | 170 | ||||
| -rw-r--r-- | net-libs/gnet/gnet-2.0.7.ebuild | 12 |
4 files changed, 202 insertions, 9 deletions
diff --git a/net-libs/gnet/ChangeLog b/net-libs/gnet/ChangeLog index 4c26f94a26b9..9ada6d1d425c 100644 --- a/net-libs/gnet/ChangeLog +++ b/net-libs/gnet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/gnet # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.44 2005/08/24 23:50:48 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.45 2005/09/13 02:32:44 dang Exp $ + + 13 Sep 2005; <dang@gentoo.org> +files/gnet-2.0.7-amd64-fixes.patch, + gnet-2.0.7.ebuild: + Fix some int/long mismatches. Fixes bug #105709 24 Aug 2005; Aron Griffis <agriffis@gentoo.org> gnet-2.0.7.ebuild: stable on ia64 diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest index f9e836bfeb43..bd50e027b939 100644 --- a/net-libs/gnet/Manifest +++ b/net-libs/gnet/Manifest @@ -1,9 +1,20 @@ -MD5 9a2d5bec1f7173bf7ba6c309446a6ddf gnet-1.1.9.ebuild 978 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 eeeded672901a9d3a98bdf5aff5192f7 gnet-2.0.7.ebuild 683 -MD5 bd60613176462f201d5107f22643ba65 ChangeLog 5500 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 8622ff62e90c2e7c596bc0760da9a7f1 gnet-2.0.5.ebuild 810 -MD5 94491a07093f86943ce66996189b4718 files/digest-gnet-2.0.5 62 +MD5 4dc58ec4d92b1da74aad7d69f4fd850c gnet-2.0.7.ebuild 818 +MD5 51e4b78d8cdb121a2af486ec146108b0 ChangeLog 5638 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 9a2d5bec1f7173bf7ba6c309446a6ddf gnet-1.1.9.ebuild 978 MD5 7b1ffb935d29a355ea158d7be3f514ed files/gnet-2.0.5-gtkdoc_fix.patch 665 -MD5 be10a790945382ccd065e826e2798bee files/digest-gnet-2.0.7 62 +MD5 7a97ee54c578392fc9c307fb28992e86 files/gnet-2.0.7-amd64-fixes.patch 6253 MD5 a39e088e927a5d9b2de3794920d01405 files/digest-gnet-1.1.9 62 +MD5 94491a07093f86943ce66996189b4718 files/digest-gnet-2.0.5 62 +MD5 be10a790945382ccd065e826e2798bee files/digest-gnet-2.0.7 62 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDJjrUomPajV0RnrERAoRhAJ9RxI4V7p8SHT3VFdOobcSfjzEytwCeK8ms +knuRp/xi6hiZBTOjvNBgyTA= +=Chrv +-----END PGP SIGNATURE----- diff --git a/net-libs/gnet/files/gnet-2.0.7-amd64-fixes.patch b/net-libs/gnet/files/gnet-2.0.7-amd64-fixes.patch new file mode 100644 index 000000000000..7a39d6b435b7 --- /dev/null +++ b/net-libs/gnet/files/gnet-2.0.7-amd64-fixes.patch @@ -0,0 +1,170 @@ +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/doc/version.xml gnet-2.0.7.amd64/doc/version.xml +--- gnet-2.0.7/doc/version.xml 2005-02-23 07:31:55.000000000 -0500 ++++ gnet-2.0.7.amd64/doc/version.xml 1969-12-31 19:00:00.000000000 -0500 +@@ -1 +0,0 @@ +-2.0.7 +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/examples/echoclient-async.c gnet-2.0.7.amd64/examples/echoclient-async.c +--- gnet-2.0.7/examples/echoclient-async.c 2004-09-27 20:27:43.000000000 -0400 ++++ gnet-2.0.7.amd64/examples/echoclient-async.c 2005-09-12 21:50:18.000000000 -0400 +@@ -122,7 +122,7 @@ + { + GIOError error; + gchar buffer[1024]; +- guint bytes_read; ++ gsize bytes_read; + + /* Read the data into our buffer */ + error = g_io_channel_read (iochannel, buffer, +@@ -185,7 +185,7 @@ + { + GIOError error; + gchar buffer[1024]; +- guint bytes_read; ++ gsize bytes_read; + + /* Read the data into our buffer */ + error = gnet_io_channel_readline (iochannel, buffer, +@@ -213,7 +213,7 @@ + { + GIOChannel* sin; + GIOError error; +- guint bytes_written; ++ gsize bytes_written; + + sin = (GIOChannel*) data; + error = gnet_io_channel_writen (sin, buffer, bytes_read, +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/examples/echoclient-gconn.c gnet-2.0.7.amd64/examples/echoclient-gconn.c +--- gnet-2.0.7/examples/echoclient-gconn.c 2003-02-05 18:40:39.000000000 -0500 ++++ gnet-2.0.7.amd64/examples/echoclient-gconn.c 2005-09-12 21:51:20.000000000 -0400 +@@ -98,7 +98,7 @@ + { + GIOError error; + gchar buffer[1024]; +- guint bytes_read; ++ gsize bytes_read; + + /* Read the data into our buffer */ + error = gnet_io_channel_readline (iochannel, buffer, +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/examples/echoclient-unix.c gnet-2.0.7.amd64/examples/echoclient-unix.c +--- gnet-2.0.7/examples/echoclient-unix.c 2003-02-03 12:56:14.000000000 -0500 ++++ gnet-2.0.7.amd64/examples/echoclient-unix.c 2005-09-12 21:51:43.000000000 -0400 +@@ -78,7 +78,7 @@ + GUnixSocket *socket = NULL; + GIOChannel* iochannel = NULL; + gchar buffer[1024]; +- guint n; ++ gsize n; + GIOError e = G_IO_ERROR_NONE; + + g_assert(path != NULL); +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/examples/echoclient.c gnet-2.0.7.amd64/examples/echoclient.c +--- gnet-2.0.7/examples/echoclient.c 2003-02-04 15:22:57.000000000 -0500 ++++ gnet-2.0.7.amd64/examples/echoclient.c 2005-09-12 21:46:39.000000000 -0400 +@@ -34,7 +34,7 @@ + GIOChannel* iochannel; + GIOError error = G_IO_ERROR_NONE; + gchar buffer[1024]; +- guint n; ++ gsize n; + + gnet_init (); + +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/examples/echoserver-async.c gnet-2.0.7.amd64/examples/echoserver-async.c +--- gnet-2.0.7/examples/echoserver-async.c 2003-02-04 15:22:57.000000000 -0500 ++++ gnet-2.0.7.amd64/examples/echoserver-async.c 2005-09-12 21:50:57.000000000 -0400 +@@ -187,7 +187,7 @@ + if (condition & G_IO_IN) + { + GIOError error; +- guint bytes_read; ++ gsize bytes_read; + + /* Read the data into our buffer */ + error = +@@ -247,7 +247,7 @@ + if (condition & G_IO_OUT) + { + GIOError error; +- guint bytes_written; ++ gsize bytes_written; + + /* Write the data out */ + error = g_io_channel_write(iochannel, client_state->buffer, +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/examples/echoserver-unix.c gnet-2.0.7.amd64/examples/echoserver-unix.c +--- gnet-2.0.7/examples/echoserver-unix.c 2003-02-03 12:56:14.000000000 -0500 ++++ gnet-2.0.7.amd64/examples/echoserver-unix.c 2005-09-12 21:52:21.000000000 -0400 +@@ -95,7 +95,7 @@ + { + GUnixSocket *client = NULL; + gchar buffer[1024]; +- guint n; ++ gsize n; + GIOChannel *ioclient = NULL; + GIOError e; + +@@ -228,7 +228,7 @@ + /* Check for data to be read (or if the socket was closed) */ + if (c & G_IO_IN) { + GIOError e; +- guint bytes_read; ++ gsize bytes_read; + + /* Read the data into our buffer */ + e = g_io_channel_read(iochannel, +@@ -259,7 +259,7 @@ + } + if (c & G_IO_OUT) { + GIOError e; +- guint bytes_written; ++ gsize bytes_written; + /* Write the data out */ + e = g_io_channel_write(iochannel, cs->buffer, cs->n, + &bytes_written); +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/examples/echoserver.c gnet-2.0.7.amd64/examples/echoserver.c +--- gnet-2.0.7/examples/echoserver.c 2003-02-04 15:22:57.000000000 -0500 ++++ gnet-2.0.7.amd64/examples/echoserver.c 2005-09-12 21:48:10.000000000 -0400 +@@ -40,7 +40,7 @@ + gchar* name; + GTcpSocket* client = NULL; + gchar buffer[1024]; +- guint n; ++ gsize n; + GIOChannel* ioclient = NULL; + GIOError error; + +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/examples/hfetch.c gnet-2.0.7.amd64/examples/hfetch.c +--- gnet-2.0.7/examples/hfetch.c 2003-02-03 12:56:14.000000000 -0500 ++++ gnet-2.0.7.amd64/examples/hfetch.c 2005-09-12 21:52:52.000000000 -0400 +@@ -113,7 +113,7 @@ + gchar* command; + gchar buffer[1024]; + GIOError error; +- guint n; ++ gsize n; + + + /* Create the address */ +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/src/conn-http.c gnet-2.0.7.amd64/src/conn-http.c +--- gnet-2.0.7/src/conn-http.c 2005-02-19 12:15:51.000000000 -0500 ++++ gnet-2.0.7.amd64/src/conn-http.c 2005-09-12 21:45:38.000000000 -0400 +@@ -632,7 +632,7 @@ + /* Note: this must be 1.1 */ + g_string_append_printf (request, "POST %s HTTP/1.1\r\n", resource); + +- g_snprintf(buf, sizeof(buf), "%u", conn->post_data_len); ++ g_snprintf(buf, sizeof(buf), "%"G_GSIZE_FORMAT, conn->post_data_len); + + gnet_conn_http_set_header (conn, "Expect", "100-continue", 0); + gnet_conn_http_set_header (conn, "Content-Length", buf, 0); +diff --exclude-from=/home/dang/.diffrc -u -ruN gnet-2.0.7/src/gnet-private.h gnet-2.0.7.amd64/src/gnet-private.h +--- gnet-2.0.7/src/gnet-private.h 2004-09-26 22:04:49.000000000 -0400 ++++ gnet-2.0.7.amd64/src/gnet-private.h 2005-09-12 21:31:40.000000000 -0400 +@@ -86,7 +86,7 @@ + #define SOCKET gint + #endif + +-#ifndef socklen_t ++#ifndef __socklen_t_defined + # ifdef GNET_APPLE_DARWIN + # define socklen_t int /* socklen_t is int in Darwin */ + # else diff --git a/net-libs/gnet/gnet-2.0.7.ebuild b/net-libs/gnet/gnet-2.0.7.ebuild index 357e2e85ac35..5190c158c915 100644 --- a/net-libs/gnet/gnet-2.0.7.ebuild +++ b/net-libs/gnet/gnet-2.0.7.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.7.ebuild,v 1.8 2005/08/24 23:50:48 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.7.ebuild,v 1.9 2005/09/13 02:32:44 dang Exp $ -inherit gnome2 +inherit gnome2 eutils DESCRIPTION="A simple network library." HOMEPAGE="http://www.gnetlibrary.org/" @@ -22,3 +22,11 @@ DEPEND="${RDEPEND} DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO" G2CONF="${G2CONF} $(use_enable static)" + +src_unpack() { + unpack ${A} + cd ${S} + + # Fix integer size mismatches on 64-bit arches + epatch ${FILESDIR}/${P}-amd64-fixes.patch +} |