From 79879227cd919962f36875c590af1603c48b8463 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Wed, 25 Mar 2009 09:32:48 +0000
Subject: 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.

---
 x11/gtk2/Makefile         |  4 ++--
 x11/gtk2/distinfo         |  3 ++-
 x11/gtk2/patches/patch-ah | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 x11/gtk2/patches/patch-ah

(limited to 'x11/gtk2')

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index c0995b5f549..f34984825ea 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,7 @@
-# $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/ \
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 215056caa50..4e2e49618e8 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,4 +1,4 @@
-$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
@@ -9,5 +9,6 @@ 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
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
new file mode 100644
index 00000000000..834212b7951
--- /dev/null
+++ b/x11/gtk2/patches/patch-ah
@@ -0,0 +1,15 @@
+$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;
-- 
cgit v1.2.3