From 171120794a952c6e0e75aef6ecdf46cd6d5154c8 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 2 Feb 2014 03:29:07 +0000 Subject: Sun Feb 2 03:26:29 UTC 2014 --- extra/bluefish/PKGBUILD | 21 ++++++---- extra/freetds/PKGBUILD | 18 ++++---- extra/i8kutils/PKGBUILD | 26 ++++++------ extra/i8kutils/i8kutils-probe.diff | 84 ++++++++++++++++++++++++++++++++++++++ extra/mpg123/PKGBUILD | 6 +-- extra/xf86-video-intel/PKGBUILD | 8 ++-- 6 files changed, 124 insertions(+), 39 deletions(-) create mode 100644 extra/i8kutils/i8kutils-probe.diff (limited to 'extra') diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD index a1e1e6628..f8095da0f 100644 --- a/extra/bluefish/PKGBUILD +++ b/extra/bluefish/PKGBUILD @@ -1,33 +1,36 @@ -# $Id: PKGBUILD 197875 2013-10-30 11:24:20Z allan $ +# $Id: PKGBUILD 204944 2014-02-01 05:29:28Z eric $ # Maintainer: Eric Bélanger pkgname=bluefish -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=1 pkgdesc="A powerful HTML editor for experienced web designers and programmers" arch=('i686' 'x86_64') url="http://bluefish.openoffice.nl/" license=('GPL3') -depends=('gtk3' 'enchant' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') +depends=('gtk3' 'enchant' 'python2' 'desktop-file-utils') makedepends=('gucharmap' 'intltool') optdepends=('gucharmap: for using the charmap plugin') install=bluefish.install source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig}) -sha1sums=('b65310617b5fd525a8c57f7681e023f6f4496378' - '6ff0474602c520e2a638436c5423957cfe4be4d0') +sha1sums=('efdd577a20a439e58f14f68e725f00be230d5de1' + 'SKIP') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ src/plugin_zencoding/zencoding/{,filters/,actions/}*.py \ data/{cssmin.py,jsbeautify,jsmin.py,lorem-ipsum-generator} - +} + +build() { + cd ${pkgname}-${pkgver} PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-spell-check --disable-update-databases --disable-xml-catalog-update make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD index 713e930fa..0fb991713 100644 --- a/extra/freetds/PKGBUILD +++ b/extra/freetds/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 197962 2013-10-30 11:56:55Z allan $ +# $Id: PKGBUILD 204952 2014-02-01 16:16:26Z eric $ # Maintainer: -# Contributor: Aaron Malone pkgname=freetds pkgver=0.91 -pkgrel=3 +pkgrel=4 pkgdesc='Library for accessing Sybase and MS SQL Server databases' url='http://www.freetds.org' arch=('i686' 'x86_64') license=('LGPL') -depends=('unixodbc') +depends=('openssl' 'unixodbc') backup=('etc/freetds/freetds.conf' 'etc/freetds/locales.conf' 'etc/freetds/pool.conf') @@ -17,12 +16,13 @@ source=("ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${pkgver}.tar.bz2") md5sums=('e88e96800c89d62307812315b235eb18') build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0 - make + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc/freetds --enable-msdblib \ + --with-tdsver=7.0 --with-unixodbc=/usr --with-openssl + make } package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } 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 -# Contributor: Eric Johnson +# $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 set applet geometry + -t|--timeout set poll timeout +@@ -556,7 +548,7 @@ + } + + if {$config(verbose) > 0} { +- set copyright "Copyright (C) 2013 i8kutils " ++ set copyright "Copyright (C) 2013 Vitor Augusto " + 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 + diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 0b7fbb569..52e2f9f9e 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 203182 2014-01-05 00:11:38Z eric $ +# $Id: PKGBUILD 204942 2014-02-01 04:52:42Z eric $ # Maintainer: Eric Bélanger pkgname=mpg123 -pkgver=1.17.0 +pkgver=1.18.0 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('sdl: for sdl audio support' 'jack: for jack audio support' 'libpulse: for pulse audio support') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('8185f06ab94651adb2fc7a1ab860f0fd154b6f80' +sha1sums=('d6e59eeb972a7d11dfcc7505cf1f3e0ae875f439' 'SKIP') build() { diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 44e41a8f2..efc847fdb 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204358 2014-01-17 21:31:02Z andyrtr $ +# $Id: PKGBUILD 204961 2014-02-01 20:25:59Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.99.907 -pkgrel=2 +pkgver=2.99.909 +pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') @@ -24,7 +24,7 @@ conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERS 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d0b02255f0ff4baa863f762bef49707ce0b4094a267a26e32e4270abe141117b') +sha256sums=('7541187161ee379f07591e1d2655f51e2d9772d98b34e8f21d7159d28ce70f55') build() { cd ${pkgname}-${pkgver} -- cgit v1.2.3-54-g00ecf