[pkgsrc/trunk]: pkgsrc/x11/gtk2 Add a patch to the cups printbackend so that ...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d8a4b45804a
branches:  trunk
changeset: 556641:7d8a4b45804a
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Mar 25 09:32:48 2009 +0000

description:
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.

diffstat:

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

diffs (48 lines):

diff -r 935b711a6828 -r 7d8a4b45804a x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Wed Mar 25 09:22:34 2009 +0000
+++ b/x11/gtk2/Makefile Wed Mar 25 09:32:48 2009 +0000
@@ -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 -r 935b711a6828 -r 7d8a4b45804a x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Wed Mar 25 09:22:34 2009 +0000
+++ b/x11/gtk2/distinfo Wed Mar 25 09:32:48 2009 +0000
@@ -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-ad) = b28feb33311f4b42bdeeae257a470edd677d5c15
 SHA1 (patch-ae) = 33e5411076362295329f82e2106e1cd7f0529863
 SHA1 (patch-aj) = 4e36ab908ae14d81bd62c3eb170be87f14bb6a35
+SHA1 (patch-ah) = 6e489e715b87badc4ab5d54df8663d55b0dfc92b
 SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
 SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb
diff -r 935b711a6828 -r 7d8a4b45804a x11/gtk2/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk2/patches/patch-ah Wed Mar 25 09:32:48 2009 +0000
@@ -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;