diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-13 16:07:04 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-13 16:07:04 -0300 |
| commit | e6b487980c858023cb4a3678f2d27f52c2a32596 (patch) | |
| tree | 3a348db541d1a1ae1f356dd3970fff4910529558 /community | |
| parent | f08b6a2decf228473f030cfd49116c9fd0b05c37 (diff) | |
| parent | 07a52495b8a64f14843878d6116151fbdb6deefb (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/ecryptfs-utils/PKGBUILD
community/linux-tools/PKGBUILD
community/qtcurve-kde4/PKGBUILD
extra/audacity/PKGBUILD
extra/cups/PKGBUILD
extra/imagemagick/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdepim/PKGBUILD
extra/kradio/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libmowgli/PKGBUILD
extra/llvm/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/pycrypto/PKGBUILD
extra/xorg-server/PKGBUILD
libre/linux-libre/PKGBUILD
libre/syslinux/PKGBUILD
multilib-staging/gcc-multilib/PKGBUILD
multilib/lib32-libldap/PKGBUILD
staging/binutils/PKGBUILD
staging/gcc/PKGBUILD
staging/glibc/PKGBUILD
testing/cronie/PKGBUILD
testing/cryptsetup/PKGBUILD
testing/krb5/PKGBUILD
testing/lvm2/PKGBUILD
testing/net-tools/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community')
54 files changed, 2768 insertions, 185 deletions
diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD index f05bd1f20..85a76a355 100644 --- a/community/aqbanking/PKGBUILD +++ b/community/aqbanking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61641 2012-01-05 10:54:39Z spupykin $ +# $Id: PKGBUILD 74854 2012-08-07 14:17:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Moore <davidm@sjsoft.com> pkgname=aqbanking -pkgver=5.0.21 -_dnrel=91 +pkgver=5.0.25 +_dnrel=95 pkgrel=1 pkgdesc="A library for online banking and financial applications" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ license=('GPL') depends=('gwenhywfar' 'ktoblzcheck' 'libofx') options=('!makeflags' '!libtool') source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz") -md5sums=('634dac2c82c583ed6643678bc214026e') +md5sums=('b238639962128ce25db81870f65173d9') build() { cd $srcdir/aqbanking-$pkgver diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index 8b715fd38..b4b69f596 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69079 2012-04-08 23:33:54Z seblu $ +# $Id: PKGBUILD 74872 2012-08-08 02:08:13Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=bird pkgname=('bird' 'bird6') -pkgver=1.3.7 -pkgrel=2 +pkgver=1.3.8 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://bird.network.cz/' license=('GPL2') @@ -14,8 +14,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.conf' 'bird.service' 'bird6.service') -md5sums=('c400b008ef834d9e7288dcdbe41b7c15' - '1a4b98756d64f52333a83eff2e95d233' +md5sums=('965fee1be1d5cd45ceef3926e49c18ce' + '5e5346a057f187f56cce928b7e423636' '25241a4d7ef639506e0080431b2c1690' 'e82a0519dca0b289685fda44787f5911' 'c32e7f6cf1be6ed6f9aa98feea25176d') @@ -69,7 +69,6 @@ package_bird6 () { # iniscripts files install -D -m 755 "$srcdir/bird.rc" "$pkgdir/etc/rc.d/bird6" install -D -m 644 "$srcdir/bird.conf" "$pkgdir/etc/conf.d/bird6" - sed -i 's/bird/bird6/' "$pkgdir/etc/rc.d/bird6" # systemd config file install -D -m 644 "$srcdir/bird6.service" "$pkgdir/usr/lib/systemd/system/bird6.service" } diff --git a/community/bird/bird.rc b/community/bird/bird.rc index 95fe65217..a3aa5e4ad 100644 --- a/community/bird/bird.rc +++ b/community/bird/bird.rc @@ -4,31 +4,30 @@ . /etc/rc.d/functions . /etc/conf.d/${0##*/} -NAME=bird -DAEMON=/usr/sbin/bird +DAEMON=/usr/sbin/${0##*/} PID=$(pidof -o %PPID $DAEMON) case "$1" in - start) - stat_busy "Starting $NAME daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 - stat_fail - ;; + start) + stat_busy "Starting ${0##*/} daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; stop) - stat_busy "Stopping $NAME daemon" - [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 - stat_fail - ;; + stat_busy "Stopping ${0##*/} daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; restart) - $0 stop - $0 start - exit 0 - ;; - *) - echo "usage: ${0##*/} {start|stop|restart}" >&2 - ;; + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; esac exit 1 -# vim:set ts=2 sw=2 ft=sh noet: +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index 513b73d62..970c7d3c5 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 71484 2012-05-27 10:23:34Z tomegun $ +# $Id: PKGBUILD 74995 2012-08-11 10:00:29Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus pkgver=2.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="A very feature-rich ncurses-based music player" arch=('i686' 'x86_64' 'mips64el') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' +makedepends=('libao' 'libmpcdec' 'ffmpeg-compat' 'flac' 'libmad' 'faad2' 'libmodplug' 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' 'libpulse: for PulseAudio output plugin support' - 'ffmpeg: for ffmpeg input plugin support' + 'ffmpeg-compat: for ffmpeg input plugin support' 'libmodplug: for modplug input plugin support' 'faad2: for input AAC plugin support' 'libmad: for mp3 input plugin support' diff --git a/community/datemath/PKGBUILD b/community/datemath/PKGBUILD index a36029d6d..b44c1be73 100644 --- a/community/datemath/PKGBUILD +++ b/community/datemath/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 65110 2012-02-20 04:48:43Z spupykin $ +# $Id: PKGBUILD 74846 2012-08-07 05:46:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Todd Musall <tmusall@comcast.net> # Contributor: Todd Musall <tmusall@comcast.net> pkgname=datemath pkgver=2.0.10 -pkgrel=3 +pkgrel=4 pkgdesc="Command line date and time math utility." arch=('i686' 'x86_64' 'mips64el') url="http://www.unixwiz.net/tools/datemath.html" license=("GPL") depends=('glibc') -source=(http://www.unixwiz.net/tools/$pkgname.tar.gz) -md5sums=('2c369d70a43313b71dbe3c7cc50207de') +source=(http://www.unixwiz.net/tools/$pkgname.tar.gz + y2k.patch) +md5sums=('2c369d70a43313b71dbe3c7cc50207de' + '87758503414a967f06566b94523fc010') build() { cd $srcdir + patch -Np0 <$srcdir/y2k.patch make install -D -m755 $srcdir/datemath $pkgdir/usr/bin/datemath } diff --git a/community/datemath/y2k.patch b/community/datemath/y2k.patch new file mode 100644 index 000000000..4605ad505 --- /dev/null +++ b/community/datemath/y2k.patch @@ -0,0 +1,29 @@ +diff -Naur ../datemath/util.c ./util.c +--- ../datemath/util.c 2004-03-06 18:27:59.000000000 +0100 ++++ ./util.c 2012-08-01 09:37:30.767738221 +0200 +@@ -18,6 +18,7 @@ + #include "defs.h" + + int century19_year = 40; /* 0..39 = 2000 / 40..99 = 1999 */ ++static int century; /* may not be 1900... */ + + /* + * jultoyymm() +@@ -35,6 +36,8 @@ + + if (mdy[YY] < 1900) /* too early? */ + mdy[YY] = 1900; ++ ++ century = mdy[YY] / 100; + + mdy[YY] %= 100; /* strip off 19xx */ + +@@ -59,7 +62,7 @@ + mdy[YY] = yymm / 100; + mdy[DD] = eflag ? daysinmm(mdy[MM], mdy[YY]) : 1; + +- mdy[YY] += 1900; ++ mdy[YY] += century * 100; + + if (rv = rmdyjul(mdy, &jdate), rv < 0) + die("bad date conversion in yymmtojul-(%d)", rv); diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD index 0db88a375..ce97ec327 100644 --- a/community/dee/PKGBUILD +++ b/community/dee/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69804 2012-04-23 09:46:49Z ibiru $ +# $Id: PKGBUILD 75004 2012-08-11 13:46:07Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=dee -pkgver=1.0.10 +pkgver=1.0.12 pkgrel=1 pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'icu') makedepends=('python2' 'gobject-introspection' 'vala') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('17b715147e1721ce9624557949408d15') +md5sums=('8c0bcdf1f96882d2b24d6f5243480fae') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,4 +27,8 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install + + # Install GI overrides for python 3 as well + install -dm755 "$pkgdir/usr/lib/python3.2/site-packages/gi/overrides" + ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.2/site-packages/gi/overrides/Dee.py" } diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD index ca3be0926..b242a1b3f 100644 --- a/community/ecryptfs-utils/PKGBUILD +++ b/community/ecryptfs-utils/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 74760 2012-08-03 12:32:39Z tredaelli $ +# $Id: PKGBUILD 74862 2012-08-07 15:20:01Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Richard Murri <admin@richardmurri.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=ecryptfs-utils pkgver=100 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" url="https://launchpad.net/ecryptfs" license=('GPL') -makedepends=('swig' 'intltool' 'gettext') -depends=('keyutils' 'nss' 'python2') +makedepends=('swig' 'intltool' 'gettext' 'python2') +depends=('keyutils' 'nss' 'openssl') +optdepends=('python2: for python module') source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz") options=(!libtool) md5sums=('efaa5eabbd368268874536036397f73b') diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD index 37d8fecc3..fd487c44f 100644 --- a/community/fish/PKGBUILD +++ b/community/fish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74604 2012-07-31 12:48:32Z bpiotrowski $ +# $Id: PKGBUILD 74993 2012-08-11 09:42:41Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> @@ -7,13 +7,13 @@ pkgname=fish pkgver=2.0b2 -pkgrel=1 +pkgrel=2 pkgdesc='Smart and user friendly shell intended mostly for interactive use' arch=('i686' 'x86_64' 'mips64el') url='http://ridiculousfish.com/shell/' license=('GPL2') -depends=('python') -makedepends=('doxygen') +depends=('python2') +makedepends=('doxygen' 'python') install=fish.install source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz) md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1') @@ -22,7 +22,7 @@ build() { cd "$srcdir"/fishfish autoconf ./configure --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc \ --without-xsel make } @@ -33,4 +33,7 @@ package() { # compress man pages find "$pkgdir"/usr/share/fish/man/ -type f | xargs gzip -9 + + # use python2 + find "$pkgdir"/usr/share/fish/tools/ -type f -exec sed -e "1s|python|python2|" -i {} \; } diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD index 9f9423a28..4e7399c63 100644 --- a/community/flashrom/PKGBUILD +++ b/community/flashrom/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68472 2012-03-25 09:15:40Z giovanni $ +# $Id: PKGBUILD 74911 2012-08-09 12:06:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Cilyan Olowen <gaknar@gmail.com> # Contributor: fill <mailbox@fillo.ru> # Contributor: Anton Shestakov <engored*ya.ru> pkgname=flashrom -pkgver=0.9.5.2 +pkgver=0.9.6.1 pkgrel=1 pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips" url="http://www.flashrom.org/" @@ -14,7 +14,7 @@ license=('GPL') depends=('libftdi' 'pciutils') [ "$CARCH" != "mips64el" ] && optdepends=('dmidecode: for SMBIOS/DMI table decoder support') source=("http://download.flashrom.org/releases/${pkgname}-${pkgver}.tar.bz2") -md5sums=('280f8b1d3ef0533d6ec913b0da857477') +md5sums=('407e836c0a2b17ec76583cb6809f65e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index e08282d2e..74636c729 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74601 2012-07-31 12:43:27Z spupykin $ +# $Id: PKGBUILD 74850 2012-08-07 11:38:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=freerdp pkgver=1.0.1 -pkgrel=7 +pkgrel=8 pkgdesc="Free RDP client" arch=('i686' 'x86_64' 'mips64el') url="http://freerdp.sourceforge.net" @@ -15,11 +15,14 @@ makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl') conflicts=('freerdp-git') changelog=${pkgname}.changelog options=('!libtool') -source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz) -md5sums=('c843185e0ff22ce8409954651718f338') +source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz + https://github.com/FreeRDP/FreeRDP/commit/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch) +md5sums=('c843185e0ff22ce8409954651718f338' + '194fd599d0f706ecce772d5187e08385') build() { cd `find ${srcdir}/ -type d -name freerdp-\*` + patch -Np1 <$srcdir/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index ed3e9a710..ae0f2ec84 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74616 2012-07-31 19:56:01Z ebelanger $ +# $Id: PKGBUILD 74975 2012-08-10 23:14:23Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -48,6 +48,7 @@ package_gambas3-runtime() { pkgdesc="Runtime environment" conflicts=('gambas3-gb-gui') replaces=('gambas3-gb-gui') + provides=("gambas3-gb-gui=${pkgver}") install=gambas3-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD index 86bc51c37..24b5f89d8 100644 --- a/community/gwenhywfar/PKGBUILD +++ b/community/gwenhywfar/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 61643 2012-01-05 10:55:35Z spupykin $ +# $Id: PKGBUILD 74856 2012-08-07 14:18:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=gwenhywfar -pkgver=4.3.1 +pkgver=4.3.3 +_dnrel=67 pkgrel=1 pkgdesc="OS abstraction functions for various projects" arch=(i686 x86_64 'mips64el') @@ -13,8 +14,8 @@ license=("LGPL") depends=('openssl' 'gnutls' 'libgcrypt') makedepends=('gtk2' 'qt') optdepends=('gtk2' 'qt') -source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-$pkgver.tar.gz") -md5sums=('63370a89befee90436720458d0c81cc5') +source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=01&dummy=gwenhywfar-$pkgver.tar.gz") +md5sums=('c5b9d52a25960f84f9264a5a5dd484d1') build() { pacman -Q gwenhywfar && return 1 diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD index a0db4e39d..bff719418 100644 --- a/community/homebank/PKGBUILD +++ b/community/homebank/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67546 2012-03-13 11:59:17Z giovanni $ +# $Id: PKGBUILD 75013 2012-08-11 18:51:43Z ebelanger $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=homebank pkgver=4.4 -pkgrel=2 +pkgrel=3 pkgdesc="Free, easy, personal accounting for everyone" arch=('i686' 'x86_64' 'mips64el') url="http://homebank.free.fr/" @@ -16,14 +16,14 @@ source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz) sha256sums=('13b89373575e3ac229d2683aa7296778ad7cdae1a7a019c9124a1d5b23dce7d2') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD new file mode 100644 index 000000000..686583d0e --- /dev/null +++ b/community/kicad/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 74934 2012-08-10 01:31:30Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Marq Schneider <queueRAM@gmail.com> + +pkgname=kicad +pkgver=20120119 +_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} +_pkgbzr=3256 +pkgrel=1 +pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" +arch=('i686' 'x86_64') +url="http://iut-tice.ujf-grenoble.fr/kicad/" +license=('GPL') +depends=('mesa' 'wxgtk') +makedepends=('boost' 'cmake' 'zlib') +optdepends=('kicad-doc-bzr: for documentation' + 'kicad-library-bzr: for footprints') +install=kicad.install +source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources-$_pkgver-BZR$_pkgbzr-stable.zip + kicad-boost-polygon-declare-gtlsort-earlier.patch) +md5sums=('d65574c42efd72638aed80adef367c3b' + 'a2c39704238946e74a5ed0c38326345f') + +build() { + cd "$srcdir/KiCad_sources" + + patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch" + + # build and install kicad + mkdir -p build/Release + cd build/Release + cmake ../.. -DKICAD_STABLE_VERSION=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/KiCad_sources/build/Release" + + make DESTDIR="$pkgdir" install + + # copy updated linux icons + #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/" +} diff --git a/community/kicad/kicad-boost-polygon-declare-gtlsort-earlier.patch b/community/kicad/kicad-boost-polygon-declare-gtlsort-earlier.patch new file mode 100644 index 000000000..b0c992297 --- /dev/null +++ b/community/kicad/kicad-boost-polygon-declare-gtlsort-earlier.patch @@ -0,0 +1,11 @@ +--- include/boost/polygon/polygon.hpp.orig 2012-04-09 13:07:03.293907598 -0500 ++++ include/boost/polygon/polygon.hpp 2012-04-09 13:07:43.759923812 -0500 +@@ -24,6 +24,8 @@ + #include "transform.hpp"
+ #include "detail/transform_detail.hpp"
+
++#include "detail/polygon_sort_adaptor.hpp"
++
+ //interval
+ #include "interval_data.hpp"
+ #include "interval_traits.hpp"
diff --git a/community/kicad/kicad.install b/community/kicad/kicad.install new file mode 100644 index 000000000..7c21ff4c7 --- /dev/null +++ b/community/kicad/kicad.install @@ -0,0 +1,15 @@ +pkgname=kicad + +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime > /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD index 2f87d406a..89c642d36 100644 --- a/community/kmymoney/PKGBUILD +++ b/community/kmymoney/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64897 2012-02-18 19:53:56Z lcarlier $ +# $Id: PKGBUILD 75014 2012-08-11 18:51:50Z ebelanger $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Vamp898 <vamp898@web.de> @@ -8,7 +8,7 @@ pkgname=kmymoney pkgver=4.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" arch=('i686' 'x86_64' 'mips64el') url="http://kmymoney2.sourceforge.net/" @@ -25,7 +25,7 @@ sha256sums=('add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75' '7612b490400dbd4f80ff27bd328f8603a22279c81bb3004e53f48545dbd359ae') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # Qt 4.8 fix - fixed upstream patch -Np1 -i ../qt4.8.patch @@ -35,12 +35,12 @@ build() { cmake ../ \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RELEASE + -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES make VERBOSE=1 } package() { - cd ${srcdir}/${pkgname}-${pkgver}/build + cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/kmymoney/kmymoney.changelog b/community/kmymoney/kmymoney.changelog index bd8d49e3c..6943a0716 100644 --- a/community/kmymoney/kmymoney.changelog +++ b/community/kmymoney/kmymoney.changelog @@ -1,3 +1,7 @@ +2012-08-09 Eric Belanger <eric@archlinux.org> + * kmymoney 4.6.2-2 + * Rebuild against libofx 0.9.5 + 2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kmymoney 4.5.3 diff --git a/community/kmymoney/kmymoney.install b/community/kmymoney/kmymoney.install index 7c8a8bd2b..f7f5bd0bf 100644 --- a/community/kmymoney/kmymoney.install +++ b/community/kmymoney/kmymoney.install @@ -1,5 +1,7 @@ post_install() { update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index 9d8adc1f7..50c3257d1 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61645 2012-01-05 10:56:22Z spupykin $ +# $Id: PKGBUILD 74858 2012-08-07 14:19:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> pkgname=ktoblzcheck -pkgver=1.37 +pkgver=1.39 pkgrel=1 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz ktoblzcheck-python3.patch) -md5sums=('93b540b5478bfb1b078613cbf1cc2446' +md5sums=('ef5efd6e2c31aaf6405060ec477c200c' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index 7ad92a44d..8440defc4 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74756 2012-08-03 11:00:41Z idevolder $ +# $Id: PKGBUILD 74867 2012-08-07 16:06:46Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: Philippe Cherel <philippe.cherel@mayenne.org> pkgname=libcec -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url="https://github.com/Pulse-Eight/libcec" license=('GPL') depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-b0a5e4f -sha256sums=('3725d19cabec4bbd4142fd735bda43d33aad2a4a62b20ef337f395b549e7adec') +_srcfolder=Pulse-Eight-libcec-34a9cec +sha256sums=('97cda7935404360b56e3c0698deabcc97548bc357a4e4fecbe89de3db12ca0bc') options=(!libtool) build() { diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index 9ca9ece7a..8af8184b3 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71582 2012-05-30 09:15:22Z spupykin $ +# $Id: PKGBUILD 74895 2012-08-09 08:03:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.58 +pkgver=0.7.59 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('a87a32f243052fb1eca3918c519f64b6' +md5sums=('d3f74fd28810e5f1eb6b9d2b893b8a5c' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index 338660765..322ca3466 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69420 2012-04-16 09:40:09Z spupykin $ +# $Id: PKGBUILD 74891 2012-08-09 07:50:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: hydro <hydro@freenet.de> pkgname=libzen -pkgver=0.4.26 +pkgver=0.4.28 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('6509bd3787509f4e62e48a99884db636') +md5sums=('f09e519b71e61a7226ffefe55d00eadf') build() { cd $srcdir/ZenLib/Project/GNU/Library diff --git a/community/linux-tools/usbipd.conf b/community/linux-tools/usbipd.conf new file mode 100644 index 000000000..5990b857a --- /dev/null +++ b/community/linux-tools/usbipd.conf @@ -0,0 +1,3 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +DAEMON_OPTS='' diff --git a/community/linux-tools/usbipd.rc b/community/linux-tools/usbipd.rc new file mode 100644 index 000000000..15a1bcf00 --- /dev/null +++ b/community/linux-tools/usbipd.rc @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${0##*/} + +DAEMON=/usr/sbin/usbipd +PID=$(pidof -o %PPID $DAEMON) +DAEMON_OPTS="--daemon $DAEMON_OPTS" + +case "$1" in + start) + stat_busy "Starting ${0##*/} daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping ${0##*/} daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/linux-tools/usbipd.service b/community/linux-tools/usbipd.service new file mode 100644 index 000000000..ac2f5f7c1 --- /dev/null +++ b/community/linux-tools/usbipd.service @@ -0,0 +1,8 @@ +[Unit] +Description=USB/IP server + +[Service] +ExecStart=/usr/sbin/usbipd + +[Install] +WantedBy=multi-user.target diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD index c464a1a9b..5016dbbd4 100644 --- a/community/mariadb/PKGBUILD +++ b/community/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74694 2012-08-02 08:13:12Z bpiotrowski $ +# $Id: PKGBUILD 74962 2012-08-10 10:08:18Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.25 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="http://mariadb.org/" @@ -136,3 +136,5 @@ package_mariadb() { install -dm700 "${pkgdir}"/var/lib/mysql } + +# vim:set ts=2 sw=2 et: diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install index 9a4479215..c9cc75b47 100644 --- a/community/mariadb/mariadb.install +++ b/community/mariadb/mariadb.install @@ -1,7 +1,7 @@ post_install(){ groupadd -g 89 mysql &>/dev/null useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - usr/bin/mysql_install_db --user=mysql --basedir=/usr + /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql chown -R mysql:mysql var/lib/mysql &>/dev/null } @@ -14,6 +14,13 @@ post_upgrade(){ echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." echo " >> " fi + + if [ "$(vercmp $2 5.5.25-4)" -lt 0 ] && [ -d /data ]; then + for x in /data/*; do + cp -r $x /var/lib/mysql/ + done + rm -rf /data + fi } post_remove(){ @@ -24,3 +31,5 @@ post_remove(){ groupdel mysql fi } + +# vim:set ts=2 sw=2 et: diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index 8b5017bc1..8e222bc18 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74240 2012-07-23 05:41:33Z ttopper $ +# $Id: PKGBUILD 74885 2012-08-08 16:34:04Z ttopper $ # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=mathomatic -pkgver=16.0.1 +pkgver=16.0.2 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'm4: for complex operations using the matho script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('550c4c27da68db1d3d62ed2888828548') +md5sums=('17d4034b9f4af59d55095d47e9096c7b') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 6de7bfed5..5dc918421 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71586 2012-05-30 09:16:55Z spupykin $ +# $Id: PKGBUILD 74899 2012-08-09 08:05:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.58 +pkgver=0.7.59 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('e0b0decf4a036fad431aa5149cc71d59') +md5sums=('485b160334254d9574ed0f7bb29ef35f') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index d879d30e9..f118ba0ac 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71584 2012-05-30 09:16:14Z spupykin $ +# $Id: PKGBUILD 74897 2012-08-09 08:04:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.58 +pkgver=0.7.59 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('e0b0decf4a036fad431aa5149cc71d59') +md5sums=('485b160334254d9574ed0f7bb29ef35f') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index cb6cd70b2..02752388f 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74696 2012-08-02 08:23:51Z bpiotrowski $ +# $Id: PKGBUILD 74874 2012-08-08 06:49:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -7,8 +7,8 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.2.2 -pkgrel=3 +pkgver=1.2.3 +pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') @@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz rc.d service nginx.logrotate) -md5sums=('53105bbe3ac9319db54d9eb46119695b' +md5sums=('0a986e60826d9e3b453dbefc36bf8f6c' 'f62c7c9b5a53471d4666a4c49ad363fb' '62d494d23aef31d0b867161f9fffa6eb' 'b38744739022876554a0444d92e6603b') diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index 8370127ab..87028fd84 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 70116 2012-04-30 04:19:56Z foutrelis $ +# $Id: PKGBUILD 74960 2012-08-10 09:27:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> pkgname=parole -pkgver=0.2.0.6 -pkgrel=2 +pkgver=0.3.0 +pkgrel=1 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/applications/parole/" license=('GPL') depends=('gstreamer0.10-base>=0.10.11' 'hicolor-icon-theme' 'libnotify>=0.4.1' - 'libxfcegui4>=4.6.0' 'taglib>=1.4' 'desktop-file-utils') + 'libxfce4ui>=4.7.0' 'taglib>=1.4' 'desktop-file-utils') makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools') optdepends=('xulrunner>=1.9.1: browser plugin') conflicts=('parole-media-player-git') options=('!libtool') install=parole.install -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('5d7e5ab7535bdf89508a8d7e551f9187') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +md5sums=('869b1c1f3a02d46ab17755d043b3e719') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD index 40254db01..ce31eff7f 100644 --- a/community/php-memcached/PKGBUILD +++ b/community/php-memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73393 2012-07-07 05:47:10Z foutrelis $ +# $Id: PKGBUILD 74848 2012-08-07 11:05:47Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-memcached -pkgver=2.0.1 -pkgrel=5 +pkgver=2.1.0 +pkgrel=1 pkgdesc="PHP extension for interfacing with memcached via libmemcached library" arch=('i686' 'x86_64' 'mips64el') url="http://pecl.php.net/package/memcached" @@ -11,7 +11,7 @@ license=('PHP') depends=('php' 'libmemcached') backup=('etc/php/conf.d/memcached.ini') source=(http://pecl.php.net/get/memcached-$pkgver.tgz) -sha256sums=('250779594e846b7b31390c384697eb24a5096123b0d3e2f4a1a0b79d14fb1bff') +sha256sums=('bc4940015be74f47908d410d7b55e10a3d5bf65674036d944c73558227fcc4af') build() { cd "$srcdir/memcached-$pkgver" diff --git a/community/pianobar/PKGBUILD b/community/pianobar/PKGBUILD index a8b929543..685342446 100644 --- a/community/pianobar/PKGBUILD +++ b/community/pianobar/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 72823 2012-06-22 22:35:27Z dwallace $ +# $Id: PKGBUILD 75011 2012-08-11 17:31:57Z dwallace $ # Maintainer: Daniel Wallace < danielwallace at gtmanfred dot com> # Contributor: Mitch Bigelow <ipha00@gmail.com> # Contributor: Patrick Palka <patrick@parcs.ath.cx> pkgname=pianobar -pkgver=2012.05.06 -pkgrel=3 +pkgver=2012.06.24 +pkgrel=1 pkgdesc="console-based frontend for Pandora" url="http://6xq.net/0017" arch=('i686' 'x86_64' 'mips64el') license=('MIT') depends=('libao' 'faad2' 'libmad' 'gnutls' 'json-c' 'libgcrypt') -source=(http://6xq.net/media/00/16/pianobar-$pkgver.tar.bz2) -sha256sums=('b143882ca50303d560f49567d1a508ca4b48208db4eb8aa67f369fcaae708d7a') +source=(http://6xq.net/projects/pianobar/$pkgname-$pkgver.tar.bz2) +sha256sums=('a80307dcfc8786c28d6025f54820664eca0cf26f888bd608c95d486762f908aa') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index d92edb97a..5bce3fd1e 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.8 +_dcpkgver=2.1.9 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/community/python2-basemap/PKGBUILD b/community/python2-basemap/PKGBUILD index 0e9da0395..8e65c2f86 100644 --- a/community/python2-basemap/PKGBUILD +++ b/community/python2-basemap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73031 2012-06-28 18:07:29Z stephane $ +# $Id: PKGBUILD 74860 2012-08-07 15:09:34Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Julien Morin <jmorin@cp.dias.ie> pkgname=python2-basemap -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="Toolkit for plotting data on map projections" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz") -sha1sums=('b6d312129d2ae7fb612490516cf87daaf18cb033') +sha1sums=('14b6f5f645febbc73b23e8aea8fdb9e4b4b9adb4') build() { cd "${srcdir}/basemap-${pkgver}" diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 3bbf863e4..ebbbb7e76 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74355 2012-07-25 15:34:15Z svenstaro $ +# $Id: PKGBUILD 74977 2012-08-10 23:21:48Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -7,15 +7,15 @@ # Contributor: delor <bartekpiech gmail com> pkgname="qtcreator" -pkgver=2.5.1 -_pkgver=2.5.1 +pkgver=2.5.2 +_pkgver=2.5.2 pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64' 'mips64el') url='http://qt.nokia.com/products/developer-tools' license=('LGPL') -depends=('qt>=4.8.0') -makedepends=('qt-private-headers>=4.8.0' 'git') +depends=('qt') +makedepends=('qt-private-headers' 'git') options=('docs') optdepends=('qt-doc: for the integrated Qt documentation' 'gdb: for the debugger' @@ -27,12 +27,16 @@ optdepends=('qt-doc: for the integrated Qt documentation' 'valgrind: for analyze support') install=qtcreator.install source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz" - 'qtcreator.desktop') -md5sums=('321e6ee4640cee8177cbb302fde2ce84' - 'f1f4680b9838ff0b8f4cf11eb850d662') - + 'qtcreator.desktop' + 'fix-glsl-shit.patch') +md5sums=('4a9c09cdf4609753283c31451c84ceb8' + 'f1f4680b9838ff0b8f4cf11eb850d662' + '7453f6aabe2d61754490a874a26c087b') + build() { cd ${srcdir} + + patch -Np1 -d $srcdir/qt-creator-$_pkgver-src < $srcdir/fix-glsl-shit.patch [[ -d build ]] && rm -r build mkdir build && cd build diff --git a/community/qtcreator/fix-glsl-shit.patch b/community/qtcreator/fix-glsl-shit.patch new file mode 100644 index 000000000..4b5e504e1 --- /dev/null +++ b/community/qtcreator/fix-glsl-shit.patch @@ -0,0 +1,2376 @@ +From e91045469d59c35607faa344bcfba2b2c566da51 Mon Sep 17 00:00:00 2001 +From: Christian Kamm <christian.d.kamm@nokia.com> +Date: Mon, 6 Aug 2012 11:29:55 +0200 +Subject: [PATCH] GLSL: Fix recovery token order to avoid infinite loop. + +The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ... + +Task-number: QTCREATORBUG-7517 +Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19 +Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> +--- + src/libs/glsl/glsl.g | 4 +- + src/libs/glsl/glslparser.cpp | 638 +++++++++++++++++++++--------------------- + src/libs/glsl/glslparser.h | 2 +- + 3 files changed, 322 insertions(+), 322 deletions(-) + +diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g +index 67f564c..3c6ae7c 100644 +--- a/src/libs/glsl/glsl.g ++++ b/src/libs/glsl/glsl.g +@@ -456,7 +456,7 @@ private: + #include <iostream> + #include <cstdio> + #include <cassert> +-#include <QtCore/QDebug> ++#include <QDebug> + + using namespace GLSL; + +@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken) + + static int tks[] = { + T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, +- T_SEMICOLON, T_COMMA, T_COLON, ++ T_SEMICOLON, T_COLON, T_COMMA, + T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, + T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, + T_WHILE, +diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp +index cf4bbe4..d82096b 100644 +--- a/src/libs/glsl/glslparser.cpp ++++ b/src/libs/glsl/glslparser.cpp +@@ -1,5 +1,5 @@ + +-#line 427 "./glsl.g" ++#line 423 "./glsl.g" + + /************************************************************************** + ** +@@ -171,7 +171,7 @@ AST *Parser::parse(int startToken) + + static int tks[] = { + T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, +- T_SEMICOLON, T_COMMA, T_COLON, ++ T_SEMICOLON, T_COLON, T_COMMA, + T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, + T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, + T_WHILE, +@@ -215,137 +215,137 @@ AST *Parser::parse(int startToken) + return 0; + } + +-#line 647 "./glsl.g" ++#line 641 "./glsl.g" + + void Parser::reduce(int ruleno) + { + switch(ruleno) { + +-#line 656 "./glsl.g" ++#line 650 "./glsl.g" + + case 0: { + ast(1) = makeAstNode<IdentifierExpressionAST>(string(1)); + } break; + +-#line 663 "./glsl.g" ++#line 657 "./glsl.g" + + case 1: { + ast(1) = makeAstNode<LiteralExpressionAST>(string(1)); + } break; + +-#line 670 "./glsl.g" ++#line 664 "./glsl.g" + + case 2: { + ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("true", 4)); + } break; + +-#line 677 "./glsl.g" ++#line 671 "./glsl.g" + + case 3: { + ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("false", 5)); + } break; + +-#line 684 "./glsl.g" ++#line 678 "./glsl.g" + + case 4: { + // nothing to do. + } break; + +-#line 691 "./glsl.g" ++#line 685 "./glsl.g" + + case 5: { + ast(1) = ast(2); + } break; + +-#line 698 "./glsl.g" ++#line 692 "./glsl.g" + + case 6: { + // nothing to do. + } break; + +-#line 705 "./glsl.g" ++#line 699 "./glsl.g" + + case 7: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ArrayAccess, expression(1), expression(3)); + } break; + +-#line 712 "./glsl.g" ++#line 706 "./glsl.g" + + case 8: { + // nothing to do. + } break; + +-#line 719 "./glsl.g" ++#line 713 "./glsl.g" + + case 9: { + ast(1) = makeAstNode<MemberAccessExpressionAST>(expression(1), string(3)); + } break; + +-#line 726 "./glsl.g" ++#line 720 "./glsl.g" + + case 10: { + ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostIncrement, expression(1)); + } break; + +-#line 733 "./glsl.g" ++#line 727 "./glsl.g" + + case 11: { + ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostDecrement, expression(1)); + } break; + +-#line 740 "./glsl.g" ++#line 734 "./glsl.g" + + case 12: { + // nothing to do. + } break; + +-#line 747 "./glsl.g" ++#line 741 "./glsl.g" + + case 13: { + // nothing to do. + } break; + +-#line 754 "./glsl.g" ++#line 748 "./glsl.g" + + case 14: { + ast(1) = makeAstNode<FunctionCallExpressionAST> + (sym(1).function.id, sym(1).function.arguments); + } break; + +-#line 762 "./glsl.g" ++#line 756 "./glsl.g" + + case 15: { + ast(1) = makeAstNode<FunctionCallExpressionAST> + (expression(1), sym(3).function.id, sym(3).function.arguments); + } break; + +-#line 770 "./glsl.g" ++#line 764 "./glsl.g" + + case 16: { + // nothing to do. + } break; + +-#line 777 "./glsl.g" ++#line 771 "./glsl.g" + + case 17: { + // nothing to do. + } break; + +-#line 784 "./glsl.g" ++#line 778 "./glsl.g" + + case 18: { + sym(1).function.id = sym(1).function_identifier; + sym(1).function.arguments = 0; + } break; + +-#line 792 "./glsl.g" ++#line 786 "./glsl.g" + + case 19: { + sym(1).function.id = sym(1).function_identifier; + sym(1).function.arguments = 0; + } break; + +-#line 800 "./glsl.g" ++#line 794 "./glsl.g" + + case 20: { + sym(1).function.id = sym(1).function_identifier; +@@ -353,7 +353,7 @@ case 20: { + makeAstNode< List<ExpressionAST *> >(expression(2)); + } break; + +-#line 809 "./glsl.g" ++#line 803 "./glsl.g" + + case 21: { + sym(1).function.arguments = +@@ -361,379 +361,379 @@ case 21: { + (sym(1).function.arguments, expression(3)); + } break; + +-#line 818 "./glsl.g" ++#line 812 "./glsl.g" + + case 22: { + // nothing to do. + } break; + +-#line 825 "./glsl.g" ++#line 819 "./glsl.g" + + case 23: { + ast(1) = makeAstNode<FunctionIdentifierAST>(type(1)); + } break; + +-#line 832 "./glsl.g" ++#line 826 "./glsl.g" + + case 24: { + ast(1) = makeAstNode<FunctionIdentifierAST>(string(1)); + } break; + +-#line 839 "./glsl.g" ++#line 833 "./glsl.g" + + case 25: { + // nothing to do. + } break; + +-#line 846 "./glsl.g" ++#line 840 "./glsl.g" + + case 26: { + ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreIncrement, expression(2)); + } break; + +-#line 853 "./glsl.g" ++#line 847 "./glsl.g" + + case 27: { + ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreDecrement, expression(2)); + } break; + +-#line 860 "./glsl.g" ++#line 854 "./glsl.g" + + case 28: { + ast(1) = makeAstNode<UnaryExpressionAST>(sym(1).kind, expression(2)); + } break; + +-#line 867 "./glsl.g" ++#line 861 "./glsl.g" + + case 29: { + sym(1).kind = AST::Kind_UnaryPlus; + } break; + +-#line 874 "./glsl.g" ++#line 868 "./glsl.g" + + case 30: { + sym(1).kind = AST::Kind_UnaryMinus; + } break; + +-#line 881 "./glsl.g" ++#line 875 "./glsl.g" + + case 31: { + sym(1).kind = AST::Kind_LogicalNot; + } break; + +-#line 888 "./glsl.g" ++#line 882 "./glsl.g" + + case 32: { + sym(1).kind = AST::Kind_BitwiseNot; + } break; + +-#line 895 "./glsl.g" ++#line 889 "./glsl.g" + + case 33: { + // nothing to do. + } break; + +-#line 902 "./glsl.g" ++#line 896 "./glsl.g" + + case 34: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Multiply, expression(1), expression(3)); + } break; + +-#line 909 "./glsl.g" ++#line 903 "./glsl.g" + + case 35: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Divide, expression(1), expression(3)); + } break; + +-#line 916 "./glsl.g" ++#line 910 "./glsl.g" + + case 36: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Modulus, expression(1), expression(3)); + } break; + +-#line 923 "./glsl.g" ++#line 917 "./glsl.g" + + case 37: { + // nothing to do. + } break; + +-#line 930 "./glsl.g" ++#line 924 "./glsl.g" + + case 38: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Plus, expression(1), expression(3)); + } break; + +-#line 937 "./glsl.g" ++#line 931 "./glsl.g" + + case 39: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Minus, expression(1), expression(3)); + } break; + +-#line 944 "./glsl.g" ++#line 938 "./glsl.g" + + case 40: { + // nothing to do. + } break; + +-#line 951 "./glsl.g" ++#line 945 "./glsl.g" + + case 41: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftLeft, expression(1), expression(3)); + } break; + +-#line 958 "./glsl.g" ++#line 952 "./glsl.g" + + case 42: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftRight, expression(1), expression(3)); + } break; + +-#line 965 "./glsl.g" ++#line 959 "./glsl.g" + + case 43: { + // nothing to do. + } break; + +-#line 972 "./glsl.g" ++#line 966 "./glsl.g" + + case 44: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessThan, expression(1), expression(3)); + } break; + +-#line 979 "./glsl.g" ++#line 973 "./glsl.g" + + case 45: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterThan, expression(1), expression(3)); + } break; + +-#line 986 "./glsl.g" ++#line 980 "./glsl.g" + + case 46: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessEqual, expression(1), expression(3)); + } break; + +-#line 993 "./glsl.g" ++#line 987 "./glsl.g" + + case 47: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterEqual, expression(1), expression(3)); + } break; + +-#line 1000 "./glsl.g" ++#line 994 "./glsl.g" + + case 48: { + // nothing to do. + } break; + +-#line 1007 "./glsl.g" ++#line 1001 "./glsl.g" + + case 49: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Equal, expression(1), expression(3)); + } break; + +-#line 1014 "./glsl.g" ++#line 1008 "./glsl.g" + + case 50: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_NotEqual, expression(1), expression(3)); + } break; + +-#line 1021 "./glsl.g" ++#line 1015 "./glsl.g" + + case 51: { + // nothing to do. + } break; + +-#line 1028 "./glsl.g" ++#line 1022 "./glsl.g" + + case 52: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseAnd, expression(1), expression(3)); + } break; + +-#line 1035 "./glsl.g" ++#line 1029 "./glsl.g" + + case 53: { + // nothing to do. + } break; + +-#line 1042 "./glsl.g" ++#line 1036 "./glsl.g" + + case 54: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseXor, expression(1), expression(3)); + } break; + +-#line 1049 "./glsl.g" ++#line 1043 "./glsl.g" + + case 55: { + // nothing to do. + } break; + +-#line 1056 "./glsl.g" ++#line 1050 "./glsl.g" + + case 56: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseOr, expression(1), expression(3)); + } break; + +-#line 1063 "./glsl.g" ++#line 1057 "./glsl.g" + + case 57: { + // nothing to do. + } break; + +-#line 1070 "./glsl.g" ++#line 1064 "./glsl.g" + + case 58: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalAnd, expression(1), expression(3)); + } break; + +-#line 1077 "./glsl.g" ++#line 1071 "./glsl.g" + + case 59: { + // nothing to do. + } break; + +-#line 1084 "./glsl.g" ++#line 1078 "./glsl.g" + + case 60: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalXor, expression(1), expression(3)); + } break; + +-#line 1091 "./glsl.g" ++#line 1085 "./glsl.g" + + case 61: { + // nothing to do. + } break; + +-#line 1098 "./glsl.g" ++#line 1092 "./glsl.g" + + case 62: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalOr, expression(1), expression(3)); + } break; + +-#line 1105 "./glsl.g" ++#line 1099 "./glsl.g" + + case 63: { + // nothing to do. + } break; + +-#line 1112 "./glsl.g" ++#line 1106 "./glsl.g" + + case 64: { + ast(1) = makeAstNode<TernaryExpressionAST>(AST::Kind_Conditional, expression(1), expression(3), expression(5)); + } break; + +-#line 1119 "./glsl.g" ++#line 1113 "./glsl.g" + + case 65: { + // nothing to do. + } break; + +-#line 1126 "./glsl.g" ++#line 1120 "./glsl.g" + + case 66: { + ast(1) = makeAstNode<AssignmentExpressionAST>(sym(2).kind, expression(1), expression(3)); + } break; + +-#line 1133 "./glsl.g" ++#line 1127 "./glsl.g" + + case 67: { + sym(1).kind = AST::Kind_Assign; + } break; + +-#line 1140 "./glsl.g" ++#line 1134 "./glsl.g" + + case 68: { + sym(1).kind = AST::Kind_AssignMultiply; + } break; + +-#line 1147 "./glsl.g" ++#line 1141 "./glsl.g" + + case 69: { + sym(1).kind = AST::Kind_AssignDivide; + } break; + +-#line 1154 "./glsl.g" ++#line 1148 "./glsl.g" + + case 70: { + sym(1).kind = AST::Kind_AssignModulus; + } break; + +-#line 1161 "./glsl.g" ++#line 1155 "./glsl.g" + + case 71: { + sym(1).kind = AST::Kind_AssignPlus; + } break; + +-#line 1168 "./glsl.g" ++#line 1162 "./glsl.g" + + case 72: { + sym(1).kind = AST::Kind_AssignMinus; + } break; + +-#line 1175 "./glsl.g" ++#line 1169 "./glsl.g" + + case 73: { + sym(1).kind = AST::Kind_AssignShiftLeft; + } break; + +-#line 1182 "./glsl.g" ++#line 1176 "./glsl.g" + + case 74: { + sym(1).kind = AST::Kind_AssignShiftRight; + } break; + +-#line 1189 "./glsl.g" ++#line 1183 "./glsl.g" + + case 75: { + sym(1).kind = AST::Kind_AssignAnd; + } break; + +-#line 1196 "./glsl.g" ++#line 1190 "./glsl.g" + + case 76: { + sym(1).kind = AST::Kind_AssignXor; + } break; + +-#line 1203 "./glsl.g" ++#line 1197 "./glsl.g" + + case 77: { + sym(1).kind = AST::Kind_AssignOr; + } break; + +-#line 1210 "./glsl.g" ++#line 1204 "./glsl.g" + + case 78: { + // nothing to do. + } break; + +-#line 1217 "./glsl.g" ++#line 1211 "./glsl.g" + + case 79: { + ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Comma, expression(1), expression(3)); + } break; + +-#line 1224 "./glsl.g" ++#line 1218 "./glsl.g" + + case 80: { + // nothing to do. + } break; + +-#line 1231 "./glsl.g" ++#line 1225 "./glsl.g" + + case 81: { + // nothing to do. + } break; + +-#line 1238 "./glsl.g" ++#line 1232 "./glsl.g" + + case 82: { + ast(1) = makeAstNode<InitDeclarationAST>(sym(1).declaration_list); + } break; + +-#line 1245 "./glsl.g" ++#line 1239 "./glsl.g" + + case 83: { + ast(1) = makeAstNode<PrecisionDeclarationAST>(sym(2).precision, type(3)); + } break; + +-#line 1252 "./glsl.g" ++#line 1246 "./glsl.g" + + case 84: { + if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) { +@@ -743,7 +743,7 @@ case 84: { + ast(1) = makeAstNode<TypeDeclarationAST>(type); + } break; + +-#line 1263 "./glsl.g" ++#line 1257 "./glsl.g" + + case 85: { + if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { +@@ -761,7 +761,7 @@ case 85: { + makeAstNode<VariableDeclarationAST>(qualtype, string(6))); + } break; + +-#line 1282 "./glsl.g" ++#line 1276 "./glsl.g" + + case 86: { + if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { +@@ -780,7 +780,7 @@ case 86: { + (makeAstNode<ArrayTypeAST>(qualtype), string(6))); + } break; + +-#line 1302 "./glsl.g" ++#line 1296 "./glsl.g" + + case 87: { + if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { +@@ -799,7 +799,7 @@ case 87: { + (makeAstNode<ArrayTypeAST>(qualtype, expression(8)), string(6))); + } break; + +-#line 1322 "./glsl.g" ++#line 1316 "./glsl.g" + + case 88: { + TypeAST *type = makeAstNode<QualifiedTypeAST> +@@ -808,59 +808,59 @@ case 88: { + ast(1) = makeAstNode<TypeDeclarationAST>(type); + } break; + +-#line 1332 "./glsl.g" ++#line 1326 "./glsl.g" + + case 89: { + function(1)->finishParams(); + } break; + +-#line 1339 "./glsl.g" ++#line 1333 "./glsl.g" + + case 90: { + // nothing to do. + } break; + +-#line 1346 "./glsl.g" ++#line 1340 "./glsl.g" + + case 91: { + // nothing to do. + } break; + +-#line 1353 "./glsl.g" ++#line 1347 "./glsl.g" + + case 92: { + function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > + (sym(2).param_declaration); + } break; + +-#line 1361 "./glsl.g" ++#line 1355 "./glsl.g" + + case 93: { + function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > + (function(1)->params, sym(3).param_declaration); + } break; + +-#line 1369 "./glsl.g" ++#line 1363 "./glsl.g" + + case 94: { + function(1) = makeAstNode<FunctionDeclarationAST>(type(1), string(2)); + } break; + +-#line 1376 "./glsl.g" ++#line 1370 "./glsl.g" + + case 95: { + sym(1).param_declarator.type = type(1); + sym(1).param_declarator.name = string(2); + } break; + +-#line 1384 "./glsl.g" ++#line 1378 "./glsl.g" + + case 96: { + sym(1).param_declarator.type = makeAstNode<ArrayTypeAST>(type(1), expression(4)); + sym(1).param_declarator.name = string(2); + } break; + +-#line 1392 "./glsl.g" ++#line 1386 "./glsl.g" + + case 97: { + ast(1) = makeAstNode<ParameterDeclarationAST> +@@ -871,7 +871,7 @@ case 97: { + sym(3).param_declarator.name); + } break; + +-#line 1404 "./glsl.g" ++#line 1398 "./glsl.g" + + case 98: { + ast(1) = makeAstNode<ParameterDeclarationAST> +@@ -880,7 +880,7 @@ case 98: { + sym(2).param_declarator.name); + } break; + +-#line 1414 "./glsl.g" ++#line 1408 "./glsl.g" + + case 99: { + ast(1) = makeAstNode<ParameterDeclarationAST> +@@ -890,7 +890,7 @@ case 99: { + (const QString *)0); + } break; + +-#line 1425 "./glsl.g" ++#line 1419 "./glsl.g" + + case 100: { + ast(1) = makeAstNode<ParameterDeclarationAST> +@@ -898,44 +898,44 @@ case 100: { + (const QString *)0); + } break; + +-#line 1434 "./glsl.g" ++#line 1428 "./glsl.g" + + case 101: { + sym(1).qualifier = ParameterDeclarationAST::In; + } break; + +-#line 1441 "./glsl.g" ++#line 1435 "./glsl.g" + + case 102: { + sym(1).qualifier = ParameterDeclarationAST::In; + } break; + +-#line 1448 "./glsl.g" ++#line 1442 "./glsl.g" + + case 103: { + sym(1).qualifier = ParameterDeclarationAST::Out; + } break; + +-#line 1455 "./glsl.g" ++#line 1449 "./glsl.g" + + case 104: { + sym(1).qualifier = ParameterDeclarationAST::InOut; + } break; + +-#line 1462 "./glsl.g" ++#line 1456 "./glsl.g" + + case 105: { + // nothing to do. + } break; + +-#line 1469 "./glsl.g" ++#line 1463 "./glsl.g" + + case 106: { + sym(1).declaration_list = makeAstNode< List<DeclarationAST *> > + (sym(1).declaration); + } break; + +-#line 1477 "./glsl.g" ++#line 1471 "./glsl.g" + + case 107: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -944,7 +944,7 @@ case 107: { + (sym(1).declaration_list, decl); + } break; + +-#line 1487 "./glsl.g" ++#line 1481 "./glsl.g" + + case 108: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -954,7 +954,7 @@ case 108: { + (sym(1).declaration_list, decl); + } break; + +-#line 1498 "./glsl.g" ++#line 1492 "./glsl.g" + + case 109: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -964,7 +964,7 @@ case 109: { + (sym(1).declaration_list, decl); + } break; + +-#line 1509 "./glsl.g" ++#line 1503 "./glsl.g" + + case 110: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -975,7 +975,7 @@ case 110: { + (sym(1).declaration_list, decl); + } break; + +-#line 1521 "./glsl.g" ++#line 1515 "./glsl.g" + + case 111: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -986,7 +986,7 @@ case 111: { + (sym(1).declaration_list, decl); + } break; + +-#line 1533 "./glsl.g" ++#line 1527 "./glsl.g" + + case 112: { + TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); +@@ -996,40 +996,40 @@ case 112: { + (sym(1).declaration_list, decl); + } break; + +-#line 1544 "./glsl.g" ++#line 1538 "./glsl.g" + + case 113: { + ast(1) = makeAstNode<TypeDeclarationAST>(type(1)); + } break; + +-#line 1551 "./glsl.g" ++#line 1545 "./glsl.g" + + case 114: { + ast(1) = makeAstNode<VariableDeclarationAST>(type(1), string(2)); + } break; + +-#line 1558 "./glsl.g" ++#line 1552 "./glsl.g" + + case 115: { + ast(1) = makeAstNode<VariableDeclarationAST> + (makeAstNode<ArrayTypeAST>(type(1)), string(2)); + } break; + +-#line 1566 "./glsl.g" ++#line 1560 "./glsl.g" + + case 116: { + ast(1) = makeAstNode<VariableDeclarationAST> + (makeAstNode<ArrayTypeAST>(type(1), expression(4)), string(2)); + } break; + +-#line 1574 "./glsl.g" ++#line 1568 "./glsl.g" + + case 117: { + ast(1) = makeAstNode<VariableDeclarationAST> + (makeAstNode<ArrayTypeAST>(type(1)), string(2), expression(6)); + } break; + +-#line 1582 "./glsl.g" ++#line 1576 "./glsl.g" + + case 118: { + ast(1) = makeAstNode<VariableDeclarationAST> +@@ -1037,26 +1037,26 @@ case 118: { + string(2), expression(7)); + } break; + +-#line 1591 "./glsl.g" ++#line 1585 "./glsl.g" + + case 119: { + ast(1) = makeAstNode<VariableDeclarationAST> + (type(1), string(2), expression(4)); + } break; + +-#line 1599 "./glsl.g" ++#line 1593 "./glsl.g" + + case 120: { + ast(1) = makeAstNode<InvariantDeclarationAST>(string(2)); + } break; + +-#line 1606 "./glsl.g" ++#line 1600 "./glsl.g" + + case 121: { + ast(1) = makeAstNode<QualifiedTypeAST>(0, type(1), (List<LayoutQualifierAST *> *)0); + } break; + +-#line 1613 "./glsl.g" ++#line 1607 "./glsl.g" + + case 122: { + ast(1) = makeAstNode<QualifiedTypeAST> +@@ -1064,207 +1064,207 @@ case 122: { + sym(1).type_qualifier.layout_list); + } break; + +-#line 1622 "./glsl.g" ++#line 1616 "./glsl.g" + + case 123: { + sym(1).qualifier = QualifiedTypeAST::Invariant; + } break; + +-#line 1629 "./glsl.g" ++#line 1623 "./glsl.g" + + case 124: { + sym(1).qualifier = QualifiedTypeAST::Smooth; + } break; + +-#line 1636 "./glsl.g" ++#line 1630 "./glsl.g" + + case 125: { + sym(1).qualifier = QualifiedTypeAST::Flat; + } break; + +-#line 1643 "./glsl.g" ++#line 1637 "./glsl.g" + + case 126: { + sym(1).qualifier = QualifiedTypeAST::NoPerspective; + } break; + +-#line 1650 "./glsl.g" ++#line 1644 "./glsl.g" + + case 127: { + sym(1) = sym(3); + } break; + +-#line 1657 "./glsl.g" ++#line 1651 "./glsl.g" + + case 128: { + sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout); + } break; + +-#line 1664 "./glsl.g" ++#line 1658 "./glsl.g" + + case 129: { + sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout_list, sym(3).layout); + } break; + +-#line 1671 "./glsl.g" ++#line 1665 "./glsl.g" + + case 130: { + sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), (const QString *)0); + } break; + +-#line 1678 "./glsl.g" ++#line 1672 "./glsl.g" + + case 131: { + sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), string(3)); + } break; + +-#line 1685 "./glsl.g" ++#line 1679 "./glsl.g" + + case 132: { + sym(1).qualifier = QualifiedTypeAST::Const; + } break; + +-#line 1692 "./glsl.g" ++#line 1686 "./glsl.g" + + case 133: { + sym(1).type_qualifier.qualifier = sym(1).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1700 "./glsl.g" ++#line 1694 "./glsl.g" + + case 134: { + sym(1).type_qualifier.layout_list = sym(1).layout_list; + sym(1).type_qualifier.qualifier = 0; + } break; + +-#line 1708 "./glsl.g" ++#line 1702 "./glsl.g" + + case 135: { + sym(1).type_qualifier.layout_list = sym(1).layout_list; + sym(1).type_qualifier.qualifier = sym(2).qualifier; + } break; + +-#line 1716 "./glsl.g" ++#line 1710 "./glsl.g" + + case 136: { + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1724 "./glsl.g" ++#line 1718 "./glsl.g" + + case 137: { + sym(1).type_qualifier.qualifier = sym(1).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1732 "./glsl.g" ++#line 1726 "./glsl.g" + + case 138: { + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1740 "./glsl.g" ++#line 1734 "./glsl.g" + + case 139: { + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1748 "./glsl.g" ++#line 1742 "./glsl.g" + + case 140: { + sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant; + sym(1).type_qualifier.layout_list = 0; + } break; + +-#line 1756 "./glsl.g" ++#line 1750 "./glsl.g" + + case 141: { + sym(1).qualifier = QualifiedTypeAST::Const; + } break; + +-#line 1763 "./glsl.g" ++#line 1757 "./glsl.g" + + case 142: { + sym(1).qualifier = QualifiedTypeAST::Attribute; + } break; + +-#line 1770 "./glsl.g" ++#line 1764 "./glsl.g" + + case 143: { + sym(1).qualifier = QualifiedTypeAST::Varying; + } break; + +-#line 1777 "./glsl.g" ++#line 1771 "./glsl.g" + + case 144: { + sym(1).qualifier = QualifiedTypeAST::CentroidVarying; + } break; + +-#line 1784 "./glsl.g" ++#line 1778 "./glsl.g" + + case 145: { + sym(1).qualifier = QualifiedTypeAST::In; + } break; + +-#line 1791 "./glsl.g" ++#line 1785 "./glsl.g" + + case 146: { + sym(1).qualifier = QualifiedTypeAST::Out; + } break; + +-#line 1798 "./glsl.g" ++#line 1792 "./glsl.g" + + case 147: { + sym(1).qualifier = QualifiedTypeAST::CentroidIn; + } break; + +-#line 1805 "./glsl.g" ++#line 1799 "./glsl.g" + + case 148: { + sym(1).qualifier = QualifiedTypeAST::CentroidOut; + } break; + +-#line 1812 "./glsl.g" ++#line 1806 "./glsl.g" + + case 149: { + sym(1).qualifier = QualifiedTypeAST::PatchIn; + } break; + +-#line 1819 "./glsl.g" ++#line 1813 "./glsl.g" + + case 150: { + sym(1).qualifier = QualifiedTypeAST::PatchOut; + } break; + +-#line 1826 "./glsl.g" ++#line 1820 "./glsl.g" + + case 151: { + sym(1).qualifier = QualifiedTypeAST::SampleIn; + } break; + +-#line 1833 "./glsl.g" ++#line 1827 "./glsl.g" + + case 152: { + sym(1).qualifier = QualifiedTypeAST::SampleOut; + } break; + +-#line 1840 "./glsl.g" ++#line 1834 "./glsl.g" + + case 153: { + sym(1).qualifier = QualifiedTypeAST::Uniform; + } break; + +-#line 1847 "./glsl.g" ++#line 1841 "./glsl.g" + + case 154: { + // nothing to do. + } break; + +-#line 1854 "./glsl.g" ++#line 1848 "./glsl.g" + + case 155: { + if (!type(2)->setPrecision(sym(1).precision)) { +@@ -1273,595 +1273,595 @@ case 155: { + ast(1) = type(2); + } break; + +-#line 1864 "./glsl.g" ++#line 1858 "./glsl.g" + + case 156: { + // nothing to do. + } break; + +-#line 1871 "./glsl.g" ++#line 1865 "./glsl.g" + + case 157: { + ast(1) = makeAstNode<ArrayTypeAST>(type(1)); + } break; + +-#line 1878 "./glsl.g" ++#line 1872 "./glsl.g" + + case 158: { + ast(1) = makeAstNode<ArrayTypeAST>(type(1), expression(3)); + } break; + +-#line 1885 "./glsl.g" ++#line 1879 "./glsl.g" + + case 159: { + ast(1) = makeBasicType(T_VOID); + } break; + +-#line 1892 "./glsl.g" ++#line 1886 "./glsl.g" + + case 160: { + ast(1) = makeBasicType(T_FLOAT); + } break; + +-#line 1899 "./glsl.g" ++#line 1893 "./glsl.g" + + case 161: { + ast(1) = makeBasicType(T_DOUBLE); + } break; + +-#line 1906 "./glsl.g" ++#line 1900 "./glsl.g" + + case 162: { + ast(1) = makeBasicType(T_INT); + } break; + +-#line 1913 "./glsl.g" ++#line 1907 "./glsl.g" + + case 163: { + ast(1) = makeBasicType(T_UINT); + } break; + +-#line 1920 "./glsl.g" ++#line 1914 "./glsl.g" + + case 164: { + ast(1) = makeBasicType(T_BOOL); + } break; + +-#line 1927 "./glsl.g" ++#line 1921 "./glsl.g" + + case 165: { + ast(1) = makeBasicType(T_VEC2); + } break; + +-#line 1934 "./glsl.g" ++#line 1928 "./glsl.g" + + case 166: { + ast(1) = makeBasicType(T_VEC3); + } break; + +-#line 1941 "./glsl.g" ++#line 1935 "./glsl.g" + + case 167: { + ast(1) = makeBasicType(T_VEC4); + } break; + +-#line 1948 "./glsl.g" ++#line 1942 "./glsl.g" + + case 168: { + ast(1) = makeBasicType(T_DVEC2); + } break; + +-#line 1955 "./glsl.g" ++#line 1949 "./glsl.g" + + case 169: { + ast(1) = makeBasicType(T_DVEC3); + } break; + +-#line 1962 "./glsl.g" ++#line 1956 "./glsl.g" + + case 170: { + ast(1) = makeBasicType(T_DVEC4); + } break; + +-#line 1969 "./glsl.g" ++#line 1963 "./glsl.g" + + case 171: { + ast(1) = makeBasicType(T_BVEC2); + } break; + +-#line 1976 "./glsl.g" ++#line 1970 "./glsl.g" + + case 172: { + ast(1) = makeBasicType(T_BVEC3); + } break; + +-#line 1983 "./glsl.g" ++#line 1977 "./glsl.g" + + case 173: { + ast(1) = makeBasicType(T_BVEC4); + } break; + +-#line 1990 "./glsl.g" ++#line 1984 "./glsl.g" + + case 174: { + ast(1) = makeBasicType(T_IVEC2); + } break; + +-#line 1997 "./glsl.g" ++#line 1991 "./glsl.g" + + case 175: { + ast(1) = makeBasicType(T_IVEC3); + } break; + +-#line 2004 "./glsl.g" ++#line 1998 "./glsl.g" + + case 176: { + ast(1) = makeBasicType(T_IVEC4); + } break; + +-#line 2011 "./glsl.g" ++#line 2005 "./glsl.g" + + case 177: { + ast(1) = makeBasicType(T_UVEC2); + } break; + +-#line 2018 "./glsl.g" ++#line 2012 "./glsl.g" + + case 178: { + ast(1) = makeBasicType(T_UVEC3); + } break; + +-#line 2025 "./glsl.g" ++#line 2019 "./glsl.g" + + case 179: { + ast(1) = makeBasicType(T_UVEC4); + } break; + +-#line 2032 "./glsl.g" ++#line 2026 "./glsl.g" + + case 180: { + ast(1) = makeBasicType(T_MAT2); + } break; + +-#line 2039 "./glsl.g" ++#line 2033 "./glsl.g" + + case 181: { + ast(1) = makeBasicType(T_MAT3); + } break; + +-#line 2046 "./glsl.g" ++#line 2040 "./glsl.g" + + case 182: { + ast(1) = makeBasicType(T_MAT4); + } break; + +-#line 2053 "./glsl.g" ++#line 2047 "./glsl.g" + + case 183: { + ast(1) = makeBasicType(T_MAT2); + } break; + +-#line 2060 "./glsl.g" ++#line 2054 "./glsl.g" + + case 184: { + ast(1) = makeBasicType(T_MAT2X3); + } break; + +-#line 2067 "./glsl.g" ++#line 2061 "./glsl.g" + + case 185: { + ast(1) = makeBasicType(T_MAT2X4); + } break; + +-#line 2074 "./glsl.g" ++#line 2068 "./glsl.g" + + case 186: { + ast(1) = makeBasicType(T_MAT3X2); + } break; + +-#line 2081 "./glsl.g" ++#line 2075 "./glsl.g" + + case 187: { + ast(1) = makeBasicType(T_MAT3); + } break; + +-#line 2088 "./glsl.g" ++#line 2082 "./glsl.g" + + case 188: { + ast(1) = makeBasicType(T_MAT3X4); + } break; + +-#line 2095 "./glsl.g" ++#line 2089 "./glsl.g" + + case 189: { + ast(1) = makeBasicType(T_MAT4X2); + } break; + +-#line 2102 "./glsl.g" ++#line 2096 "./glsl.g" + + case 190: { + ast(1) = makeBasicType(T_MAT4X3); + } break; + +-#line 2109 "./glsl.g" ++#line 2103 "./glsl.g" + + case 191: { + ast(1) = makeBasicType(T_MAT4); + } break; + +-#line 2116 "./glsl.g" ++#line 2110 "./glsl.g" + + case 192: { + ast(1) = makeBasicType(T_DMAT2); + } break; + +-#line 2123 "./glsl.g" ++#line 2117 "./glsl.g" + + case 193: { + ast(1) = makeBasicType(T_DMAT3); + } break; + +-#line 2130 "./glsl.g" ++#line 2124 "./glsl.g" + + case 194: { + ast(1) = makeBasicType(T_DMAT4); + } break; + +-#line 2137 "./glsl.g" ++#line 2131 "./glsl.g" + + case 195: { + ast(1) = makeBasicType(T_DMAT2); + } break; + +-#line 2144 "./glsl.g" ++#line 2138 "./glsl.g" + + case 196: { + ast(1) = makeBasicType(T_DMAT2X3); + } break; + +-#line 2151 "./glsl.g" ++#line 2145 "./glsl.g" + + case 197: { + ast(1) = makeBasicType(T_DMAT2X4); + } break; + +-#line 2158 "./glsl.g" ++#line 2152 "./glsl.g" + + case 198: { + ast(1) = makeBasicType(T_DMAT3X2); + } break; + +-#line 2165 "./glsl.g" ++#line 2159 "./glsl.g" + + case 199: { + ast(1) = makeBasicType(T_DMAT3); + } break; + +-#line 2172 "./glsl.g" ++#line 2166 "./glsl.g" + + case 200: { + ast(1) = makeBasicType(T_DMAT3X4); + } break; + +-#line 2179 "./glsl.g" ++#line 2173 "./glsl.g" + + case 201: { + ast(1) = makeBasicType(T_DMAT4X2); + } break; + +-#line 2186 "./glsl.g" ++#line 2180 "./glsl.g" + + case 202: { + ast(1) = makeBasicType(T_DMAT4X3); + } break; + +-#line 2193 "./glsl.g" ++#line 2187 "./glsl.g" + + case 203: { + ast(1) = makeBasicType(T_DMAT4); + } break; + +-#line 2200 "./glsl.g" ++#line 2194 "./glsl.g" + + case 204: { + ast(1) = makeBasicType(T_SAMPLER1D); + } break; + +-#line 2207 "./glsl.g" ++#line 2201 "./glsl.g" + + case 205: { + ast(1) = makeBasicType(T_SAMPLER2D); + } break; + +-#line 2214 "./glsl.g" ++#line 2208 "./glsl.g" + + case 206: { + ast(1) = makeBasicType(T_SAMPLER3D); + } break; + +-#line 2221 "./glsl.g" ++#line 2215 "./glsl.g" + + case 207: { + ast(1) = makeBasicType(T_SAMPLERCUBE); + } break; + +-#line 2228 "./glsl.g" ++#line 2222 "./glsl.g" + + case 208: { + ast(1) = makeBasicType(T_SAMPLER1DSHADOW); + } break; + +-#line 2235 "./glsl.g" ++#line 2229 "./glsl.g" + + case 209: { + ast(1) = makeBasicType(T_SAMPLER2DSHADOW); + } break; + +-#line 2242 "./glsl.g" ++#line 2236 "./glsl.g" + + case 210: { + ast(1) = makeBasicType(T_SAMPLERCUBESHADOW); + } break; + +-#line 2249 "./glsl.g" ++#line 2243 "./glsl.g" + + case 211: { + ast(1) = makeBasicType(T_SAMPLER1DARRAY); + } break; + +-#line 2256 "./glsl.g" ++#line 2250 "./glsl.g" + + case 212: { + ast(1) = makeBasicType(T_SAMPLER2DARRAY); + } break; + +-#line 2263 "./glsl.g" ++#line 2257 "./glsl.g" + + case 213: { + ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW); + } break; + +-#line 2270 "./glsl.g" ++#line 2264 "./glsl.g" + + case 214: { + ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW); + } break; + +-#line 2277 "./glsl.g" ++#line 2271 "./glsl.g" + + case 215: { + ast(1) = makeBasicType(T_SAMPLERCUBEARRAY); + } break; + +-#line 2284 "./glsl.g" ++#line 2278 "./glsl.g" + + case 216: { + ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW); + } break; + +-#line 2291 "./glsl.g" ++#line 2285 "./glsl.g" + + case 217: { + ast(1) = makeBasicType(T_ISAMPLER1D); + } break; + +-#line 2298 "./glsl.g" ++#line 2292 "./glsl.g" + + case 218: { + ast(1) = makeBasicType(T_ISAMPLER2D); + } break; + +-#line 2305 "./glsl.g" ++#line 2299 "./glsl.g" + + case 219: { + ast(1) = makeBasicType(T_ISAMPLER3D); + } break; + +-#line 2312 "./glsl.g" ++#line 2306 "./glsl.g" + + case 220: { + ast(1) = makeBasicType(T_ISAMPLERCUBE); + } break; + +-#line 2319 "./glsl.g" ++#line 2313 "./glsl.g" + + case 221: { + ast(1) = makeBasicType(T_ISAMPLER1DARRAY); + } break; + +-#line 2326 "./glsl.g" ++#line 2320 "./glsl.g" + + case 222: { + ast(1) = makeBasicType(T_ISAMPLER2DARRAY); + } break; + +-#line 2333 "./glsl.g" ++#line 2327 "./glsl.g" + + case 223: { + ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY); + } break; + +-#line 2340 "./glsl.g" ++#line 2334 "./glsl.g" + + case 224: { + ast(1) = makeBasicType(T_USAMPLER1D); + } break; + +-#line 2347 "./glsl.g" ++#line 2341 "./glsl.g" + + case 225: { + ast(1) = makeBasicType(T_USAMPLER2D); + } break; + +-#line 2354 "./glsl.g" ++#line 2348 "./glsl.g" + + case 226: { + ast(1) = makeBasicType(T_USAMPLER3D); + } break; + +-#line 2361 "./glsl.g" ++#line 2355 "./glsl.g" + + case 227: { + ast(1) = makeBasicType(T_USAMPLERCUBE); + } break; + +-#line 2368 "./glsl.g" ++#line 2362 "./glsl.g" + + case 228: { + ast(1) = makeBasicType(T_USAMPLER1DARRAY); + } break; + +-#line 2375 "./glsl.g" ++#line 2369 "./glsl.g" + + case 229: { + ast(1) = makeBasicType(T_USAMPLER2DARRAY); + } break; + +-#line 2382 "./glsl.g" ++#line 2376 "./glsl.g" + + case 230: { + ast(1) = makeBasicType(T_USAMPLERCUBEARRAY); + } break; + +-#line 2389 "./glsl.g" ++#line 2383 "./glsl.g" + + case 231: { + ast(1) = makeBasicType(T_SAMPLER2DRECT); + } break; + +-#line 2396 "./glsl.g" ++#line 2390 "./glsl.g" + + case 232: { + ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW); + } break; + +-#line 2403 "./glsl.g" ++#line 2397 "./glsl.g" + + case 233: { + ast(1) = makeBasicType(T_ISAMPLER2DRECT); + } break; + +-#line 2410 "./glsl.g" ++#line 2404 "./glsl.g" + + case 234: { + ast(1) = makeBasicType(T_USAMPLER2DRECT); + } break; + +-#line 2417 "./glsl.g" ++#line 2411 "./glsl.g" + + case 235: { + ast(1) = makeBasicType(T_SAMPLERBUFFER); + } break; + +-#line 2424 "./glsl.g" ++#line 2418 "./glsl.g" + + case 236: { + ast(1) = makeBasicType(T_ISAMPLERBUFFER); + } break; + +-#line 2431 "./glsl.g" ++#line 2425 "./glsl.g" + + case 237: { + ast(1) = makeBasicType(T_USAMPLERBUFFER); + } break; + +-#line 2438 "./glsl.g" ++#line 2432 "./glsl.g" + + case 238: { + ast(1) = makeBasicType(T_SAMPLER2DMS); + } break; + +-#line 2445 "./glsl.g" ++#line 2439 "./glsl.g" + + case 239: { + ast(1) = makeBasicType(T_ISAMPLER2DMS); + } break; + +-#line 2452 "./glsl.g" ++#line 2446 "./glsl.g" + + case 240: { + ast(1) = makeBasicType(T_USAMPLER2DMS); + } break; + +-#line 2459 "./glsl.g" ++#line 2453 "./glsl.g" + + case 241: { + ast(1) = makeBasicType(T_SAMPLER2DMSARRAY); + } break; + +-#line 2466 "./glsl.g" ++#line 2460 "./glsl.g" + + case 242: { + ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY); + } break; + +-#line 2473 "./glsl.g" ++#line 2467 "./glsl.g" + + case 243: { + ast(1) = makeBasicType(T_USAMPLER2DMSARRAY); + } break; + +-#line 2480 "./glsl.g" ++#line 2474 "./glsl.g" + + case 244: { + // nothing to do. + } break; + +-#line 2487 "./glsl.g" ++#line 2481 "./glsl.g" + + case 245: { + ast(1) = makeAstNode<NamedTypeAST>(string(1)); + } break; + +-#line 2494 "./glsl.g" ++#line 2488 "./glsl.g" + + case 246: { + sym(1).precision = TypeAST::Highp; + } break; + +-#line 2501 "./glsl.g" ++#line 2495 "./glsl.g" + + case 247: { + sym(1).precision = TypeAST::Mediump; + } break; + +-#line 2508 "./glsl.g" ++#line 2502 "./glsl.g" + + case 248: { + sym(1).precision = TypeAST::Lowp; + } break; + +-#line 2515 "./glsl.g" ++#line 2509 "./glsl.g" + + case 249: { + ast(1) = makeAstNode<StructTypeAST>(string(2), sym(4).field_list); + } break; + +-#line 2522 "./glsl.g" ++#line 2516 "./glsl.g" + + case 250: { + ast(1) = makeAstNode<StructTypeAST>(sym(3).field_list); + } break; + +-#line 2529 "./glsl.g" ++#line 2523 "./glsl.g" + + case 251: { + // nothing to do. + } break; + +-#line 2536 "./glsl.g" ++#line 2530 "./glsl.g" + + case 252: { + sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list); + } break; + +-#line 2543 "./glsl.g" ++#line 2537 "./glsl.g" + + case 253: { + sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list); + } break; + +-#line 2550 "./glsl.g" ++#line 2544 "./glsl.g" + + case 254: { + sym(1).field_list = StructTypeAST::fixInnerTypes +@@ -1870,106 +1870,106 @@ case 254: { + sym(1).type_qualifier.layout_list), sym(3).field_list); + } break; + +-#line 2560 "./glsl.g" ++#line 2554 "./glsl.g" + + case 255: { + // nothing to do. + sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field); + } break; + +-#line 2568 "./glsl.g" ++#line 2562 "./glsl.g" + + case 256: { + sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field_list, sym(3).field); + } break; + +-#line 2575 "./glsl.g" ++#line 2569 "./glsl.g" + + case 257: { + sym(1).field = makeAstNode<StructTypeAST::Field>(string(1)); + } break; + +-#line 2582 "./glsl.g" ++#line 2576 "./glsl.g" + + case 258: { + sym(1).field = makeAstNode<StructTypeAST::Field> + (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0)); + } break; + +-#line 2590 "./glsl.g" ++#line 2584 "./glsl.g" + + case 259: { + sym(1).field = makeAstNode<StructTypeAST::Field> + (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0, expression(3))); + } break; + +-#line 2598 "./glsl.g" ++#line 2592 "./glsl.g" + + case 260: { + // nothing to do. + } break; + +-#line 2605 "./glsl.g" ++#line 2599 "./glsl.g" + + case 261: { + ast(1) = makeAstNode<DeclarationStatementAST>(sym(1).declaration); + } break; + +-#line 2612 "./glsl.g" ++#line 2606 "./glsl.g" + + case 262: { + // nothing to do. + } break; + +-#line 2619 "./glsl.g" ++#line 2613 "./glsl.g" + + case 263: { + // nothing to do. + } break; + +-#line 2626 "./glsl.g" ++#line 2620 "./glsl.g" + + case 264: { + // nothing to do. + } break; + +-#line 2633 "./glsl.g" ++#line 2627 "./glsl.g" + + case 265: { + // nothing to do. + } break; + +-#line 2640 "./glsl.g" ++#line 2634 "./glsl.g" + + case 266: { + // nothing to do. + } break; + +-#line 2647 "./glsl.g" ++#line 2641 "./glsl.g" + + case 267: { + // nothing to do. + } break; + +-#line 2654 "./glsl.g" ++#line 2648 "./glsl.g" + + case 268: { + // nothing to do. + } break; + +-#line 2661 "./glsl.g" ++#line 2655 "./glsl.g" + + case 269: { + // nothing to do. + } break; + +-#line 2668 "./glsl.g" ++#line 2662 "./glsl.g" + + case 270: { + // nothing to do. + } break; + +-#line 2675 "./glsl.g" ++#line 2669 "./glsl.g" + + case 271: { + CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); +@@ -1978,7 +1978,7 @@ case 271: { + ast(1) = stmt; + } break; + +-#line 2685 "./glsl.g" ++#line 2679 "./glsl.g" + + case 272: { + CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); +@@ -1987,19 +1987,19 @@ case 272: { + ast(1) = stmt; + } break; + +-#line 2695 "./glsl.g" ++#line 2689 "./glsl.g" + + case 273: { + // nothing to do. + } break; + +-#line 2702 "./glsl.g" ++#line 2696 "./glsl.g" + + case 274: { + // nothing to do. + } break; + +-#line 2709 "./glsl.g" ++#line 2703 "./glsl.g" + + case 275: { + CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); +@@ -2008,7 +2008,7 @@ case 275: { + ast(1) = stmt; + } break; + +-#line 2719 "./glsl.g" ++#line 2713 "./glsl.g" + + case 276: { + CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); +@@ -2017,186 +2017,186 @@ case 276: { + ast(1) = stmt; + } break; + +-#line 2729 "./glsl.g" ++#line 2723 "./glsl.g" + + case 277: { + sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement); + } break; + +-#line 2736 "./glsl.g" ++#line 2730 "./glsl.g" + + case 278: { + sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement_list, sym(2).statement); + } break; + +-#line 2743 "./glsl.g" ++#line 2737 "./glsl.g" + + case 279: { + ast(1) = makeAstNode<CompoundStatementAST>(); // Empty statement + } break; + +-#line 2750 "./glsl.g" ++#line 2744 "./glsl.g" + + case 280: { + ast(1) = makeAstNode<ExpressionStatementAST>(expression(1)); + } break; + +-#line 2757 "./glsl.g" ++#line 2751 "./glsl.g" + + case 281: { + ast(1) = makeAstNode<IfStatementAST>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause); + } break; + +-#line 2764 "./glsl.g" ++#line 2758 "./glsl.g" + + case 282: { + sym(1).ifstmt.thenClause = statement(1); + sym(1).ifstmt.elseClause = statement(3); + } break; + +-#line 2772 "./glsl.g" ++#line 2766 "./glsl.g" + + case 283: { + sym(1).ifstmt.thenClause = statement(1); + sym(1).ifstmt.elseClause = 0; + } break; + +-#line 2780 "./glsl.g" ++#line 2774 "./glsl.g" + + case 284: { + // nothing to do. + } break; + +-#line 2787 "./glsl.g" ++#line 2781 "./glsl.g" + + case 285: { + ast(1) = makeAstNode<DeclarationExpressionAST> + (type(1), string(2), expression(4)); + } break; + +-#line 2795 "./glsl.g" ++#line 2789 "./glsl.g" + + case 286: { + ast(1) = makeAstNode<SwitchStatementAST>(expression(3), statement(6)); + } break; + +-#line 2802 "./glsl.g" ++#line 2796 "./glsl.g" + + case 287: { + ast(1) = makeAstNode<CompoundStatementAST>(); + } break; + +-#line 2809 "./glsl.g" ++#line 2803 "./glsl.g" + + case 288: { + ast(1) = makeAstNode<CompoundStatementAST>(sym(1).statement_list); + } break; + +-#line 2816 "./glsl.g" ++#line 2810 "./glsl.g" + + case 289: { + ast(1) = makeAstNode<CaseLabelStatementAST>(expression(2)); + } break; + +-#line 2823 "./glsl.g" ++#line 2817 "./glsl.g" + + case 290: { + ast(1) = makeAstNode<CaseLabelStatementAST>(); + } break; + +-#line 2830 "./glsl.g" ++#line 2824 "./glsl.g" + + case 291: { + ast(1) = makeAstNode<WhileStatementAST>(expression(3), statement(5)); + } break; + +-#line 2837 "./glsl.g" ++#line 2831 "./glsl.g" + + case 292: { + ast(1) = makeAstNode<DoStatementAST>(statement(2), expression(5)); + } break; + +-#line 2844 "./glsl.g" ++#line 2838 "./glsl.g" + + case 293: { + ast(1) = makeAstNode<ForStatementAST>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6)); + } break; + +-#line 2851 "./glsl.g" ++#line 2845 "./glsl.g" + + case 294: { + // nothing to do. + } break; + +-#line 2858 "./glsl.g" ++#line 2852 "./glsl.g" + + case 295: { + // nothing to do. + } break; + +-#line 2865 "./glsl.g" ++#line 2859 "./glsl.g" + + case 296: { + // nothing to do. + } break; + +-#line 2872 "./glsl.g" ++#line 2866 "./glsl.g" + + case 297: { + // nothing to do. + } break; + +-#line 2879 "./glsl.g" ++#line 2873 "./glsl.g" + + case 298: { + sym(1).forstmt.condition = expression(1); + sym(1).forstmt.increment = 0; + } break; + +-#line 2887 "./glsl.g" ++#line 2881 "./glsl.g" + + case 299: { + sym(1).forstmt.condition = expression(1); + sym(1).forstmt.increment = expression(3); + } break; + +-#line 2895 "./glsl.g" ++#line 2889 "./glsl.g" + + case 300: { + ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Continue); + } break; + +-#line 2902 "./glsl.g" ++#line 2896 "./glsl.g" + + case 301: { + ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Break); + } break; + +-#line 2909 "./glsl.g" ++#line 2903 "./glsl.g" + + case 302: { + ast(1) = makeAstNode<ReturnStatementAST>(); + } break; + +-#line 2916 "./glsl.g" ++#line 2910 "./glsl.g" + + case 303: { + ast(1) = makeAstNode<ReturnStatementAST>(expression(2)); + } break; + +-#line 2923 "./glsl.g" ++#line 2917 "./glsl.g" + + case 304: { + ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Discard); + } break; + +-#line 2930 "./glsl.g" ++#line 2924 "./glsl.g" + + case 305: { + ast(1) = makeAstNode<TranslationUnitAST>(sym(1).declaration_list); + } break; + +-#line 2937 "./glsl.g" ++#line 2931 "./glsl.g" + + case 306: { + if (sym(1).declaration) { +@@ -2207,7 +2207,7 @@ case 306: { + } + } break; + +-#line 2949 "./glsl.g" ++#line 2943 "./glsl.g" + + case 307: { + if (sym(1).declaration_list && sym(2).declaration) { +@@ -2223,49 +2223,49 @@ case 307: { + } + } break; + +-#line 2966 "./glsl.g" ++#line 2960 "./glsl.g" + + case 308: { + // nothing to do. + } break; + +-#line 2973 "./glsl.g" ++#line 2967 "./glsl.g" + + case 309: { + // nothing to do. + } break; + +-#line 2980 "./glsl.g" ++#line 2974 "./glsl.g" + + case 310: { + ast(1) = 0; + } break; + +-#line 2987 "./glsl.g" ++#line 2981 "./glsl.g" + + case 311: { + function(1)->body = statement(2); + } break; + +-#line 2994 "./glsl.g" ++#line 2988 "./glsl.g" + + case 312: { + ast(1) = 0; + } break; + +-#line 3002 "./glsl.g" ++#line 2996 "./glsl.g" + + case 313: { + ast(1) = ast(2); + } break; + +-#line 3009 "./glsl.g" ++#line 3003 "./glsl.g" + + case 314: { + ast(1) = ast(2); + } break; + +-#line 3015 "./glsl.g" ++#line 3009 "./glsl.g" + + } // end switch + } // end Parser::reduce() +diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h +index 7bf70e2..bab2616 100644 +--- a/src/libs/glsl/glslparser.h ++++ b/src/libs/glsl/glslparser.h +@@ -1,5 +1,5 @@ + +-#line 217 "./glsl.g" ++#line 215 "./glsl.g" + + /************************************************************************** + ** +-- +1.7.10 + diff --git a/community/qtcurve-kde4/PKGBUILD b/community/qtcurve-kde4/PKGBUILD index 74cf7c2f9..2291fe95e 100644 --- a/community/qtcurve-kde4/PKGBUILD +++ b/community/qtcurve-kde4/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74842 2012-08-06 23:10:17Z andrea $ +# $Id: PKGBUILD 74971 2012-08-10 22:17:48Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-kde4 -pkgver=1.8.13 -pkgrel=3 +pkgver=1.8.14 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') groups=('qtcurve') license=('GPL') @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4') source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2" 'bypass-kde-config.patch' 'fix-kwin_decoration-macro.patch') -md5sums=('94ba22bc487a18f585249c2967878189' +md5sums=('b4d7924806058f39e842ce7ffe47a4f8' '3f6681147cc361bd2bfd4d7477f2a8d0' '7366e45ef9f24f53a36f87a539a937d6') diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD index 646527e32..8f406ff9e 100644 --- a/community/r8168-lts/PKGBUILD +++ b/community/r8168-lts/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74289 2012-07-23 14:15:48Z mtorromeo $ +# $Id: PKGBUILD 74880 2012-08-08 15:17:49Z tpowa $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=r8168-lts _pkgname=r8168 pkgver=8.031.00 -pkgrel=3 +pkgrel=4 pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" url="http://www.realtek.com.tw" license=("GPL") diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD index 43f6df9ce..07d5eb3ba 100644 --- a/community/rygel/PKGBUILD +++ b/community/rygel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 72601 2012-06-17 12:53:20Z bgyorgy $ +# $Id: PKGBUILD 75009 2012-08-11 13:57:55Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.14.2 +pkgver=0.14.3 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ backup=('etc/rygel.conf') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ac7417ef95e767df2e6c87085e62e8f2948d01c88ce06326c751068ab1ed8f6e') +sha256sums=('e615d4fea616ecaedfaba57e70a455ac8339048490a423af66a70d05c7186ace') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 45c6dc52d..1c19fbf44 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74657 2012-08-01 15:35:10Z dwallace $ +# $Id: PKGBUILD 75012 2012-08-11 18:46:02Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,8 +7,8 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.1 -pkgrel=3 +pkgver=5.2 +pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' arch=('i686' 'x86_64') @@ -35,9 +35,6 @@ build() { # fix build errors unset LDFLAGS - # don't build GCC - export SAGE_INSTALL_GCC='no' - # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') export MAKE="make -j${SAGE_BUILD_THREADS}" @@ -99,5 +96,5 @@ package() { } # vim :set ts=2 sw=2 et: -md5sums=('fa612f36387218d07b84f76995914c93' +md5sums=('59f55ec8cdd1ca595c56cc72620b3576' 'dc391f12b7d17dd37326343ec0e99bbd') diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index 61e5c8343..6453e0c04 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70372 2012-05-05 12:26:17Z jlichtblau $ +# $Id: PKGBUILD 75015 2012-08-11 18:51:57Z ebelanger $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ pkgname=skrooge pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://skrooge.org/" @@ -19,7 +19,7 @@ source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2) sha256sums=('7f8ec247084a005b743bb080ded5724f6c1ee3644c135e12002c80df93fddfe9') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr @@ -27,7 +27,7 @@ build() { } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog index 946388d77..ffc491ba5 100644 --- a/community/skrooge/skrooge.changelog +++ b/community/skrooge/skrooge.changelog @@ -1,3 +1,6 @@ +2012-08-09 Eric Belanger <eric@archlinux.org> + * skrooge 1.3.0-2 Rebuild against libofx 0.9.5 + 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * skrooge 1.3.0-1 diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index 63477fdac..2716cd7ab 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74195 2012-07-22 19:47:59Z lfleischer $ +# $Id: PKGBUILD 74966 2012-08-10 17:25:48Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> @@ -6,7 +6,7 @@ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=snort -pkgver=2.9.3 +pkgver=2.9.3.1 pkgrel=1 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64' 'mips64el') @@ -24,8 +24,8 @@ install='snort.install' source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz"{,.sig} 'snort' 'snort.conf.d') -md5sums=('e128f5d5d14dad335dc0c549c7fe2e98' - '8f8689efad6338ca76c344366c97d4ea' +md5sums=('b2102605a7ca023ad6a2429821061c29' + '2ae6566c4fbf40a863e9550f3a85340a' '361b8b9e40b9af0164f6b3e3da2e8277' 'b4fb8a68490589cd34df93de7609bfac') diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index 9cb6a966f..57cd498df 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68019 2012-03-17 01:01:55Z giovanni $ +# $Id: PKGBUILD 74889 2012-08-08 19:20:31Z giovanni $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> @@ -6,14 +6,14 @@ # TODO: # bring in pyalsa, csound, mma pkgname=solfege -pkgver=3.20.4 -pkgrel=2 +pkgver=3.20.6 +pkgrel=1 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64' 'mips64el') url="http://www.solfege.org/" license=('GPL3') -depends=('pygtk' 'libgtkhtml') -makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt' +depends=('pygtk' 'libgtkhtml' 'librsvg') +makedepends=('ghostscript' 'gnome-doc-utils' 'libxslt' 'swig' 'texinfo' 'txt2man') optdepends=('timidity++: or any MIDI player & MIDI-WAV converter' 'mpg123: or any MP3 player' @@ -22,7 +22,7 @@ optdepends=('timidity++: or any MIDI player & MIDI-WAV converter' 'lilypond: for generating print-outs & score sheets' 'texlive-bin: use LaTeX to replace HTML reports with DVI') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('3a1914158ad218ad5b119ee4f719b567') +md5sums=('078e3bb06df0355e8ed53ee633ed3abd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index 1e4e50780..e5e46d471 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62767 2012-01-26 14:20:03Z spupykin $ +# $Id: PKGBUILD 74852 2012-08-07 13:20:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> pkgname=tomoyo-tools _basever=2.5.0 -_timestamp=20111025 +_timestamp=20120805 _file=53357 pkgver=${_basever}.${_timestamp} pkgrel=1 @@ -17,11 +17,11 @@ depends=('ncurses') conflicts=('ccs-tools') install=tomoyo-tools.install source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('99999779698ea5f44c74d49e8c640ec1') +md5sums=('cccc7cb7f9492dc53063065f7ccf7b21') build() { cd "${srcdir}/${pkgname}" - make -j1 + make } package() { diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index 9aada1a70..27caac2c7 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73256 2012-07-04 13:05:20Z tredaelli $ +# $Id: PKGBUILD 74865 2012-08-07 15:48:23Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rorschach <r0rschach@lavabit.com> pkgname=vidalia -pkgver=0.2.19 -pkgrel=3 +pkgver=0.2.20 +pkgrel=1 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" arch=('i686' 'x86_64' 'mips64el') @@ -12,17 +12,13 @@ license=('GPL') depends=('qt' 'tor') makedepends=('cmake') install=vidalia.install -source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc} - bug6178.patch) -md5sums=('caf92b44ad2932bbc1c40d6405951c39' - '1ba45d7c91797e880d79a3fc85818dee' - 'bdc0855fef6b230ab63a5b523e853d4e') +source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('f40a3a1c43f4a1f16322969c0cb6f5bf' + '703c872eb865f11027a6d6b02d2e5e72') build() { [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh - patch -d "$srcdir/$pkgname-$pkgver" -i "$srcdir"/bug6178.patch -p1 - cd "$srcdir" mkdir build cd build diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD index d6d506855..8bd07de60 100644 --- a/community/wvstreams/PKGBUILD +++ b/community/wvstreams/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 59490 2011-11-26 18:58:32Z bluewind $ +# $Id: PKGBUILD 74964 2012-08-10 12:12:57Z bluewind $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=wvstreams pkgver=4.6.1 -pkgrel=3 +pkgrel=4 pkgdesc="A network programming library written in C++" arch=('i686' 'x86_64' 'mips64el') url="http://alumnit.ca/wiki/?page=WvStreams" license=('LGPL') depends=('zlib' 'pam' 'xplc' 'openssl' 'readline') source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz -wvstreams-4.6.1-glibc212.patch) +wvstreams-4.6.1-glibc212.patch wvstreams-4.6.1-gcc47.patch openssl-buildfix.patch) md5sums=('2760dac31a43d452a19a3147bfde571c' - '5f6e24864209055239cb4e7c9bbd4a41') + '5f6e24864209055239cb4e7c9bbd4a41' + '918be13d35205385a39077403ce36388' + 'df423c68134a09439b3961c34635e0b4') options=('!makeflags') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" + patch -p1 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" + patch -p1 -i "$srcdir/openssl-buildfix.patch" + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/community/wvstreams/openssl-buildfix.patch b/community/wvstreams/openssl-buildfix.patch new file mode 100644 index 000000000..1b0445d9e --- /dev/null +++ b/community/wvstreams/openssl-buildfix.patch @@ -0,0 +1,14 @@ +--- wvstreams-4.6.1/crypto/wvx509.cc 2008-10-23 22:23:49.000000000 +0200 ++++ wvstreams-4.6.1-1/crypto/wvx509.cc 2010-01-27 11:09:06.000000000 +0100 +@@ -1157,7 +1157,11 @@ + + if (ext) + { ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#else + X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#endif + if (!method) + { + WvDynBuf buf;
\ No newline at end of file diff --git a/community/wvstreams/wvstreams-4.6.1-gcc47.patch b/community/wvstreams/wvstreams-4.6.1-gcc47.patch new file mode 100644 index 000000000..3d6704832 --- /dev/null +++ b/community/wvstreams/wvstreams-4.6.1-gcc47.patch @@ -0,0 +1,10 @@ +--- wvstreams-4.6.1-dist/include/wvuid.h 2012-01-05 10:18:58.713661236 +0100 ++++ wvstreams-4.6.1/include/wvuid.h 2012-01-05 10:27:42.198435328 +0100 +@@ -7,6 +7,7 @@ + #ifndef __WVUID_H + #define __WVUID_H + ++#include <unistd.h> + #include "wvstring.h" + + #if WIN32 diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD index d83edfe41..5ca0e3ab0 100644 --- a/community/xfe/PKGBUILD +++ b/community/xfe/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69198 2012-04-10 02:25:31Z spupykin $ +# $Id: PKGBUILD 74893 2012-08-09 07:50:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Ravi Desai <ravster3@hotmail.com> pkgname=xfe -pkgver=1.32.5 +pkgver=1.33 pkgrel=1 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X." arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,13 @@ license=("GPL") depends=('fox') makedepends=('intltool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('3b80908b0ebaa78b7e8610d09ee2d154') +md5sums=('fb089ba73add411b08a6560eeb51742d') build() { cd $srcdir/$pkgname-$pkgver - LDFLAGS=-lX11 ./configure --prefix=/usr - sed -i 's|inline||' src/xfeutils.cpp +# LDFLAGS=-lX11 ./configure --prefix=/usr + ./configure --prefix=/usr +# sed -i 's|inline||' src/xfeutils.cpp make } |