From 03a61ce0245413a8759dd3391ca37dc25794f565 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 3 Dec 2018 20:59:30 +0000
Subject: Mon Dec  3 20:59:30 UTC 2018

ap/sqlite-3.26.0-x86_64-1.txz:  Upgraded.
l/libzip-1.5.1-x86_64-5.txz:  Rebuilt.
  Fixed path in libzip.pc. Thanks to orbea.
l/mozilla-nss-3.40.1-x86_64-1.txz:  Upgraded.
  Mitigate cache side-channel variant of the Bleichenbacher attack.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-12404
  (* Security fix *)
n/mutt-1.11.1-x86_64-1.txz:  Upgraded.
n/stunnel-5.50-x86_64-1.txz:  Upgraded.
xfce/xfce4-systemload-plugin-1.2.2-x86_64-2.txz:  Rebuilt.
  Applied reworked hover timeout patch. Thanks to Rod3775.
---
 .../xfce4-systemload-plugin.HOVER_TIMEOUT.diff     | 51 ++++++++++++++++++++++
 .../xfce4-systemload-plugin.SlackBuild             |  4 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff

(limited to 'source/xfce/xfce4-systemload-plugin')

diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff
new file mode 100644
index 00000000..648cb202
--- /dev/null
+++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff
@@ -0,0 +1,51 @@
+--- ./panel-plugin/systemload.c.orig	2018-11-29 10:44:33.000000000 -0600
++++ ./panel-plugin/systemload.c	2018-12-02 13:22:54.163384487 -0600
+@@ -55,6 +55,8 @@
+ static gchar *DEFAULT_COLOR[] = { "#0000c0", "#00c000", "#f0f000" };
+ static gchar *DEFAULT_COMMAND_TEXT = "xfce4-taskmanager";
+ 
++/* HOVER_TIMEOUT is a fixed constant in gtk+-3; this must match - Aargh */
++#define HOVER_TIMEOUT 500
+ #define UPDATE_TIMEOUT 500
+ #define UPDATE_TIMEOUT_SECONDS 1
+ 
+@@ -106,6 +108,7 @@
+     guint             timeout, timeout_seconds;
+     gboolean          use_timeout_seconds;
+     guint             timeout_id;
++    guint	      tooltip_timeout;
+     t_command         command;
+     t_monitor         *monitor[3];
+     t_uptime_monitor  *uptime;
+@@ -173,6 +176,9 @@
+                  global->monitor[count]->value_read / 100.0);
+         }
+     }
++/* don't write tooltip too often */
++    if((global->tooltip_timeout += global->timeout) <= HOVER_TIMEOUT) return TRUE;
++    global->tooltip_timeout = 0;
+     if (global->monitor[0]->options.enabled)
+     {
+         g_snprintf(caption, sizeof(caption), _("System Load: %ld%%"),
+@@ -335,6 +341,7 @@
+ #endif
+     global->plugin = plugin;
+     global->timeout = UPDATE_TIMEOUT;
++    global->tooltip_timeout = 0;
+     global->timeout_seconds = UPDATE_TIMEOUT_SECONDS;
+     global->use_timeout_seconds = TRUE;
+     global->timeout_id = 0;
+@@ -422,13 +429,6 @@
+     }
+ #endif
+     global->timeout_id = g_timeout_add(global->timeout, (GSourceFunc)update_monitors, global);
+-    /* reduce the default tooltip timeout to be smaller than the update interval otherwise
+-     * we won't see tooltips on GTK 2.16 or newer */
+-    settings = gtk_settings_get_default();
+-    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
+-        g_object_set(settings, "gtk-tooltip-timeout",
+-                     global->timeout - 10, NULL);
+-
+ }
+ 
+ static void
diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
index 01cfbbe9..c174e0e0 100755
--- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
+++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-systemload-plugin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -78,6 +78,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+zcat $CWD/xfce4-systemload-plugin.HOVER_TIMEOUT.diff.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-- 
cgit v1.2.3