[packages/xfce4-session] - fix verbose logging enabled by default - rel 2

[baggins]

commit 149ecd404281f3230594831b86b3aafda71708b4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 15 22:55:37 2016 +0200

    - fix verbose logging enabled by default
    - rel 2

 verbose-logging.patch | 28 ++++++++++++++++++++++++++++
 xfce4-session.spec    |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 14af127..1b84def 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -7,7 +7,7 @@ Summary:	Xfce session manager
 Summary(pl.UTF-8):	Zarządca sesji Xfce
 Name:		xfce4-session
 Version:	4.12.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/xfce/%{name}/4.12/%{name}-%{version}.tar.bz2
@@ -18,6 +18,7 @@ Source1:	http://www.blues.gda.pl/SOURCES/%{name}-ubuntu_icons.tar.bz2
 # http://lists.fedoraproject.org/pipermail/devel-announce/2011-February/000758.html
 Source2:        polkit-mate-authentication-agent-1.desktop
 Patch0:		%{name}-ubuntu_icons.patch
+Patch1:		verbose-logging.patch
 URL:		http://www.xfce.org/projects/xfce4-session
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -94,6 +95,7 @@ Statyczna biblioteka zarządcy sesji dla środowiska Xfce.
 %prep
 %setup -q -a1
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
diff --git a/verbose-logging.patch b/verbose-logging.patch
new file mode 100644
index 0000000..3b9f247
--- /dev/null
+++ b/verbose-logging.patch
@@ -0,0 +1,28 @@
+From 26f9ae8df629f02af0773df2ed82db6b85c5b556 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Sat, 28 Mar 2015 16:57:24 +0300
+Subject: Make verbose logging conditional (Bug #11698)
+
+Bug report and patch submitted by Zhihao Yuan
+
+Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
+
+diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h
+index d2e0c29..d458712 100644
+--- a/xfce4-session/xfsm-global.h
++++ b/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 v0.10.1
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfce4-session.git/commitdiff/149ecd404281f3230594831b86b3aafda71708b4