From 3df783234bcdfe03277dc1823ae4c1128115200d Mon Sep 17 00:00:00 2001
From: martin <martin@pkgsrc.org>
Date: Sat, 10 Jun 2006 23:59:51 +0000
Subject: THOU SHALT NOT USE XChangeProperty with format=32 ON int VALUES WHEN
 THE MANUAL SPECIFIES THAT 32 MEANS long, EVEN IF YOU GET AWAY WITH IT ON
 i386!!!

---
 wm/qvwm/distinfo         |  3 ++-
 wm/qvwm/patches/patch-ad | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 wm/qvwm/patches/patch-ad

(limited to 'wm')

diff --git a/wm/qvwm/distinfo b/wm/qvwm/distinfo
index 6e708e0911f..f1e6150ca39 100644
--- a/wm/qvwm/distinfo
+++ b/wm/qvwm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/11/13 19:18:14 martin Exp $
+$NetBSD: distinfo,v 1.6 2006/06/10 23:59:51 martin Exp $
 
 SHA1 (qvwm-1.1.12.tar.gz) = 27b43148a750e5b6b3efac6a6506819adbc2ed4d
 RMD160 (qvwm-1.1.12.tar.gz) = ed8d78b43e4e5778224af3a490daa2d31eb9a914
@@ -6,3 +6,4 @@ Size (qvwm-1.1.12.tar.gz) = 434618 bytes
 SHA1 (patch-aa) = f6417e645c7a17e7f826cebea51ba34713071a9d
 SHA1 (patch-ab) = 8f1b98de794a524cc58a75850c8384c92f7faf1d
 SHA1 (patch-ac) = b066895160e6123aed9372477ea881d146b2b8aa
+SHA1 (patch-ad) = 8e4d793b37de9b64132e105b19d5a7533d04db24
diff --git a/wm/qvwm/patches/patch-ad b/wm/qvwm/patches/patch-ad
new file mode 100644
index 00000000000..b4af52b505f
--- /dev/null
+++ b/wm/qvwm/patches/patch-ad
@@ -0,0 +1,35 @@
+$NetBSD: patch-ad,v 1.1 2006/06/10 23:59:51 martin Exp $
+
+--- src/gnome.cc.orig	2001-03-03 06:13:32.000000000 +0100
++++ src/gnome.cc	2006-06-06 11:50:07.000000000 +0200
+@@ -104,11 +104,12 @@ void Gnome::SetProtocols()
+ void Gnome::SetWorkspace()
+ {
+   Rect rcVirt = paging->GetVirtRect();
+-  int num, val[2];
++  long num, val[2];
+ 
+   // set the number of desktops for workspace
+   XA_WIN_WORKSPACE_COUNT = XInternAtom(display, "_WIN_WORKSPACE_COUNT", False);
+   num = 1;  // fixed
++
+   XChangeProperty(display, root, XA_WIN_WORKSPACE_COUNT, XA_CARDINAL, 32, 
+ 		  PropModeReplace, (unsigned char *)&num, 1);
+ 
+@@ -116,6 +117,7 @@ void Gnome::SetWorkspace()
+   XA_WIN_AREA_COUNT = XInternAtom(display, "_WIN_AREA_COUNT", False);
+   val[0] = rcVirt.width;
+   val[1] = rcVirt.height;
++
+   XChangeProperty(display, root, XA_WIN_AREA_COUNT, XA_CARDINAL, 32, 
+ 		  PropModeReplace, (unsigned char *)val, 2);
+ 
+@@ -134,7 +136,7 @@ void Gnome::SetWorkspace()
+   XA_WIN_WORKSPACE = XInternAtom(display, "_WIN_WORKSPACE", False);
+   XA_WIN_AREA = XInternAtom(display, "_WIN_AREA", False);
+ 
+-  int index = 0;  // fixed
++  long index = 0;  // fixed
+   XChangeProperty(display, root, XA_WIN_WORKSPACE, XA_CARDINAL, 32, 
+ 		  PropModeReplace, (unsigned char *)&index, 1);
+ }
-- 
cgit v1.2.3