diff options
| author | youri <youri> | 2015-07-07 14:04:22 +0000 |
|---|---|---|
| committer | youri <youri> | 2015-07-07 14:04:22 +0000 |
| commit | c091ba42ee601dd9b46cf5300b66b91aa6ca99ee (patch) | |
| tree | fed9ea2e2fd2ebe9d86aa0a9eeaa8aec14c47b13 /x11 | |
| parent | 87b029067b11782f45e5969a0f5e27e11b9e87d6 (diff) | |
| download | pkgsrc-c091ba42ee601dd9b46cf5300b66b91aa6ca99ee.tar.gz | |
Make verbose logging optional, fix already included upstream.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xfce4-session/distinfo | 5 | ||||
| -rw-r--r-- | x11/xfce4-session/patches/patch-configure | 4 | ||||
| -rw-r--r-- | x11/xfce4-session/patches/patch-xfce4-session_xfsm-global.h | 17 |
3 files changed, 22 insertions, 4 deletions
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo index 7194a28f5a8..c0fa92b31e1 100644 --- a/x11/xfce4-session/distinfo +++ b/x11/xfce4-session/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.16 2015/07/06 10:39:35 richard Exp $ +$NetBSD: distinfo,v 1.17 2015/07/07 14:04:22 youri Exp $ SHA1 (xfce4-session-4.12.1.tar.bz2) = ccdeac8bb6b4bb2382a963efdf2e05c09c61fee4 RMD160 (xfce4-session-4.12.1.tar.bz2) = 14db09177003f4139345b4d670015d90ebf28ef6 Size (xfce4-session-4.12.1.tar.bz2) = 1289284 bytes SHA1 (patch-ac) = 14398273b8169d26f89262310c1ca4d8546a2c0c SHA1 (patch-config.h.in) = 88c67de7708c958674de7f222937739dd9f7fc00 -SHA1 (patch-configure) = 22924508b9af1b428dfe41413ff46b5592d17c48 +SHA1 (patch-configure) = 10b5a5dd2047685012c1a898204cc695c9a70d35 SHA1 (patch-scripts_Makefile.in) = 1d1f2230fc861f222f44b9541d52c157a23c16dc SHA1 (patch-settings_xfce4-session.xml) = 6607e682df06674c4e6a3219b911f58f756cfab7 +SHA1 (patch-xfce4-session_xfsm-global.h) = 1f7e1dd237b52666755fc385c2a0c74273f28036 SHA1 (patch-xfsm-shutdown-helper_main.c) = 6f885efe31597360bb9534007daffa46df41c831 diff --git a/x11/xfce4-session/patches/patch-configure b/x11/xfce4-session/patches/patch-configure index b84bbbe6a41..809653ad9bb 100644 --- a/x11/xfce4-session/patches/patch-configure +++ b/x11/xfce4-session/patches/patch-configure @@ -1,7 +1,7 @@ -$NetBSD: patch-configure,v 1.1 2015/07/02 13:15:58 youri Exp $ +$NetBSD: patch-configure,v 1.2 2015/07/07 14:04:22 youri Exp $ Add NetBSD backend detection. ---- configure.orig 2015-06-29 16:19:21.000000000 +0000 +--- configure.orig 2015-03-16 07:29:45.000000000 +0000 +++ configure @@ -18208,6 +18208,8 @@ if test x$with_backend = x; then with_backend=freebsd ;; #( diff --git a/x11/xfce4-session/patches/patch-xfce4-session_xfsm-global.h b/x11/xfce4-session/patches/patch-xfce4-session_xfsm-global.h new file mode 100644 index 00000000000..eb7b2b4ebcf --- /dev/null +++ b/x11/xfce4-session/patches/patch-xfce4-session_xfsm-global.h @@ -0,0 +1,17 @@ +$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 + |