details: https://anonhg.NetBSD.org/pkgsrc/rev/782acaec8be0
branches: trunk
changeset: 353273:782acaec8be0
user: mrg <mrg%pkgsrc.org@localhost>
date: Sat Oct 01 20:40:06 2016 +0000
description:
fix unaligned issues on sparc64: don't pass pid_t, but a long, to
XChangeProperty(). PR#37559
bump revision.
diffstat:
wm/icewm/Makefile.common | 3 ++-
wm/icewm/distinfo | 3 ++-
wm/icewm/patches/patch-src_wmapp.cc | 23 +++++++++++++++++++++++
3 files changed, 27 insertions(+), 2 deletions(-)
diffs (58 lines):
diff -r 99890eebd60a -r 782acaec8be0 wm/icewm/Makefile.common
--- a/wm/icewm/Makefile.common Sat Oct 01 19:44:46 2016 +0000
+++ b/wm/icewm/Makefile.common Sat Oct 01 20:40:06 2016 +0000
@@ -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 -r 99890eebd60a -r 782acaec8be0 wm/icewm/distinfo
--- a/wm/icewm/distinfo Sat Oct 01 19:44:46 2016 +0000
+++ b/wm/icewm/distinfo Sat Oct 01 20:40:06 2016 +0000
@@ -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-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 -r 99890eebd60a -r 782acaec8be0 wm/icewm/patches/patch-src_wmapp.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/icewm/patches/patch-src_wmapp.cc Sat Oct 01 20:40:06 2016 +0000
@@ -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,