diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-02 03:29:07 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-02 03:29:07 +0000 |
commit | 171120794a952c6e0e75aef6ecdf46cd6d5154c8 (patch) | |
tree | 963098bd54ea43d811307fd081a8d08380723e30 /extra/i8kutils | |
parent | 2d8813df5b3f8a63835a228496f998914755d820 (diff) |
Sun Feb 2 03:26:29 UTC 2014
Diffstat (limited to 'extra/i8kutils')
-rw-r--r-- | extra/i8kutils/PKGBUILD | 26 | ||||
-rw-r--r-- | extra/i8kutils/i8kutils-probe.diff | 84 |
2 files changed, 96 insertions, 14 deletions
diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD index 120c6a2fd..5eac42783 100644 --- a/extra/i8kutils/PKGBUILD +++ b/extra/i8kutils/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 185227 2013-05-12 10:04:52Z eric $ -# Maintainer: Thayer Williams <thayer@archlinux.org> -# Contributor: Eric Johnson <eric@coding-zone.com> +# $Id: PKGBUILD 204963 2014-02-01 21:25:15Z eric $ +# Maintainer: pkgname=i8kutils -pkgver=1.33 +pkgver=1.40 pkgrel=3 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities" arch=('i686' 'x86_64') -url="http://people.debian.org/~dz/i8k/" -license=('GPL2') -depends=('glibc') +url="https://launchpad.net/i8kutils" +license=('GPL') +depends=('bash') optdepends=('tk: for i8kmon deamon') -conflicts=('i8kmon') -provides=('i8kmon') -replaces=('i8kmon') backup=('etc/i8kutils/i8kmon.conf') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}_${pkgver}.tar.gz - i8kmon.service) -md5sums=('1ab077b301dbb0f4be8ef52eb3b97628' - '32c159616f72ab65969db95b9e824ced') +source=(http://ftp.de.debian.org/debian/pool/main/i/${pkgname}/${pkgname}_${pkgver}.tar.gz + i8kmon.service i8kutils-probe.diff) +sha1sums=('584edfbd90aa167885520b84848381585d9212fb' + '5c20f5241de7e60b46117269f4e867b08734cdc8' + 'ab9058f92adb3e8b9306568005d5751908fb1765') prepare() { cd $pkgname-$pkgver + patch -p0 -i "$srcdir"/i8kutils-probe.diff # conform to Arch Linux guidelines sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1 diff --git a/extra/i8kutils/i8kutils-probe.diff b/extra/i8kutils/i8kutils-probe.diff new file mode 100644 index 000000000..60485d737 --- /dev/null +++ b/extra/i8kutils/i8kutils-probe.diff @@ -0,0 +1,84 @@ +=== modified file 'i8kmon' +--- i8kmon 2013-11-23 19:41:17 +0000 ++++ i8kmon 2013-11-23 20:30:47 +0000 +@@ -27,6 +27,7 @@ + sysconfig /etc/i8kmon.conf + userconfig ~/.i8kmon + i8kfan /usr/bin/i8kfan ++ acpi "acpi" + geometry {} + use_conf 1 + auto 1 +@@ -202,22 +202,15 @@ + + set status(acpi_timer) [expr 60 / $config(timeout)] + +- set cmd "acpi -a"; set acpi_ac [eval exec $cmd] +- set cmd2 "acpitool -a"; set acpi_ac2 [eval exec $cmd2] +- set ret [string first "on-line" $acpi_ac] +- set ret2 [string first "online" $acpi_ac2] +- if {$ret >= 0 | $ret2 >= 0} { ++ set acpi_ac [exec {*}$config(acpi)] ++ if {[string match *on-line* $acpi_ac] || [string match *online* $acpi_ac]} { + set status(ac) 1 + } else { + set status(ac) 0 + } + + if {$config(verbose) > 0} { +- if {$ret >= 0} { +- puts "[clock seconds] acpi: $acpi_ac" +- } elseif {$ret2 >= 0} { +- puts "[clock seconds] acpi: $acpi_ac2" +- } ++ puts "[clock seconds] acpi: $acpi_ac" + } + + return 0 +@@ -495,8 +487,8 @@ + -a|--auto control automatically the fans + -na|--noauto don\x27t control automatically the fans + -d|--daemon run in daemon mode without user interface +- -nd|--nodaemon don\x27 run as daemon, open the user interface +- -nc|--nouserconfig don't use \$HOME/.i8kmon ++ -nd|--nodaemon don\x27t run as daemon, open the user interface ++ -nc|--nouserconfig don\x27t use \$HOME/.i8kmon + -v|--verbose report status on stdout + -g|--geometry <geom> set applet geometry + -t|--timeout <secs> set poll timeout +@@ -556,7 +548,7 @@ + } + + if {$config(verbose) > 0} { +- set copyright "Copyright (C) 2013 i8kutils <https://launchpad.net/i8kutils>" ++ set copyright "Copyright (C) 2013 Vitor Augusto <vitorafsr@gmail.com>" + puts "i8kmon $PROG_VERSION - $copyright" + parray config + parray status +@@ -596,8 +588,25 @@ + set status(rightspeed) "0 $rspeed1 $rspeed2 $rspeed3" + } + ++# probe external tools ++proc probe_tools {} { ++ ++ # The possibility of choosing 'acpi' or 'acpitool' is for compatibility ++ # between different architectures: amd64, i386, kFreeBSD ++ # This code below is strictly related on package dependency stated at ++ # keyword 'Depends:' on file 'debian/control' ++ if {![catch {exec acpi}]} { ++ set config(acpi) "acpi" ++ } elseif {[catch {exec acpitool}]} { ++ set config(acpi) "acpitool" ++ } else { ++ puts stderr "Package dependency problem: neither 'acpi' nor 'acpitool' package is installed" ++ } ++} ++ + proc main {} { + probe_fan_speed ++ probe_tools + read_config + parse_options + make_ui + |