summaryrefslogtreecommitdiff
path: root/source/xfce/xfce4-systemload-plugin
diff options
context:
space:
mode:
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
-rwxr-xr-xsource/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild8
2 files changed, 30 insertions, 3 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
new file mode 100644
index 00000000..a40bedff
--- /dev/null
+++ b/source/xfce/xfce4-systemload-plugin/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch
@@ -0,0 +1,25 @@
+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/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
index 35501f90..427a3487 100755
--- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
+++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
@@ -30,7 +30,7 @@ BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,6 +69,8 @@ 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
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \