Date: Tuesday, June 27, 2017 @ 03:51:38 Author: foutrelis Revision: 299280
upgpkg: xfce4-session 4.12.1-7 Make verbose logging conditional (FS#48955). Added: xfce4-session/trunk/0001-Make-verbose-logging-conditional-Bug-11698.patch Modified: xfce4-session/trunk/PKGBUILD -------------------------------------------------------+ 0001-Make-verbose-logging-conditional-Bug-11698.patch | 31 ++++++++++++++++ PKGBUILD | 7 +++ 2 files changed, 37 insertions(+), 1 deletion(-) Added: 0001-Make-verbose-logging-conditional-Bug-11698.patch =================================================================== --- 0001-Make-verbose-logging-conditional-Bug-11698.patch (rev 0) +++ 0001-Make-verbose-logging-conditional-Bug-11698.patch 2017-06-27 03:51:38 UTC (rev 299280) @@ -0,0 +1,31 @@ +From 26f9ae8df629f02af0773df2ed82db6b85c5b556 Mon Sep 17 00:00:00 2001 +From: Eric Koegel <eric.koe...@gmail.com> +Date: Sat, 28 Mar 2015 16:57:24 +0300 +Subject: [PATCH] Make verbose logging conditional (Bug #11698) + +Bug report and patch submitted by Zhihao Yuan + +Signed-off-by: Eric Koegel <eric.koe...@gmail.com> +--- + xfce4-session/xfsm-global.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +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 + +-- +2.13.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-27 02:21:20 UTC (rev 299279) +++ PKGBUILD 2017-06-27 03:51:38 UTC (rev 299280) @@ -4,7 +4,7 @@ pkgname=xfce4-session pkgver=4.12.1 -pkgrel=6 +pkgrel=7 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -21,10 +21,12 @@ replaces=('xfce-utils') source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch + 0001-Make-verbose-logging-conditional-Bug-11698.patch xfce4-session-source-system-xinitrc-scripts.patch xfce-polkit-gnome-authentication-agent-1.desktop) sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd' '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1' + '6bbd714008f31198f9631cdfb3ed8aac1c780f00d15b81c32c00860ae37521a6' 'a717a0ee6289c9ce06a8e18c6a7cb5a6d6f1769c05c456a6a84843df6a0111da' '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643') @@ -34,6 +36,9 @@ # https://bugzilla.xfce.org/show_bug.cgi?id=11759 patch -Np1 -i ../0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch + # https://bugzilla.xfce.org/show_bug.cgi?id=11698 + patch -Np1 -i ../0001-Make-verbose-logging-conditional-Bug-11698.patch + # https://bugzilla.xfce.org/show_bug.cgi?id=12754 patch -Np1 -i ../xfce4-session-source-system-xinitrc-scripts.patch }