Wed Apr 21 05:43:28 2010 UTC ()
Add patch fixing a problem with Qt applications on 64bit machines,
from Debian via Helge M端hlmeier in PR 43178.
Bump PKGREVISION.
(wiz)
diff -r1.81 -r1.82 pkgsrc/wm/windowmaker/Makefile
diff -r1.27 -r1.28 pkgsrc/wm/windowmaker/distinfo
diff -r0 -r1.1 pkgsrc/wm/windowmaker/patches/patch-am
--- pkgsrc/wm/windowmaker/Makefile 2010/01/18 09:59:30 1.81
+++ pkgsrc/wm/windowmaker/Makefile 2010/04/21 05:43:28 1.82
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2010/04/21 05:43:28 wiz Exp $
DISTNAME= WindowMaker-0.92.0
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= x11 wm windowmaker
MASTER_SITES= http://windowmaker.info/pub/source/release/ \
ftp://ftp.dti.ad.jp/pub/X/WindowMaker/source/release/
--- pkgsrc/wm/windowmaker/distinfo 2007/06/21 00:00:23 1.27
+++ pkgsrc/wm/windowmaker/distinfo 2010/04/21 05:43:28 1.28
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2007/06/21 00:00:23 minskim Exp $
+$NetBSD: distinfo,v 1.28 2010/04/21 05:43:28 wiz Exp $
SHA1 (WindowMaker-0.92.0.tar.bz2) = 4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c
RMD160 (WindowMaker-0.92.0.tar.bz2) = c161eee64092fafb4868181fe2a0b6db96ed6de0
@@ -15,3 +15,4 @@
SHA1 (patch-aj) = 9d993770f77cd53d005b1f2c81baff49831fe96a
SHA1 (patch-ak) = aca311941e7c2fa7860934cd029ff87fde96c8ff
SHA1 (patch-al) = b900fcc52c3fb5b5184b28e22c29e111317ea7ad
+SHA1 (patch-am) = b25f546dc8192cfa910461e3dc5111703aecc586
$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);