diff options
Diffstat (limited to 'extra')
79 files changed, 1008 insertions, 442 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 59c134e35..a3b1e81c6 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 150439 2012-02-17 19:32:24Z giovanni $ +# $Id: PKGBUILD 151264 2012-02-25 10:26:10Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10759 +pkgver=10765 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('52f319a1e05edf85ea3204c1a69cccb2') +md5sums=('62d408a9e524452ebf51e807122320b0') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 3f0574d4e..f4fb7d41e 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138815 2011-09-28 12:33:40Z schiv $ +# $Id: PKGBUILD 151373 2012-02-25 18:36:44Z schiv $ # Maintainer: tobias <tobias@archlinux.org> # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ pkgname=ardour pkgver=2.8.12 -pkgrel=1 +pkgrel=2 pkgdesc="A multichannel hard disk recorder and digital audio workstation" arch=('i686' 'x86_64') url="http://ardour.org/" @@ -20,8 +20,8 @@ depends=('liblrdf>=0.4.0-8' 'liblo' 'libusb-compat' # +soundtouch (these +/- changes are for SYSLIBS) # liblrdf versioned for https://bugs.archlinux.org/task/25005 # slv2 versioned for https://bugs.archlinux.org/task/25060 -makedepends=('scons' 'boost' 'cwiid') -optdepends=('cwiid: Wiimote support') +makedepends=('scons' 'boost') +#optdepends=('cwiid: Wiimote support') changelog=${pkgname}.changelog source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.desktop) @@ -38,7 +38,7 @@ build() { DIST_LIBDIR="lib" \ FREEDESKTOP=0 \ FREESOUND=1 \ - WIIMOTE=1 \ + WIIMOTE=0 \ SYSLIBS=0 \ DESTDIR="${pkgdir}" } diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD index 0e4920fe7..b9b39db34 100644 --- a/extra/bochs/PKGBUILD +++ b/extra/bochs/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 127309 2011-06-13 01:13:14Z kevin $ +# $Id: PKGBUILD 151161 2012-02-25 06:28:51Z pierre $ #Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=bochs -pkgver=2.4.6 +pkgver=2.5.1 pkgrel=1 pkgdesc="A portable x86 PC emulation software package" arch=('i686' 'x86_64') license=('LGPL') url="http://bochs.sourceforge.net/" -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") depends=('gcc-libs' 'libxrandr') -sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9') +md5sums=('4fe5325ec422a7f74dbb0adb52c76bb6') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \ - --enable-fpu --enable-3dnow + ./configure --prefix=/usr --without-wx --enable-cpu-level=6 \ + --enable-fpu --enable-3dnow make } diff --git a/extra/clisp/PKGBUILD b/extra/clisp/PKGBUILD index a6451270c..eed5c6e36 100644 --- a/extra/clisp/PKGBUILD +++ b/extra/clisp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 90068 2010-09-07 13:27:59Z juergen $ +# $Id: PKGBUILD 151174 2012-02-25 06:56:49Z pierre $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=clisp pkgver=2.49 -pkgrel=1 +pkgrel=2 pkgdesc="ANSI Common Lisp interpreter, compiler and debugger" arch=('i686' 'x86_64') license=('GPL') @@ -10,18 +10,26 @@ url="http://clisp.cons.org/" depends=('readline' 'libsigsegv') provides=('common-lisp') makedepends=('ffcall') -options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/clisp/clisp-${pkgver}.tar.bz2) +options=('!makeflags' '!emptydirs') +source=("http://downloads.sourceforge.net/sourceforge/clisp/clisp-${pkgver}.tar.bz2") md5sums=('1962b99d5e530390ec3829236d168649') build() { cd $srcdir/${pkgname}-${pkgver} - unset CFLAGS CXXFLAGS ./configure --prefix=/usr --with-readline --with-ffcall src cd src ./makemake --prefix=/usr --with-readline --with-ffcall --with-dynamic-ffi > Makefile - make || return 1 + make sed -i 's,http://www.lisp.org/HyperSpec/,http://www.lispworks.com/reference/HyperSpec/,g' config.lisp - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make +} + +check() { + cd $srcdir/${pkgname}-${pkgver}/src + make check +} + +package() { + cd $srcdir/${pkgname}-${pkgver}/src + make DESTDIR=$pkgdir install } diff --git a/extra/cx_freeze/PKGBUILD b/extra/cx_freeze/PKGBUILD index ee7476c7b..02591e1bd 100644 --- a/extra/cx_freeze/PKGBUILD +++ b/extra/cx_freeze/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 116705 2011-03-25 11:30:44Z schiv $ +# $Id: PKGBUILD 151178 2012-02-25 07:00:37Z pierre $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ pkgname=cx_freeze _tarname=cx_Freeze pkgver=4.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A set of utilities for freezing Python scripts into executables" arch=('i686' 'x86_64') url="http://www.python.net/crew/atuining/cx_Freeze/" diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index c71137bf8..29f30028c 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 150139 2012-02-13 12:13:16Z andyrtr $ +# $Id: PKGBUILD 151364 2012-02-25 17:40:42Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.0.18 -pkgrel=1 +pkgver=2.1.1 +pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') url="http://dovecot.org/" license=("LGPL") depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10' 'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl') -makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22') -optdepends=('libldap: ldap plugin') +makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene') +optdepends=('libldap: ldap plugin' + 'clucene: alternative FTS indexer') provides=('imap-server' 'pop3-server') options=('!libtool') backup=(etc/dovecot/dovecot.conf @@ -24,9 +25,9 @@ backup=(etc/dovecot/dovecot.conf etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext etc/ssl/dovecot-openssl.cnf) install=$pkgname.install -source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) -md5sums=('4fdee96b390a287d75b51ffcf6abe30f' - 'c317125fd613a6ed207fbaf7d7543163' +source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) +md5sums=('db41a4de848d2bc834c30af0eb5575fd' + 'e3bf2c4989ccb8a30a5d80ae89b06f76' '587159e84e2da6f83d70b3c706ba87cc') build() { @@ -47,6 +48,7 @@ build() { --with-zlib --with-bzlib \ --with-libcap \ --with-solr \ + --with-lucene \ --with-docs make } diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD index 1a24e90ca..2a39d83b0 100644 --- a/extra/dssi/PKGBUILD +++ b/extra/dssi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140086 2011-10-06 09:24:49Z schiv $ +# $Id: PKGBUILD 151210 2012-02-25 08:01:57Z pierre $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=dssi pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="An API for audio processing plugins & softsynths with UIs" arch=('i686' 'x86_64') url="http://dssi.sourceforge.net/" diff --git a/extra/expect/ChangeLog b/extra/expect/ChangeLog index d43e10c0c..f0432ba02 100644 --- a/extra/expect/ChangeLog +++ b/extra/expect/ChangeLog @@ -1,3 +1,8 @@ +2011-01-01 Allan McRae <allan@archlinux.org> + + * expect 5.45-2 + - Package signing rebuild + 2011-01-01 kevin <kevin@archlinux.org> * expect 5.45-1 diff --git a/extra/expect/PKGBUILD b/extra/expect/PKGBUILD index 3b630ba43..140b4a43f 100644 --- a/extra/expect/PKGBUILD +++ b/extra/expect/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 104372 2011-01-01 23:52:17Z kevin $ +# $Id: PKGBUILD 151250 2012-02-25 10:00:44Z allan $ # Maintainer: kevin <kevin@archlinux.org> pkgname=expect pkgver=5.45 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for automating interactive applications" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.nist.gov/el/msid/expect.cfm" license=('custom') depends=('tcl>=8.5.3') @@ -28,6 +28,10 @@ build() { # Keep $startdir/pkg out of library search paths. sed -e 's/-rpath,${LIB_RUNTIME_DIR}:/-rpath,/' -i Makefile make +} + +package() { + cd ${srcdir}/expect${pkgver} make DESTDIR=${pkgdir} install # license. diff --git a/extra/fastjar/PKGBUILD b/extra/fastjar/PKGBUILD index 345493735..d34ff0a77 100644 --- a/extra/fastjar/PKGBUILD +++ b/extra/fastjar/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 123670 2011-05-12 09:09:06Z guillaume $ +# $Id: PKGBUILD 151330 2012-02-25 14:29:04Z pierre $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=fastjar pkgver=0.98 -pkgrel=1 +pkgrel=2 pkgdesc="Sun java jar compatible archiver" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/fastjar" license=('GPL') depends=('zlib' 'texinfo') install=fastjar.install -source=(http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('d2d264d343d4d0e1575832cc1023c3bf') build() { diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD index 65087f373..700a817f2 100644 --- a/extra/fftw/PKGBUILD +++ b/extra/fftw/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 136896 2011-09-02 17:27:59Z ronald $ +# $Id: PKGBUILD 151333 2012-02-25 14:36:24Z pierre $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=fftw pkgver=3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library for computing the discrete Fourier transform (DFT)" arch=('i686' 'x86_64') license=('GPL2') url="http://www.fftw.org/" depends=('glibc' 'bash') makedepends=('gcc-fortran') -options=(!libtool) -source=(http://www.fftw.org/${pkgname}-${pkgver}.tar.gz) +options=('!libtool') +source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz") install=fftw.install sha1sums=('e44493ba4babeacba184568e727876d9aed44205') diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD index b54502a19..4e383731b 100644 --- a/extra/fluidsynth/PKGBUILD +++ b/extra/fluidsynth/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 137033 2011-09-05 17:19:25Z schiv $ +# $Id: PKGBUILD 151334 2012-02-25 14:36:41Z pierre $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=fluidsynth pkgver=1.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications" arch=('i686' 'x86_64') url="http://www.fluidsynth.org/" depends=('glib2' 'jack' 'dbus-core' 'libpulse') makedepends=('cmake' 'ladspa' 'doxygen') -optdepends=('pulseaudio: PulseAudio sound support' - 'bash: init script') +optdepends=('pulseaudio: PulseAudio sound support') license=('LGPL') backup=('etc/conf.d/fluidsynth') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index 86d445528..d92ecb746 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 117538 2011-04-04 10:27:03Z jgc $ +# $Id: PKGBUILD 151260 2012-02-25 10:17:00Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> @@ -6,7 +6,7 @@ pkgname=giflib pkgver=4.1.6 -pkgrel=4 +pkgrel=5 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64') @@ -26,14 +26,19 @@ build() { autoreconf ./configure --prefix=/usr --disable-static make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" # libungif compatibility - instructions taken from Redhat specfile MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'` gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 libungif.so.${pkgver} "${pkgdir}/usr/lib/" ln -sf libungif.so.${pkgver} "${pkgdir}/usr/lib/libungif.so.4" ln -sf libungif.so.4 "${pkgdir}/usr/lib/libungif.so" + + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 2ce59e323..ef7d50468 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 138768 2011-09-28 01:47:51Z kevin $ +# $Id: PKGBUILD 151329 2012-02-25 14:28:40Z pierre $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 -pkgdesc="A platform independent GUI for Apple's iPod using GTK2" +pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" license=('GPL') -depends=('anjuta' 'curl' 'dconf' 'flac' 'libid3tag' 'libgpod>=0.8.0') +depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk') makedepends=('flex' 'intltool') optdepends=('libmp4v2: MP4/h264 support' 'vorbis-tools: OGG support' 'id3v2: mp3 conversion support') install=gtkpod.install -source=(http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz) -md5sums=('8e01f7cf2db1a421140eab561aee26d7') +options=('!libtool') +source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz") +md5sums=('36fd0324fd1d1da00fcddacef1b09983') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/hspell/PKGBUILD b/extra/hspell/PKGBUILD index 21ddd78d4..a29064d56 100644 --- a/extra/hspell/PKGBUILD +++ b/extra/hspell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143756 2011-11-28 20:54:27Z andyrtr $ +# $Id: PKGBUILD 151262 2012-02-25 10:23:43Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase=hspell pkgname=('hspell' 'hunspell-he') pkgver=1.1 -pkgrel=1 -arch=(i686 x86_64) +pkgrel=2 +arch=('i686' 'x86_64') license=('GPL') url="http://www.ivrix.org.il/projects/spell-checker/" makedepends=('glibc' 'zlib' 'perl' 'hunspell' 'gawk') @@ -44,8 +44,8 @@ package_hunspell-he() { cd "${srcdir}/${pkgbase}-${pkgver}" install -dm755 ${pkgdir}/usr/share/hunspell - cp -p hunspell/new_he.dic ${pkgdir}/usr/share/hunspell/he_IL.dic - cp -p hunspell/new_he.aff ${pkgdir}/usr/share/hunspell/he_IL.aff + install -m644 hunspell/new_he.dic ${pkgdir}/usr/share/hunspell/he_IL.dic + install -m644 hunspell/new_he.aff ${pkgdir}/usr/share/hunspell/he_IL.aff # the symlinks install -dm755 ${pkgdir}/usr/share/myspell/dicts diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD index 483d3300f..a8768b8bf 100644 --- a/extra/id3lib/PKGBUILD +++ b/extra/id3lib/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 123876 2011-05-14 00:23:46Z andrea $ -# Maintainer: +# $Id: PKGBUILD 151326 2012-02-25 14:15:27Z pierre $ # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=id3lib pkgver=3.8.3 -pkgrel=11 +pkgrel=12 pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('LGPL') url="http://id3lib.sourceforge.net/" depends=('zlib' 'gcc-libs') diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD index 9a879d865..ba651684f 100644 --- a/extra/imake/PKGBUILD +++ b/extra/imake/PKGBUILD @@ -1,46 +1,53 @@ -# $Id: PKGBUILD 87585 2010-08-17 07:28:34Z jgc $ +# $Id: PKGBUILD 151214 2012-02-25 08:26:04Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=imake -pkgver=1.0.3 -pkgrel=2 +pkgver=1.0.4 +pkgrel=1 pkgdesc="X.Org imake program and related utilities" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') -depends=(glibc) -makedepends=(pkgconfig xproto perl) +depends=('glibc') +makedepends=('pkgconfig' 'xproto' 'perl') optdepends=('perl: for mkhtmlindex') -source=(http://xorg.freedesktop.org/releases/individual/util/imake-1.0.3.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.2.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.3.tar.bz2 - linuxconfig.patch - xorg-cf-files-1.0.2-xprint.patch - LICENSE) -md5sums=('ff553c4646edcc9e76b7308991ad421a' +source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2" + 'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2' + 'linuxconfig.patch' + 'LICENSE') +md5sums=('48133c75bd77c127c7eff122e08ebbf6' 'b533c0771dbbaf9b041ff35bb941d3a2' '619acbb2ed766d7762f02328513b1f72' - '62e58330fe8d1e3e28c7a45779833a48' - '10546b5ddda3cdda7950bb56bf98e0ea' + '4e6cb97bbecfbb34f3f644a75e513093' + '700c6d040d36a569e657a3ba5e1d8b24' 'b3385d8efbbe7c7fc50ed3a96ce37a16' - '82356cfc8a761c85b0b37736fc91f604' 'f5767133ef7a98a0bfa15139e0e3d32e') build() { - cd ${srcdir}/xorg-cf-files-1.0.3* - patch -Np1 -i "${srcdir}/linuxconfig.patch" || return 1 - patch -Np1 -i "${srcdir}/xorg-cf-files-1.0.2-xprint.patch" || return 1 + cd ${srcdir}/xorg-cf-files-1.0.4 + patch -p1 -i "${srcdir}/linuxconfig.patch" cd "${srcdir}" for i in *; do if [ -d "${i}" ]; then pushd "${i}" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man + make popd fi done - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 +} + +package() { + cd "${srcdir}" + for i in *; do + if [ -d "${i}" ]; then + pushd "${i}" + make DESTDIR="${pkgdir}" install + popd + fi + done + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/kdevelop-pg-qt/PKGBUILD b/extra/kdevelop-pg-qt/PKGBUILD index 82ab9fb0d..496b2d67a 100644 --- a/extra/kdevelop-pg-qt/PKGBUILD +++ b/extra/kdevelop-pg-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144905 2011-12-09 16:07:54Z andrea $ +# $Id: PKGBUILD 151356 2012-02-25 16:59:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-pg-qt -pkgver=0.9.5 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="KDevelop Parser Generator, a LL(1) parser generator used by KDevelop language plugins" arch=('i686' 'x86_64') url="http://www.kdevelop.org/" @@ -11,7 +11,7 @@ license=('GPL') depends=('kdevelop') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('b5bcb46a490bfb6a2d04c48cb28e0c77cdde183f') +sha1sums=('468bc91c5be16061dc265e9471f75462b32b73d5') build() { cd ${srcdir} diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD index 6bcb2cc66..2c2f6c7f3 100644 --- a/extra/kdevelop-php/PKGBUILD +++ b/extra/kdevelop-php/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145872 2012-01-03 14:17:04Z andrea $ +# $Id: PKGBUILD 151362 2012-02-25 17:02:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-php -pkgver=1.2.3 -_pkgver=4.2.3 -pkgrel=2 +pkgver=1.2.90 +_pkgver=4.2.90 +pkgrel=1 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta" arch=('i686' 'x86_64') url="http://www.kdevelop.org/" @@ -13,10 +13,9 @@ depends=('kdevelop-pg-qt') makedepends=('cmake' 'automoc4') replaces=('kdevelop-php-docs') conflicts=('kdevelop-php-docs') -source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - "http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-docs-${pkgver}.tar.bz2") -sha1sums=('b0dc43cf01d2005f2ad66872ce6b49b093a7ceb4' - 'e399465638457fe015e920227e3aca5a53716804') +source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) +sha1sums=('51511e78067a98a69003ba8bc36cf677dba9c69a' + '03747b9abcc6a7144a5e6ec914e513fc258c29b8') build() { cd "${srcdir}" diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index 877c469ca..c7bebec61 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 145874 2012-01-03 14:26:18Z andrea $ +# $Id: PKGBUILD 151360 2012-02-25 17:01:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevelop -pkgver=4.2.3 -pkgrel=3 +pkgver=4.2.90 +pkgrel=1 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64') url="http://www.kdevelop.org/" license=('GPL') depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-kwrite') -makedepends=('cmake' 'automoc4' 'perl') +makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('e87ae29b343df3fea9bda7d8d85ec696e57b68e4') +sha1sums=('459dbbc51f157b9a9322bf429bec84a881473f32') build() { cd "${srcdir}" diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index 32981bc0c..6792028a4 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 144973 2011-12-12 18:32:32Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 151358 2012-02-25 17:00:52Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevplatform -pkgver=1.2.3 -_pkgver=4.2.3 -pkgrel=2 +pkgver=1.2.90 +_pkgver=4.2.90 +pkgrel=1 pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64') url="http://www.kdevelop.org/" @@ -15,15 +14,10 @@ depends=('kdelibs' 'subversion' 'qjson') optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install -source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'subversion17.patch') -sha1sums=('c8badd157c2477b1b299403d01d40f68a1ba14cd' - '08e2ab2005a7a447f1733e8449a9bc926035fb9e') +source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('1049eb9c723225c24a38cf2e34381feb370013fc') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/subversion17.patch - cd "${srcdir}" mkdir build cd build diff --git a/extra/libfontenc/PKGBUILD b/extra/libfontenc/PKGBUILD index 1d7ca277f..89ef62d2c 100644 --- a/extra/libfontenc/PKGBUILD +++ b/extra/libfontenc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96490 2010-10-21 21:08:10Z jgc $ +# $Id: PKGBUILD 151268 2012-02-25 10:31:13Z allan $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libfontenc pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="X11 font encoding library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('zlib') @@ -18,10 +18,12 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --with-encodingsdir=/usr/share/fonts/encodings - + --with-encodingsdir=/usr/share/fonts/encodings make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/libice/PKGBUILD b/extra/libice/PKGBUILD index a350cfaf7..6f64276a6 100644 --- a/extra/libice/PKGBUILD +++ b/extra/libice/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 96500 2010-10-21 21:18:07Z jgc $ +# $Id: PKGBUILD 151270 2012-02-25 10:36:47Z allan $ # Contributor: Alexander Baldeck <alexander@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=libice pkgver=1.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Inter-Client Exchange library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" depends=('glibc' 'xproto>=7.0.18') makedepends=('pkgconfig' 'xtrans>=1.2.5') @@ -18,8 +19,11 @@ build() { cd "${srcdir}/libICE-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc make +} + +package() { + cd "${srcdir}/libICE-${pkgver}" make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index c2bd39665..866cefa5d 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 149956 2012-02-11 23:31:02Z allan $ +# $Id: PKGBUILD 151286 2012-02-25 12:53:00Z pierre $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libmp3splt -pkgver=0.7 -pkgrel=2 +pkgver=0.7.1 +pkgrel=1 pkgdesc="Library for splitting mp3 and ogg files without decoding" arch=('i686' 'x86_64') url="http://mp3splt.sourceforge.net" license=('GPL') -depends=('libmad' 'libvorbis' 'libid3tag' 'libtool') -makedepends=('git') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz) -md5sums=('dadb166361e2a28955032a1b9f10ed38') +depends=('libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl') +makedepends=('libtool') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz") +md5sums=('62025951f483334f14f1b9be58162094') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/libsm/PKGBUILD b/extra/libsm/PKGBUILD index 0abf5d86c..efe242c63 100644 --- a/extra/libsm/PKGBUILD +++ b/extra/libsm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97792 2010-11-01 22:14:37Z jgc $ +# $Id: PKGBUILD 151272 2012-02-25 10:40:09Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsm pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Session Management library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libice' 'util-linux-ng') @@ -18,8 +18,11 @@ build() { cd "${srcdir}/libSM-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc make +} + +package() { + cd "${srcdir}/libSM-${pkgver}" make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/libspectre/PKGBUILD b/extra/libspectre/PKGBUILD index bbef6cfbc..08a6f7952 100644 --- a/extra/libspectre/PKGBUILD +++ b/extra/libspectre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94716 2010-10-10 10:09:55Z andyrtr $ +# $Id: PKGBUILD 151274 2012-02-25 10:45:30Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libspectre pkgver=0.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="Small library for rendering Postscript documents" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL2') url="http://libspectre.freedesktop.org/wiki/" depends=('ghostscript>=9.00') diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD index 2836a8ceb..eff5f89ad 100644 --- a/extra/libtasn1/PKGBUILD +++ b/extra/libtasn1/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 119236 2011-04-11 12:58:31Z jgc $ +# $Id: PKGBUILD 151276 2012-02-25 10:48:25Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=libtasn1 pkgver=2.9 -pkgrel=1 +pkgrel=2 pkgdesc="The ASN.1 library used in GNUTLS" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/libtasn1/" depends=('glibc' 'texinfo') diff --git a/extra/libtextcat/PKGBUILD b/extra/libtextcat/PKGBUILD index dfccfb8db..55673275b 100644 --- a/extra/libtextcat/PKGBUILD +++ b/extra/libtextcat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122957 2011-05-07 14:06:48Z andyrtr $ +# $Id: PKGBUILD 151316 2012-02-25 13:40:31Z allan $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgname=libtextcat pkgver=2.2 -pkgrel=8 +pkgrel=9 pkgdesc="Library that implements N-gram-based text categorization" arch=('i686' 'x86_64') url="http://software.wise-guys.nl/libtextcat/" diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD index b9032299c..e70cdb796 100644 --- a/extra/libwpd/PKGBUILD +++ b/extra/libwpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122922 2011-05-07 10:20:23Z andyrtr $ +# $Id: PKGBUILD 151318 2012-02-25 13:42:09Z allan $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libwpd pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="Library for importing WordPerfect (tm) documents" arch=('i686' 'x86_64') url="http://libwpd.sourceforge.net/" diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD index 650e94400..011d4a9ba 100644 --- a/extra/libwps/PKGBUILD +++ b/extra/libwps/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122933 2011-05-07 10:59:22Z andyrtr $ +# $Id: PKGBUILD 151320 2012-02-25 13:44:08Z allan $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Robert McCathie <archaur at rmcc dot com dot au> pkgname=libwps pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="a Microsoft Works file word processor format import filter library" arch=('i686' 'x86_64') url="http://libwps.sourceforge.net/" @@ -12,8 +12,6 @@ license=('LGPL') depends=('libwpd>=0.9.2') options=(!libtool) source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") -#md5sums=('83d4029aebf290c0a9a8fee9c99638d3') -#md5sums=('9e436bff44c60dc8b97cba0c7fc11a5c') md5sums=('29721a16f25967d59969d5f0ae485b4a') build() { diff --git a/extra/libxau/PKGBUILD b/extra/libxau/PKGBUILD index f5301af1a..587eb9aff 100644 --- a/extra/libxau/PKGBUILD +++ b/extra/libxau/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 88375 2010-08-23 07:44:23Z jgc $ +# $Id: PKGBUILD 151322 2012-02-25 13:46:57Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxau pkgver=1.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="X11 authorisation library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" depends=('glibc' 'xproto>=7.0.18') makedepends=('pkgconfig') @@ -19,8 +19,11 @@ build() { cd "${srcdir}/libXau-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc make +} + +package() { + cd "${srcdir}/libXau-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/libxaw/PKGBUILD b/extra/libxaw/PKGBUILD index d4f65c437..f8b06a07f 100644 --- a/extra/libxaw/PKGBUILD +++ b/extra/libxaw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 106867 2011-01-19 15:23:45Z jgc $ +# $Id: PKGBUILD 151324 2012-02-25 13:52:04Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxaw pkgver=1.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Athena Widget library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxmu' 'libxpm') @@ -18,7 +18,11 @@ build() { cd "${srcdir}/libXaw-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/libXaw-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/libxkbui/PKGBUILD b/extra/libxkbui/PKGBUILD index 78e39fe67..83b03186d 100644 --- a/extra/libxkbui/PKGBUILD +++ b/extra/libxkbui/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 78062 2010-04-19 08:52:11Z dgriffiths $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 151385 2012-02-25 23:56:14Z pierre $ +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxkbui pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="X11 keyboard UI presentation library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxt' 'libxkbfile') makedepends=('pkgconfig') -options=(!libtool) -source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 LICENSE) -md5sums=('1143e456f7429e18e88f2eadb2f2b6b1' 'd1efaa1271fc028cd5bec33f836ee9ef') +options=('!libtool') +source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +md5sums=('1143e456f7429e18e88f2eadb2f2b6b1' + 'd1efaa1271fc028cd5bec33f836ee9ef') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libxxf86dga/PKGBUILD b/extra/libxxf86dga/PKGBUILD index c66ee69e5..ad6ad264b 100644 --- a/extra/libxxf86dga/PKGBUILD +++ b/extra/libxxf86dga/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 97581 2010-10-31 16:05:58Z jgc $ +# $Id: PKGBUILD 151312 2012-02-25 13:26:08Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxxf86dga pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Direct Graphics Access extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxext' 'xf86dgaproto') @@ -19,8 +19,11 @@ build() { cd "${srcdir}/libXxf86dga-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/libXxf86dga-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/libxxf86vm/PKGBUILD b/extra/libxxf86vm/PKGBUILD index 12a6f3069..dc77c59ba 100644 --- a/extra/libxxf86vm/PKGBUILD +++ b/extra/libxxf86vm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97576 2010-10-31 16:03:53Z jgc $ +# $Id: PKGBUILD 151308 2012-02-25 13:23:04Z allan $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxxf86vm pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="X11 XFree86 video mode extension library" arch=('x86_64' 'i686') license=('custom') @@ -18,8 +18,12 @@ build() { cd "${srcdir}/libXxf86vm-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() +{ + cd "${srcdir}/libXxf86vm-${pkgver}" make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/lpsolve/PKGBUILD b/extra/lpsolve/PKGBUILD index d956a516f..db2c1502f 100644 --- a/extra/lpsolve/PKGBUILD +++ b/extra/lpsolve/PKGBUILD @@ -1,11 +1,11 @@ - # $Id: PKGBUILD 51162 2009-09-05 13:45:34Z andyrtr $ +# $Id: PKGBUILD 51162 2009-09-05 13:45:34Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=lpsolve _origname=lp_solve pkgver=5.5.2.0 _mainver=5.5 -pkgrel=1 +pkgrel=2 pkgdesc="a Mixed Integer Linear Programming (MILP) solver" arch=('i686' 'x86_64') url="http://lpsolve.sourceforge.net/" @@ -18,19 +18,21 @@ md5sums=('167c0fb4ab178e0b7ab50bf0a635a836' build() { cd "${srcdir}/${_origname}_${_mainver}" - patch -Np1 -i $srcdir/cflags.patch || return 1 + patch -Np1 -i $srcdir/cflags.patch - # taken from Fedora spec - cd lpsolve55 - sh -x ccc - rm bin/ux*/liblpsolve55.a - cd ../lp_solve - sh -x ccc - cd .. - - # install - install -d ${pkgdir}/usr/{bin,lib,include/lpsolve} - install -m 755 lp_solve/bin/ux*/lp_solve ${pkgdir}/usr/bin/ - install -m 755 lpsolve55/bin/ux*/liblpsolve55.so ${pkgdir}/usr/lib/ - install -m 644 lp*.h ${pkgdir}/usr/include/lpsolve/ + # taken from Fedora spec + cd lpsolve55 + sh -x ccc + rm bin/ux*/liblpsolve55.a + cd ../lp_solve + sh -x ccc +} + +package() { + cd "${srcdir}/${_origname}_${_mainver}" + + install -dm755 ${pkgdir}/usr/{bin,lib,include/lpsolve} + install -m755 lp_solve/bin/ux*/lp_solve ${pkgdir}/usr/bin/ + install -m755 lpsolve55/bin/ux*/liblpsolve55.so ${pkgdir}/usr/lib/ + install -m644 lp*.h ${pkgdir}/usr/include/lpsolve/ } diff --git a/extra/mod_fcgid/PKGBUILD b/extra/mod_fcgid/PKGBUILD index 30eca4e61..813f69ac5 100644 --- a/extra/mod_fcgid/PKGBUILD +++ b/extra/mod_fcgid/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 133036 2011-07-27 01:53:07Z dan $ +# $Id: PKGBUILD 151282 2012-02-25 12:36:27Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=mod_fcgid pkgver=2.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="A FastCGI module for Apache HTTP Server." license=('APACHE') arch=('i686' 'x86_64') url="http://httpd.apache.org/mod_fcgid/" depends=('apache') -source=(http://apache.cs.utah.edu/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.gz) +source=("http://apache.cs.utah.edu/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.gz") sha256sums=('e831795498d91cf27a519ea1332c2a92a2a9920b0844d817b2ea7f079056d12b') build() { cd "$srcdir"/$pkgname-$pkgver ./configure.apxs - make || return 1 + make } package() { diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD index 3d03d5b62..63b5aa1cb 100644 --- a/extra/mp3splt/PKGBUILD +++ b/extra/mp3splt/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 131861 2011-07-16 10:18:13Z tpowa $ +# $Id: PKGBUILD 151288 2012-02-25 12:55:39Z pierre $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=mp3splt -pkgver=2.4 +pkgver=2.4.1 pkgrel=1 arch=('i686' 'x86_64') -pkgdesc="Comandline tool for splitting mp3 and ogg files without decoding" +pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding" license=('GPL') url="http://mp3splt.sourceforge.net" depends=('libmp3splt') -source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz) -options=(!libtool) +source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz") +options=('!libtool') +md5sums=('aed4a94f996abcdb07679206a600fc5b') build() { cd $srcdir/$pkgname-$pkgver @@ -22,4 +23,3 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('aa4dc3de6e789961c71d8b3daaac0623') diff --git a/extra/multitail/PKGBUILD b/extra/multitail/PKGBUILD index aa356da64..665644161 100644 --- a/extra/multitail/PKGBUILD +++ b/extra/multitail/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 125613 2011-05-27 00:13:31Z kevin $ +# $Id: PKGBUILD 151290 2012-02-25 13:01:05Z pierre $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Roberto Carvajal <roberto@archlinux.org> pkgname=multitail -pkgver=5.2.8 +pkgver=5.2.9 pkgrel=1 pkgdesc="Lets you view one or multiple files like the original tail program" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') url="http://www.vanheusden.com/multitail" depends=('ncurses') -backup=(etc/multitail.conf) -source=(${url}/${pkgname}-${pkgver}.tgz) -md5sums=('aaa3691b0ea66ef02ffefd628c7dee8b') +backup=('etc/multitail.conf') +source=("${url}/${pkgname}-${pkgver}.tgz") +md5sums=('871cb6a9a0d4f599b9cbd9f603da4c51') build() { cd ${srcdir}/${pkgname}-${pkgver} - /usr/bin/make + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - /bin/install -D -m 755 multitail ${pkgdir}/usr/bin/multitail - /bin/install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1 - /bin/install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf + install -D -m 755 multitail ${pkgdir}/usr/bin/multitail + install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1 + install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index f025b013f..c61a5e354 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138817 2011-09-28 12:59:46Z ibiru $ +# $Id: PKGBUILD 151239 2012-02-25 09:44:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.8.9 -pkgrel=2 +pkgver=4.9 +pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) url="http://www.mozilla.org/projects/nspr/" @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('60770d45dc08c0f181b22cdfce5be3e8' +md5sums=('aa0c960b23a9d66a3c30c3e6ba80a99a' 'bce1611f3117b53fc904cab549c09967') build() { diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 0dd8f4f2d..44c23b44b 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,36 +1,32 @@ -# $Id: PKGBUILD 145700 2011-12-28 10:05:27Z jgc $ +# $Id: PKGBUILD 151237 2012-02-25 09:44:20Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.13.1 -pkgrel=2 +pkgver=3.13.3 +pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.8.9 +_nsprver=4.9 depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh') makedepends=('perl') -replaces=('nss-nspr') options=('!strip') -source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_WITH_CKBI_1_88_RTM/src/${pkgname}-${pkgver}.with.ckbi.1.88.tar.gz - bug702090.patch +source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}/src/${pkgname}-${pkgver}.tar.gz nss-no-rpath.patch nss.pc.in nss-config.in add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch) -sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6' - '057dd510ba567d344e705062436a786beb5592b6' +sha1sums=('6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6' 'c8fcdb153af9d39689243119adb475905a657284' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' - '11e4980911a1fe7142264e9b783b89abdc750c5d' + '3d89f29e321d7df7269b7ae6d219654543feaa6a' '8a964a744ba098711b80c0d279a2993524e8eb92') build() { cd "${srcdir}/${pkgname}-${pkgver}/mozilla" - patch -Np2 -i "${srcdir}/bug702090.patch" # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch" # Adds transitional SSL renegotiate support - patch from Debian diff --git a/extra/nss/add_spi+cacert_ca_certs.patch b/extra/nss/add_spi+cacert_ca_certs.patch index 7126a1281..bf7e2ca16 100644 --- a/extra/nss/add_spi+cacert_ca_certs.patch +++ b/extra/nss/add_spi+cacert_ca_certs.patch @@ -5,12 +5,13 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt =================================================================== ---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-11-05 17:03:08.370363036 +0100 -+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-11-05 17:03:28.082392262 +0100 -@@ -23580,3 +23580,557 @@ +--- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:32:14.000000000 +0100 ++++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:35:07.577861466 +0100 +@@ -23475,3 +23475,558 @@ + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - ++ +# +# Certificate "CAcert.org Class 1 Root CA" +# diff --git a/extra/nss_ldap/PKGBUILD b/extra/nss_ldap/PKGBUILD index 0a1f93d38..71c689f86 100644 --- a/extra/nss_ldap/PKGBUILD +++ b/extra/nss_ldap/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 121171 2011-04-29 06:45:19Z stephane $ +# $Id: PKGBUILD 151294 2012-02-25 13:12:18Z pierre $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Comete <la_comete@tiscali.fr> pkgname=nss_ldap pkgver=265 -pkgrel=2 +pkgrel=3 pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories." -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.padl.com/OSS/nss_ldap.html" license=('LGPL') -depends=('libldap>=2.4.18' 'krb5') +depends=('libldap' 'krb5') backup=("etc/nss_ldap.conf") -source=(http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz) +source=("http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz") md5sums=('c1cb02d1a85538cf16bca6f6a562abe4') build() { diff --git a/extra/opencore-amr/PKGBUILD b/extra/opencore-amr/PKGBUILD index 73736c22d..71d8eb566 100644 --- a/extra/opencore-amr/PKGBUILD +++ b/extra/opencore-amr/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 150469 2012-02-18 00:45:39Z allan $ +# $Id: PKGBUILD 151248 2012-02-25 09:58:05Z ibiru $ # Maintainer: Ionut Biru <ionut@archlinux.ro> # Contributor: WAntilles <wantilles@adslgr.com> pkgname=opencore-amr -pkgver=0.1.2 -pkgrel=2 +pkgver=0.1.3 +pkgrel=1 pkgdesc="Open source implementation of the Adaptive Multi Rate (AMR) speech codec" arch=('i686' 'x86_64') license=('APACHE') url="http://opencore-amr.sourceforge.net/" -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +depends=(glibc) options=('!libtool') -md5sums=('8e8b8b253eb046340ff7b6bf7a6ccd3e') +md5sums=('09d2c5dfb43a9f6e9fec8b1ae678e725') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir}/ install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/pam_ldap/PKGBUILD b/extra/pam_ldap/PKGBUILD index b3418220a..d59b9fc9f 100644 --- a/extra/pam_ldap/PKGBUILD +++ b/extra/pam_ldap/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 87842 2010-08-18 13:07:56Z jgc $ +# $Id: PKGBUILD 151292 2012-02-25 13:09:27Z pierre $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Comete <la_comete@tiscali.fr> + pkgname=pam_ldap -pkgver=185 +pkgver=186 pkgrel=1 pkgdesc="LDAP authentication module for the PAM framework" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.padl.com/OSS/pam_ldap.html" license=('LGPL') -depends=('libldap>=2.4.22' 'pam') -backup=(etc/pam_ldap.conf) -options=(!makeflags) -source=(http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('639260f0c81d57a6fcbd1cb47dd6c5e7') +depends=('libldap' 'pam') +backup=('etc/pam_ldap.conf') +options=('!makeflags') +source=("http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz") +md5sums=('58c8689921c5c4578363438acd8503c2') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -20,6 +21,10 @@ build() { --with-ldap-conf-file=/etc/pam_ldap.conf \ --mandir=/usr/share/man PATH="${PATH}:${srcdir}/${pkgname}-${pkgver}" make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install mv "${pkgdir}/etc/ldap.conf" "${pkgdir}/etc/pam_ldap.conf" } diff --git a/extra/perl-xml-parser/PKGBUILD b/extra/perl-xml-parser/PKGBUILD index 021aa1b05..25273db30 100644 --- a/extra/perl-xml-parser/PKGBUILD +++ b/extra/perl-xml-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 129383 2011-06-27 06:10:42Z andrea $ +# $Id: PKGBUILD 151310 2012-02-25 13:24:17Z pierre $ # Maintainer: # Contributor: firmicus <francois@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=perl-xml-parser _realname=XML-Parser pkgver=2.41 -pkgrel=1 +pkgrel=2 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') @@ -21,10 +21,14 @@ md5sums=('c320d2ffa459e6cdc6f9f59c1185855e') build() { cd "${srcdir}/${_realname}-${pkgver}" - + # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } diff --git a/extra/psi/PKGBUILD b/extra/psi/PKGBUILD index d8769aed9..36542f8d2 100644 --- a/extra/psi/PKGBUILD +++ b/extra/psi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137579 2011-09-09 21:39:09Z pierre $ +# $Id: PKGBUILD 151383 2012-02-25 23:49:47Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=psi pkgver=0.14 -pkgrel=5 +pkgrel=6 pkgdesc='Instant messaging application designed for the Jabber IM' url='http://psi-im.org/' license=('GPL') @@ -11,13 +11,22 @@ arch=('i686' 'x86_64') depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils') install='psi.install' source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2" - 'archlinux.patch') + 'archlinux.patch' 'affiliationlistconfigmuc.patch' + 'configureroomcrash.patch' 'gcc-47.patch' 'input-validation.patch') md5sums=('9d7dcce3bcab53b741a712199bd986be' - 'a965c6a4ad1028f14a5897c3f5088ae8') + 'a965c6a4ad1028f14a5897c3f5088ae8' + '28258c884a0a6f2cbb297435a144ae04' + '8291eee7110a8aa8163c2e2e38c6d491' + 'd7acbb7b81671339d490622c74082d11' + '259cf255ca2d2395840a25799056a58b') build() { cd ${srcdir}/psi-${pkgver} patch -p1 -i ${srcdir}/archlinux.patch + patch -p1 -i ${srcdir}/affiliationlistconfigmuc.patch + patch -p1 -i ${srcdir}/configureroomcrash.patch + patch -p0 -i ${srcdir}/gcc-47.patch + patch -p0 -i ${srcdir}/input-validation.patch ./configure --prefix=/usr --disable-bundled-qca --release --no-separate-debug-info make } diff --git a/extra/psi/affiliationlistconfigmuc.patch b/extra/psi/affiliationlistconfigmuc.patch new file mode 100644 index 000000000..dd9119e78 --- /dev/null +++ b/extra/psi/affiliationlistconfigmuc.patch @@ -0,0 +1,92 @@ +commit ef1df7a42e7aa7b6bfb1dca5b86b303f71739fc4 +Author: Rion <rion4ik@gmail.com> +Date: Fri Dec 3 16:39:56 2010 +0500 + + Fixed changing affiliations list from muc config dialog + +diff --git a/src/mucaffiliationsview.cpp b/src/mucaffiliationsview.cpp +index 8632c43..94adcec 100644 +--- a/src/mucaffiliationsview.cpp ++++ b/src/mucaffiliationsview.cpp +@@ -33,30 +33,6 @@ MUCAffiliationsView::MUCAffiliationsView(QWidget* parent) : QTreeView(parent) + setDropIndicatorShown(true); + } + +-bool MUCAffiliationsView::addToCurrent(const QString& j) +-{ +- QModelIndex index = currentIndex(); +- if (!index.isValid()) +- return false; +- +- if (index.parent().isValid()) +- index = index.parent(); +- +- if (!index.parent().isValid()) { +- XMPP::Jid jid(j); +- if (!jid.isValid()) +- return false; +- +- // TODO: Check if the user is already in the list +- +- int row = model()->rowCount(index); +- model()->insertRows(row,1,index); +- model()->setData(model()->index(row,0,index),QVariant(jid.bare())); +- return true; +- } +- return false; +-} +- + void MUCAffiliationsView::removeCurrent() + { + QModelIndex index = currentIndex(); +diff --git a/src/mucaffiliationsview.h b/src/mucaffiliationsview.h +index 11f1446..54ee0ff 100644 +--- a/src/mucaffiliationsview.h ++++ b/src/mucaffiliationsview.h +@@ -32,7 +32,6 @@ public: + + public slots: + void removeCurrent(); +- bool addToCurrent(const QString&); + + signals: + void addEnabled(bool); +diff --git a/src/mucconfigdlg.cpp b/src/mucconfigdlg.cpp +index a10f14e..dcf4a35 100644 +--- a/src/mucconfigdlg.cpp ++++ b/src/mucconfigdlg.cpp +@@ -158,9 +158,31 @@ void MUCConfigDlg::add() + { + bool ok; + QString text = QInputDialog::getText(this, tr("Add affiliation"), tr("Enter the JID of the user:"), QLineEdit::Normal, "", &ok); +- if (ok) { +- if (text.isEmpty() || !ui_.tv_affiliations->addToCurrent(text)) +- QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID.")); ++ if (ok && ui_.tv_affiliations->currentIndex().isValid()) { ++ if (!text.isEmpty()) { ++ ++ QModelIndex index = affiliations_proxy_model_->mapToSource(ui_.tv_affiliations->currentIndex()); ++ ++ if (index.parent().isValid()) ++ index = index.parent(); ++ ++ if (!index.parent().isValid()) { ++ XMPP::Jid jid(text); ++ if (jid.isValid()) { ++ ++ // TODO: Check if the user is already in the list ++ ++ int row = affiliations_model_->rowCount(index); ++ affiliations_model_->insertRows(row,1,index); ++ QModelIndex newIndex = affiliations_model_->index(row,0,index); ++ affiliations_model_->setData(newIndex, QVariant(jid.bare())); ++ ui_.tv_affiliations->setCurrentIndex(affiliations_proxy_model_->mapFromSource(newIndex)); ++ return; ++ } ++ } ++ } ++ ++ QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID.")); + } + } + diff --git a/extra/psi/configureroomcrash.patch b/extra/psi/configureroomcrash.patch new file mode 100644 index 000000000..99fa30794 --- /dev/null +++ b/extra/psi/configureroomcrash.patch @@ -0,0 +1,40 @@ +commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd +Author: Michail Pishchagin <mblsha@users.sourceforge.net> +Date: Tue Oct 19 11:26:31 2010 +0400 + + Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087) + Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+ + +diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp +index 722b762..fd0a830 100644 +--- a/src/mucaffiliationsmodel.cpp ++++ b/src/mucaffiliationsmodel.cpp +@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists() + + void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a) + { ++ emit layoutAboutToBeChanged(); + enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false; + QModelIndex index = affiliationListIndex(a); + if (hasChildren(index)) { + removeRows(0,rowCount(index),index); + } ++ emit layoutChanged(); + } + + void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b) + { ++ emit layoutAboutToBeChanged(); + QModelIndex index = affiliationListIndex(a); + enabled_[(AffiliationListIndex) index.row()] = b; + emit layoutChanged(); +@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items) + foreach(MUCItem item, items) { + QModelIndex list = affiliationListIndex(item.affiliation()); + if (list.isValid() && !item.jid().isEmpty()) { ++ if (!dirty) { ++ emit layoutAboutToBeChanged(); ++ } + int row = rowCount(list); + if (row == 0) { + enabled_[(AffiliationListIndex) list.row()] = true; diff --git a/extra/psi/gcc-47.patch b/extra/psi/gcc-47.patch new file mode 100644 index 000000000..64cb83fba --- /dev/null +++ b/extra/psi/gcc-47.patch @@ -0,0 +1,10 @@ +--- iris/src/irisnet/corelib/netinterface_unix.cpp.orig 2012-01-07 19:46:39.493999646 +0100 ++++ iris/src/irisnet/corelib/netinterface_unix.cpp 2012-01-07 19:46:57.251002321 +0100 +@@ -33,6 +33,7 @@ + #include <net/route.h> + #include <netinet/in.h> + #include <errno.h> ++#include <unistd.h> + + // for solaris + #ifndef SIOCGIFCONF diff --git a/extra/psi/input-validation.patch b/extra/psi/input-validation.patch new file mode 100644 index 000000000..7260c80e1 --- /dev/null +++ b/extra/psi/input-validation.patch @@ -0,0 +1,257 @@ +commit c68fdd9926a38b2820bc5df97fd1905355a2640d +Author: rion <rion4ik@gmail.com> +Date: Fri Oct 7 22:19:05 2011 +0600 + + Fixed QLabel CVE + +--- src/Certificates/CertificateDisplay.ui 2011-10-19 08:30:15 +0000 ++++ src/Certificates/CertificateDisplay.ui 2011-10-19 08:31:23 +0000 +@@ -1,105 +1,118 @@ +-<ui version="4.0" > ++<?xml version="1.0" encoding="UTF-8"?> ++<ui version="4.0"> + <class>CertificateDisplay</class> +- <widget class="QDialog" name="CertificateDisplay" > +- <property name="geometry" > ++ <widget class="QDialog" name="CertificateDisplay"> ++ <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> +- <width>518</width> ++ <width>525</width> + <height>369</height> + </rect> + </property> +- <property name="windowTitle" > ++ <property name="windowTitle"> + <string>Certificate Information</string> + </property> +- <layout class="QVBoxLayout" > +- <property name="margin" > ++ <layout class="QVBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> + <number>11</number> + </property> +- <property name="spacing" > +- <number>6</number> +- </property> + <item> +- <layout class="QHBoxLayout" > +- <property name="margin" > ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> + <number>0</number> + </property> +- <property name="spacing" > +- <number>6</number> +- </property> + <item> +- <layout class="QVBoxLayout" > +- <property name="margin" > ++ <layout class="QVBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> + <number>0</number> + </property> +- <property name="spacing" > +- <number>6</number> +- </property> + <item> +- <widget class="QLabel" name="textLabel4" > +- <property name="text" > ++ <widget class="QLabel" name="textLabel4"> ++ <property name="text"> + <string>Certificate Validation:</string> + </property> + </widget> + </item> + <item> +- <widget class="QLabel" name="lb_valid" > +- <property name="text" > ++ <widget class="QLabel" name="lb_valid"> ++ <property name="text"> + <string/> + </property> ++ <property name="textFormat"> ++ <enum>Qt::PlainText</enum> ++ </property> + </widget> + </item> + <item> +- <widget class="QLabel" name="textLabel2" > +- <property name="text" > ++ <widget class="QLabel" name="textLabel2"> ++ <property name="text"> + <string>Valid From:</string> + </property> + </widget> + </item> + <item> +- <widget class="QLabel" name="lb_notBefore" > +- <property name="text" > ++ <widget class="QLabel" name="lb_notBefore"> ++ <property name="text"> + <string/> + </property> ++ <property name="textFormat"> ++ <enum>Qt::PlainText</enum> ++ </property> + </widget> + </item> + <item> +- <widget class="QLabel" name="textLabel3" > +- <property name="text" > ++ <widget class="QLabel" name="textLabel3"> ++ <property name="text"> + <string>Valid Until:</string> + </property> + </widget> + </item> + <item> +- <widget class="QLabel" name="lb_notAfter" > +- <property name="text" > ++ <widget class="QLabel" name="lb_notAfter"> ++ <property name="text"> + <string/> + </property> ++ <property name="textFormat"> ++ <enum>Qt::PlainText</enum> ++ </property> + </widget> + </item> + <item> +- <widget class="QLabel" name="textLabel1" > +- <property name="text" > ++ <widget class="QLabel" name="textLabel1"> ++ <property name="text"> + <string>Serial Number:</string> + </property> + </widget> + </item> + <item> +- <widget class="QLabel" name="lb_sn" > +- <property name="text" > ++ <widget class="QLabel" name="lb_sn"> ++ <property name="text"> + <string/> + </property> ++ <property name="textFormat"> ++ <enum>Qt::PlainText</enum> ++ </property> + </widget> + </item> + <item> + <spacer> +- <property name="orientation" > ++ <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> +- <property name="sizeType" > ++ <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> +- <property name="sizeHint" > ++ <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>106</height> +@@ -110,14 +123,14 @@ + </layout> + </item> + <item> +- <widget class="QTextBrowser" name="tb_cert" > +- <property name="minimumSize" > ++ <widget class="QTextBrowser" name="tb_cert"> ++ <property name="minimumSize"> + <size> + <width>350</width> + <height>300</height> + </size> + </property> +- <property name="horizontalScrollBarPolicy" > ++ <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + </widget> +@@ -125,35 +138,35 @@ + </layout> + </item> + <item> +- <widget class="Line" name="line1" > +- <property name="frameShape" > ++ <widget class="Line" name="line1"> ++ <property name="frameShape"> + <enum>QFrame::HLine</enum> + </property> +- <property name="frameShadow" > ++ <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> +- <property name="orientation" > ++ <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> +- <layout class="QHBoxLayout" > +- <property name="margin" > ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> + <number>0</number> + </property> +- <property name="spacing" > +- <number>6</number> +- </property> + <item> + <spacer> +- <property name="orientation" > ++ <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> +- <property name="sizeType" > ++ <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> +- <property name="sizeHint" > ++ <property name="sizeHint" stdset="0"> + <size> + <width>421</width> + <height>20</height> +@@ -162,17 +175,17 @@ + </spacer> + </item> + <item> +- <widget class="QPushButton" native="1" name="pb_close"> +- <property name="text"> +- <string>Close</string> +- </property> +- </widget> ++ <widget class="QPushButton" name="pb_close"> ++ <property name="text"> ++ <string>Close</string> ++ </property> ++ </widget> + </item> + </layout> + </item> + </layout> + </widget> +- <layoutdefault spacing="6" margin="11" /> ++ <layoutdefault spacing="6" margin="11"/> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>tb_cert</tabstop> + diff --git a/extra/pysmbc/PKGBUILD b/extra/pysmbc/PKGBUILD index 3864697f8..429111579 100644 --- a/extra/pysmbc/PKGBUILD +++ b/extra/pysmbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140148 2011-10-07 22:11:09Z eric $ +# $Id: PKGBUILD 151369 2012-02-25 18:31:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Shane Peelar <lookatyouhacker@gm@il(d0t)c0m> pkgname=pysmbc -pkgver=1.0.11.1 +pkgver=1.0.13 pkgrel=1 pkgdesc="Python bindings for libsmbclient" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://pypi.python.org/pypi/pysmbc/" license=('GPL') depends=('python2' 'smbclient') source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('97a2a9738f41f89400c510efb2c20f77') +md5sums=('019dbb3bc6ee217f7389a2330cda9fe0') build(){ cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/python-pyspi/PKGBUILD b/extra/python-pyspi/PKGBUILD index ef5c18be6..739f3b08a 100644 --- a/extra/python-pyspi/PKGBUILD +++ b/extra/python-pyspi/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 89911 2010-09-04 17:41:32Z remy $ +# $Id: PKGBUILD 151344 2012-02-25 14:53:09Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> + pkgname=python-pyspi pkgver=0.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="Python AT-SPI bindings" arch=('i686' 'x86_64') url="http://people.redhat.com/zcerza/dogtail" license=('LGPL') -depends=('python2' 'at-spi>=1.7.12') +depends=('python2' 'at-spi') makedepends=('pyrex') conflicts=('pyspi') provides=('pyspi') replaces=('pyspi') -source=(http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz - pyspi-build.patch) +source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz" + 'pyspi-build.patch') md5sums=('def336bd566ea688a06ec03db7ccf1f4' '721f74cbae653a258c00b83acf7dd1da') diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD index 1c28b8ae8..e3c81d5a6 100644 --- a/extra/qjackctl/PKGBUILD +++ b/extra/qjackctl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130089 2011-07-02 07:06:29Z schiv $ +# $Id: PKGBUILD 151342 2012-02-25 14:50:45Z pierre $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> pkgname=qjackctl pkgver=0.3.8 -pkgrel=1 +pkgrel=2 pkgdesc="A Qt front-end for the JACK low-latency audio server" url="http://qjackctl.sourceforge.net/" arch=('i686' 'x86_64') diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD index 56524dc94..3f1c7c379 100644 --- a/extra/qsynth/PKGBUILD +++ b/extra/qsynth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118833 2011-04-08 10:15:47Z schiv $ +# $Id: PKGBUILD 151340 2012-02-25 14:47:42Z pierre $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=qsynth pkgver=0.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="Qt GUI for FluidSynth" arch=('i686' 'x86_64') url="http://qsynth.sourceforge.net/" @@ -19,6 +19,10 @@ build() { ./configure --prefix=/usr make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 7f2401e01..e08b0fae2 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148910 2012-02-05 11:55:33Z ibiru $ +# $Id: PKGBUILD 151354 2012-02-25 16:38:53Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r pkgver=2.14.1 -pkgrel=2 +pkgrel=3 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/recode/PKGBUILD b/extra/recode/PKGBUILD index f95e08fde..ffa636c60 100644 --- a/extra/recode/PKGBUILD +++ b/extra/recode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103548 2010-12-21 11:02:32Z andrea $ +# $Id: PKGBUILD 151219 2012-02-25 08:35:55Z pierre $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=recode pkgver=3.6 -pkgrel=6 +pkgrel=7 pkgdesc="Converts files between various character sets and usages" arch=('i686' 'x86_64') url="http://recode.progiciels-bpi.ca/index.html" @@ -13,8 +13,8 @@ depends=('glibc' 'texinfo') options=('!libtool') install=recode.install source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}" - http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz - recode-3.6-as-if.patch recode-3.6-gettextfix.diff) + 'http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz' + 'recode-3.6-as-if.patch' 'recode-3.6-gettextfix.diff') md5sums=('f82e9a6ede9119268c13493c9add2809' '95ca772e367a7ef56d3f46d724b6f86e' 'fca7484ba332c8ad59eb02334883cd92' diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD index f9506554d..9cf4c07d1 100644 --- a/extra/rubberband/PKGBUILD +++ b/extra/rubberband/PKGBUILD @@ -1,30 +1,22 @@ -# $Id: PKGBUILD 140085 2011-10-06 09:24:38Z schiv $ +# $Id: PKGBUILD 151338 2012-02-25 14:44:44Z pierre $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com> pkgname=rubberband -pkgver=1.6.0 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 pkgdesc="Time-stretching and pitch-shifting audio library and utility" arch=('i686' 'x86_64') url="http://www.breakfastquay.com/rubberband/" license=('GPL') depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk') makedepends=('ladspa') -source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2" - 'gcc46.patch' - 'vectorops.patch') +source=("http://code.breakfastquay.com/attachments/download/23/$pkgname-$pkgver.tar.bz2") +md5sums=('49093923c7a48e5860a5f7db3590ac74') build() { cd "$srcdir/$pkgname-$pkgver" - # fix gcc 4.6 compatibility - patch -Np1 -i "$srcdir/gcc46.patch" - - # fix bug exposed by gcc 4.6 - # see https://bugs.archlinux.org/task/26140 - patch -Np1 -i "$srcdir/vectorops.patch" - ./configure --prefix=/usr make } @@ -34,8 +26,3 @@ package() { make DESTDIR="$pkgdir" install } - -# vim:set ts=2 sw=2 et: -md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc' - '7c2f404975da6052f6b80eac12efbeb4' - '4bdc9689179d3a2cf64172f0f911701d') diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index c4786c331..8ceaba4b4 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -1,46 +1,56 @@ -# $Id: PKGBUILD 146483 2012-01-11 15:22:37Z stephane $ -# Maintainer: +# Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: Jeramy Rutley <jrutley@gmail.com> -pkgbase=ruby -pkgname=('ruby' 'ruby-docs') -pkgver=1.9.3_p0 -pkgrel=3 -pkgdesc="An object-oriented language for quick and easy programming" +pkgname=ruby +pkgver=1.9.3_p125 +pkgrel=1 +pkgdesc='An object-oriented language for quick and easy programming' arch=('i686' 'x86_64') -url="http://www.ruby-lang.org/en/" +url='http://www.ruby-lang.org/en/' license=('BSD' 'custom') -makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') +backup=('etc/gemrc') +provides=('rubygems' 'rake') +conflicts=('rake') +depends=('openssl' 'libffi' 'libyaml') +makedepends=('tk') +optdepends=('tk: for Ruby/TK' + 'ruby-docs: Ruby documentation') options=('!emptydirs' '!makeflags') -source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2) -sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf') +install='ruby.install' +source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" + 'gemrc') +md5sums=('341b8fc42aa18bd668314199f219db14' + '6fb8e7a09955e0f64be3158fb4a27e7a') build() { - cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-shared --enable-pthread --disable-rpath + cd ruby-${pkgver//_/-} + + PKG_CONFIG=/usr/bin/pkg-config ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-pthread \ + --disable-rpath \ + --disable-install-doc + make } -package_ruby() { - depends=('openssl' 'libffi' 'libyaml') - provides=('rubygems' 'rake') - conflicts=('rake') - optdepends=('tk: for Ruby/TK') +check() { + cd ruby-${pkgver//_/-} - cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - make DESTDIR="${pkgdir}" install-nodoc - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" + make test } -package_ruby-docs() { - pkgdesc="Documentation files for ruby" +package() { + cd ruby-${pkgver//_/-} + + make DESTDIR="${pkgdir}" install-nodoc + + install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc" - cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - make DESTDIR="${pkgdir}" install-doc install-capi - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL" } diff --git a/extra/ruby/gemrc b/extra/ruby/gemrc new file mode 100644 index 000000000..3d11de1ec --- /dev/null +++ b/extra/ruby/gemrc @@ -0,0 +1,5 @@ +# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11 + +# --user-install is used to install to $HOME/.gem/ by default since we want to separate +# pacman installed gems and gem installed gems +gem: --user-install diff --git a/extra/ruby/ruby.install b/extra/ruby/ruby.install new file mode 100644 index 000000000..f91254084 --- /dev/null +++ b/extra/ruby/ruby.install @@ -0,0 +1,11 @@ +#!/bin/sh + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 1.9.3_p125)" -lt 0 ]; then + echo 'The default location of gem installs has changed to $HOME/.gem/ruby' + echo 'If you want to install to the system wide location, you must either:' + echo 'edit /etc/gemrc or run gem with the --no-user-install flag.' + fi +} diff --git a/extra/schedtool/PKGBUILD b/extra/schedtool/PKGBUILD index 345c96ce6..2987ec6ca 100644 --- a/extra/schedtool/PKGBUILD +++ b/extra/schedtool/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 100636 2010-11-24 23:01:00Z schiv $ +# $Id: PKGBUILD 151233 2012-02-25 09:26:59Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: James Rayner <james@archlinux.org> pkgname=schedtool pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Query or alter a process' scheduling policy" arch=('i686' 'x86_64') url="http://freequaos.host.sk/schedtool/" license=('GPL') -depends=('glibc') source=(http://freequaos.host.sk/schedtool/$pkgname-$pkgver.tar.bz2) md5sums=('0d968f05d3ad7675f1f33ef1f6d0a3fb') build() { cd "$srcdir/$pkgname-$pkgver" - make } package() { cd "$srcdir/$pkgname-$pkgver" - - install -dm755 "$pkgdir/usr" make DESTPREFIX="$pkgdir/usr" install } diff --git a/extra/slv2/PKGBUILD b/extra/slv2/PKGBUILD index 3005cd313..2c9920324 100644 --- a/extra/slv2/PKGBUILD +++ b/extra/slv2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131701 2011-07-13 15:39:04Z schiv $ +# $Id: PKGBUILD 151231 2012-02-25 09:24:44Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Leslie P. Polzer <polzer@stardawn.org> pkgname=slv2 pkgver=0.6.6 -pkgrel=6 +pkgrel=7 pkgdesc="Library for LV2 hosts" arch=('i686' 'x86_64') url="http://drobilla.net/software/slv2" diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD index 47f2bf91a..de23127a0 100644 --- a/extra/squid/PKGBUILD +++ b/extra/squid/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 140501 2011-10-15 22:54:05Z kevin $ +# $Id: PKGBUILD 151208 2012-02-25 07:43:33Z pierre $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=squid -pkgver=3.1.16 +pkgver=3.1.19 pkgrel=1 pkgdesc="A full-featured Web proxy cache server." -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.squid-cache.org" depends=('openssl' 'pam' 'cron' 'perl' 'libtool') -makedepends=('libcap>=2.16') +makedepends=('libcap') license=('GPL') -backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid) +backup=('etc/squid/squid.conf' 'etc/squid/mime.conf' 'etc/conf.d/squid') install=squid.install -source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2 - squid squid.conf.d squid.pam squid.cron) -md5sums=('675aef4411d41f5b55b15a29ad6e5261' +source=("http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2" + 'squid' 'squid.conf.d' 'squid.pam' 'squid.cron') +md5sums=('9b6ffaf96bee8f05f0085bc6361d7c94' 'd213b0cc1db72b749bb8c88716fdab39' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD index 03b72606d..755a1c863 100644 --- a/extra/ssmtp/PKGBUILD +++ b/extra/ssmtp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75590 2010-04-01 22:29:13Z ibiru $ +# $Id: PKGBUILD 151206 2012-02-25 07:42:28Z pierre $ # Maintainer: Hugo Doria <hugo@archlinux.org> pkgname=ssmtp pkgver=2.64 -pkgrel=2 +pkgrel=3 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub" arch=('i686' 'x86_64') license=('GPL') @@ -13,21 +13,29 @@ conflicts=('exim') provides=('smtp-forwarder') backup=('etc/ssmtp/ssmtp.conf' 'etc/ssmtp/revaliases') options=('!makeflags' '!emptydirs') -source=(http://ftp.debian.org/debian/pool/main/s/ssmtp/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('65b4e0df4934a6cd08c506cabcbe584f') +source=("http://ftp.debian.org/debian/pool/main/s/ssmtp/${pkgname}_${pkgver}.orig.tar.bz2" + 'opessl_crypto.patch') +md5sums=('65b4e0df4934a6cd08c506cabcbe584f' + 'aeb4ed09a26eefea9a5f6ac755c4dff0') ## if you build in chroot, make sure the chroots fully qualified hostname is the same as in your real root system ## build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/opessl_crypto.patch" + autoreconf ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-md5auth --enable-ssl || return 1 - make || return 1 - yes | make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man8" etcdir="${pkgdir}/etc" install || return 1 + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-md5auth --enable-ssl + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + yes | make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man8" etcdir="${pkgdir}/etc" install - install -D -m644 ssmtp.conf.5 "${pkgdir}/usr/share/man/man5/ssmtp.conf.5" || return 1 + install -D -m644 ssmtp.conf.5 "${pkgdir}/usr/share/man/man5/ssmtp.conf.5" ln -s ssmtp "${pkgdir}/usr/sbin/sendmail" ln -s ssmtp "${pkgdir}/usr/sbin/newaliases" diff --git a/extra/ssmtp/opessl_crypto.patch b/extra/ssmtp/opessl_crypto.patch new file mode 100644 index 000000000..e3055b2e7 --- /dev/null +++ b/extra/ssmtp/opessl_crypto.patch @@ -0,0 +1,21 @@ +Fix linking error: + +Undefined symbols: + "_X509_free", referenced from: + _smtp_open in ssmtp.o +ld: symbol(s) not found + + +Index: ssmtp-2.64/configure.in +=================================================================== +--- ssmtp-2.64.orig/configure.in ++++ ssmtp-2.64/configure.in +@@ -52,7 +52,7 @@ AC_ARG_ENABLE(ssl, + [ --enable-ssl support for secure connection to mail server]) + if test x$enableval = xyes ; then + AC_DEFINE(HAVE_SSL) +- LIBS="$LIBS -lssl" ++ LIBS="$LIBS -lssl -lcrypto" + fi + enableval="" + diff --git a/extra/swh-plugins/PKGBUILD b/extra/swh-plugins/PKGBUILD index b51701d23..50685f19a 100644 --- a/extra/swh-plugins/PKGBUILD +++ b/extra/swh-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 126506 2011-06-05 21:13:52Z schiv $ +# $Id: PKGBUILD 151225 2012-02-25 09:04:22Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Robert Emil Berge pkgname=swh-plugins pkgver=0.4.15 -pkgrel=4 +pkgrel=5 pkgdesc="Steve Harris' LADSPA plug-ins suite" arch=('i686' 'x86_64') url="http://plugin.org.uk/" diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index b82990a84..d3c72229e 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 140389 2011-10-12 04:35:30Z eric $ +# $Id: PKGBUILD 151381 2012-02-25 21:27:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' - 'system-config-printer-gnome') -pkgver=1.3.7 -pkgrel=1 + 'system-config-printer-gnome') +pkgver=1.3.8 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') license=('GPL') -makedepends=('udev' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2') +makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils') source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) -md5sums=('f579ba287403d8ae3028377c6641feed' - 'a2ce58f4e612130b30e5c029e9afd31f') +md5sums=('ca04568dd7ff1ef7a381ad637d4e915b' + '67c103760f9b4227bc1d99204d8378cd') build() { cd "${srcdir}"/${pkgbase}-${pkgver} @@ -78,7 +78,7 @@ package_system-config-printer-common() { package_system-config-printer-gnome() { pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend' - depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') + depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify' 'python-pycurl') optdependence=('gnome-keyring: password management') cd "${srcdir}"/${pkgbase}-${pkgver} diff --git a/extra/telepathy-rakia/PKGBUILD b/extra/telepathy-rakia/PKGBUILD new file mode 100644 index 000000000..991422eeb --- /dev/null +++ b/extra/telepathy-rakia/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 151254 2012-02-25 10:06:13Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> + +pkgname=telepathy-rakia +pkgver=0.7.3 +pkgrel=1 +pkgdesc="SIP connection manager for Telepathy" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +license=('LGPL') +depends=('telepathy-glib' 'sofia-sip') +makedepends=('libxslt' 'python2') +install=telepathy-rakia.install +groups=('telepathy') +replaces=('telepathy-sofiasip') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('dea76f93fe6234d18c6c7746c9ce0d6e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} diff --git a/extra/telepathy-rakia/telepathy-rakia.install b/extra/telepathy-rakia/telepathy-rakia.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/extra/telepathy-rakia/telepathy-rakia.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/umfpack/PKGBUILD b/extra/umfpack/PKGBUILD index b37f17f42..4fc9b0644 100644 --- a/extra/umfpack/PKGBUILD +++ b/extra/umfpack/PKGBUILD @@ -4,12 +4,12 @@ # Contributor: iKevin <kellwood at ameritech dot net> pkgname=umfpack -pkgver=5.5.0 -_ufcfgver=3.5.0 -_amdver=2.2.1 -_cholmodver=1.7.1 -_colamdver=2.7.2 -_ccolamdver=2.7.2 +pkgver=5.5.2 +_ufcfgver=3.7.0 +_amdver=2.2.3 +_cholmodver=1.7.4 +_colamdver=2.7.4 +_ccolamdver=2.7.4 pkgrel=1 pkgdesc="A multifrontal direct solver for unsymmetric linear systems (AMD/${_amdver}, UFConfig/${_ufcgfgver})" arch=('i686' 'x86_64') @@ -24,35 +24,32 @@ source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz http://www.cise.ufl.edu/research/sparse/amd/AMD-${_amdver}.tar.gz http://www.cise.ufl.edu/research/sparse/cholmod/CHOLMOD-${_cholmodver}.tar.gz http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-${_colamdver}.tar.gz - http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-${_ccolamdver}.tar.gz - UFconfig.mk) -md5sums=('b3490d4f529fbcf4f415e60aa2680a15' - '4335ee565feec67e8ba9fc0f6a5e2504' - '25548053958c1c5810b17d077b8f37b9' - '9032c5724bee43ccd8f4546338a29fac' - '2b4e43c8ef33dacfade6d1ec49542ac1' - '79d813d5b54951060fc264172bfb5ca6' - 'ce9731da58d58923a3cdc3fbef724c4e') + http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-${_ccolamdver}.tar.gz) +md5sums=('07eaa6ae3de176e5b3681032c10c76be' + 'ab8c355d683e8c5597a0824b32704c70' + '4d2a7db82406f880e7686fbd2df5a3bf' + 'c2088078a86ca1a88e64037f80ae6540' + '186d692ab7211e79f9b727d8192635f7' + 'bb55f6b4b9358160eaba1a57f863c65e') build() { - cd "$srcdir/UMFPACK" - cp -rf "$srcdir/UFconfig/xerbla" . - cp -L ../UFconfig.mk $startdir/src/UFconfig - [ $CARCH == "x86_64" ] && sed -i 's#CFLAGS = -O3 -fexceptions#CFLAGS = -O3 -fexceptions -fPIC#' $srcdir/UFconfig/UFconfig.mk - make library || return 1 - install -d "$pkgdir/usr/lib" "$pkgdir/usr/include" + CFLAGS+=" -DNCHOLMOD" + cd "$srcdir" + cp -rf UFconfig/xerbla UMFPACK + make -C UMFPACK library + make -C AMD library +} - install -D -m644 Lib/libumfpack.a "$pkgdir/usr/lib/libumfpack.a" - cp $startdir/src/UMFPACK/Include/*.h $startdir/pkg/usr/include +package() { + cd "$srcdir" + + install -dm755 "$pkgdir"/usr/{include,lib} - install -D -m644 "$srcdir/AMD/Lib/libamd.a" "$pkgdir/usr/lib/libamd.a" - cp $startdir/src/AMD/Include/*.h $startdir/pkg/usr/include + install -m644 $srcdir/UMFPACK/Lib/libumfpack.a "$pkgdir/usr/lib/" + install -m644 $srcdir/UMFPACK/Include/*.h $pkgdir/usr/include - install -m644 "$srcdir/UFconfig/UFconfig.h" "$pkgdir/usr/include" || return 1 + install -m644 "$srcdir/AMD/Lib/libamd.a" "$pkgdir/usr/lib/" + install -m644 $srcdir/AMD/Include/*.h $pkgdir/usr/include - # Fix permissions - cd $startdir/pkg/usr/include - chmod oug+r * - cd $startdir/pkg/usr/lib - chmod oug+r * + install -m644 "$srcdir/UFconfig/UFconfig.h" "$pkgdir/usr/include" } diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD index 72a3938d5..88eb1559e 100644 --- a/extra/vamp-plugin-sdk/PKGBUILD +++ b/extra/vamp-plugin-sdk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134888 2011-08-08 13:42:21Z schiv $ +# $Id: PKGBUILD 151204 2012-02-25 07:32:54Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Orivej Desh <smpuj@bk.ru> pkgname=vamp-plugin-sdk pkgver=2.2 -pkgrel=1 +pkgrel=2 pkgdesc="The Vamp audio analysis plug-in system" arch=('i686' 'x86_64') url="http://www.vamp-plugins.org/" diff --git a/extra/xorg-xbacklight/PKGBUILD b/extra/xorg-xbacklight/PKGBUILD index 5ed14c78c..fd40c6117 100644 --- a/extra/xorg-xbacklight/PKGBUILD +++ b/extra/xorg-xbacklight/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 113718 2011-03-10 14:54:32Z jgc $ +# $Id: PKGBUILD 151182 2012-02-25 07:02:48Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xbacklight pkgver=1.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="RandR-based backlight control application" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxrandr' 'libx11') @@ -18,7 +18,10 @@ build() { cd "${srcdir}/xbacklight-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xbacklight-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xorg-xbiff/PKGBUILD b/extra/xorg-xbiff/PKGBUILD index 60c750ed2..d30551e11 100644 --- a/extra/xorg-xbiff/PKGBUILD +++ b/extra/xorg-xbiff/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 108983 2011-02-05 10:35:36Z andyrtr $ +# $Id: PKGBUILD 151176 2012-02-25 06:58:45Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xbiff pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Watch mailboxes for new message delivery" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxaw' 'libxext') @@ -22,6 +22,5 @@ build() { package() { cd "${srcdir}/xbiff-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xorg-xcalc/PKGBUILD b/extra/xorg-xcalc/PKGBUILD index 8272a7965..13bdb8ae4 100644 --- a/extra/xorg-xcalc/PKGBUILD +++ b/extra/xorg-xcalc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: $ +# $Id: PKGBUILD 151172 2012-02-25 06:55:40Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xcalc pkgver=1.0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Scientific calculator for X" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxaw') @@ -17,7 +17,10 @@ build() { cd "${srcdir}/xcalc-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xcalc-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xorg-xconsole/PKGBUILD b/extra/xorg-xconsole/PKGBUILD index 204892339..ec5f653c6 100644 --- a/extra/xorg-xconsole/PKGBUILD +++ b/extra/xorg-xconsole/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: $ +# $Id: PKGBUILD 151170 2012-02-25 06:52:57Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xconsole pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Monitor system console messages with X" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') @@ -17,7 +17,10 @@ build() { cd "${srcdir}/xconsole-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xconsole-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xorg-xedit/PKGBUILD b/extra/xorg-xedit/PKGBUILD index b6a7dbf41..8b5e389bb 100644 --- a/extra/xorg-xedit/PKGBUILD +++ b/extra/xorg-xedit/PKGBUILD @@ -3,9 +3,9 @@ pkgname=xorg-xedit pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple text editor for X" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') @@ -17,7 +17,10 @@ build() { cd "${srcdir}/xedit-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xedit-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xorg-xeyes/PKGBUILD b/extra/xorg-xeyes/PKGBUILD index aea051d3a..717d7a7b7 100644 --- a/extra/xorg-xeyes/PKGBUILD +++ b/extra/xorg-xeyes/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: $ +# $Id: PKGBUILD 151165 2012-02-25 06:45:35Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xeyes pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Follow the mouse/SHAPE extension X demo" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'libxt' 'libxext' 'libxmu' 'libxrender') @@ -17,7 +17,10 @@ build() { cd "${srcdir}/xeyes-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xeyes-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xorg-xvinfo/PKGBUILD b/extra/xorg-xvinfo/PKGBUILD index f125fa32d..84f55418d 100644 --- a/extra/xorg-xvinfo/PKGBUILD +++ b/extra/xorg-xvinfo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 113836 2011-03-10 15:58:02Z jgc $ +# $Id: PKGBUILD 151163 2012-02-25 06:42:49Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xvinfo pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Prints out the capabilities of any video adaptors associated with the display that are accessible through the X-Video extension" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'libxv') @@ -18,7 +18,10 @@ build() { cd "${srcdir}/xvinfo-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xvinfo-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } |