head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.22
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.20
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.18
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.16
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.14
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.12
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.10
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.8
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.6
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.4
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.2
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.1.0.2
	pkgsrc-2007Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.11.05.19.06.05;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2007.09.20.21.12.13;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 2.20.0
This switches to the new gnome-2.20 branch.

pkgsrc notes:
-System dependant parts were reorganized upstream, in particular there
 if a subtree for FreeBSD now, and one for the other BSDs. I didn't
 pull in the DragonFly patches because I can't decide whether to base
 them on the freebsd or the rest.
-I've changed the NetBSD code to use kinfo_proc2 almost completely.
 Some vm statistics reporting might be less accurate now because
 some fields in proc2 seem to be unmaintained by the current kernel
 (eg ixrss).
-Also, some libgtop functions might be able to run in the non-privileged
 part now, but dealing with this would require even more #ifdefs, so
 we should consider setting up a private subtree as FreeBSD did.
-I didn't verify with older NetBSDs; kvm_getproc2() has been in the
 tree for quite some time so I hope it will just work without the need
 for excessive "#if __NetBSD_Version__ > t".
@
text
@$NetBSD: patch-ba,v 1.1 2007/09/20 21:12:13 wiz Exp $

From FreeBSD's GNOME development repository.

--- lib/read.c.orig	2006-04-10 10:41:46.000000000 +0200
+++ lib/read.c
@@@@ -22,6 +22,7 @@@@
 */
 
 #include <config.h>
+#include <errno.h>
 #include <glibtop/read.h>
 #include <glibtop/error.h>
 #include <glib/gi18n-lib.h>
@@@@ -56,14 +57,18 @@@@ glibtop_read_l (glibtop *server, size_t 
 	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
 #endif
 
+retry:
 	if (server->socket) {
 		do_read (server->socket, buf, size);
 	} else {
-		if(read (server->input [0], buf, size) < 0)
+		if(read (server->input [0], buf, size) < 0) {
+			if (errno == EINTR)
+				goto retry;
 			glibtop_error_io_r (
 				server,
 				ngettext ("read %d byte",
 					  "read %d bytes", size),
 				(int)size);
+		}
 	}
 }
@


1.1
log
@Rename libgtop2 to libgtop, to match upstream name.
@
text
@d1 1
a1 1
$NetBSD: patch-ba,v 1.2 2006/08/06 19:06:44 jmmv Exp $
@