[pkgsrc/trunk]: pkgsrc/x11/gtk2 Add patch that fixes a bug in reading PNM fil...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c6d1a83998c
branches:  trunk
changeset: 475560:6c6d1a83998c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed May 19 12:46:10 2004 +0000

description:
Add patch that fixes a bug in reading PNM files (from the gtk-2-4
CVS branch).

Submitted by Kouichirou Hiratsuka in PR 25636.

Bump PKGREVISION to 1.

diffstat:

 x11/gtk2/Makefile         |   3 ++-
 x11/gtk2/distinfo         |   3 ++-
 x11/gtk2/patches/patch-ad |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r a11c0f31de52 -r 6c6d1a83998c x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Wed May 19 12:36:42 2004 +0000
+++ b/x11/gtk2/Makefile Wed May 19 12:46:10 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2004/05/16 08:10:41 grant Exp $
+# $NetBSD: Makefile,v 1.53 2004/05/19 12:46:10 wiz Exp $
 #
 
 DISTNAME=              gtk+-2.4.1
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          ftp://ftp.gtk.org/pub/gtk/v2.4/ \
                        ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \
diff -r a11c0f31de52 -r 6c6d1a83998c x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Wed May 19 12:36:42 2004 +0000
+++ b/x11/gtk2/distinfo Wed May 19 12:46:10 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.24 2004/05/02 20:07:37 jmmv Exp $
+$NetBSD: distinfo,v 1.25 2004/05/19 12:46:10 wiz Exp $
 
 SHA1 (gtk+-2.4.1.tar.bz2) = 608f8b67b0877355b19e49a9daa683909fc65c6b
 Size (gtk+-2.4.1.tar.bz2) = 8853839 bytes
 SHA1 (patch-aa) = 05be7ab51f2e9297f68e4b51a0086ff64ace970b
 SHA1 (patch-ab) = 00ffc4436c64bd45042232a0a376d8a69de35d40
 SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
+SHA1 (patch-ad) = 73b4c95639ae911203992f6c9cfca87d2501f1a2
diff -r a11c0f31de52 -r 6c6d1a83998c x11/gtk2/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk2/patches/patch-ad Wed May 19 12:46:10 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.7 2004/05/19 12:46:10 wiz Exp $
+
+--- gdk-pixbuf/io-pnm.c.orig   2004-01-07 01:26:58.000000000 +0100
++++ gdk-pixbuf/io-pnm.c
+@@ -237,7 +237,7 @@ pnm_read_next_value (PnmIOBuffer *inbuf,
+       *word = '\0';
+       
+       /* hmmm, there must be more data to this 'word' */
+-      if (!g_ascii_isspace (*p) && (*p != '#')  && (p - inptr < 128))
++      if (p == inend || (!g_ascii_isspace (*p) && (*p != '#') && (p - inptr < 128)))
+           return PNM_SUSPEND;
+       
+       /* get the value */