From be4140b297ccd742526dbc1c2d05b36d906c8e56 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 19 May 2004 12:46:10 +0000
Subject: 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.
---
 x11/gtk2/Makefile         |  3 ++-
 x11/gtk2/distinfo         |  3 ++-
 x11/gtk2/patches/patch-ad | 13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 x11/gtk2/patches/patch-ad

(limited to 'x11')

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 028bebfc5f2..995f359b08b 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -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 --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 69e91d44b41..edd08f91a1d 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -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 --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
new file mode 100644
index 00000000000..2396ce4d1da
--- /dev/null
+++ b/x11/gtk2/patches/patch-ad
@@ -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 */
-- 
cgit v1.2.3