From 4c1d731fca10cd0aa6ccd71a6e3fe5349d5697a0 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 21 Dec 2020 22:23:10 +0000
Subject: Mon Dec 21 22:23:10 UTC 2020

a/kernel-generic-5.10.2-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.10.2-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.10.2-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.10.2-x86-1.txz:  Upgraded.
d/parallel-20201222-noarch-1.txz:  Upgraded.
d/python-setuptools-51.1.0-x86_64-1.txz:  Upgraded.
k/kernel-source-5.10.2-noarch-1.txz:  Upgraded.
  -USB_SISUSBVGA_CON y
   PCIE_BW y -> n
  Thanks to walecha.
l/gegl-0.4.28-x86_64-2.txz:  Rebuilt.
  Make sure gegl:introspect is available or GIMP won't start.
n/gnupg2-2.2.26-x86_64-1.txz:  Upgraded.
n/iproute2-5.10.0-x86_64-1.txz:  Upgraded.
n/ipset-7.10-x86_64-1.txz:  Upgraded.
x/liberation-fonts-ttf-2.1.2-noarch-1.txz:  Upgraded.
xfce/xfce4-systemload-plugin-1.2.4-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 .../xfce4-systemload-plugin.HOVER_TIMEOUT.diff     | 51 ----------------------
 .../xfce4-systemload-plugin.SlackBuild             |  4 +-
 2 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff

(limited to 'source/xfce')

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
deleted file mode 100644
index 648cb2026..000000000
--- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./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 d960ba4fe..83918e240 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:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -78,8 +78,6 @@ 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-80-g2a13