Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2016-09-24 15:28:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-session" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2015-03-18 13:05:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2016-09-24 15:29:15.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 19 17:55:53 UTC 2016 - [email protected] + +- xfce4-session-Make-verbose-logging-conditional.patch: + Make verbose logging conditional (boo#999676). + +------------------------------------------------------------------- New: ---- xfce4-session-Make-verbose-logging-conditional.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-session.spec ++++++ --- /var/tmp/diff_new_pack.8WVVIw/_old 2016-09-24 15:29:17.000000000 +0200 +++ /var/tmp/diff_new_pack.8WVVIw/_new 2016-09-24 15:29:17.000000000 +0200 @@ -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 @@ Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 [email protected] -- 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 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build xdt-autogen ++++++ xfce4-session-Make-verbose-logging-conditional.patch ++++++ >From 26f9ae8df629f02af0773df2ed82db6b85c5b556 Mon Sep 17 00:00:00 2001 From: Eric Koegel <[email protected]> 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 <[email protected]> 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
