diff options
| author | mrg <mrg> | 2016-10-01 20:40:06 +0000 |
|---|---|---|
| committer | mrg <mrg> | 2016-10-01 20:40:06 +0000 |
| commit | 2b73ba183cbcacb6fbc615a640db69c1bdfc6b12 (patch) | |
| tree | ad72605051ec9dca03ee799450c1632bc61fd42c /wm | |
| parent | 945a17c70071ef931aa0d97a936b303a70063c2c (diff) | |
| download | pkgsrc-2b73ba183cbcacb6fbc615a640db69c1bdfc6b12.tar.gz | |
fix unaligned issues on sparc64: don't pass pid_t, but a long, to
XChangeProperty(). PR#37559
bump revision.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/icewm/Makefile.common | 3 | ||||
| -rw-r--r-- | wm/icewm/distinfo | 3 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-src_wmapp.cc | 23 |
3 files changed, 27 insertions, 2 deletions
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index a521668dff6..a56d52c41d2 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,9 +1,10 @@ -# $NetBSD: Makefile.common,v 1.68 2016/07/24 20:12:34 rillig Exp $ +# $NetBSD: Makefile.common,v 1.69 2016/10/01 20:40:06 mrg Exp $ # # used by wm/icewm/Makefile # used by wm/icewm-imlib/Makefile DISTNAME= icewm-1.2.38pre2 +PKGREVISION= 1 CATEGORIES= x11 wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/} diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo index acb2f4c8a7e..38bd5e39fa5 100644 --- a/wm/icewm/distinfo +++ b/wm/icewm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.40 2015/11/02 23:42:52 agc Exp $ +$NetBSD: distinfo,v 1.41 2016/10/01 20:40:06 mrg Exp $ SHA1 (icewm-1.2.38pre2.tar.gz) = e0fa0ac454c8a7bbe850f114e9a0a82082516da3 RMD160 (icewm-1.2.38pre2.tar.gz) = e2b3fefdae7e1d368920e84d175058e3fe7c8d93 @@ -10,5 +10,6 @@ SHA1 (patch-aj) = aa357c56d3165f36a347133cf11cc299438617e9 SHA1 (patch-ak) = 8f96d98019071522cd8a9196a029842410e4ede1 SHA1 (patch-src_apppstatus.cc) = ea685b05bdcc7169b8f830409c4948c7ee9092a3 SHA1 (patch-src_base.h) = cd869fd68b2d169fcded97662212e7eccee9c83c +SHA1 (patch-src_wmapp.cc) = ce76173aac533a2555c57555de1335d047c14b10 SHA1 (patch-src_yarray.h) = c1e96402396bf6120a286e01c57b7202b4a3b9fb SHA1 (patch-src_ypixbuf.cc) = 6ecc2f9b76a2bf0589ae9ea98733f61a49f9afd1 diff --git a/wm/icewm/patches/patch-src_wmapp.cc b/wm/icewm/patches/patch-src_wmapp.cc new file mode 100644 index 00000000000..9b412513b9b --- /dev/null +++ b/wm/icewm/patches/patch-src_wmapp.cc @@ -0,0 +1,23 @@ +$NetBSD: patch-src_wmapp.cc,v 1.1 2016/10/01 20:40:06 mrg Exp $ + +Avoid passing 4-byte aligned data to 8-byte aligned needing functions. + +--- src/wmapp.cc.orig 2009-11-08 10:59:46.000000000 -0800 ++++ src/wmapp.cc 2016-10-01 13:14:03.000000000 -0700 +@@ -219,6 +219,7 @@ + #endif + + pid_t pid = getpid(); ++ long lpid = (long)pid; + const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")"; + + #ifdef GNOME1_HINTS +@@ -238,7 +239,7 @@ + + XChangeProperty(xapp->display(), xid, + _XA_NET_WM_PID, XA_CARDINAL, 32, +- PropModeReplace, (unsigned char *)&pid, 1); ++ PropModeReplace, (unsigned char *)&lpid, 1); + + XChangeProperty(xapp->display(), xid, + _XA_NET_WM_NAME, XA_STRING, 8, |