CVS commit: pkgsrc/wm/xfce4-wm

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Jan  9 01:33:35 UTC 2019

Modified Files:
        pkgsrc/wm/xfce4-wm: Makefile distinfo
Added Files:
        pkgsrc/wm/xfce4-wm/patches: patch-src_startup__notification.c

Log Message:
wm/xfce4-wm: fix crasher bug

Address PR pkg/53396, reported and solved by Martin Husemann.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/wm/xfce4-wm/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/wm/xfce4-wm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/wm/xfce4-wm/patches/patch-src_startup__notification.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/xfce4-wm/Makefile
diff -u pkgsrc/wm/xfce4-wm/Makefile:1.66 pkgsrc/wm/xfce4-wm/Makefile:1.67
--- pkgsrc/wm/xfce4-wm/Makefile:1.66    Wed Nov 14 22:22:34 2018
+++ pkgsrc/wm/xfce4-wm/Makefile Wed Jan  9 01:33:35 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2018/11/14 22:22:34 kleink Exp $
+# $NetBSD: Makefile,v 1.67 2019/01/09 01:33:35 gutteridge Exp $
 
-PKGREVISION= 2
+PKGREVISION=   3
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 VERSION=       4.13.1

Index: pkgsrc/wm/xfce4-wm/distinfo
diff -u pkgsrc/wm/xfce4-wm/distinfo:1.25 pkgsrc/wm/xfce4-wm/distinfo:1.26
--- pkgsrc/wm/xfce4-wm/distinfo:1.25    Mon Nov  5 18:58:49 2018
+++ pkgsrc/wm/xfce4-wm/distinfo Wed Jan  9 01:33:35 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.25 2018/11/05 18:58:49 bsiegert Exp $
+$NetBSD: distinfo,v 1.26 2019/01/09 01:33:35 gutteridge Exp $
 
 SHA1 (xfwm4-4.13.1.tar.bz2) = 74e367d8b1e37872c3a7c5d0b5a1e0b1195a6228
 RMD160 (xfwm4-4.13.1.tar.bz2) = ca6a598107a1a0bb8ab2e9837a43c25955295754
 SHA512 (xfwm4-4.13.1.tar.bz2) = 2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320
 Size (xfwm4-4.13.1.tar.bz2) = 1224120 bytes
 SHA1 (patch-defaults_defaults) = 116409b6ee52344984bf6547c9f6cf06d6d66b92
+SHA1 (patch-src_startup__notification.c) = 1f9abc22d52145b6fef71a9a00ad0eea76b15c6e

Added files:

Index: pkgsrc/wm/xfce4-wm/patches/patch-src_startup__notification.c
diff -u /dev/null pkgsrc/wm/xfce4-wm/patches/patch-src_startup__notification.c:1.1
--- /dev/null   Wed Jan  9 01:33:35 2019
+++ pkgsrc/wm/xfce4-wm/patches/patch-src_startup__notification.c        Wed Jan  9 01:33:35 2019
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_startup__notification.c,v 1.1 2019/01/09 01:33:35 gutteridge Exp $
+
+Crash fixer from Martin Husemann in PR pkg/53396:
+sn_startup_sequence_get_last_active_time takes two long pointer
+arguments, but xfce4-wm passes pointers to may-be-different types.
+
+--- src/startup_notification.c.orig    2018-07-29 13:08:54.000000000 +0000
++++ src/startup_notification.c
+@@ -128,6 +128,7 @@ sn_collect_timed_out_foreach (void *elem
+     SnStartupSequence *sequence;
+     time_t tv_sec;
+     suseconds_t tv_usec;
++    long l_sec, l_usec;
+     double elapsed;
+ 
+     g_return_if_fail (data != NULL);
+@@ -135,7 +136,8 @@ sn_collect_timed_out_foreach (void *elem
+ 
+     sequence = element;
+     ctod = (CollectTimedOutData *) data;
+-    sn_startup_sequence_get_last_active_time (sequence, &tv_sec, &tv_usec);
++    sn_startup_sequence_get_last_active_time (sequence, &l_sec, &l_usec);
++    tv_sec = l_sec; tv_usec = l_sec;
+ 
+     elapsed =
+         ((((double) ctod->now.tv_sec - tv_sec) * G_USEC_PER_SEC +