summaryrefslogtreecommitdiffstats
path: root/source/xfce/xfce4-systemload-plugin
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/xfce/xfce4-systemload-plugin
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xfce/xfce4-systemload-plugin')
-rw-r--r--source/xfce/xfce4-systemload-plugin/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch25
-rw-r--r--source/xfce/xfce4-systemload-plugin/slack-desc6
-rw-r--r--source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff51
-rwxr-xr-xsource/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild15
4 files changed, 66 insertions, 31 deletions
diff --git a/source/xfce/xfce4-systemload-plugin/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch b/source/xfce/xfce4-systemload-plugin/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch
deleted file mode 100644
index a40bedff0..000000000
--- a/source/xfce/xfce4-systemload-plugin/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ca2b7fdf3f684a55280174ecf20935c7f2e7c897 Mon Sep 17 00:00:00 2001
-From: Robby Workman <rw@rlworkman.net>
-Date: Tue, 17 Mar 2015 22:10:56 +0100
-Subject: [PATCH] g_free() on a GtkWidget is wrong on so many levels.. (bug
- #11713)
-
----
- panel-plugin/systemload.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
-index 628947e..4df29e5 100644
---- a/panel-plugin/systemload.c
-+++ b/panel-plugin/systemload.c
-@@ -394,7 +394,6 @@ monitor_free(XfcePanelPlugin *plugin, t_global_monitor *global)
- g_source_remove(global->timeout_id);
-
- g_free(global->command.command_text);
-- g_free(global->menu_item);
-
- for(count = 0; count < 3; count++)
- {
---
-2.3.3
-
diff --git a/source/xfce/xfce4-systemload-plugin/slack-desc b/source/xfce/xfce4-systemload-plugin/slack-desc
index e83e9306d..1f57f4003 100644
--- a/source/xfce/xfce4-systemload-plugin/slack-desc
+++ b/source/xfce/xfce4-systemload-plugin/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
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 000000000..2cdd26f82
--- /dev/null
+++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff
@@ -0,0 +1,51 @@
+--- ./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 427a3487d..f4b93c557 100755
--- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
+++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for xfce4-systemload-plugin
@@ -24,6 +24,8 @@
# Maintained by Ozan Turkyilmaz ozan.turkyilmaz@gmail.com
+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}
@@ -36,9 +38,16 @@ if [ -z "$ARCH" ]; then
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -69,7 +78,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-patch -p1 < $CWD/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch
+zcat $CWD/xfce4-systemload-plugin.HOVER_TIMEOUT.diff.gz | patch -p1 --verbose || exit 1
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \