From 9675d444e96c2c9c19d6937279e99df61f2a093c Mon Sep 17 00:00:00 2001 From: Olivier Duchateau Date: Sat, 28 Mar 2015 20:28:08 +0000 Subject: - Add patch, to make verbose logging conditional - Bump PORTREVISION PR: 198560 Submitted by: Zhihao Yuan --- x11-wm/xfce4-session/Makefile | 1 + .../files/patch-xfce4-session_xfsm-global.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h (limited to 'x11-wm') diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index a80ccc257114..d890d26209ad 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-session PORTVERSION= 4.12.1 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 diff --git a/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h b/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h new file mode 100644 index 000000000000..71ab36ef6302 --- /dev/null +++ b/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h @@ -0,0 +1,16 @@ +Make verbose logging conditional (Bug #11698) + +--- xfce4-session/xfsm-global.h.orig 2014-09-28 14:51:01 UTC ++++ 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 + -- cgit v1.2.3