diff options
Diffstat (limited to 'extra/i8kutils')
| -rw-r--r-- | extra/i8kutils/PKGBUILD | 30 | ||||
| -rw-r--r-- | extra/i8kutils/i8kutils-probe.diff | 84 |
2 files changed, 16 insertions, 98 deletions
diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD index e50f59444..220034c7e 100644 --- a/extra/i8kutils/PKGBUILD +++ b/extra/i8kutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 205566 2014-02-07 20:38:36Z eric $ +# $Id: PKGBUILD 208208 2014-03-19 01:47:32Z eric $ # Maintainer: pkgname=i8kutils -pkgver=1.40 -pkgrel=4 +pkgver=1.41 +pkgrel=1 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities" arch=('i686' 'x86_64') url="https://launchpad.net/i8kutils" @@ -11,30 +11,32 @@ license=('GPL') depends=('bash' 'acpi') optdepends=('tk: for i8kmon deamon') backup=('etc/i8kutils/i8kmon.conf') -source=(http://ftp.de.debian.org/debian/pool/main/i/${pkgname}/${pkgname}_${pkgver}.tar.gz - i8kmon.service i8kutils-probe.diff) -sha1sums=('584edfbd90aa167885520b84848381585d9212fb' - '5c20f5241de7e60b46117269f4e867b08734cdc8' - 'ab9058f92adb3e8b9306568005d5751908fb1765') +DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 --insecure -o %o %u') +source=(https://launchpad.net/i8kutils/trunk/${pkgver}/+download/i8kutils_${pkgver}.tar.gz{,.asc} + i8kmon.service) +sha1sums=('7baf9ed1b27f4bcab7a9a5c7c037d36c769945cc' + 'SKIP' + '5c20f5241de7e60b46117269f4e867b08734cdc8') prepare() { - cd $pkgname-$pkgver - patch -p0 -i "$srcdir"/i8kutils-probe.diff - + cd $pkgname # conform to Arch Linux guidelines sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1 sed -i 's|/etc/i8kmon.conf|/etc/i8kutils/i8kmon.conf|g' i8kmon + make clean } build() { - cd $pkgname-$pkgver + cd $pkgname make } package() { - cd $pkgname-$pkgver + cd $pkgname install -d "$pkgdir"/usr/{bin,share/man/man1} - make DESTDIR="$pkgdir" install install-man + install -D -m644 i8kctl.1 i8kmon.1 "$pkgdir/usr/share/man/man1" + install -D -m755 i8kctl i8kfan i8kmon "$pkgdir/usr/bin" + install -D -m644 i8kmon.conf "$pkgdir/etc/i8kutils/i8kmon.conf" install -D -m644 ../i8kmon.service "$pkgdir/usr/lib/systemd/system/i8kmon.service" } diff --git a/extra/i8kutils/i8kutils-probe.diff b/extra/i8kutils/i8kutils-probe.diff deleted file mode 100644 index 60485d737..000000000 --- a/extra/i8kutils/i8kutils-probe.diff +++ /dev/null @@ -1,84 +0,0 @@ -=== 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 - |