Accepting request 428952 from home:rmilasan:branches:X11:xfce

- xfce4-session-Make-verbose-logging-conditional.patch:
  Make verbose logging conditional (boo#999676).

OBS-URL: https://build.opensuse.org/request/show/428952
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=128

xfce4-session-Make-verbose-logging-conditional.patch

@@ -0,0 +1,28 @@
+From 26f9ae8df629f02af0773df2ed82db6b85c5b556 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@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@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
+

xfce4-session.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 19 17:55:53 UTC 2016 - robert@linux-source.org
+
+- xfce4-session-Make-verbose-logging-conditional.patch:
+  Make verbose logging conditional (boo#999676). 
+
 -------------------------------------------------------------------
 Mon Mar 16 08:45:42 UTC 2015 - gber@opensuse.org
 

xfce4-session.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xfce4-session
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,8 @@ Source0:        http://archive.xfce.org/src/xfce/xfce4-session/4.12/%{name}-%{ve
 Patch0:         xfce4-session-simple-splash-remove-shadows.patch
 # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 gber@opensuse.org -- Adapt upstream sessions script to openSUSE
 Patch1:         xfce4-session-adapt-session-scripts.patch
+# PATCH-FIX-UPSTREAM xfce4-session-Make-verbose-logging-conditional.patch boo#999676
+Patch2:         xfce4-session-Make-verbose-logging-conditional.patch
 BuildRequires:  iceauth
 BuildRequires:  intltool
 BuildRequires:  update-desktop-files
@@ -111,6 +113,7 @@ This package provides the upstream look and feel for the Xfce Session Manager.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 xdt-autogen