summaryrefslogtreecommitdiffstats
path: root/extra/xaw3d/Xaw3d-1.5-box.c.patch
diff options
context:
space:
mode:
authorThierry N <thierryn1 at hispeed dot ch>2009-08-12 20:58:26 +0200
committerThierry N <thierryn1 at hispeed dot ch>2009-08-12 20:58:26 +0200
commitb5d84ce4c74f974d66fd9630fa1099a3f66626f4 (patch)
treea5a9d850cb178822926fbd8c6e75df384376bf46 /extra/xaw3d/Xaw3d-1.5-box.c.patch
parent68db4635e192db5ba604de7f702bdea83c76c1b7 (diff)
downloadnutyx-pakxe-b5d84ce4c74f974d66fd9630fa1099a3f66626f4.tar.gz
nutyx-pakxe-b5d84ce4c74f974d66fd9630fa1099a3f66626f4.tar.bz2
nutyx-pakxe-b5d84ce4c74f974d66fd9630fa1099a3f66626f4.tar.xz
nutyx-pakxe-b5d84ce4c74f974d66fd9630fa1099a3f66626f4.zip
Ajout de xaw3d#1.5E-1
Diffstat (limited to 'extra/xaw3d/Xaw3d-1.5-box.c.patch')
-rwxr-xr-xextra/xaw3d/Xaw3d-1.5-box.c.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/extra/xaw3d/Xaw3d-1.5-box.c.patch b/extra/xaw3d/Xaw3d-1.5-box.c.patch
new file mode 100755
index 000000000..252238af8
--- /dev/null
+++ b/extra/xaw3d/Xaw3d-1.5-box.c.patch
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## box.c.dpatch by Francesco Paolo Lovergine <frankie@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xaw3d-1.5+E~/lib/Xaw3d/Box.c xaw3d-1.5+E/lib/Xaw3d/Box.c
+--- Xaw3d-1.5E/xc/lib/Xaw3d/Box.c 1996-10-15 16:41:18.000000000 +0200
++++ Xaw3d-1.5E/xc/lib/Xaw3d/Box.c 2007-04-24 15:28:39.000000000 +0200
+@@ -353,8 +353,16 @@
+ else {
+ width = preferred_width;
+ do { /* find some width big enough to stay within this height */
++#if 0
+ width *= 2;
+ if (width > constraint->width) width = constraint->width;
++#endif
++ 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);