diff options
| -rw-r--r-- | x11/Xaw3d/Makefile | 4 | ||||
| -rw-r--r-- | x11/Xaw3d/distinfo | 3 | ||||
| -rw-r--r-- | x11/Xaw3d/patches/patch-ac | 18 |
3 files changed, 22 insertions, 3 deletions
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile index cf0d9c6e1a4..103344a697a 100644 --- a/x11/Xaw3d/Makefile +++ b/x11/Xaw3d/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.47 2006/03/04 21:31:07 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2006/03/13 00:16:23 markd Exp $ # DISTNAME= Xaw3d-1.5E -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ftp://ftp.visi.com/users/hawkeyd/X/ diff --git a/x11/Xaw3d/distinfo b/x11/Xaw3d/distinfo index 3be9e9ea9d6..11ab36fe725 100644 --- a/x11/Xaw3d/distinfo +++ b/x11/Xaw3d/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.8 2005/04/14 01:41:27 dmcmahill Exp $ +$NetBSD: distinfo,v 1.9 2006/03/13 00:16:23 markd Exp $ SHA1 (Xaw3d-1.5E.tar.gz) = efc5b923feda52866c859c59a5b553cb675a69d1 RMD160 (Xaw3d-1.5E.tar.gz) = 086cbabaa45ce5c110815aea24eebcbb54613118 Size (Xaw3d-1.5E.tar.gz) = 309264 bytes SHA1 (patch-aa) = 7729cfe83671f482670350ead9ccf1bfe3e932e3 SHA1 (patch-ab) = 9bbe44041708b2d01b728638ac07e32addc01cff +SHA1 (patch-ac) = cce339b75bdfe407608f004eaf1f22fca26ecd5e diff --git a/x11/Xaw3d/patches/patch-ac b/x11/Xaw3d/patches/patch-ac new file mode 100644 index 00000000000..0525528ea4b --- /dev/null +++ b/x11/Xaw3d/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.1 2006/03/13 00:16:23 markd Exp $ + +--- Box.c.orig 1996-10-16 03:41:18.000000000 +1300 ++++ Box.c +@@ -352,8 +352,12 @@ static XtGeometryResult PreferredSize(wi + } + else { + width = preferred_width; ++ if (0==width) width=1; + do { /* find some width big enough to stay within this height */ +- width *= 2; ++ if (width>=32768) /* overflow */ ++ width=constraint->width; ++ else ++ width *= 2; + if (width > constraint->width) width = constraint->width; + DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE); + } while (preferred_height > constraint->height && |