diff options
author | Matteo Bernardini <ponce@slackbuilds.org> | 2019-03-11 11:23:56 +0100 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2019-03-16 06:53:36 +0700 |
commit | d1f9f51d309105f48feb0b6a701cf2770586fd97 (patch) | |
tree | 1eba86546e604a9661a937b84a007870f8c15645 /desktop | |
parent | 327a4d8ad1623238f82af697742f6426a25e1396 (diff) |
desktop/lxpanel: Updated for version 0.10.0.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/lxpanel/fix_battery_alarm.patch | 47 | ||||
-rw-r--r-- | desktop/lxpanel/lxpanel.SlackBuild | 10 | ||||
-rw-r--r-- | desktop/lxpanel/lxpanel.info | 6 |
3 files changed, 56 insertions, 7 deletions
diff --git a/desktop/lxpanel/fix_battery_alarm.patch b/desktop/lxpanel/fix_battery_alarm.patch new file mode 100644 index 0000000000000..2753619444404 --- /dev/null +++ b/desktop/lxpanel/fix_battery_alarm.patch @@ -0,0 +1,47 @@ +From 19936f24c343437447ef7e765113fc4679df07eb Mon Sep 17 00:00:00 2001 +From: Andriy Grytsenko <andrej@rep.kiev.ua> +Date: Wed, 27 Feb 2019 02:49:00 +0200 +Subject: [PATCH] fix battery alarm when measurement of current is missing. + +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854643 +--- + ChangeLog | 4 ++++ + plugins/batt/batt.c | 3 ++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index c0861de..0d610c8 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++0.10.1 ++------------------------------------------------------------------------- ++* Fixed battery alarm when measurement of current is missing. ++ + 0.10.0 + ------------------------------------------------------------------------- + * Fixed delayed application of font cnahges on dclock and weather plugins. +diff --git a/plugins/batt/batt.c b/plugins/batt/batt.c +index f47549c..cc7bfea 100644 +--- a/plugins/batt/batt.c ++++ b/plugins/batt/batt.c +@@ -111,6 +111,7 @@ static void * alarmProcess(void *arg) { + sem_wait(a->lock); + if (system(a->command) != 0) + g_warning("plugin batt: failed to execute alarm command \"%s\"", a->command); ++ sleep(51); /* do not spam messages more often than once a minute */ + sem_post(a->lock); + + g_free(a); +@@ -257,7 +258,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) { + isCharging = battery_is_charging ( b ); + + /* Consider running the alarm command */ +- if ( !isCharging && rate > 0 && ++ if ( !isCharging && + ( ( battery_get_remaining( b ) / 60 ) < (int)lx_b->alarmTime ) ) + { + /* FIXME: this should be done using glibs process functions */ +-- +2.1.4 + diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild index 5473b379ceba2..cce093b1e7497 100644 --- a/desktop/lxpanel/lxpanel.SlackBuild +++ b/desktop/lxpanel/lxpanel.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for lxpanel # (C) 2008 Michael Wagner <lapinours@web.de> -# Copyright 2011-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ # Modified by Matteo Bernardini <ponce@slackbuilds.org> PRGNAM=lxpanel -VERSION=${VERSION:-0.9.3} +VERSION=${VERSION:-0.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -43,8 +43,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS COPYING ChangeLog README" - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -59,6 +57,8 @@ else LIBDIRSUFFIX="" fi +DOCS="AUTHORS COPYING ChangeLog README" + set -e rm -rf $PKG @@ -74,6 +74,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/fix_battery_alarm.patch + sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info index 70a71212fdbf4..be31b8a229656 100644 --- a/desktop/lxpanel/lxpanel.info +++ b/desktop/lxpanel/lxpanel.info @@ -1,8 +1,8 @@ PRGNAM="lxpanel" -VERSION="0.9.3" +VERSION="0.10.0" HOMEPAGE="https://wiki.lxde.org/en/LXPanel" -DOWNLOAD="https://downloads.sf.net/lxde/lxpanel-0.9.3.tar.xz" -MD5SUM="57f0add873815dc608eb45241c9504a7" +DOWNLOAD="https://downloads.sf.net/lxde/lxpanel-0.10.0.tar.xz" +MD5SUM="e6a1f9bd5cf39812e1c5d2453a34a7c5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libfm" |