Tue Jul 7 14:04:22 2015 UTC ()
Make verbose logging optional, fix already included upstream.


(youri)
diff -r1.16 -r1.17 pkgsrc/x11/xfce4-session/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/xfce4-session/patches/patch-configure
diff -r0 -r1.1 pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-global.h
cvs diff -r1.16 -r1.17 pkgsrc/x11/xfce4-session/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-session/distinfo 2015/07/06 10:39:35 1.16
+++ pkgsrc/x11/xfce4-session/distinfo 2015/07/07 14:04:22 1.17
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.16 2015/07/06 10:39:35 richard Exp $ 1$NetBSD: distinfo,v 1.17 2015/07/07 14:04:22 youri Exp $
2 2
3SHA1 (xfce4-session-4.12.1.tar.bz2) = ccdeac8bb6b4bb2382a963efdf2e05c09c61fee4 3SHA1 (xfce4-session-4.12.1.tar.bz2) = ccdeac8bb6b4bb2382a963efdf2e05c09c61fee4
4RMD160 (xfce4-session-4.12.1.tar.bz2) = 14db09177003f4139345b4d670015d90ebf28ef6 4RMD160 (xfce4-session-4.12.1.tar.bz2) = 14db09177003f4139345b4d670015d90ebf28ef6
5Size (xfce4-session-4.12.1.tar.bz2) = 1289284 bytes 5Size (xfce4-session-4.12.1.tar.bz2) = 1289284 bytes
6SHA1 (patch-ac) = 14398273b8169d26f89262310c1ca4d8546a2c0c 6SHA1 (patch-ac) = 14398273b8169d26f89262310c1ca4d8546a2c0c
7SHA1 (patch-config.h.in) = 88c67de7708c958674de7f222937739dd9f7fc00 7SHA1 (patch-config.h.in) = 88c67de7708c958674de7f222937739dd9f7fc00
8SHA1 (patch-configure) = 22924508b9af1b428dfe41413ff46b5592d17c48 8SHA1 (patch-configure) = 10b5a5dd2047685012c1a898204cc695c9a70d35
9SHA1 (patch-scripts_Makefile.in) = 1d1f2230fc861f222f44b9541d52c157a23c16dc 9SHA1 (patch-scripts_Makefile.in) = 1d1f2230fc861f222f44b9541d52c157a23c16dc
10SHA1 (patch-settings_xfce4-session.xml) = 6607e682df06674c4e6a3219b911f58f756cfab7 10SHA1 (patch-settings_xfce4-session.xml) = 6607e682df06674c4e6a3219b911f58f756cfab7
 11SHA1 (patch-xfce4-session_xfsm-global.h) = 1f7e1dd237b52666755fc385c2a0c74273f28036
11SHA1 (patch-xfsm-shutdown-helper_main.c) = 6f885efe31597360bb9534007daffa46df41c831 12SHA1 (patch-xfsm-shutdown-helper_main.c) = 6f885efe31597360bb9534007daffa46df41c831
cvs diff -r1.1 -r1.2 pkgsrc/x11/xfce4-session/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-session/patches/patch-configure 2015/07/02 13:15:58 1.1
+++ pkgsrc/x11/xfce4-session/patches/patch-configure 2015/07/07 14:04:22 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-configure,v 1.1 2015/07/02 13:15:58 youri Exp $ 1$NetBSD: patch-configure,v 1.2 2015/07/07 14:04:22 youri Exp $
2 2
3Add NetBSD backend detection. 3Add NetBSD backend detection.
4--- configure.orig 2015-06-29 16:19:21.000000000 +0000 4--- configure.orig 2015-03-16 07:29:45.000000000 +0000
5+++ configure 5+++ configure
6@@ -18208,6 +18208,8 @@ if test x$with_backend = x; then 6@@ -18208,6 +18208,8 @@ if test x$with_backend = x; then
7 with_backend=freebsd ;; #( 7 with_backend=freebsd ;; #(
8 *-*dragonfly*) : 8 *-*dragonfly*) :
9 with_backend=freebsd ;; #( 9 with_backend=freebsd ;; #(
10+ *-*netbsd*) : 10+ *-*netbsd*) :
11+ with_backend=netbsd ;; #( 11+ with_backend=netbsd ;; #(
12 *-openbsd*) : 12 *-openbsd*) :
13 with_backend=openbsd ;; #( 13 with_backend=openbsd ;; #(
14 *) : 14 *) :
15@@ -18237,6 +18239,11 @@ if test x$with_backend = xopenbsd; then 15@@ -18237,6 +18239,11 @@ if test x$with_backend = xopenbsd; then
16 $as_echo "#define BACKEND_TYPE_OPENBSD 1" >>confdefs.h 16 $as_echo "#define BACKEND_TYPE_OPENBSD 1" >>confdefs.h
17  17
File Added: pkgsrc/x11/xfce4-session/patches/Attic/patch-xfce4-session_xfsm-global.h
$NetBSD: patch-xfce4-session_xfsm-global.h,v 1.1 2015/07/07 14:04:22 youri Exp $

Make verbose logging optional.
--- xfce4-session/xfsm-global.h.orig	2014-09-28 14:51:01.000000000 +0000
+++ xfce4-session/xfsm-global.h
@@ -49,7 +49,10 @@ extern XfsmSplashScreen *splash_screen;
 #if defined(G_HAVE_ISO_VARARGS)
 
 #define xfsm_verbose(...)\
-    xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
+G_STMT_START{	\
+	if (G_UNLIKELY (verbose))	\
+    		xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__);\
+}G_STMT_END
 
 #else