head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.2
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.1.0.24
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.22
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.20
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.18
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.16
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.14
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.12
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.10
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.8
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.6
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.4
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.2
	pkgsrc-2010Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2013.05.21.14.38.40;	author hans;	state dead;
branches;
next	1.1;
commitid	wEfr53DTVsRSvvQw;

1.1
date	2010.04.21.05.43.28;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update WindowMaker to 0.95.4

Changes since 0.92.0:
- Left Half / Right Half Maximize, tiled maximization
- New mouse-resizing functionality
- History and TAB completion in dialogs
- Bouncing appicon effect
- New applications (wmgenmenu and wmmenugen) to generate the root menu
  automatically by looking which applications you have on your $PATH
- Automatic detection of configuration changes through inotify
- Improved dockapp recognition
- many trivial things which reduce little annoyances one might have
- Added keyboard shortcut to uncover/cover the dock
- Mac OS X-style window cycling
- Preliminary XRandR support
- lots of bug fixes
@
text
@$NetBSD: patch-am,v 1.1 2010/04/21 05:43:28 wiz Exp $

Fix Qt applications on 64bit platforms. PR 43178.

--- src/wmspec.c.orig	2005-05-15 16:41:09.000000000 +0000
+++ src/wmspec.c
@@@@ -35,6 +35,7 @@@@
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#include <X11/Xarch.h>
 #include <string.h>
 
 #include "WindowMaker.h"
@@@@ -322,15 +323,15 @@@@ setSupportedHints(WScreen *scr)
 void
 wNETWMUpdateDesktop(WScreen *scr)
 {
-    CARD32 *views, sizes[2];
+    long *views, sizes[2];
     int count, i;
 
     if (scr->workspace_count==0)
         return;
 
     count = scr->workspace_count * 2;
-    views = wmalloc(sizeof(CARD32) * count);
-    /*memset(views, 0, sizeof(CARD32) * count);*/
+    views = wmalloc(sizeof(long) * count);
+    /*memset(views, 0, sizeof(long) * count);*/
 
 #ifdef VIRTUAL_DESKTOP
     sizes[0] = scr->workspaces[scr->current_workspace]->width;
@@@@ -370,7 +371,7 @@@@ wNETWMGetCurrentDesktopFromHint(WScreen 
                                0, 1, &count);
     if (prop)
     {
-        int desktop= *(CARD32*)prop;
+       int desktop= *(long*)prop;
         XFree(prop);
         return desktop;
     }
@@@@ -487,7 +488,7 @@@@ updateIconImage(WScreen *scr, WWindow *w
 static void
 updateShowDesktop(WScreen * scr, Bool show)
 {
-    CARD32 foo;
+    long foo;
 
     foo = (show == True);
     XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
@@@@ -660,7 +661,7 @@@@ wNETWMUpdateActions(WWindow *wwin, Bool 
 void
 wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
 {
-    CARD32 *area;
+    long *area;
     int count, i;
 
     /* XXX: not Xinerama compatible,
@@@@ -670,7 +671,7 @@@@ wNETWMUpdateWorkarea(WScreen *scr, WArea
         return;
 
     count = scr->workspace_count * 4;
-    area = wmalloc(sizeof(CARD32) * count);
+    area = wmalloc(sizeof(long) * count);
     for (i=0; i<scr->workspace_count; i++) {
         area[4*i + 0] = usableArea.x1;
         area[4*i + 1] = usableArea.y1;
@@@@ -793,7 +794,7 @@@@ updateClientListStacking(WScreen *scr, W
 static void
 updateWorkspaceCount(WScreen *scr) /* changeable */
 {
-    CARD32 count;
+    long count;
 
     count = scr->workspace_count;
 
@@@@ -805,7 +806,7 @@@@ updateWorkspaceCount(WScreen *scr) /* ch
 static void
 updateCurrentWorkspace(WScreen *scr) /* changeable */
 {
-    CARD32 count;
+    long count;
 
     count = scr->current_workspace;
 
@@@@ -852,7 +853,7 @@@@ updateFocusHint(WScreen *scr, WWindow *w
 static void
 updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
 {
-    CARD32 l;
+    long l;
 
     if (del) {
         XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);
@


1.1
log
@Add patch fixing a problem with Qt applications on 64bit machines,
from Debian via Helge Mühlmeier in PR 43178.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@