[pkgsrc/trunk]: pkgsrc/wm/sawfish Fix, hopefully, problem spotted in 2007Q3 b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f3a896365c3
branches:  trunk
changeset: 534432:3f3a896365c3
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Oct 20 14:13:45 2007 +0000

description:
Fix, hopefully, problem spotted in 2007Q3 bulk builds when using XFree86.

diffstat:

 wm/sawfish/distinfo         |   3 ++-
 wm/sawfish/patches/patch-ac |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 870b3ff2a809 -r 3f3a896365c3 wm/sawfish/distinfo
--- a/wm/sawfish/distinfo       Sat Oct 20 13:35:12 2007 +0000
+++ b/wm/sawfish/distinfo       Sat Oct 20 14:13:45 2007 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2007/09/14 15:04:49 tnn Exp $
+$NetBSD: distinfo,v 1.12 2007/10/20 14:13:45 tnn Exp $
 
 SHA1 (sawfish-1.3.1.tar.gz) = c204129b7b6fdf702580140c39f62c561683216a
 RMD160 (sawfish-1.3.1.tar.gz) = 66de77629ad98e6205c13b7300928616d687c80a
 Size (sawfish-1.3.1.tar.gz) = 1741281 bytes
 SHA1 (patch-aa) = d2883ff092ce4fa86b20f9928dc004cf5bf61e75
 SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e
+SHA1 (patch-ac) = 5b06b5d5d5ea1c30af3c48f7dc87c7ce2ce29816
diff -r 870b3ff2a809 -r 3f3a896365c3 wm/sawfish/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/sawfish/patches/patch-ac       Sat Oct 20 14:13:45 2007 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.3 2007/10/20 14:13:45 tnn Exp $
+
+--- src/events.c.orig  2007-07-26 19:55:01.000000000 +0200
++++ src/events.c
+@@ -1155,7 +1155,11 @@ shape_notify (XEvent *ev)
+     XShapeEvent *sev = (XShapeEvent *)ev;
+     Lisp_Window *w = find_window_by_id (sev->window);
+     if (w != 0 && sev->window == w->id
+-      && (sev->kind == ShapeBounding || sev->kind == ShapeInput))
++      && (sev->kind == ShapeBounding
++#ifdef ShapeInput
++ || sev->kind == ShapeInput
++#endif
++))
+     {
+       if (sev->kind == ShapeBounding)
+           w->shaped = sev->shaped ? 1 : 0;