From b09fd3e104dae2ee469d038470afedcef6703c0b Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Thu, 4 Apr 2013 22:20:40 +0700 Subject: [PATCH] Fix CPU Applet Crashing on Load > Remove it from KNOWN ISSUE Signed-off-by: Willy Sudiarto Raharjo --- KNOWN_ISSUES.TXT | 5 ---- extra/mate-applets/cpufreq-gsetting.patch | 28 ++++++++++++++++++++++ extra/mate-applets/mate-applets.SlackBuild | 7 ++++-- 3 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 extra/mate-applets/cpufreq-gsetting.patch diff --git a/KNOWN_ISSUES.TXT b/KNOWN_ISSUES.TXT index ebbaa47..2b7463f 100644 --- a/KNOWN_ISSUES.TXT +++ b/KNOWN_ISSUES.TXT @@ -1,10 +1,5 @@ The following is a list of known issues with MATE on Slackware: -Wed Mar 27 12:10:09 UTC 2013 -CPU Frequency Scaling Monitor panel applet fails with a "quit unexpectedly" -error message. This is a known issue, see: -https://github.com/mate-desktop/mate-applets/issues/34 - Wed Mar 27 04:23:24 UTC 2013 If you have dual monitor with NVidia card and set it up to use both monitors as separate, you might encounter some freeze lockup. A temporary workaround diff --git a/extra/mate-applets/cpufreq-gsetting.patch b/extra/mate-applets/cpufreq-gsetting.patch new file mode 100644 index 0000000..2131943 --- /dev/null +++ b/extra/mate-applets/cpufreq-gsetting.patch @@ -0,0 +1,28 @@ +From a48819d511d123db2e45c7f159169910c0cf6dc9 Mon Sep 17 00:00:00 2001 +From: Stefano Karapetsas +Date: Thu, 04 Apr 2013 13:43:25 +0000 +Subject: cpufreq: Fix GSettings init + +--- +diff --git a/cpufreq/src/cpufreq-prefs.c b/cpufreq/src/cpufreq-prefs.c +index 38c0ca0..6fdfff4 100644 +--- a/cpufreq/src/cpufreq-prefs.c ++++ b/cpufreq/src/cpufreq-prefs.c +@@ -238,7 +238,6 @@ static void + cpufreq_prefs_setup (CPUFreqPrefs *prefs) + { + g_assert (G_IS_SETTINGS (prefs->priv->settings)); +- g_assert (prefs->priv->settings != NULL); + + prefs->priv->cpu = g_settings_get_int (prefs->priv->settings, "cpu"); + prefs->priv->show_mode = g_settings_get_int (prefs->priv->settings, "show-mode"); +@@ -256,6 +255,7 @@ cpufreq_prefs_new (GSettings *settings) + "gsettings", settings, + NULL)); + ++ prefs->priv->settings = settings; + cpufreq_prefs_setup (prefs); + + return prefs; +-- +cgit diff --git a/extra/mate-applets/mate-applets.SlackBuild b/extra/mate-applets/mate-applets.SlackBuild index 10e6502..55b86ba 100644 --- a/extra/mate-applets/mate-applets.SlackBuild +++ b/extra/mate-applets/mate-applets.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for mate-applets # Copyright 2013 Chess Griffin Raleigh, NC +# Copyright 2013 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +25,7 @@ PRGNAM=mate-applets VERSION=${VERSION:-1.6.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_msb} if [ -z "$ARCH" ]; then @@ -75,6 +76,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/cpufreq-gsetting.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./autogen.sh \ @@ -130,7 +133,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh # Remove help files for now - until MATE upstream fixes help documentation -# buttons and menuso. Confirmed help button problem w/ upstream. +# buttons and menus. Confirmed help button problem w/ upstream. for i in {mate-cpufreq-applet,mate-drivemount,mateweather,mate-char-palette,mate-accessx-status,mate-stickynotes_applet,mate-trashapplet,mate-battstat,mate-geyes,mate-invest-applet}; do find $PKG/usr/share/mate/help/$i/* -maxdepth 0 -type d ! -name C -exec rm -rf {} \; || true done