Wed Mar 25 09:32:49 2009 UTC ()

Add a patch to the cups printbackend so that listing of remote
cups printers works on NetBSD. Code assumes that a connect()
on a non blocking socket will eventually succeed but what it actually gets
is failure with EISCONN.  Bump PKGREVISION.


(markd)

diff -r1.170 -r1.171 pkgsrc/x11/gtk2/Makefile
diff -r1.109 -r1.110 pkgsrc/x11/gtk2/distinfo
diff -r0 -r1.12 pkgsrc/x11/gtk2/patches/patch-ah

--- pkgsrc/x11/gtk2/Makefile 2009/03/25 09:13:16 1.170
+++ pkgsrc/x11/gtk2/Makefile 2009/03/25 09:32:48 1.171

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.170 2009/03/25 09:13:16 wiz Exp $
+# $NetBSD: Makefile,v 1.171 2009/03/25 09:32:48 markd Exp $
 DISTNAME=		gtk+-2.16.0
-PKGREVISION=		2
+PKGREVISION=		3
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.16/ \
 			${MASTER_SITE_GNOME:=sources/gtk+/2.16/}
 EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gtk.org/
 COMMENT=		GIMP Toolkit v2 - libraries for building X11 user interfaces
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=		gtk2-engines<2.6.0

--- pkgsrc/x11/gtk2/distinfo 2009/03/15 14:01:37 1.109
+++ pkgsrc/x11/gtk2/distinfo 2009/03/25 09:32:48 1.110

 @@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.109 2009/03/15 14:01:37 jmcneill Exp $
+$NetBSD: distinfo,v 1.110 2009/03/25 09:32:48 markd Exp $
 SHA1 (gtk+-2.16.0.tar.bz2) = b737ad4b224a3cff966ef43b2682c696d756764c
 RMD160 (gtk+-2.16.0.tar.bz2) = 17138ef5576486725591efdf6e4f35c9fad66aea
 Size (gtk+-2.16.0.tar.bz2) = 17978429 bytes
 SHA1 (patch-aa) = 507f43c8257607c3ddb194015cc67c5b166a5047
 SHA1 (patch-ab) = 075dcdceeeea06d93802643b9bd2c23f0ee32a64
 SHA1 (patch-ac) = 81765fc056a25c5b53a7223ea62f6f98a6da6104
 SHA1 (patch-ad) = b28feb33311f4b42bdeeae257a470edd677d5c15
 SHA1 (patch-ae) = 33e5411076362295329f82e2106e1cd7f0529863
 SHA1 (patch-aj) = 4e36ab908ae14d81bd62c3eb170be87f14bb6a35
 SHA1 (patch-ah) = 6e489e715b87badc4ab5d54df8663d55b0dfc92b
 SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
 SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb

$NetBSD: patch-ah,v 1.12 2009/03/25 09:32:49 markd Exp $

On NetBSD subsequent socket() calls return EISCONN

--- modules/printbackends/cups/gtkcupsutils.c~	2009-01-08 05:33:32.000000000 +1300
+++ modules/printbackends/cups/gtkcupsutils.c	2009-03-15 17:59:52.000000000 +1300
@@ -1290,7 +1290,7 @@
 
           error_code = errno;
 
-          if (code == 0)
+          if (code == 0 || error_code == EISCONN)
             {
               close (test->socket);
               test->socket = -1;