summaryrefslogtreecommitdiff
path: root/source/xfce/xfce4-systemload-plugin
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-12-01 03:16:35 +0000
committerEric Hameleers <alien@slackware.com>2018-12-01 08:59:43 +0100
commita2792a0934ceb485e388584ba06f9f66cb1dabcc (patch)
tree162163fa208055dadd00bcaefc9650af724d422f /source/xfce/xfce4-systemload-plugin
parent6aa2cc8350712ea9d90cb4905aae2b1dd3a68038 (diff)
downloadcurrent-a2792a0934ceb485e388584ba06f9f66cb1dabcc.tar.gz
Sat Dec 1 03:16:35 UTC 201820181201031635
ap/texinfo-6.5-x86_64-7.txz: Rebuilt. Recompiled against perl-5.28.1. ap/vim-8.1.0552-x86_64-1.txz: Upgraded. Compiled against perl-5.28.1. d/perl-5.28.1-x86_64-1.txz: Upgraded. Upgraded DBD-mysql-4.049, DBI-1.642, abd IO-Socket-SSL-2.060. Added Devel-CheckLib-1.13 (needed by DBD-mysql-4.049). kde/perlkde-4.14.3-x86_64-7.txz: Rebuilt. Recompiled against perl-5.28.1. kde/perlqt-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against perl-5.28.1. n/epic5-2.0.1-x86_64-7.txz: Rebuilt. Recompiled against perl-5.28.1. n/irssi-1.1.1-x86_64-5.txz: Rebuilt. Recompiled against perl-5.28.1. n/net-snmp-5.8-x86_64-4.txz: Rebuilt. Recompiled against perl-5.28.1. n/ntp-4.2.8p12-x86_64-4.txz: Rebuilt. Recompiled against perl-5.28.1. xap/hexchat-2.14.2-x86_64-2.txz: Rebuilt. Recompiled against perl-5.28.1. xap/mozilla-thunderbird-60.3.2-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/60.3.2/releasenotes/ xap/rxvt-unicode-9.22-x86_64-6.txz: Rebuilt. Recompiled against perl-5.28.1. xap/vim-gvim-8.1.0552-x86_64-1.txz: Upgraded. Compiled against perl-5.28.1. xfce/xfce4-systemload-plugin-1.2.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xfce/xfce4-systemload-plugin')
-rw-r--r--source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff51
-rwxr-xr-xsource/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild4
2 files changed, 1 insertions, 54 deletions
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 2cdd26f8..00000000
--- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./panel-plugin/systemload.c.orig 2017-02-09 13:22:46.000000000 -0600
-+++ ./panel-plugin/systemload.c 2018-04-15 14:28:15.729304272 -0500
-@@ -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 250
- #define UPDATE_TIMEOUT_SECONDS 1
-
-@@ -107,6 +109,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;
-@@ -174,6 +177,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%%"),
-@@ -338,6 +344,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;
-@@ -435,13 +442,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 c174e0e0..01cfbbe9 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 \