Date: Fri, 25 Oct 2013 15:08:37 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331595 - in head/x11-toolkits/Xaw3d: . files Message-ID: <201310251508.r9PF8bWT006080@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Fri Oct 25 15:08:37 2013 New Revision: 331595 URL: http://svnweb.freebsd.org/changeset/ports/331595 Log: - fix a bug that causes xfig to hang Reported by: Cejka Rudolf Obtained from: debian Added: head/x11-toolkits/Xaw3d/files/patch-Box.c (contents, props changed) Modified: head/x11-toolkits/Xaw3d/Makefile Modified: head/x11-toolkits/Xaw3d/Makefile ============================================================================== --- head/x11-toolkits/Xaw3d/Makefile Fri Oct 25 15:06:30 2013 (r331594) +++ head/x11-toolkits/Xaw3d/Makefile Fri Oct 25 15:08:37 2013 (r331595) @@ -3,7 +3,7 @@ PORTNAME= Xaw3d PORTVERSION= 1.5E -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.visi.com/users/hawkeyd/X/ \ ftp.slackware.com/pub/slackware/slackware_source/x/xaw3d/ Added: head/x11-toolkits/Xaw3d/files/patch-Box.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/Xaw3d/files/patch-Box.c Fri Oct 25 15:08:37 2013 (r331595) @@ -0,0 +1,24 @@ +*** Box.c~ 1996-10-15 10:41:18.000000000 -0400 +--- Box.c 2007-04-21 14:12:44.000000000 -0400 +*************** +*** 353,360 **** + else { + width = preferred_width; + do { /* find some width big enough to stay within this height */ +! width *= 2; +! if (width > constraint->width) width = constraint->width; + DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE); + } while (preferred_height > constraint->height && + width < constraint->width); +--- 353,363 ---- + else { + width = preferred_width; + do { /* find some width big enough to stay within this height */ +! if (width > constraint->width/2) /* avoid short int overflow */ +! width = constraint->width; +! else +! width *= 2; +! + DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE); + } while (preferred_height > constraint->height && + width < constraint->width);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310251508.r9PF8bWT006080>