summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghen <ghen@pkgsrc.org>2007-12-17 21:31:03 +0000
committerghen <ghen@pkgsrc.org>2007-12-17 21:31:03 +0000
commit5d1c055abb622992bf861c592378353bb69c2c0b (patch)
tree965c67cd31b17b513eb16812d837e3ae670d0b95
parent1b355c4f77b83b4265088562eceff037f2e64aa7 (diff)
downloadpkgsrc-5d1c055abb622992bf861c592378353bb69c2c0b.tar.gz
Pullup ticket 2208 - requested by tnn
build fix for sawfish - pkgsrc/wm/sawfish/distinfo 1.12 - pkgsrc/wm/sawfish/patches/patch-ac 1.3 Module Name: pkgsrc Committed By: tnn Date: Sat Oct 20 14:13:45 UTC 2007 Modified Files: pkgsrc/wm/sawfish: distinfo Added Files: pkgsrc/wm/sawfish/patches: patch-ac Log Message: Fix, hopefully, problem spotted in 2007Q3 bulk builds when using XFree86.
-rw-r--r--wm/sawfish/distinfo3
-rw-r--r--wm/sawfish/patches/patch-ac17
2 files changed, 19 insertions, 1 deletions
diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo
index 49518c6af18..1366ff68972 100644
--- a/wm/sawfish/distinfo
+++ b/wm/sawfish/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2007/09/14 15:04:49 tnn Exp $
+$NetBSD: distinfo,v 1.11.2.1 2007/12/17 21:31:03 ghen 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 --git a/wm/sawfish/patches/patch-ac b/wm/sawfish/patches/patch-ac
new file mode 100644
index 00000000000..c33505f8917
--- /dev/null
+++ b/wm/sawfish/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.2.4.1 2007/12/17 21:31:03 ghen 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;