diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-26 01:22:45 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-26 01:22:45 -0700 |
| commit | 24152c3ea77087edccf017c13d44904a75799ff7 (patch) | |
| tree | 65e25106816e5071dd5b2edc2270e0138c23dc7c | |
| parent | 5a3821aec094b38a412cf5e6997c08b6428d6f77 (diff) | |
Sat Oct 26 01:21:13 PDT 2013
117 files changed, 1459 insertions, 792 deletions
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index 0e6ad935b..8bd2d48a8 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97224 2013-09-15 13:34:01Z alucryd $ +# $Id: PKGBUILD 99199 2013-10-25 12:58:18Z giovanni $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: kozec <kozec@kozec.com> # Contributor: Limao Luo <luolimao+AUR@gmail.com> pkgname=aegisub pkgver=3.0.4 -pkgrel=4 +pkgrel=5 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" arch=('i686' 'x86_64') url="http://www.aegisub.org" diff --git a/community/bamf/PKGBUILD b/community/bamf/PKGBUILD new file mode 100644 index 000000000..0e9e817f2 --- /dev/null +++ b/community/bamf/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 99159 2013-10-25 08:28:21Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd at gmail dot com> +# Contributor: Balló György <ballogyor+arch at gmail dot com> + +pkgname=bamf +pkgver=0.5.0 +pkgrel=2 +pkgdesc="Application matching framework" +arch=('i686' 'x86_64') +url="https://launchpad.net/bamf" +license=('GPL') +depends=('libgtop' 'libwnck3') +makedepends=('gobject-introspection' 'python2-lxml' 'vala') +source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +sha256sums=('93b1acced96d32b36270cf18feb2761014ce2226814303c632448f717a8f9113') + +build() { + cd ${pkgname}-${pkgver} + + export PYTHON='/usr/bin/python2' + ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgname}" --disable-{static,webapps} + make +} + +package() { + cd ${pkgbase}-${pkgver} + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD index 8f52b48c5..a5469b833 100644 --- a/community/bullet/PKGBUILD +++ b/community/bullet/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 83395 2013-01-31 09:42:11Z svenstaro $ +# $Id: PKGBUILD 99165 2013-10-25 09:52:29Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgbase=bullet pkgname=('bullet' 'bullet-docs') -_rev=2613 -pkgver=2.81 -pkgrel=2 +_rev=2704 +pkgver=2.82 +pkgrel=1 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('i686' 'x86_64') url="http://www.bulletphysics.com/Bullet/" license=('custom:zlib') depends=() makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev${_rev}.tgz +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r${_rev}.tgz ${pkgbase}.pc) -md5sums=('cec9c9a79c2804dbf6385dd7d061346c' +md5sums=('70b3c8d202dee91a0854b4cbc88173e8' 'd1da06deba3b08b884d2212f6838905c') build() { - cd ${pkgbase}-${pkgver}-rev${_rev} + cd ${pkgbase}-${pkgver}-r${_rev} # get a clean build dir [[ -d build ]] && rm -rf build @@ -48,7 +48,7 @@ build() { package_bullet() { optdepends=('bullet-docs: documentation') - cd ${pkgbase}-${pkgver}-rev${_rev}/build + cd ${pkgbase}-${pkgver}-r${_rev}/build # install it make DESTDIR=${pkgdir} install @@ -65,7 +65,7 @@ package_bullet-docs() { pkgdesc="Documentation for bullet" depends=() - cd ${pkgbase}-${pkgver}-rev${_rev} + cd ${pkgbase}-${pkgver}-r${_rev} # install docs install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD index 2dc0711ea..9a6d063a6 100644 --- a/community/flam3/PKGBUILD +++ b/community/flam3/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 90023 2013-05-06 19:36:52Z foutrelis $ +# $Id: PKGBUILD 99213 2013-10-25 20:22:05Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=flam3 pkgver=3.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations" arch=('i686' 'x86_64') url="http://flam3.com/" license=('GPL3') depends=('libjpeg' 'libpng' 'libxml2') -options=('!libtool') source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz flam3-3.0.1-libpng15.patch) sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9' '17ece6cc00899e5135dad2bc79f97dfbd73107a6') prepare() { cd ${pkgname}-${pkgver}/src - patch -p1 -i ../../flam3-3.0.1-libpng15.patch + patch -p1 -i "${srcdir}/flam3-3.0.1-libpng15.patch" } build() { diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD index 68d902e4f..ab5e6a1c4 100644 --- a/community/gitg/PKGBUILD +++ b/community/gitg/PKGBUILD @@ -1,17 +1,15 @@ -# $Id: PKGBUILD 88690 2013-04-21 22:17:07Z heftig $ +# $Id: PKGBUILD 99215 2013-10-25 20:50:04Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gitg pkgver=0.2.7 -pkgrel=1 +pkgrel=2 pkgdesc='A GIT repository viewer based on GTK+' arch=('i686' 'x86_64') url='https://git.gnome.org/browse/gitg/' license=('GPL') -depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \ - 'hicolor-icon-theme') +depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas') makedepends=('intltool') -options=('!libtool') install=gitg.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a') @@ -19,7 +17,7 @@ sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a') build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr - make + make WARN_CFLAGS="-Wall" } package() { diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD index 51869c8d1..687bcbe87 100644 --- a/community/gmtk/PKGBUILD +++ b/community/gmtk/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 92205 2013-06-02 18:41:20Z bpiotrowski $ +# $Id: PKGBUILD 99144 2013-10-25 02:20:05Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=gmtk pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc='Common functions for gnome-mplayer and gecko-mediaplayer.' arch=('i686' 'x86_64') url='http://gmtk.googlecode.com/' license=('GPL') depends=('glib2' 'gtk3' 'dconf') makedepends=('intltool' 'pkg-config') -options=(!libtool) source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") md5sums=('ee8ab99f3ac2e0071c99a35e4847bba5') diff --git a/community/google-glog/PKGBUILD b/community/google-glog/PKGBUILD index 7ca4be213..a96367afc 100644 --- a/community/google-glog/PKGBUILD +++ b/community/google-glog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83436 2013-02-01 07:03:30Z fyan $ +# $Id: PKGBUILD 99149 2013-10-25 05:03:45Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Ian Yang <doit.ian@gmail.com> pkgname=google-glog pkgver=0.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="Logging library for C++" arch=('i686' 'x86_64') license=('custom:BSD3') diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index b3ac37c1a..c5815e61a 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94884 2013-08-01 06:54:59Z bpiotrowski $ +# $Id: PKGBUILD 99218 2013-10-25 20:55:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac @@ -12,7 +12,7 @@ depends=('ffmpeg' 'libjpeg' 'libpng' 'glu' 'libxv') makedepends=('jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa') optdepends=('jack: for jack support' 'a52dec: for A52 support' 'faad2: for AAC support' 'libmad: for mp3 support') -options=('!makeflags') +options=('staticlibs' '!makeflags') source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch) sha1sums=('6ba29de672b6e4260e510e0e16d5bc0ab09cabb6' 'SKIP' diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD index ffea0e7d4..cab7251c1 100644 --- a/community/haskell-ghc-paths/PKGBUILD +++ b/community/haskell-ghc-paths/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ +# $Id: PKGBUILD 99206 2013-10-25 16:17:55Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-ghc-paths pkgver=0.1.0.9 -pkgrel=2 +pkgrel=3 pkgdesc="Knowledge of GHC's installation directories" url='http://hackage.haskell.org/package/ghc-paths' license=('custom:BSD3') @@ -12,10 +12,11 @@ arch=('x86_64' 'i686') depends=('ghc=7.6.3-1') source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") install="$pkgname.install" +options=('staticlibs') sha256sums=('afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945') build() { - cd "$srcdir/ghc-paths-$pkgver" + cd "ghc-paths-$pkgver" runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ @@ -28,7 +29,7 @@ build() { } package() { - cd "$srcdir/ghc-paths-$pkgver" + cd "ghc-paths-$pkgver" install -Dm 744 register.sh \ "$pkgdir/usr/share/haskell/$pkgname/register.sh" diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD index 09d1ccf4b..dfe3b31e2 100644 --- a/community/haveged/PKGBUILD +++ b/community/haveged/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92888 2013-06-18 08:41:07Z bpiotrowski $ +# $Id: PKGBUILD 99131 2013-10-25 01:13:09Z bisson $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: kfgz <kfgz at interia dot pl> # Contributor: pootzko <pootzko at gmail dot com> @@ -6,7 +6,7 @@ pkgname=haveged pkgver=1.7.c _pkgver=${pkgver/.c/c} -pkgrel=1 +pkgrel=2 pkgdesc='Entropy harvesting daemon using CPU timings' arch=('i686' 'x86_64') url='http://www.issihosts.com/haveged' diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD index 9ea0595f9..62656dbcd 100644 --- a/community/jbig2dec/PKGBUILD +++ b/community/jbig2dec/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90049 2013-05-06 19:37:57Z foutrelis $ +# $Id: PKGBUILD 99133 2013-10-25 01:14:19Z bisson $ # Maintainer: Bartłomiej Piotrowski # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=jbig2dec pkgver=0.11 -pkgrel=6 +pkgrel=7 pkgdesc="decoder implementation of the JBIG2 image compression format" arch=('x86_64' 'i686') url="http://jbig2dec.sourceforge.net/" diff --git a/community/kyotocabinet/PKGBUILD b/community/kyotocabinet/PKGBUILD index bb08be242..b7eb075d0 100644 --- a/community/kyotocabinet/PKGBUILD +++ b/community/kyotocabinet/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 90164 2013-05-07 16:07:18Z fyan $ +# $Id: PKGBUILD 99150 2013-10-25 05:03:47Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Alexander Duscheleit <jinks@archlinux.us> # Contributor: Joaquim Pedro (osmano807) <osmano807@gmail.com> pkgname=kyotocabinet pkgver=1.2.76 -pkgrel=3 +pkgrel=4 pkgdesc="a modern implementation of DBM in C++" arch=('i686' 'x86_64') url="http://fallabs.com/kyotocabinet" license=('LGPL3') -makedepends=('gcc' 'make' 'pkgconfig' 'zlib') depends=('zlib' 'gcc-libs') source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz") build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-opt make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make install DESTDIR="$pkgdir/" } diff --git a/community/libdbusmenu/PKGBUILD b/community/libdbusmenu/PKGBUILD new file mode 100644 index 000000000..ca900239e --- /dev/null +++ b/community/libdbusmenu/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 99160 2013-10-25 08:29:02Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd at gmail dot com> +# Contributor: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Branchini Massimo <max dot bra dot gtalk at gmail dot com + +pkgbase=libdbusmenu +pkgname=('libdbusmenu-glib' 'libdbusmenu-gtk3') +pkgver=12.10.2 +pkgrel=3 +pkgdesc="A library for passing menus over DBus" +arch=('i686' 'x86_64') +url="https://launchpad.net/libdbusmenu" +license=('GPL3') +makedepends=('gnome-doc-utils' 'gobject-introspection' 'gtk3' 'intltool' 'vala') +options=('!emptydirs') +source=("http://launchpad.net/dbusmenu/${pkgver%.?}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz") +sha256sums=('9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9') + +build() { + cd ${pkgbase}-${pkgver} + + export HAVE_VALGRIND_TRUE='#' + export HAVE_VALGRIND_FALSE='' + ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-{dumper,static,tests} + make +} + +package_libdbusmenu-glib() { +depends=('glib2') + + cd ${pkgbase}-${pkgver} + + make -C libdbusmenu-glib DESTDIR="${pkgdir}" install +} + +package_libdbusmenu-gtk3() { +depends=('gtk3' 'libdbusmenu-glib') + + cd ${pkgbase}-${pkgver} + + make -C libdbusmenu-glib DESTDIR="${pkgdir}" install + make -C libdbusmenu-gtk DESTDIR="${pkgdir}" install + make -C libdbusmenu-glib DESTDIR="${pkgdir}" uninstall +} + +# vim: ts=2 sw=2 et: diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD index 3cef1c18a..193e5eb5b 100644 --- a/community/libsodium/PKGBUILD +++ b/community/libsodium/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 96998 2013-09-10 02:39:45Z fyan $ +# $Id: PKGBUILD 99151 2013-10-25 05:03:48Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: namelessjon <jonathan.stott@gmail.com> # Contributor: Alessio Sergi <asergi at archlinux dot us> pkgname=libsodium -pkgver=0.4.3 +pkgver=0.4.5 pkgrel=1 pkgdesc="P(ortable|ackageable) NaCl-based crypto library" arch=('i686' 'x86_64') url="https://github.com/jedisct1/libsodium" license=('custom:ISC') depends=('glibc') -options=('!libtool') source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz) build() { @@ -35,4 +34,4 @@ package() { } # vim:set ts=2 sw=2 et: -sha512sums=('479016922fa522409eac80e65046129b4ea3a34642483e6f56331c430c9cb21cf69ec4650a6717560283096d1416bf15035dbf56eba3c35259ddfc8feccda331') +sha512sums=('8c446b62c0400ed972f11c399a03f334cead80fc48513c4b5eba6f569725e28cf98d71cd6d46da5602fc553719a18e74598008c311fe02b2f05b61c7bc72525b') diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD index 6d5a7c483..d94bb5526 100644 --- a/community/liteide/PKGBUILD +++ b/community/liteide/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 96319 2013-08-25 13:45:50Z arodseth $ +# $Id: PKGBUILD 99195 2013-10-25 12:43:33Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=liteide pkgver=19 -pkgrel=3 +pkgrel=4 pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")' license=('LGPL') arch=('x86_64' 'i686') url='https://github.com/visualfc/liteide' -depends=('go' 'libpng12' 'qt5-webkit') +depends=('go' 'qt5-webkit') replaces=('golangide') conflicts=('golangide') makedepends=('gendesk') @@ -23,15 +23,13 @@ sha256sums=('182694341940878cf5df4f083a750659bffc97eb4ae517410e157bebc14f97df' '5d6f05b072586c31e3a4a08ea2d7332dd0a78f5db6b2d088fb76e8cb032672f0') prepare() { - cd "$srcdir" - gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" cd "liteide-x$pkgver/build" chmod +x build_linux.sh } build() { - cd "$srcdir/liteide-x$pkgver/build" + cd "liteide-x$pkgver/build" QTDIR=/usr ./build_linux.sh @@ -42,7 +40,7 @@ build() { } package() { - cd "$srcdir/liteide-x$pkgver/build/liteide" + cd "liteide-x$pkgver/build/liteide" msg2 'Creating directories...' mkdir -p \ diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD index 87f4707cf..f9ee37a12 100644 --- a/community/ming/PKGBUILD +++ b/community/ming/PKGBUILD @@ -3,14 +3,14 @@ pkgname=ming pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="SWF output library" arch=('i686' 'x86_64') url="http://www.libming.net/" license=('GPL' 'LGPL') depends=('freetype2' 'libpng' 'flex') makedepends=('bison' 'pkg-config' 'python2') -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('73bcbcb837f3872ef1a936c539a2513c') diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 3dc14a894..d8998635f 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96182 2013-08-21 06:12:24Z fyan $ +# $Id: PKGBUILD 99147 2013-10-25 05:02:21Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,13 +6,13 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.4.6 +pkgver=2.4.7 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64') url='http://www.mongodb.org' license=('AGPL3') -depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') # 'v8') +depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap') # 'cyrus-sasl') checkdepends=('python2-pymongo') optdepends=('libpcap: needed for mongosniff') @@ -37,8 +37,8 @@ build() { --use-system-tcmalloc \ --ssl \ --sharedclient - # --use-system-v8 # --use-sasl-client + # --use-system-v8 } <<COMMENT @@ -68,15 +68,13 @@ package() { # --use-system-v8 # --use-sasl-client - rm "$pkgdir/usr/lib/libmongoclient.a" - install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf" install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service" install -dm700 "$pkgdir/var/lib/mongodb" install -dm755 "$pkgdir/var/log/mongodb" } -sha512sums=('73921d439f1bc2b6c1f358ab96f05f5f082db7b2c09f8964f2e3cc2d3cfd059e0c923d228a77fbfb8c8613eee1fbf16a35d5347b6316219aed3b0357dec97eae' +sha512sums=('bd682944f5388cef9115ccdf0d8488d2a7a699974f395dd9eea62562528a7a6205fceb92c148187f003362f1ef983ead672cacacc678b2f2b77cdd827812b6c9' '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c' '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9' 'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84') diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 2c866dea6..75e4bdfa8 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99077 2013-10-24 08:16:35Z bpiotrowski $ +# $Id: PKGBUILD 99197 2013-10-25 12:45:06Z giovanni $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Eivind Uggedal <eivind@uggedal.com> pkgname=mpv pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index a053fffa9..669c837ad 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99069 2013-10-24 02:39:07Z jconder $ +# $Id: PKGBUILD 99201 2013-10-25 13:44:56Z giovanni $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.27 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -27,10 +27,10 @@ conflicts=('myththemes' 'mythplugins-mythvideo') replaces=('myththemes' 'mythplugins-mythvideo') backup=() install='mythtv.install' -source=("http://www.$pkgname.org/download/$pkgname/$pkgver" +source=("$pkgname-$pkgver.tar.gz::http://www.$pkgname.org/download/$pkgname/$pkgver" 'mythbackend.service' 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch') -sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8' +sha256sums=('49789de705be73275325b1a4984b727cf8284fdc4ae6b041ad152857c830dc46' 'f628f44164ce773ae54d320fb2f65353cacf9deec16981e4e56316ac33000a2f' '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3') diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD index 01375c5e2..3a88ab6b4 100644 --- a/community/opencc/PKGBUILD +++ b/community/opencc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95956 2013-08-19 06:36:39Z fyan $ +# $Id: PKGBUILD 99152 2013-10-25 05:05:17Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgbase=opencc pkgname=(opencc opencc-doc) pkgver=0.4.3 -pkgrel=1 +pkgrel=2 url="http://code.google.com/p/opencc/" arch=('i686' 'x86_64') license=('Apache') @@ -12,7 +12,7 @@ makedepends=('cmake' 'doxygen') source=("http://opencc.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz") build() { - cd "$srcdir/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCUMENTATION:BOOL=ON make } @@ -21,7 +21,7 @@ package_opencc() { pkgdesc="Library for Open Chinese Convert" depends=('glibc') - cd "$srcdir/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install # Remove docs - install in splitted package @@ -31,7 +31,7 @@ package_opencc() { package_opencc-doc() { pkgdesc="Documentation for Library for Open Chinese Convert" - cd "$srcdir/${pkgbase}-${pkgver}/doc" + cd ${pkgbase}-${pkgver}/doc make DESTDIR="${pkgdir}" install # Remove manpages - already installed in main package diff --git a/community/pdflib-lite/PKGBUILD b/community/pdflib-lite/PKGBUILD index f99c4f350..73e4a997c 100644 --- a/community/pdflib-lite/PKGBUILD +++ b/community/pdflib-lite/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pdflib-lite _pkgnamecaps=PDFlib-Lite pkgver=7.0.5p3 _basepkgver=${pkgver/p*/} -pkgrel=2 +pkgrel=3 pkgdesc="PDF manipulation library." url="http://www.pdflib.com" arch=(i686 x86_64) diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index f201be457..1ad8e2d03 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 98649 2013-10-16 12:59:04Z mtorromeo $ +# $Id: PKGBUILD 99185 2013-10-25 10:38:59Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.6.13_rel61.0 +pkgver=5.6.14_rel62.0 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ url="http://www.percona.com/software/percona-server/" options=('!libtool' 'emptydirs') backup=('etc/mysql/my.cnf') install=percona.install -source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/source/Percona-Server-${pkgver/_/-}.tar.gz" +source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/release-${pkgver/_rel/-}/483/source/Percona-Server-${pkgver/_/-}.tar.gz" 'mysqld-post.sh' 'mysqld.service' 'mysqld-tmpfile.conf' @@ -102,9 +102,9 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('6fa6c240f08c3aedacbefe31559128d239c7f18089c5bba64136698bd64910c8' +sha256sums=('69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280' '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60' '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729' - '89aab4eafa97cd0e40b61871a472fd90b4372e69c7af0d86145e5a7de9c8d4ee') + 'd36c807f085b6051cc8fddb2abc5a1939be809650f1cfefc8a87731978958929') diff --git a/community/percona-server/mysql56-bison3.patch b/community/percona-server/mysql56-bison3.patch index 79c6b5c28..b9767cf71 100644 --- a/community/percona-server/mysql56-bison3.patch +++ b/community/percona-server/mysql56-bison3.patch @@ -1,5 +1,5 @@ diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc -index 1bb7747..009780f 100644 +index 75440c5..af50807 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -34,7 +34,7 @@ @@ -11,7 +11,7 @@ index 1bb7747..009780f 100644 /* We are using pointer to this variable for distinguishing between assignment -@@ -905,9 +905,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted) +@@ -906,9 +906,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted) (which can't be followed by a signed number) */ @@ -22,7 +22,7 @@ index 1bb7747..009780f 100644 Lex_input_stream *lip= & thd->m_parser_state->m_lip; YYSTYPE *yylval=(YYSTYPE*) arg; int token; -@@ -926,7 +925,7 @@ int MYSQLlex(void *arg, void *yythd) +@@ -927,7 +926,7 @@ int MYSQLlex(void *arg, void *yythd) return token; } @@ -31,7 +31,7 @@ index 1bb7747..009780f 100644 switch(token) { case WITH: -@@ -937,7 +936,7 @@ int MYSQLlex(void *arg, void *yythd) +@@ -938,7 +937,7 @@ int MYSQLlex(void *arg, void *yythd) to transform the grammar into a LALR(1) grammar, which sql_yacc.yy can process. */ @@ -40,7 +40,7 @@ index 1bb7747..009780f 100644 switch(token) { case CUBE_SYM: lip->m_digest_psi= MYSQL_ADD_TOKEN(lip->m_digest_psi, WITH_CUBE_SYM, -@@ -966,14 +965,13 @@ int MYSQLlex(void *arg, void *yythd) +@@ -967,14 +966,13 @@ int MYSQLlex(void *arg, void *yythd) return token; } @@ -57,10 +57,10 @@ index 1bb7747..009780f 100644 LEX *lex= thd->lex; YYSTYPE *yylval=(YYSTYPE*) arg; diff --git a/sql/sql_lex.h b/sql/sql_lex.h -index b7030e4..e2d3a60 100644 +index 42a5e77..602f52a 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h -@@ -2845,7 +2845,7 @@ extern void lex_init(void); +@@ -2857,7 +2857,7 @@ extern void lex_init(void); extern void lex_free(void); extern void lex_start(THD *thd); extern void lex_end(LEX *lex); @@ -70,10 +70,10 @@ index b7030e4..e2d3a60 100644 extern void trim_whitespace(const CHARSET_INFO *cs, LEX_STRING *str); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc -index bcf5be1..d58838b 100644 +index c88dd69..fc30370 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc -@@ -8497,7 +8497,7 @@ bool check_host_name(LEX_STRING *str) +@@ -8575,7 +8575,7 @@ bool check_host_name(LEX_STRING *str) } @@ -83,7 +83,7 @@ index bcf5be1..d58838b 100644 /** diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy -index 0c9e81d..765e389 100644 +index e640073..f2c7bfb 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -22,21 +22,14 @@ @@ -154,7 +154,7 @@ index 0c9e81d..765e389 100644 /* Currently there are 161 shift/reduce conflicts. We should not introduce new conflicts any more. -@@ -1971,7 +1965,6 @@ rule: <-- starts at col 1 +@@ -1972,7 +1966,6 @@ rule: <-- starts at col 1 query: END_OF_INPUT { @@ -162,7 +162,7 @@ index 0c9e81d..765e389 100644 if (!thd->bootstrap && (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT))) { -@@ -1985,7 +1978,7 @@ query: +@@ -1986,7 +1979,7 @@ query: { Lex_input_stream *lip = YYLIP; @@ -171,7 +171,7 @@ index 0c9e81d..765e389 100644 lip->multi_statements && ! lip->eof()) { -@@ -2082,7 +2075,6 @@ statement: +@@ -2083,7 +2076,6 @@ statement: deallocate: deallocate_or_drop PREPARE_SYM ident { @@ -179,7 +179,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_DEALLOCATE_PREPARE; lex->prepared_stmt_name= $3; -@@ -2097,7 +2089,6 @@ deallocate_or_drop: +@@ -2098,7 +2090,6 @@ deallocate_or_drop: prepare: PREPARE_SYM ident FROM prepare_src { @@ -187,7 +187,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_PREPARE; lex->prepared_stmt_name= $2; -@@ -2107,14 +2098,12 @@ prepare: +@@ -2118,14 +2109,12 @@ prepare: prepare_src: TEXT_STRING_sys { @@ -202,7 +202,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->prepared_stmt_code= $2; lex->prepared_stmt_code_is_varref= TRUE; -@@ -2124,7 +2113,6 @@ prepare_src: +@@ -2135,7 +2124,6 @@ prepare_src: execute: EXECUTE_SYM ident { @@ -210,7 +210,16 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_EXECUTE; lex->prepared_stmt_name= $2; -@@ -2291,7 +2279,7 @@ master_def: +@@ -2245,7 +2233,7 @@ master_def: + { + Lex_input_stream *lip= YYLIP; + const char *start= lip->get_tok_start(); +- const char *msg= YYTHD->strmake(start, lip->get_ptr() - start); ++ const char *msg= thd->strmake(start, lip->get_ptr() - start); + my_error(ER_MASTER_DELAY_VALUE_OUT_OF_RANGE, MYF(0), + msg, MASTER_DELAY_MAX); + } +@@ -2305,7 +2293,7 @@ master_def: } if (Lex->mi.heartbeat_period > slave_net_timeout) { @@ -219,7 +228,7 @@ index 0c9e81d..765e389 100644 ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX, ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX)); } -@@ -2299,7 +2287,7 @@ master_def: +@@ -2313,7 +2301,7 @@ master_def: { if (Lex->mi.heartbeat_period != 0.0) { @@ -228,7 +237,7 @@ index 0c9e81d..765e389 100644 ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN, ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN)); Lex->mi.heartbeat_period= 0.0; -@@ -2382,7 +2370,6 @@ master_file_def: +@@ -2396,7 +2384,6 @@ master_file_def: create: CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident { @@ -236,7 +245,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_CREATE_TABLE; if (!lex->select_lex.add_table_to_list(thd, $5, NULL, -@@ -2408,7 +2395,6 @@ create: +@@ -2422,7 +2409,6 @@ create: } create2 { @@ -244,7 +253,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->current_select= &lex->select_lex; if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) && -@@ -2417,7 +2403,7 @@ create: +@@ -2431,7 +2417,7 @@ create: lex->create_info.db_type= lex->create_info.options & HA_LEX_CREATE_TMP_TABLE ? ha_default_temp_handlerton(thd) : ha_default_handlerton(thd); @@ -253,7 +262,7 @@ index 0c9e81d..765e389 100644 ER_WARN_USING_OTHER_HANDLER, ER(ER_WARN_USING_OTHER_HANDLER), ha_resolve_storage_engine_name(lex->create_info.db_type), -@@ -2551,7 +2537,6 @@ server_option: +@@ -2565,7 +2551,6 @@ server_option: event_tail: remember_name EVENT_SYM opt_if_not_exists sp_name { @@ -261,7 +270,7 @@ index 0c9e81d..765e389 100644 LEX *lex=Lex; lex->stmt_definition_begin= $1; -@@ -2618,7 +2603,7 @@ opt_ev_status: +@@ -2632,7 +2617,7 @@ opt_ev_status: ev_starts: /* empty */ { @@ -270,7 +279,7 @@ index 0c9e81d..765e389 100644 if (item == NULL) MYSQL_YYABORT; Lex->event_parse_data->item_starts= item; -@@ -2668,7 +2653,6 @@ opt_ev_comment: +@@ -2682,7 +2667,6 @@ opt_ev_comment: ev_sql_stmt: { @@ -278,7 +287,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; -@@ -2711,7 +2695,6 @@ ev_sql_stmt: +@@ -2725,7 +2709,6 @@ ev_sql_stmt: } ev_sql_stmt_inner { @@ -286,7 +295,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_finish_parsing(thd); -@@ -2765,11 +2748,10 @@ sp_name: +@@ -2779,11 +2762,10 @@ sp_name: $$= new sp_name($1, $3, true); if ($$ == NULL) MYSQL_YYABORT; @@ -299,7 +308,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; LEX_STRING db; if (sp_check_name(&$1)) -@@ -2839,7 +2821,7 @@ call: +@@ -2853,7 +2835,7 @@ call: lex->sql_command= SQLCOM_CALL; lex->spname= $2; lex->value_list.empty(); @@ -308,7 +317,7 @@ index 0c9e81d..765e389 100644 } opt_sp_cparam_list {} ; -@@ -2900,7 +2882,6 @@ sp_init_param: +@@ -2914,7 +2896,6 @@ sp_init_param: sp_fdparam: ident sp_init_param type_with_opt_collate { @@ -316,7 +325,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -2941,7 +2922,6 @@ sp_pdparams: +@@ -2955,7 +2936,6 @@ sp_pdparams: sp_pdparam: sp_opt_inout sp_init_param ident type_with_opt_collate { @@ -324,7 +333,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3017,7 +2997,6 @@ sp_decls: +@@ -3031,7 +3011,6 @@ sp_decls: sp_decl: DECLARE_SYM sp_decl_idents { @@ -332,7 +341,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3028,7 +3007,6 @@ sp_decl: +@@ -3042,7 +3021,6 @@ sp_decl: type_with_opt_collate sp_opt_default { @@ -340,7 +349,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3101,7 +3079,6 @@ sp_decl: +@@ -3115,7 +3093,6 @@ sp_decl: } | DECLARE_SYM ident CONDITION_SYM FOR_SYM sp_cond { @@ -348,7 +357,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3117,7 +3094,6 @@ sp_decl: +@@ -3131,7 +3108,6 @@ sp_decl: } | DECLARE_SYM sp_handler_type HANDLER_SYM FOR_SYM { @@ -356,7 +365,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -3157,7 +3133,6 @@ sp_decl: +@@ -3171,7 +3147,6 @@ sp_decl: } sp_hcond_list sp_proc_stmt { @@ -364,7 +373,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3191,7 +3166,6 @@ sp_decl: +@@ -3205,7 +3180,6 @@ sp_decl: } | DECLARE_SYM ident CURSOR_SYM FOR_SYM { @@ -372,7 +381,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; -@@ -3200,7 +3174,6 @@ sp_decl: +@@ -3214,7 +3188,6 @@ sp_decl: } select { @@ -380,7 +389,7 @@ index 0c9e81d..765e389 100644 LEX *cursor_lex= Lex; sp_head *sp= cursor_lex->sphead; -@@ -3305,7 +3278,7 @@ sp_cond: +@@ -3319,7 +3292,7 @@ sp_cond: my_error(ER_WRONG_VALUE, MYF(0), "CONDITION", "0"); MYSQL_YYABORT; } @@ -389,7 +398,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3328,7 +3301,7 @@ sqlstate: +@@ -3342,7 +3315,7 @@ sqlstate: my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str); MYSQL_YYABORT; } @@ -398,7 +407,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3359,19 +3332,19 @@ sp_hcond: +@@ -3373,19 +3346,19 @@ sp_hcond: } | SQLWARNING_SYM /* SQLSTATEs 01??? */ { @@ -421,7 +430,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3380,7 +3353,6 @@ sp_hcond: +@@ -3394,7 +3367,6 @@ sp_hcond: signal_stmt: SIGNAL_SYM signal_value opt_set_signal_information { @@ -429,7 +438,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Yacc_state *state= & thd->m_parser_state->m_yacc; -@@ -3433,7 +3405,7 @@ opt_signal_value: +@@ -3447,7 +3419,7 @@ opt_signal_value: opt_set_signal_information: /* empty */ { @@ -438,7 +447,7 @@ index 0c9e81d..765e389 100644 } | SET signal_information_item_list ; -@@ -3442,7 +3414,7 @@ signal_information_item_list: +@@ -3456,7 +3428,7 @@ signal_information_item_list: signal_condition_information_item_name EQ signal_allowed_expr { Set_signal_information *info; @@ -447,7 +456,7 @@ index 0c9e81d..765e389 100644 int index= (int) $1; info->clear(); info->m_item[index]= $3; -@@ -3451,7 +3423,7 @@ signal_information_item_list: +@@ -3465,7 +3437,7 @@ signal_information_item_list: signal_condition_information_item_name EQ signal_allowed_expr { Set_signal_information *info; @@ -456,7 +465,7 @@ index 0c9e81d..765e389 100644 int index= (int) $3; if (info->m_item[index] != NULL) { -@@ -3522,7 +3494,6 @@ signal_condition_information_item_name: +@@ -3536,7 +3508,6 @@ signal_condition_information_item_name: resignal_stmt: RESIGNAL_SYM opt_signal_value opt_set_signal_information { @@ -464,7 +473,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Yacc_state *state= & thd->m_parser_state->m_yacc; -@@ -3543,7 +3514,7 @@ get_diagnostics: +@@ -3557,7 +3528,7 @@ get_diagnostics: info->set_which_da($2); Lex->sql_command= SQLCOM_GET_DIAGNOSTICS; @@ -473,7 +482,7 @@ index 0c9e81d..765e389 100644 if (Lex->m_sql_cmd == NULL) MYSQL_YYABORT; -@@ -3560,13 +3531,13 @@ which_area: +@@ -3574,13 +3545,13 @@ which_area: diagnostics_information: statement_information { @@ -489,7 +498,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3575,7 +3546,7 @@ diagnostics_information: +@@ -3589,7 +3560,7 @@ diagnostics_information: statement_information: statement_information_item { @@ -498,7 +507,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL || $$->push_back($1)) MYSQL_YYABORT; } -@@ -3590,7 +3561,7 @@ statement_information: +@@ -3604,7 +3575,7 @@ statement_information: statement_information_item: simple_target_specification EQ statement_information_item_name { @@ -507,7 +516,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3598,7 +3569,6 @@ statement_information_item: +@@ -3612,7 +3583,6 @@ statement_information_item: simple_target_specification: ident { @@ -515,7 +524,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; sp_head *sp= lex->sphead; -@@ -3627,7 +3597,7 @@ simple_target_specification: +@@ -3641,7 +3611,7 @@ simple_target_specification: } | '@' ident_or_text { @@ -524,7 +533,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3652,7 +3622,7 @@ condition_number: +@@ -3666,7 +3636,7 @@ condition_number: condition_information: condition_information_item { @@ -533,7 +542,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL || $$->push_back($1)) MYSQL_YYABORT; } -@@ -3667,7 +3637,7 @@ condition_information: +@@ -3681,7 +3651,7 @@ condition_information: condition_information_item: simple_target_specification EQ condition_information_item_name { @@ -542,7 +551,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -3706,7 +3676,6 @@ sp_decl_idents: +@@ -3720,7 +3690,6 @@ sp_decl_idents: { /* NOTE: field definition is filled in sp_decl section. */ @@ -550,7 +559,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3726,7 +3695,6 @@ sp_decl_idents: +@@ -3740,7 +3709,6 @@ sp_decl_idents: { /* NOTE: field definition is filled in sp_decl section. */ @@ -558,7 +567,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3782,7 +3750,6 @@ sp_proc_stmt_if: +@@ -3796,7 +3764,6 @@ sp_proc_stmt_if: sp_proc_stmt_statement: { @@ -566,7 +575,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; sp_head *sp= lex->sphead; -@@ -3792,7 +3759,6 @@ sp_proc_stmt_statement: +@@ -3806,7 +3773,6 @@ sp_proc_stmt_statement: } statement { @@ -574,7 +583,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -3839,7 +3805,6 @@ sp_proc_stmt_statement: +@@ -3853,7 +3819,6 @@ sp_proc_stmt_statement: sp_proc_stmt_return: RETURN_SYM { @@ -582,7 +591,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -3849,7 +3814,6 @@ sp_proc_stmt_return: +@@ -3863,7 +3828,6 @@ sp_proc_stmt_return: } expr { @@ -590,7 +599,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -3895,7 +3859,6 @@ sp_proc_stmt_return: +@@ -3909,7 +3873,6 @@ sp_proc_stmt_return: sp_proc_stmt_unlabeled: { /* Unlabeled controls get a secret label. */ @@ -598,7 +607,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3918,7 +3881,6 @@ sp_proc_stmt_unlabeled: +@@ -3932,7 +3895,6 @@ sp_proc_stmt_unlabeled: sp_proc_stmt_leave: LEAVE_SYM label_ident { @@ -606,7 +615,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp = lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -3977,7 +3939,6 @@ sp_proc_stmt_leave: +@@ -3991,7 +3953,6 @@ sp_proc_stmt_leave: sp_proc_stmt_iterate: ITERATE_SYM label_ident { @@ -614,7 +623,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4027,7 +3988,6 @@ sp_proc_stmt_iterate: +@@ -4041,7 +4002,6 @@ sp_proc_stmt_iterate: sp_proc_stmt_open: OPEN_SYM ident { @@ -622,7 +631,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4051,7 +4011,6 @@ sp_proc_stmt_open: +@@ -4065,7 +4025,6 @@ sp_proc_stmt_open: sp_proc_stmt_fetch: FETCH_SYM sp_opt_fetch_noise ident INTO { @@ -630,7 +639,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4077,7 +4036,6 @@ sp_proc_stmt_fetch: +@@ -4091,7 +4050,6 @@ sp_proc_stmt_fetch: sp_proc_stmt_close: CLOSE_SYM ident { @@ -638,7 +647,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4145,7 +4103,6 @@ sp_fetch_list: +@@ -4159,7 +4117,6 @@ sp_fetch_list: sp_if: { @@ -646,7 +655,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4154,7 +4111,6 @@ sp_if: +@@ -4168,7 +4125,6 @@ sp_if: } expr { @@ -654,7 +663,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4190,7 +4146,6 @@ sp_if: +@@ -4204,7 +4160,6 @@ sp_if: } THEN_SYM sp_proc_stmts1 { @@ -662,7 +671,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4232,7 +4187,6 @@ case_stmt_specification: +@@ -4246,7 +4201,6 @@ case_stmt_specification: simple_case_stmt: CASE_SYM { @@ -670,7 +679,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4243,7 +4197,6 @@ simple_case_stmt: +@@ -4257,7 +4211,6 @@ simple_case_stmt: } expr { @@ -678,7 +687,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; -@@ -4294,7 +4247,7 @@ simple_case_stmt: +@@ -4308,7 +4261,7 @@ simple_case_stmt: searched_case_stmt: CASE_SYM { @@ -687,7 +696,7 @@ index 0c9e81d..765e389 100644 } searched_when_clause_list else_clause_opt -@@ -4318,7 +4271,6 @@ searched_when_clause_list: +@@ -4332,7 +4285,6 @@ searched_when_clause_list: simple_when_clause: WHEN_SYM { @@ -695,7 +704,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4329,7 +4281,6 @@ simple_when_clause: +@@ -4343,7 +4295,6 @@ simple_when_clause: { /* Simple case: <caseval> = <whenval> */ @@ -703,7 +712,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4368,7 +4319,7 @@ simple_when_clause: +@@ -4382,7 +4333,7 @@ simple_when_clause: THEN_SYM sp_proc_stmts1 { @@ -712,7 +721,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -4376,7 +4327,6 @@ simple_when_clause: +@@ -4390,7 +4341,6 @@ simple_when_clause: searched_when_clause: WHEN_SYM { @@ -720,7 +729,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4385,7 +4335,6 @@ searched_when_clause: +@@ -4399,7 +4349,6 @@ searched_when_clause: } expr { @@ -728,7 +737,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4421,7 +4370,7 @@ searched_when_clause: +@@ -4435,7 +4384,7 @@ searched_when_clause: THEN_SYM sp_proc_stmts1 { @@ -737,7 +746,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -4429,7 +4378,6 @@ searched_when_clause: +@@ -4443,7 +4392,6 @@ searched_when_clause: else_clause_opt: /* empty */ { @@ -745,7 +754,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4459,7 +4407,7 @@ sp_labeled_control: +@@ -4473,7 +4421,7 @@ sp_labeled_control: } else { @@ -754,7 +763,7 @@ index 0c9e81d..765e389 100644 lab->type= sp_label::ITERATION; } } -@@ -4501,7 +4449,7 @@ sp_labeled_block: +@@ -4515,7 +4463,7 @@ sp_labeled_block: MYSQL_YYABORT; } @@ -763,7 +772,7 @@ index 0c9e81d..765e389 100644 lab->type= sp_label::BEGIN; } sp_block_content sp_opt_label -@@ -4528,7 +4476,7 @@ sp_unlabeled_block: +@@ -4542,7 +4490,7 @@ sp_unlabeled_block: sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); sp_label *lab= @@ -772,7 +781,7 @@ index 0c9e81d..765e389 100644 lab->type= sp_label::BEGIN; } -@@ -4544,7 +4492,6 @@ sp_block_content: +@@ -4558,7 +4506,6 @@ sp_block_content: { /* QQ This is just a dummy for grouping declarations and statements together. No [[NOT] ATOMIC] yet, and we need to figure out how make it coexist with the existing BEGIN COMMIT/ROLLBACK. */ @@ -780,7 +789,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *parent_pctx= lex->get_sp_current_parsing_ctx(); -@@ -4557,7 +4504,6 @@ sp_block_content: +@@ -4571,7 +4518,6 @@ sp_block_content: sp_proc_stmts END { @@ -788,7 +797,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4593,7 +4539,6 @@ sp_unlabeled_control: +@@ -4607,7 +4553,6 @@ sp_unlabeled_control: LOOP_SYM sp_proc_stmts1 END LOOP_SYM { @@ -796,7 +805,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4608,7 +4553,6 @@ sp_unlabeled_control: +@@ -4622,7 +4567,6 @@ sp_unlabeled_control: } | WHILE_SYM { @@ -804,7 +813,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4617,7 +4561,6 @@ sp_unlabeled_control: +@@ -4631,7 +4575,6 @@ sp_unlabeled_control: } expr { @@ -812,7 +821,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4655,7 +4598,6 @@ sp_unlabeled_control: +@@ -4669,7 +4612,6 @@ sp_unlabeled_control: sp_proc_stmts1 END WHILE_SYM { @@ -820,7 +829,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -4671,7 +4613,6 @@ sp_unlabeled_control: +@@ -4685,7 +4627,6 @@ sp_unlabeled_control: } | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM { @@ -828,7 +837,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -4680,7 +4621,6 @@ sp_unlabeled_control: +@@ -4694,7 +4635,6 @@ sp_unlabeled_control: } expr { @@ -836,7 +845,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -5133,7 +5073,6 @@ create2: +@@ -5147,7 +5087,6 @@ create2: create3 {} | LIKE table_ident { @@ -844,7 +853,7 @@ index 0c9e81d..765e389 100644 TABLE_LIST *src_table; LEX *lex= thd->lex; -@@ -5148,7 +5087,6 @@ create2: +@@ -5162,7 +5101,6 @@ create2: } | '(' LIKE table_ident ')' { @@ -852,7 +861,7 @@ index 0c9e81d..765e389 100644 TABLE_LIST *src_table; LEX *lex= thd->lex; -@@ -5749,7 +5687,7 @@ part_value_expr_item: +@@ -5763,7 +5701,7 @@ part_value_expr_item: my_parse_error(ER(ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR)); MYSQL_YYABORT; } @@ -861,7 +870,7 @@ index 0c9e81d..765e389 100644 { MYSQL_YYABORT; } -@@ -6207,7 +6145,6 @@ default_collation: +@@ -6221,7 +6159,6 @@ default_collation: storage_engines: ident_or_text { @@ -869,7 +878,7 @@ index 0c9e81d..765e389 100644 plugin_ref plugin= ha_resolve_by_name(thd, &$1, thd->lex->create_info.options & HA_LEX_CREATE_TMP_TABLE); -@@ -6233,7 +6170,6 @@ storage_engines: +@@ -6247,7 +6184,6 @@ storage_engines: known_storage_engines: ident_or_text { @@ -877,7 +886,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; plugin_ref plugin= ha_resolve_by_name(thd, &$1, -@@ -6469,7 +6405,7 @@ type: +@@ -6483,7 +6419,7 @@ type: { /* Reset unsupported positive column width to default value */ Lex->length= NULL; @@ -886,7 +895,7 @@ index 0c9e81d..765e389 100644 ER_INVALID_YEAR_COLUMN_LENGTH, ER(ER_INVALID_YEAR_COLUMN_LENGTH), length); -@@ -6483,7 +6419,7 @@ type: +@@ -6497,7 +6433,7 @@ type: { $$= MYSQL_TYPE_TIME2; } | TIMESTAMP type_datetime_precision { @@ -895,7 +904,7 @@ index 0c9e81d..765e389 100644 $$=MYSQL_TYPE_DATETIME2; else { -@@ -6491,7 +6427,7 @@ type: +@@ -6505,7 +6441,7 @@ type: Unlike other types TIMESTAMP fields are NOT NULL by default. This behavior is deprecated now. */ @@ -904,7 +913,7 @@ index 0c9e81d..765e389 100644 Lex->type|= NOT_NULL_FLAG; $$=MYSQL_TYPE_TIMESTAMP2; -@@ -6618,7 +6554,7 @@ int_type: +@@ -6632,7 +6568,7 @@ int_type: real_type: REAL { @@ -913,7 +922,7 @@ index 0c9e81d..765e389 100644 MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE; } | DOUBLE_SYM -@@ -6807,7 +6743,7 @@ type_with_opt_collate: +@@ -6821,7 +6757,7 @@ type_with_opt_collate: now: NOW_SYM func_datetime_precision { @@ -922,7 +931,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; }; -@@ -7287,7 +7223,6 @@ string_list: +@@ -7301,7 +7237,6 @@ string_list: alter: ALTER opt_ignore TABLE_SYM table_ident { @@ -930,7 +939,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->name.str= 0; lex->name.length= 0; -@@ -7313,7 +7248,6 @@ alter: +@@ -7327,7 +7262,6 @@ alter: } alter_commands { @@ -938,7 +947,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; if (!lex->m_sql_cmd) { -@@ -7426,7 +7360,7 @@ alter: +@@ -7440,7 +7374,7 @@ alter: Event_parse_data. */ @@ -947,7 +956,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Lex->event_parse_data->identifier= $4; -@@ -7529,7 +7463,7 @@ alter_commands: +@@ -7543,7 +7477,7 @@ alter_commands: /* empty */ | DISCARD TABLESPACE { @@ -956,7 +965,7 @@ index 0c9e81d..765e389 100644 Sql_cmd_discard_import_tablespace( Sql_cmd_discard_import_tablespace::DISCARD_TABLESPACE); if (Lex->m_sql_cmd == NULL) -@@ -7537,7 +7471,7 @@ alter_commands: +@@ -7551,7 +7485,7 @@ alter_commands: } | IMPORT TABLESPACE { @@ -965,7 +974,7 @@ index 0c9e81d..765e389 100644 Sql_cmd_discard_import_tablespace( Sql_cmd_discard_import_tablespace::IMPORT_TABLESPACE); if (Lex->m_sql_cmd == NULL) -@@ -7571,7 +7505,6 @@ alter_commands: +@@ -7585,7 +7519,6 @@ alter_commands: | OPTIMIZE PARTITION_SYM opt_no_write_to_binlog all_or_alt_part_name_list { @@ -973,7 +982,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->no_write_to_binlog= $3; lex->check_opt.init(); -@@ -7585,7 +7518,6 @@ alter_commands: +@@ -7599,7 +7532,6 @@ alter_commands: | ANALYZE_SYM PARTITION_SYM opt_no_write_to_binlog all_or_alt_part_name_list { @@ -981,7 +990,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->no_write_to_binlog= $3; lex->check_opt.init(); -@@ -7597,7 +7529,6 @@ alter_commands: +@@ -7611,7 +7543,6 @@ alter_commands: } | CHECK_SYM PARTITION_SYM all_or_alt_part_name_list { @@ -989,7 +998,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->check_opt.init(); DBUG_ASSERT(!lex->m_sql_cmd); -@@ -7610,7 +7541,6 @@ alter_commands: +@@ -7624,7 +7555,6 @@ alter_commands: | REPAIR PARTITION_SYM opt_no_write_to_binlog all_or_alt_part_name_list { @@ -997,7 +1006,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->no_write_to_binlog= $3; lex->check_opt.init(); -@@ -7630,7 +7560,6 @@ alter_commands: +@@ -7644,7 +7574,6 @@ alter_commands: } | TRUNCATE_SYM PARTITION_SYM all_or_alt_part_name_list { @@ -1005,7 +1014,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->check_opt.init(); DBUG_ASSERT(!lex->m_sql_cmd); -@@ -7643,7 +7572,6 @@ alter_commands: +@@ -7657,7 +7586,6 @@ alter_commands: | EXCHANGE_SYM PARTITION_SYM alt_part_name_item WITH TABLE_SYM table_ident have_partitioning { @@ -1013,7 +1022,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; size_t dummy; lex->select_lex.db=$6->db.str; -@@ -7925,7 +7853,6 @@ alter_list_item: +@@ -7939,7 +7867,6 @@ alter_list_item: { if (!$4) { @@ -1021,7 +1030,7 @@ index 0c9e81d..765e389 100644 $4= thd->variables.collation_database; } $5= $5 ? $5 : $4; -@@ -8287,7 +8214,6 @@ repair: +@@ -8301,7 +8228,6 @@ repair: } table_list opt_mi_repair_type { @@ -1029,7 +1038,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_repair_table(); -@@ -8325,7 +8251,6 @@ analyze: +@@ -8339,7 +8265,6 @@ analyze: } table_list { @@ -1037,7 +1046,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_analyze_table(); -@@ -8360,7 +8285,6 @@ check: +@@ -8374,7 +8299,6 @@ check: } table_list opt_mi_check_type { @@ -1045,7 +1054,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_check_table(); -@@ -8401,7 +8325,6 @@ optimize: +@@ -8415,7 +8339,6 @@ optimize: } table_list { @@ -1053,7 +1062,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_optimize_table(); -@@ -8486,7 +8409,7 @@ keycache_list: +@@ -8500,7 +8423,7 @@ keycache_list: assign_to_keycache: table_ident cache_keys_spec { @@ -1062,7 +1071,7 @@ index 0c9e81d..765e389 100644 MDL_SHARED_READ, Select->pop_index_hints())) MYSQL_YYABORT; -@@ -8496,7 +8419,7 @@ assign_to_keycache: +@@ -8510,7 +8433,7 @@ assign_to_keycache: assign_to_keycache_parts: table_ident adm_partition cache_keys_spec { @@ -1071,7 +1080,7 @@ index 0c9e81d..765e389 100644 MDL_SHARED_READ, Select->pop_index_hints())) MYSQL_YYABORT; -@@ -8532,7 +8455,7 @@ preload_list: +@@ -8546,7 +8469,7 @@ preload_list: preload_keys: table_ident cache_keys_spec opt_ignore_leaves { @@ -1080,7 +1089,7 @@ index 0c9e81d..765e389 100644 MDL_SHARED_READ, Select->pop_index_hints())) MYSQL_YYABORT; -@@ -8542,7 +8465,7 @@ preload_keys: +@@ -8556,7 +8479,7 @@ preload_keys: preload_keys_parts: table_ident adm_partition cache_keys_spec opt_ignore_leaves { @@ -1089,7 +1098,7 @@ index 0c9e81d..765e389 100644 MDL_SHARED_READ, Select->pop_index_hints())) MYSQL_YYABORT; -@@ -8559,7 +8482,7 @@ adm_partition: +@@ -8573,7 +8496,7 @@ adm_partition: cache_keys_spec: { @@ -1098,7 +1107,7 @@ index 0c9e81d..765e389 100644 Select->set_index_hint_type(INDEX_HINT_USE, old_mode ? INDEX_HINT_MASK_JOIN : -@@ -8774,7 +8697,6 @@ select_item_list: +@@ -8788,7 +8711,6 @@ select_item_list: | select_item | '*' { @@ -1106,7 +1115,7 @@ index 0c9e81d..765e389 100644 Item *item= new (thd->mem_root) Item_field(&thd->lex->current_select->context, NULL, NULL, "*"); -@@ -8789,14 +8711,11 @@ select_item_list: +@@ -8803,14 +8725,11 @@ select_item_list: select_item: remember_name table_wild remember_end { @@ -1121,7 +1130,7 @@ index 0c9e81d..765e389 100644 DBUG_ASSERT($1 < $3); if (add_item_to_list(thd, $2)) -@@ -8891,7 +8810,7 @@ expr: +@@ -8905,7 +8824,7 @@ expr: else { /* X OR Y */ @@ -1130,7 +1139,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -8899,7 +8818,7 @@ expr: +@@ -8913,7 +8832,7 @@ expr: | expr XOR expr %prec XOR { /* XOR is a proprietary extension */ @@ -1139,7 +1148,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -8941,50 +8860,50 @@ expr: +@@ -8955,50 +8874,50 @@ expr: else { /* X AND Y */ @@ -1198,7 +1207,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -8994,19 +8913,19 @@ expr: +@@ -9008,19 +8927,19 @@ expr: bool_pri: bool_pri IS NULL_SYM %prec IS { @@ -1221,7 +1230,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9028,13 +8947,12 @@ bool_pri: +@@ -9042,13 +8961,12 @@ bool_pri: predicate: bit_expr IN_SYM '(' subselect ')' { @@ -1236,7 +1245,7 @@ index 0c9e81d..765e389 100644 Item *item= new (thd->mem_root) Item_in_subselect($1, $5); if (item == NULL) MYSQL_YYABORT; -@@ -9044,7 +8962,7 @@ predicate: +@@ -9058,7 +8976,7 @@ predicate: } | bit_expr IN_SYM '(' expr ')' { @@ -1245,7 +1254,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9052,13 +8970,13 @@ predicate: +@@ -9066,13 +8984,13 @@ predicate: { $6->push_front($4); $6->push_front($1); @@ -1261,7 +1270,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9066,7 +8984,7 @@ predicate: +@@ -9080,7 +8998,7 @@ predicate: { $7->push_front($5); $7->push_front($1); @@ -1270,7 +1279,7 @@ index 0c9e81d..765e389 100644 if (item == NULL) MYSQL_YYABORT; item->negate(); -@@ -9074,14 +8992,14 @@ predicate: +@@ -9088,14 +9006,14 @@ predicate: } | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate { @@ -1287,7 +1296,7 @@ index 0c9e81d..765e389 100644 if (item == NULL) MYSQL_YYABORT; item->negate(); -@@ -9089,42 +9007,42 @@ predicate: +@@ -9103,42 +9021,42 @@ predicate: } | bit_expr SOUNDS_SYM LIKE bit_expr { @@ -1339,7 +1348,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9134,85 +9052,85 @@ predicate: +@@ -9148,85 +9066,85 @@ predicate: bit_expr: bit_expr '|' bit_expr %prec '|' { @@ -1439,7 +1448,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9261,7 +9179,6 @@ simple_expr: +@@ -9275,7 +9193,6 @@ simple_expr: | function_call_conflict | simple_expr COLLATE_SYM ident_or_text %prec NEG { @@ -1447,7 +1456,7 @@ index 0c9e81d..765e389 100644 Item *i1= new (thd->mem_root) Item_string($3.str, $3.length, thd->charset()); -@@ -9277,7 +9194,7 @@ simple_expr: +@@ -9291,7 +9208,7 @@ simple_expr: | sum_expr | simple_expr OR_OR_SYM simple_expr { @@ -1456,7 +1465,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9287,25 +9204,25 @@ simple_expr: +@@ -9301,25 +9218,25 @@ simple_expr: } | '-' simple_expr %prec NEG { @@ -1486,7 +1495,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9314,20 +9231,20 @@ simple_expr: +@@ -9328,20 +9245,20 @@ simple_expr: | '(' expr ',' expr_list ')' { $4->push_front($2); @@ -1510,7 +1519,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9364,7 +9281,7 @@ simple_expr: +@@ -9378,7 +9295,7 @@ simple_expr: type= MYSQL_TYPE_DATETIME; } if (type != MYSQL_TYPE_STRING) @@ -1519,7 +1528,7 @@ index 0c9e81d..765e389 100644 str.ptr(), str.length(), system_charset_info, type, false); -@@ -9375,7 +9292,7 @@ simple_expr: +@@ -9389,7 +9306,7 @@ simple_expr: | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')' { $2->push_front($5); @@ -1528,7 +1537,7 @@ index 0c9e81d..765e389 100644 if (i1 == NULL) MYSQL_YYABORT; Select->add_ftfunc_to_list(i1); -@@ -9383,7 +9300,7 @@ simple_expr: +@@ -9397,7 +9314,7 @@ simple_expr: } | BINARY simple_expr %prec NEG { @@ -1537,7 +1546,7 @@ index 0c9e81d..765e389 100644 &my_charset_bin); if ($$ == NULL) MYSQL_YYABORT; -@@ -9391,27 +9308,27 @@ simple_expr: +@@ -9405,27 +9322,27 @@ simple_expr: | CAST_SYM '(' expr AS cast_type ')' { LEX *lex= Lex; @@ -1569,7 +1578,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9424,14 +9341,14 @@ simple_expr: +@@ -9438,14 +9355,14 @@ simple_expr: my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->m_name.ptr()); MYSQL_YYABORT; } @@ -1586,7 +1595,7 @@ index 0c9e81d..765e389 100644 $3); if ($$ == NULL) MYSQL_YYABORT; -@@ -9439,7 +9356,7 @@ simple_expr: +@@ -9453,7 +9370,7 @@ simple_expr: | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM /* we cannot put interval before - */ { @@ -1595,7 +1604,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9454,19 +9371,19 @@ simple_expr: +@@ -9468,19 +9385,19 @@ simple_expr: function_call_keyword: CHAR_SYM '(' expr_list ')' { @@ -1618,7 +1627,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); -@@ -9474,31 +9391,30 @@ function_call_keyword: +@@ -9488,31 +9405,30 @@ function_call_keyword: } | DATE_SYM '(' expr ')' { @@ -1654,7 +1663,7 @@ index 0c9e81d..765e389 100644 List<Item> *list= new (thd->mem_root) List<Item>; if (list == NULL) MYSQL_YYABORT; -@@ -9513,7 +9429,6 @@ function_call_keyword: +@@ -9527,7 +9443,6 @@ function_call_keyword: } | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM { @@ -1662,7 +1671,7 @@ index 0c9e81d..765e389 100644 $7->push_front($5); $7->push_front($3); Item_row *item= new (thd->mem_root) Item_row(*$7); -@@ -9525,103 +9440,103 @@ function_call_keyword: +@@ -9539,103 +9454,103 @@ function_call_keyword: } | LEFT '(' expr ',' expr ')' { @@ -1783,7 +1792,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); -@@ -9629,7 +9544,7 @@ function_call_keyword: +@@ -9643,7 +9558,7 @@ function_call_keyword: } | YEAR_SYM '(' expr ')' { @@ -1792,7 +1801,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9650,27 +9565,27 @@ function_call_keyword: +@@ -9664,27 +9579,27 @@ function_call_keyword: function_call_nonkeyword: ADDDATE_SYM '(' expr ',' expr ')' { @@ -1824,7 +1833,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->safe_to_cache_query=0; -@@ -9678,26 +9593,26 @@ function_call_nonkeyword: +@@ -9692,26 +9607,26 @@ function_call_nonkeyword: | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' %prec INTERVAL_SYM { @@ -1855,7 +1864,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9708,44 +9623,44 @@ function_call_nonkeyword: +@@ -9722,44 +9637,44 @@ function_call_nonkeyword: } | POSITION_SYM '(' bit_expr IN_SYM expr ')' { @@ -1907,7 +1916,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9760,42 +9675,42 @@ function_call_nonkeyword: +@@ -9774,42 +9689,42 @@ function_call_nonkeyword: */ Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); if (global_system_variables.sysdate_is_now == 0) @@ -1957,7 +1966,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->safe_to_cache_query=0; -@@ -9810,75 +9725,74 @@ function_call_nonkeyword: +@@ -9824,75 +9739,74 @@ function_call_nonkeyword: function_call_conflict: ASCII_SYM '(' expr ')' { @@ -2044,7 +2053,7 @@ index 0c9e81d..765e389 100644 Item* i1; Lex->contains_plaintext_password= true; if (thd->variables.old_passwords == 1) -@@ -9891,31 +9805,31 @@ function_call_conflict: +@@ -9905,31 +9819,31 @@ function_call_conflict: } | QUARTER_SYM '(' expr ')' { @@ -2081,7 +2090,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); -@@ -9923,13 +9837,12 @@ function_call_conflict: +@@ -9937,13 +9851,12 @@ function_call_conflict: } | TRUNCATE_SYM '(' expr ',' expr ')' { @@ -2096,7 +2105,7 @@ index 0c9e81d..765e389 100644 Item *i1= new (thd->mem_root) Item_int(NAME_STRING("0"), thd->variables.default_week_format, 1); -@@ -9941,19 +9854,19 @@ function_call_conflict: +@@ -9955,19 +9868,19 @@ function_call_conflict: } | WEEK_SYM '(' expr ',' expr ')' { @@ -2119,7 +2128,7 @@ index 0c9e81d..765e389 100644 Item_func_weight_string($3, 0, $6, $7 | MY_STRXFRM_PAD_WITH_SPACE); if ($$ == NULL) -@@ -9961,17 +9874,17 @@ function_call_conflict: +@@ -9975,17 +9888,17 @@ function_call_conflict: } | WEIGHT_STRING_SYM '(' expr AS BINARY ws_nweights ')' { @@ -2140,7 +2149,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -9993,52 +9906,52 @@ function_call_conflict: +@@ -10007,52 +9920,52 @@ function_call_conflict: geometry_function: CONTAINS_SYM '(' expr ',' expr ')' { @@ -2201,7 +2210,7 @@ index 0c9e81d..765e389 100644 Item_func_spatial_collection(* $3, Geometry::wkb_polygon, Geometry::wkb_linestring)); -@@ -10076,7 +9989,6 @@ function_call_generic: +@@ -10090,7 +10003,6 @@ function_call_generic: } opt_udf_expr_list ')' { @@ -2209,7 +2218,7 @@ index 0c9e81d..765e389 100644 Create_func *builder; Item *item= NULL; -@@ -10130,7 +10042,6 @@ function_call_generic: +@@ -10144,7 +10056,6 @@ function_call_generic: } | ident '.' ident '(' opt_expr_list ')' { @@ -2217,7 +2226,7 @@ index 0c9e81d..765e389 100644 Create_qfunc *builder; Item *item= NULL; -@@ -10192,7 +10103,7 @@ opt_udf_expr_list: +@@ -10206,7 +10117,7 @@ opt_udf_expr_list: udf_expr_list: udf_expr { @@ -2226,7 +2235,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; $$->push_back($1); -@@ -10225,7 +10136,7 @@ udf_expr: +@@ -10239,7 +10150,7 @@ udf_expr: */ else if ($2->type() != Item::FIELD_ITEM && $2->type() != Item::REF_ITEM /* For HAVING */ ) @@ -2235,7 +2244,7 @@ index 0c9e81d..765e389 100644 $$= $2; } ; -@@ -10233,46 +10144,46 @@ udf_expr: +@@ -10247,46 +10158,46 @@ udf_expr: sum_expr: AVG_SYM '(' in_sum_expr ')' { @@ -2290,7 +2299,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -10282,13 +10193,13 @@ sum_expr: +@@ -10296,13 +10207,13 @@ sum_expr: { Select->in_sum_expr--; } ')' { @@ -2306,7 +2315,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -10299,55 +10210,55 @@ sum_expr: +@@ -10313,55 +10224,55 @@ sum_expr: */ | MIN_SYM '(' DISTINCT in_sum_expr ')' { @@ -2371,7 +2380,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -10359,7 +10270,7 @@ sum_expr: +@@ -10373,7 +10284,7 @@ sum_expr: { SELECT_LEX *sel= Select; sel->in_sum_expr--; @@ -2380,7 +2389,7 @@ index 0c9e81d..765e389 100644 Item_func_group_concat(Lex->current_context(), $3, $5, sel->gorder_list, $7); if ($$ == NULL) -@@ -10389,7 +10300,7 @@ variable_aux: +@@ -10403,7 +10314,7 @@ variable_aux: { Item_func_set_user_var *item; $$= item= @@ -2389,7 +2398,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; LEX *lex= Lex; -@@ -10398,7 +10309,7 @@ variable_aux: +@@ -10412,7 +10323,7 @@ variable_aux: } | ident_or_text { @@ -2398,7 +2407,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; LEX *lex= Lex; -@@ -10412,7 +10323,7 @@ variable_aux: +@@ -10426,7 +10337,7 @@ variable_aux: my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; } @@ -2407,7 +2416,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; if (!((Item_func_get_system_var*) $$)->is_written_to_binlog()) Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE); -@@ -10427,7 +10338,7 @@ opt_distinct: +@@ -10441,7 +10352,7 @@ opt_distinct: opt_gconcat_separator: /* empty */ { @@ -2416,7 +2425,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -10454,9 +10365,9 @@ opt_gorder_clause: +@@ -10468,9 +10379,9 @@ opt_gorder_clause: gorder_list: gorder_list ',' order_ident order_dir @@ -2428,7 +2437,7 @@ index 0c9e81d..765e389 100644 ; in_sum_expr: -@@ -10509,7 +10420,7 @@ opt_expr_list: +@@ -10523,7 +10434,7 @@ opt_expr_list: expr_list: expr { @@ -2437,7 +2446,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; $$->push_back($1); -@@ -10529,7 +10440,7 @@ ident_list_arg: +@@ -10543,7 +10454,7 @@ ident_list_arg: ident_list: simple_ident { @@ -2446,7 +2455,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; $$->push_back($1); -@@ -10629,7 +10540,7 @@ join_table: +@@ -10643,7 +10554,7 @@ join_table: { MYSQL_YYABORT_UNLESS($1 && $3); /* Change the current name resolution context to a local context. */ @@ -2455,7 +2464,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Select->parsing_place= IN_ON; } -@@ -10644,7 +10555,7 @@ join_table: +@@ -10658,7 +10569,7 @@ join_table: { MYSQL_YYABORT_UNLESS($1 && $3); /* Change the current name resolution context to a local context. */ @@ -2464,7 +2473,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Select->parsing_place= IN_ON; } -@@ -10674,7 +10585,7 @@ join_table: +@@ -10688,7 +10599,7 @@ join_table: { MYSQL_YYABORT_UNLESS($1 && $5); /* Change the current name resolution context to a local context. */ @@ -2473,7 +2482,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Select->parsing_place= IN_ON; } -@@ -10710,7 +10621,7 @@ join_table: +@@ -10724,7 +10635,7 @@ join_table: { MYSQL_YYABORT_UNLESS($1 && $5); /* Change the current name resolution context to a local context. */ @@ -2482,7 +2491,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; Select->parsing_place= IN_ON; } -@@ -10781,7 +10692,7 @@ table_factor: +@@ -10795,7 +10706,7 @@ table_factor: } table_ident opt_use_partition opt_table_alias opt_key_definition { @@ -2491,7 +2500,7 @@ index 0c9e81d..765e389 100644 Select->get_table_join_options(), YYPS->m_lock_type, YYPS->m_mdl_type, -@@ -11090,7 +11001,7 @@ index_hints_list: +@@ -11104,7 +11015,7 @@ index_hints_list: opt_index_hints_list: /* empty */ @@ -2500,7 +2509,7 @@ index 0c9e81d..765e389 100644 ; opt_key_definition: -@@ -11099,15 +11010,15 @@ opt_key_definition: +@@ -11113,15 +11024,15 @@ opt_key_definition: ; opt_key_usage_list: @@ -2519,7 +2528,7 @@ index 0c9e81d..765e389 100644 ; key_usage_list: -@@ -11120,7 +11031,7 @@ using_list: +@@ -11134,7 +11045,7 @@ using_list: { if (!($$= new List<String>)) MYSQL_YYABORT; @@ -2528,7 +2537,7 @@ index 0c9e81d..765e389 100644 $1.length, system_charset_info); if (s == NULL) -@@ -11129,7 +11040,7 @@ using_list: +@@ -11143,7 +11054,7 @@ using_list: } | using_list ',' ident { @@ -2537,7 +2546,7 @@ index 0c9e81d..765e389 100644 $3.length, system_charset_info); if (s == NULL) -@@ -11234,7 +11145,6 @@ opt_escape: +@@ -11248,7 +11159,6 @@ opt_escape: } | /* empty */ { @@ -2545,7 +2554,7 @@ index 0c9e81d..765e389 100644 Lex->escape_used= FALSE; $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ? new (thd->mem_root) Item_string("", 0, &my_charset_latin1) : -@@ -11255,9 +11165,9 @@ group_clause: +@@ -11269,9 +11179,9 @@ group_clause: group_list: group_list ',' order_ident order_dir @@ -2557,7 +2566,7 @@ index 0c9e81d..765e389 100644 ; olap_opt: -@@ -11324,7 +11234,6 @@ alter_order_list: +@@ -11338,7 +11248,6 @@ alter_order_list: alter_order_item: simple_ident_nospvar order_dir { @@ -2565,7 +2574,7 @@ index 0c9e81d..765e389 100644 bool ascending= ($2 == 1) ? true : false; if (add_order_to_list(thd, $1, ascending)) MYSQL_YYABORT; -@@ -11377,9 +11286,9 @@ order_clause: +@@ -11391,9 +11300,9 @@ order_clause: order_list: order_list ',' order_ident order_dir @@ -2577,7 +2586,7 @@ index 0c9e81d..765e389 100644 ; order_dir: -@@ -11442,7 +11351,6 @@ limit_options: +@@ -11456,7 +11365,6 @@ limit_options: limit_option: ident { @@ -2585,7 +2594,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; Lex_input_stream *lip= YYLIP; sp_head *sp= lex->sphead; -@@ -11473,19 +11381,19 @@ limit_option: +@@ -11487,19 +11395,19 @@ limit_option: } | ULONGLONG_NUM { @@ -2608,7 +2617,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -11787,7 +11695,6 @@ drop: +@@ -11801,7 +11709,6 @@ drop: } | DROP FUNCTION_SYM if_exists ident '.' ident { @@ -2616,7 +2625,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_name *spname; if ($4.str && -@@ -11808,7 +11715,6 @@ drop: +@@ -11822,7 +11729,6 @@ drop: } | DROP FUNCTION_SYM if_exists ident { @@ -2624,7 +2633,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; LEX_STRING db= {0, 0}; sp_name *spname; -@@ -11893,7 +11799,7 @@ table_list: +@@ -11907,7 +11813,7 @@ table_list: table_name: table_ident { @@ -2633,7 +2642,7 @@ index 0c9e81d..765e389 100644 TL_OPTION_UPDATING, YYPS->m_lock_type, YYPS->m_mdl_type)) -@@ -11904,7 +11810,7 @@ table_name: +@@ -11918,7 +11824,7 @@ table_name: table_name_with_opt_use_partition: table_ident opt_use_partition { @@ -2642,7 +2651,7 @@ index 0c9e81d..765e389 100644 TL_OPTION_UPDATING, YYPS->m_lock_type, YYPS->m_mdl_type, -@@ -11922,7 +11828,7 @@ table_alias_ref_list: +@@ -11936,7 +11842,7 @@ table_alias_ref_list: table_alias_ref: table_ident_opt_wild { @@ -2651,7 +2660,7 @@ index 0c9e81d..765e389 100644 TL_OPTION_UPDATING | TL_OPTION_ALIAS, YYPS->m_lock_type, YYPS->m_mdl_type)) -@@ -12011,12 +11917,12 @@ insert_lock_option: +@@ -12025,12 +11931,12 @@ insert_lock_option: | DELAYED_SYM { Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() - @@ -2666,7 +2675,7 @@ index 0c9e81d..765e389 100644 ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), "INSERT DELAYED", "INSERT"); -@@ -12029,12 +11935,12 @@ replace_lock_option: +@@ -12043,12 +11949,12 @@ replace_lock_option: | DELAYED_SYM { Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() - @@ -2681,7 +2690,7 @@ index 0c9e81d..765e389 100644 ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), "REPLACE DELAYED", "REPLACE"); -@@ -12151,7 +12057,7 @@ expr_or_default: +@@ -12165,7 +12071,7 @@ expr_or_default: expr { $$= $1;} | DEFAULT { @@ -2690,7 +2699,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -12204,7 +12110,7 @@ update_list: +@@ -12218,7 +12124,7 @@ update_list: update_elem: simple_ident_nospvar equal expr_or_default { @@ -2699,7 +2708,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -12249,7 +12155,7 @@ delete: +@@ -12263,7 +12169,7 @@ delete: single_multi: FROM table_ident opt_use_partition { @@ -2708,7 +2717,7 @@ index 0c9e81d..765e389 100644 YYPS->m_lock_type, YYPS->m_mdl_type, NULL, -@@ -12295,7 +12201,7 @@ table_wild_one: +@@ -12309,7 +12215,7 @@ table_wild_one: Table_ident *ti= new Table_ident($1); if (ti == NULL) MYSQL_YYABORT; @@ -2717,7 +2726,7 @@ index 0c9e81d..765e389 100644 ti, NULL, TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -12305,10 +12211,10 @@ table_wild_one: +@@ -12319,10 +12225,10 @@ table_wild_one: } | ident '.' ident opt_wild { @@ -2730,7 +2739,7 @@ index 0c9e81d..765e389 100644 ti, NULL, TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -12348,7 +12254,6 @@ truncate: +@@ -12362,7 +12268,6 @@ truncate: } table_name { @@ -2738,7 +2747,7 @@ index 0c9e81d..765e389 100644 LEX* lex= thd->lex; DBUG_ASSERT(!lex->m_sql_cmd); lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_truncate_table(); -@@ -12442,7 +12347,7 @@ show_param: +@@ -12456,7 +12361,7 @@ show_param: { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_DATABASES; @@ -2747,7 +2756,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | opt_full TABLES opt_db wild_and_where -@@ -12450,7 +12355,7 @@ show_param: +@@ -12464,7 +12369,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_TABLES; lex->select_lex.db= $3; @@ -2756,7 +2765,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | opt_full TRIGGERS_SYM opt_db wild_and_where -@@ -12458,7 +12363,7 @@ show_param: +@@ -12472,7 +12377,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_TRIGGERS; lex->select_lex.db= $3; @@ -2765,7 +2774,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | EVENTS_SYM opt_db wild_and_where -@@ -12466,7 +12371,7 @@ show_param: +@@ -12480,7 +12385,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_EVENTS; lex->select_lex.db= $2; @@ -2774,7 +2783,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | TABLE_SYM STATUS_SYM opt_db wild_and_where -@@ -12474,7 +12379,7 @@ show_param: +@@ -12488,7 +12393,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_TABLE_STATUS; lex->select_lex.db= $3; @@ -2783,7 +2792,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | OPEN_SYM TABLES opt_db wild_and_where -@@ -12482,14 +12387,14 @@ show_param: +@@ -12496,14 +12401,14 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_OPEN_TABLES; lex->select_lex.db= $3; @@ -2800,7 +2809,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | ENGINE_SYM known_storage_engines show_engine_param -@@ -12502,7 +12407,7 @@ show_param: +@@ -12516,7 +12421,7 @@ show_param: lex->sql_command= SQLCOM_SHOW_FIELDS; if ($5) $4->change_db($5); @@ -2809,7 +2818,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | master_or_binary LOGS_SYM -@@ -12529,14 +12434,14 @@ show_param: +@@ -12543,14 +12448,14 @@ show_param: lex->sql_command= SQLCOM_SHOW_KEYS; if ($4) $3->change_db($4); @@ -2826,7 +2835,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | PRIVILEGES -@@ -12554,7 +12459,7 @@ show_param: +@@ -12568,7 +12473,7 @@ show_param: { Lex->sql_command = SQLCOM_SHOW_ERRORS;} | PROFILES_SYM { @@ -2835,7 +2844,7 @@ index 0c9e81d..765e389 100644 ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), "SHOW PROFILES", "Performance Schema"); -@@ -12562,13 +12467,13 @@ show_param: +@@ -12576,13 +12481,13 @@ show_param: } | PROFILE_SYM opt_profile_defs opt_profile_args opt_limit_clause_init { @@ -2851,7 +2860,7 @@ index 0c9e81d..765e389 100644 YYABORT; } | opt_var_type STATUS_SYM wild_and_where -@@ -12576,7 +12481,7 @@ show_param: +@@ -12590,7 +12495,7 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_STATUS; lex->option_type= $1; @@ -2860,7 +2869,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | opt_full PROCESSLIST_SYM -@@ -12586,21 +12491,21 @@ show_param: +@@ -12600,21 +12505,21 @@ show_param: LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_VARIABLES; lex->option_type= $1; @@ -2885,7 +2894,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | GRANTS -@@ -12630,7 +12535,7 @@ show_param: +@@ -12644,7 +12549,7 @@ show_param: { LEX *lex= Lex; lex->sql_command = SQLCOM_SHOW_CREATE; @@ -2894,7 +2903,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; lex->only_view= 0; lex->create_info.storage_media= HA_SM_DEFAULT; -@@ -12639,7 +12544,7 @@ show_param: +@@ -12653,7 +12558,7 @@ show_param: { LEX *lex= Lex; lex->sql_command = SQLCOM_SHOW_CREATE; @@ -2903,7 +2912,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; lex->only_view= 1; } -@@ -12660,35 +12565,35 @@ show_param: +@@ -12674,35 +12579,35 @@ show_param: { LEX *lex= Lex; Lex->sql_command= SQLCOM_SELECT; @@ -2944,7 +2953,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | CREATE PROCEDURE_SYM sp_name -@@ -12715,14 +12620,14 @@ show_param: +@@ -12729,14 +12634,14 @@ show_param: { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_STATUS_PROC; @@ -2961,7 +2970,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | PROCEDURE_SYM CODE_SYM sp_name -@@ -12790,7 +12695,7 @@ wild_and_where: +@@ -12804,7 +12709,7 @@ wild_and_where: /* empty */ | LIKE TEXT_STRING_sys { @@ -2970,7 +2979,7 @@ index 0c9e81d..765e389 100644 system_charset_info); if (Lex->wild == NULL) MYSQL_YYABORT; -@@ -12813,7 +12718,7 @@ describe: +@@ -12827,7 +12732,7 @@ describe: lex->sql_command= SQLCOM_SHOW_FIELDS; lex->select_lex.db= 0; lex->verbose= 0; @@ -2979,7 +2988,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } opt_describe_column -@@ -12883,7 +12788,7 @@ opt_describe_column: +@@ -12897,7 +12802,7 @@ opt_describe_column: | text_string { Lex->wild= $1; } | ident { @@ -2988,7 +2997,7 @@ index 0c9e81d..765e389 100644 $1.length, system_charset_info); if (Lex->wild == NULL) -@@ -13123,7 +13028,6 @@ use: +@@ -13137,7 +13042,6 @@ use: load: LOAD data_or_xml { @@ -2996,7 +3005,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; if (lex->sphead) -@@ -13146,7 +13050,7 @@ load: +@@ -13160,7 +13064,7 @@ load: opt_duplicate INTO TABLE_SYM table_ident opt_use_partition { LEX *lex=Lex; @@ -3005,7 +3014,7 @@ index 0c9e81d..765e389 100644 $4, MDL_SHARED_WRITE, NULL, $13)) MYSQL_YYABORT; lex->field_list.empty(); -@@ -13289,7 +13193,7 @@ field_or_var: +@@ -13303,7 +13207,7 @@ field_or_var: simple_ident_nospvar {$$= $1;} | '@' ident_or_text { @@ -3014,7 +3023,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -13310,16 +13214,16 @@ load_data_set_elem: +@@ -13324,16 +13228,16 @@ load_data_set_elem: { LEX *lex= Lex; uint length= (uint) ($5 - $3); @@ -3034,7 +3043,7 @@ index 0c9e81d..765e389 100644 } ; -@@ -13329,7 +13233,6 @@ text_literal: +@@ -13343,7 +13247,6 @@ text_literal: TEXT_STRING { LEX_STRING tmp; @@ -3042,7 +3051,7 @@ index 0c9e81d..765e389 100644 const CHARSET_INFO *cs_con= thd->variables.collation_connection; const CHARSET_INFO *cs_cli= thd->variables.character_set_client; uint repertoire= thd->lex->text_string_is_7bit && -@@ -13355,7 +13258,7 @@ text_literal: +@@ -13369,7 +13272,7 @@ text_literal: uint repertoire= Lex->text_string_is_7bit ? MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30; DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info)); @@ -3051,7 +3060,7 @@ index 0c9e81d..765e389 100644 national_charset_info, DERIVATION_COERCIBLE, repertoire); -@@ -13364,7 +13267,7 @@ text_literal: +@@ -13378,7 +13281,7 @@ text_literal: } | UNDERSCORE_CHARSET TEXT_STRING { @@ -3060,7 +3069,7 @@ index 0c9e81d..765e389 100644 $2.length, $1); if (str == NULL) MYSQL_YYABORT; -@@ -13383,7 +13286,7 @@ text_literal: +@@ -13397,7 +13300,7 @@ text_literal: If the string has been pure ASCII so far, check the new part. */ @@ -3069,7 +3078,7 @@ index 0c9e81d..765e389 100644 item->collation.repertoire|= my_string_repertoire(cs, $2.str, $2.length); -@@ -13394,15 +13297,15 @@ text_literal: +@@ -13408,15 +13311,15 @@ text_literal: text_string: TEXT_STRING_literal { @@ -3088,7 +3097,7 @@ index 0c9e81d..765e389 100644 if (tmp == NULL) MYSQL_YYABORT; /* -@@ -13414,7 +13317,7 @@ text_string: +@@ -13428,7 +13331,7 @@ text_string: } | BIN_NUM { @@ -3097,7 +3106,7 @@ index 0c9e81d..765e389 100644 if (tmp == NULL) MYSQL_YYABORT; /* -@@ -13429,7 +13332,6 @@ text_string: +@@ -13443,7 +13346,6 @@ text_string: param_marker: PARAM_MARKER { @@ -3105,7 +3114,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; Item_param *item; -@@ -13464,38 +13366,38 @@ literal: +@@ -13478,38 +13380,38 @@ literal: | temporal_literal { $$= $1; } | NULL_SYM { @@ -3150,7 +3159,7 @@ index 0c9e81d..765e389 100644 if (tmp == NULL) MYSQL_YYABORT; /* -@@ -13506,7 +13408,7 @@ literal: +@@ -13520,7 +13422,7 @@ literal: String *str= tmp->val_str((String*) 0); Item_string *item_str; @@ -3159,7 +3168,7 @@ index 0c9e81d..765e389 100644 Item_string(null_name_string, /* name will be set in select_item */ str ? str->ptr() : "", str ? str->length() : 0, -@@ -13524,7 +13426,7 @@ literal: +@@ -13538,7 +13440,7 @@ literal: } | UNDERSCORE_CHARSET BIN_NUM { @@ -3168,7 +3177,7 @@ index 0c9e81d..765e389 100644 if (tmp == NULL) MYSQL_YYABORT; /* -@@ -13535,7 +13437,7 @@ literal: +@@ -13549,7 +13451,7 @@ literal: String *str= tmp->val_str((String*) 0); Item_string *item_str; @@ -3177,7 +3186,7 @@ index 0c9e81d..765e389 100644 Item_string(null_name_string, /* name will be set in select_item */ str ? str->ptr() : "", str ? str->length() : 0, -@@ -13556,7 +13458,7 @@ NUM_literal: +@@ -13570,7 +13472,7 @@ NUM_literal: NUM { int error; @@ -3186,7 +3195,7 @@ index 0c9e81d..765e389 100644 Item_int($1, (longlong) my_strtoll10($1.str, NULL, &error), $1.length); -@@ -13566,7 +13468,7 @@ NUM_literal: +@@ -13580,7 +13482,7 @@ NUM_literal: | LONG_NUM { int error; @@ -3195,7 +3204,7 @@ index 0c9e81d..765e389 100644 Item_int($1, (longlong) my_strtoll10($1.str, NULL, &error), $1.length); -@@ -13575,23 +13477,23 @@ NUM_literal: +@@ -13589,23 +13491,23 @@ NUM_literal: } | ULONGLONG_NUM { @@ -3225,7 +3234,7 @@ index 0c9e81d..765e389 100644 { MYSQL_YYABORT; } -@@ -13602,19 +13504,19 @@ NUM_literal: +@@ -13616,19 +13518,19 @@ NUM_literal: temporal_literal: DATE_SYM TEXT_STRING { @@ -3248,7 +3257,7 @@ index 0c9e81d..765e389 100644 MYSQL_TYPE_DATETIME, true))) MYSQL_YYABORT; } -@@ -13636,7 +13538,7 @@ table_wild: +@@ -13650,7 +13552,7 @@ table_wild: ident '.' '*' { SELECT_LEX *sel= Select; @@ -3257,7 +3266,7 @@ index 0c9e81d..765e389 100644 NullS, $1.str, "*"); if ($$ == NULL) MYSQL_YYABORT; -@@ -13644,7 +13546,6 @@ table_wild: +@@ -13658,7 +13560,6 @@ table_wild: } | ident '.' ident '.' '*' { @@ -3265,7 +3274,7 @@ index 0c9e81d..765e389 100644 SELECT_LEX *sel= Select; const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ? NullS : $1.str; -@@ -13664,7 +13565,6 @@ order_ident: +@@ -13678,7 +13579,6 @@ order_ident: simple_ident: ident { @@ -3273,7 +3282,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx = lex->get_sp_current_parsing_ctx(); sp_variable *spv; -@@ -13719,7 +13619,6 @@ simple_ident: +@@ -13733,7 +13633,6 @@ simple_ident: simple_ident_nospvar: ident { @@ -3281,7 +3290,7 @@ index 0c9e81d..765e389 100644 SELECT_LEX *sel=Select; if ((sel->parsing_place != IN_HAVING) || (sel->get_in_sum_expr() > 0)) -@@ -13741,7 +13640,6 @@ simple_ident_nospvar: +@@ -13755,7 +13654,6 @@ simple_ident_nospvar: simple_ident_q: ident '.' ident { @@ -3289,7 +3298,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -13821,7 +13719,6 @@ simple_ident_q: +@@ -13835,7 +13733,6 @@ simple_ident_q: } | '.' ident '.' ident { @@ -3297,7 +3306,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; SELECT_LEX *sel= lex->current_select; if (sel->no_table_names_allowed) -@@ -13846,7 +13743,6 @@ simple_ident_q: +@@ -13860,7 +13757,6 @@ simple_ident_q: } | ident '.' ident '.' ident { @@ -3305,7 +3314,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; SELECT_LEX *sel= lex->current_select; const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ? -@@ -13914,7 +13810,7 @@ table_ident: +@@ -13928,7 +13824,7 @@ table_ident: } | ident '.' ident { @@ -3314,7 +3323,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -13936,7 +13832,7 @@ table_ident_opt_wild: +@@ -13950,7 +13846,7 @@ table_ident_opt_wild: } | ident '.' ident opt_wild { @@ -3323,7 +3332,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -13946,7 +13842,7 @@ table_ident_nodb: +@@ -13960,7 +13856,7 @@ table_ident_nodb: ident { LEX_STRING db={(char*) any_db,3}; @@ -3332,7 +3341,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -13956,8 +13852,6 @@ IDENT_sys: +@@ -13970,8 +13866,6 @@ IDENT_sys: IDENT { $$= $1; } | IDENT_QUOTED { @@ -3341,7 +3350,7 @@ index 0c9e81d..765e389 100644 if (thd->charset_is_system_charset) { const CHARSET_INFO *cs= system_charset_info; -@@ -13999,8 +13893,6 @@ TEXT_STRING_sys_nonewline: +@@ -14013,8 +13907,6 @@ TEXT_STRING_sys_nonewline: TEXT_STRING_sys: TEXT_STRING { @@ -3350,7 +3359,7 @@ index 0c9e81d..765e389 100644 if (thd->charset_is_system_charset) $$= $1; else -@@ -14015,8 +13907,6 @@ TEXT_STRING_sys: +@@ -14029,8 +13921,6 @@ TEXT_STRING_sys: TEXT_STRING_literal: TEXT_STRING { @@ -3359,7 +3368,7 @@ index 0c9e81d..765e389 100644 if (thd->charset_is_collation_connection) $$= $1; else -@@ -14031,8 +13921,6 @@ TEXT_STRING_literal: +@@ -14045,8 +13935,6 @@ TEXT_STRING_literal: TEXT_STRING_filesystem: TEXT_STRING { @@ -3368,7 +3377,7 @@ index 0c9e81d..765e389 100644 if (thd->charset_is_character_set_filesystem) $$= $1; else -@@ -14049,7 +13937,6 @@ ident: +@@ -14063,7 +13951,6 @@ ident: IDENT_sys { $$=$1; } | keyword { @@ -3376,7 +3385,7 @@ index 0c9e81d..765e389 100644 $$.str= thd->strmake($1.str, $1.length); if ($$.str == NULL) MYSQL_YYABORT; -@@ -14061,7 +13948,6 @@ label_ident: +@@ -14075,7 +13962,6 @@ label_ident: IDENT_sys { $$=$1; } | keyword_sp { @@ -3384,7 +3393,7 @@ index 0c9e81d..765e389 100644 $$.str= thd->strmake($1.str, $1.length); if ($$.str == NULL) MYSQL_YYABORT; -@@ -14078,7 +13964,6 @@ ident_or_text: +@@ -14092,7 +13978,6 @@ ident_or_text: user: ident_or_text { @@ -3392,7 +3401,7 @@ index 0c9e81d..765e389 100644 if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) MYSQL_YYABORT; $$->user= $1; -@@ -14105,7 +13990,6 @@ user: +@@ -14119,7 +14004,6 @@ user: } | ident_or_text '@' ident_or_text { @@ -3400,7 +3409,7 @@ index 0c9e81d..765e389 100644 if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) MYSQL_YYABORT; $$->user= $1; -@@ -14138,7 +14022,7 @@ user: +@@ -14152,7 +14036,7 @@ user: } | CURRENT_USER optional_braces { @@ -3409,7 +3418,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; /* empty LEX_USER means current_user and -@@ -14542,7 +14426,7 @@ set: +@@ -14557,7 +14441,7 @@ set: lex->one_shot_set= 0; lex->autocommit= 0; @@ -3418,7 +3427,7 @@ index 0c9e81d..765e389 100644 } start_option_value_list {} -@@ -14553,7 +14437,7 @@ set: +@@ -14596,7 +14480,7 @@ set_stmt_option_value_following_option_type_list: start_option_value_list: option_value_no_option_type { @@ -3427,7 +3436,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } option_value_list_continued -@@ -14563,7 +14447,7 @@ start_option_value_list: +@@ -14606,7 +14490,7 @@ start_option_value_list: } transaction_characteristics { @@ -3436,7 +3445,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } | option_type -@@ -14578,13 +14462,13 @@ start_option_value_list: +@@ -14621,13 +14505,13 @@ start_option_value_list: start_option_value_list_following_option_type: option_value_following_option_type { @@ -3452,7 +3461,7 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -14598,20 +14482,20 @@ option_value_list_continued: +@@ -14641,20 +14525,20 @@ option_value_list_continued: // Repeating list of option values after first option value. option_value_list: { @@ -3477,15 +3486,15 @@ index 0c9e81d..765e389 100644 MYSQL_YYABORT; } ; -@@ -14650,7 +14534,6 @@ opt_var_ident_type: +@@ -14693,7 +14577,6 @@ opt_var_ident_type: option_value_following_option_type: internal_variable_name equal set_expr_or_default { - THD *thd= YYTHD; LEX *lex= Lex; - - if ($1.var && $1.var != trg_new_row_fake_var) -@@ -14682,7 +14565,6 @@ option_value_no_option_type: + /* + Ignore SET STATEMENT variables list on slaves because system +@@ -14733,7 +14616,6 @@ option_value_no_option_type: } set_expr_or_default { @@ -3493,7 +3502,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; const char *expr_start_ptr= NULL; -@@ -14776,7 +14658,7 @@ option_value_no_option_type: +@@ -14827,7 +14709,7 @@ option_value_no_option_type: | '@' ident_or_text equal expr { Item_func_set_user_var *item; @@ -3502,7 +3511,7 @@ index 0c9e81d..765e389 100644 if (item == NULL) MYSQL_YYABORT; set_var_user *var= new set_var_user(item); -@@ -14786,7 +14668,6 @@ option_value_no_option_type: +@@ -14837,7 +14719,6 @@ option_value_no_option_type: } | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default { @@ -3510,7 +3519,7 @@ index 0c9e81d..765e389 100644 struct sys_var_with_base tmp= $4; /* Lookup if necessary: must be a system variable. */ if (tmp.var == NULL) -@@ -14799,7 +14680,6 @@ option_value_no_option_type: +@@ -14850,7 +14731,6 @@ option_value_no_option_type: } | charset old_or_new_charset_name_or_default { @@ -3518,7 +3527,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; int flags= $2 ? 0 : set_var_collation_client::SET_CS_DEFAULT; const CHARSET_INFO *cs2; -@@ -14850,7 +14730,6 @@ option_value_no_option_type: +@@ -14901,7 +14781,6 @@ option_value_no_option_type: } | PASSWORD equal text_or_password { @@ -3526,7 +3535,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); -@@ -14927,7 +14806,6 @@ option_value_no_option_type: +@@ -14978,7 +14857,6 @@ option_value_no_option_type: internal_variable_name: ident { @@ -3534,7 +3543,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); sp_variable *spv; -@@ -14990,7 +14868,7 @@ internal_variable_name: +@@ -15041,7 +14919,7 @@ internal_variable_name: } else { @@ -3543,7 +3552,7 @@ index 0c9e81d..765e389 100644 if (!tmp) MYSQL_YYABORT; if (!tmp->is_struct()) -@@ -15001,7 +14879,7 @@ internal_variable_name: +@@ -15052,7 +14930,7 @@ internal_variable_name: } | DEFAULT '.' ident { @@ -3552,7 +3561,7 @@ index 0c9e81d..765e389 100644 if (!tmp) MYSQL_YYABORT; if (!tmp->is_struct()) -@@ -15022,7 +14900,6 @@ transaction_characteristics: +@@ -15073,7 +14951,6 @@ transaction_characteristics: transaction_access_mode: transaction_access_mode_types { @@ -3560,7 +3569,7 @@ index 0c9e81d..765e389 100644 LEX *lex=Lex; Item *item= new (thd->mem_root) Item_int((int32) $1); if (item == NULL) -@@ -15040,7 +14917,6 @@ transaction_access_mode: +@@ -15091,7 +14968,6 @@ transaction_access_mode: isolation_level: ISOLATION LEVEL_SYM isolation_types { @@ -3568,7 +3577,7 @@ index 0c9e81d..765e389 100644 LEX *lex=Lex; Item *item= new (thd->mem_root) Item_int((int32) $3); if (item == NULL) -@@ -15074,13 +14950,13 @@ text_or_password: +@@ -15125,13 +15001,13 @@ text_or_password: if ($3.length == 0) $$= $3.str; else @@ -3585,7 +3594,7 @@ index 0c9e81d..765e389 100644 break; } if ($$ == NULL) -@@ -15090,7 +14966,7 @@ text_or_password: +@@ -15141,7 +15017,7 @@ text_or_password: | OLD_PASSWORD '(' TEXT_STRING ')' { $$= $3.length ? Item_func_old_password:: @@ -3594,7 +3603,7 @@ index 0c9e81d..765e389 100644 $3.str; if ($$ == NULL) MYSQL_YYABORT; -@@ -15104,19 +14980,19 @@ set_expr_or_default: +@@ -15155,19 +15031,19 @@ set_expr_or_default: | DEFAULT { $$=0; } | ON { @@ -3617,7 +3626,7 @@ index 0c9e81d..765e389 100644 if ($$ == NULL) MYSQL_YYABORT; } -@@ -15155,7 +15031,7 @@ table_lock: +@@ -15206,7 +15082,7 @@ table_lock: { thr_lock_type lock_type= (thr_lock_type) $3; bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE); @@ -3626,7 +3635,7 @@ index 0c9e81d..765e389 100644 (lock_for_write ? MDL_SHARED_NO_READ_WRITE : MDL_SHARED_READ))) -@@ -15169,7 +15045,7 @@ lock_option: +@@ -15220,7 +15096,7 @@ lock_option: | LOW_PRIORITY WRITE_SYM { $$= TL_WRITE_LOW_PRIORITY; @@ -3635,7 +3644,7 @@ index 0c9e81d..765e389 100644 } | READ_SYM LOCAL_SYM { $$= TL_READ; } ; -@@ -15197,7 +15073,6 @@ unlock: +@@ -15248,7 +15124,6 @@ unlock: handler: HANDLER_SYM table_ident OPEN_SYM opt_table_alias { @@ -3643,7 +3652,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; if (lex->sphead) { -@@ -15213,7 +15088,6 @@ handler: +@@ -15264,7 +15139,6 @@ handler: } | HANDLER_SYM table_ident_nodb CLOSE_SYM { @@ -3651,7 +3660,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; if (lex->sphead) { -@@ -15237,7 +15111,7 @@ handler: +@@ -15288,7 +15162,7 @@ handler: } lex->expr_allows_subselect= FALSE; lex->sql_command = SQLCOM_HA_READ; @@ -3660,7 +3669,7 @@ index 0c9e81d..765e389 100644 if (one == NULL) MYSQL_YYABORT; lex->current_select->select_limit= one; -@@ -15247,7 +15121,6 @@ handler: +@@ -15298,7 +15172,6 @@ handler: } handler_read_or_scan where_clause opt_limit_clause { @@ -3668,7 +3677,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; Lex->expr_allows_subselect= TRUE; /* Stored functions are not supported for HANDLER READ. */ -@@ -15282,7 +15155,7 @@ handler_rkey_function: +@@ -15333,7 +15206,7 @@ handler_rkey_function: | LAST_SYM { $$= RLAST; } | handler_rkey_mode { @@ -3677,7 +3686,7 @@ index 0c9e81d..765e389 100644 Lex->insert_list= new List_item; if (! Lex->insert_list) MYSQL_YYABORT; -@@ -15590,8 +15463,8 @@ grant_user: +@@ -15641,8 +15514,8 @@ grant_user: my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; } @@ -3688,7 +3697,7 @@ index 0c9e81d..765e389 100644 check_password_policy(password); /* 1. Plugin must be resolved -@@ -15611,8 +15484,8 @@ grant_user: +@@ -15662,8 +15535,8 @@ grant_user: $1->password= $5; if (!strcmp($5.str, "")) { @@ -3699,7 +3708,7 @@ index 0c9e81d..765e389 100644 check_password_policy(password); } /* -@@ -15670,7 +15543,7 @@ column_list: +@@ -15721,7 +15594,7 @@ column_list: column_list_id: ident { @@ -3708,7 +3717,7 @@ index 0c9e81d..765e389 100644 if (new_str == NULL) MYSQL_YYABORT; List_iterator <LEX_COLUMN> iter(Lex->columns); -@@ -15880,7 +15753,6 @@ opt_union_order_or_limit: +@@ -15931,7 +15804,6 @@ opt_union_order_or_limit: union_order_or_limit: { @@ -3716,7 +3725,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE); SELECT_LEX *sel= lex->current_select; -@@ -15896,7 +15768,6 @@ union_order_or_limit: +@@ -15947,7 +15819,6 @@ union_order_or_limit: } order_or_limit { @@ -3724,7 +3733,7 @@ index 0c9e81d..765e389 100644 thd->lex->current_select->no_table_names_allowed= 0; thd->where= ""; } -@@ -16078,14 +15949,14 @@ no_definer: +@@ -16129,14 +16000,14 @@ no_definer: from older master servers (i.e. to create non-suid trigger in this case). */ @@ -3741,7 +3750,7 @@ index 0c9e81d..765e389 100644 } ; -@@ -16130,7 +16001,6 @@ view_suid: +@@ -16181,7 +16052,6 @@ view_suid: view_tail: view_suid VIEW_SYM table_ident { @@ -3749,7 +3758,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sql_command= SQLCOM_CREATE_VIEW; /* first table in list is target VIEW name */ -@@ -16174,7 +16044,6 @@ view_select: +@@ -16225,7 +16095,6 @@ view_select: } view_select_aux view_check_option { @@ -3757,7 +3766,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str; void *create_view_select= thd->memdup(lex->create_view_select.str, len); -@@ -16266,7 +16135,6 @@ trigger_tail: +@@ -16317,7 +16186,6 @@ trigger_tail: EACH_SYM /* $13 */ ROW_SYM /* $14 */ { /* $15 */ @@ -3765,7 +3774,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex_input_stream *lip= YYLIP; -@@ -16296,7 +16164,6 @@ trigger_tail: +@@ -16347,7 +16215,6 @@ trigger_tail: } sp_proc_stmt /* $16 */ { /* $17 */ @@ -3773,7 +3782,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_head *sp= lex->sphead; -@@ -16331,7 +16198,6 @@ udf_tail: +@@ -16382,7 +16249,6 @@ udf_tail: AGGREGATE_SYM remember_name FUNCTION_SYM ident RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys { @@ -3781,7 +3790,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; if (is_native_function(thd, & $4)) { -@@ -16349,7 +16215,6 @@ udf_tail: +@@ -16400,7 +16266,6 @@ udf_tail: | remember_name FUNCTION_SYM ident RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys { @@ -3789,7 +3798,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; if (is_native_function(thd, & $3)) { -@@ -16372,7 +16237,6 @@ sf_tail: +@@ -16423,7 +16288,6 @@ sf_tail: sp_name /* $3 */ '(' /* $4 */ { /* $5 */ @@ -3797,7 +3806,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->stmt_definition_begin= $1; -@@ -16431,7 +16295,7 @@ sf_tail: +@@ -16482,7 +16346,7 @@ sf_tail: MYSQL_YYABORT; } @@ -3806,7 +3815,7 @@ index 0c9e81d..765e389 100644 (enum enum_field_types) $11, &sp->m_return_field_def)) MYSQL_YYABORT; -@@ -16440,7 +16304,6 @@ sf_tail: +@@ -16491,7 +16355,6 @@ sf_tail: } sp_c_chistics /* $13 */ { /* $14 */ @@ -3814,7 +3823,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sphead->m_chistics= &lex->sp_chistics; -@@ -16448,7 +16311,6 @@ sf_tail: +@@ -16499,7 +16362,6 @@ sf_tail: } sp_proc_stmt /* $15 */ { @@ -3822,7 +3831,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; sp_head *sp= lex->sphead; -@@ -16506,7 +16368,6 @@ sf_tail: +@@ -16557,7 +16419,6 @@ sf_tail: sp_tail: PROCEDURE_SYM remember_name sp_name { @@ -3830,7 +3839,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; if (lex->sphead) -@@ -16539,7 +16400,6 @@ sp_tail: +@@ -16590,7 +16451,6 @@ sp_tail: sp_pdparam_list ')' { @@ -3838,7 +3847,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; Lex->sphead->m_parser_data.set_parameter_end_ptr( -@@ -16549,7 +16409,6 @@ sp_tail: +@@ -16600,7 +16460,6 @@ sp_tail: } sp_c_chistics { @@ -3846,7 +3855,7 @@ index 0c9e81d..765e389 100644 LEX *lex= thd->lex; lex->sphead->m_chistics= &lex->sp_chistics; -@@ -16557,7 +16416,6 @@ sp_tail: +@@ -16608,7 +16467,6 @@ sp_tail: } sp_proc_stmt { @@ -3854,7 +3863,7 @@ index 0c9e81d..765e389 100644 LEX *lex= Lex; sp_finish_parsing(thd); -@@ -16599,21 +16457,21 @@ xid: +@@ -16650,21 +16508,21 @@ xid: text_string { MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE); diff --git a/community/pidgin-hotkeys/PKGBUILD b/community/pidgin-hotkeys/PKGBUILD index bd2130cab..98a10a1c5 100644 --- a/community/pidgin-hotkeys/PKGBUILD +++ b/community/pidgin-hotkeys/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80723 2012-12-01 13:56:24Z fyan $ +# $Id: PKGBUILD 99153 2013-10-25 05:05:18Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: detto <detto-brumm@freenet.de> pkgname=pidgin-hotkeys pkgver=0.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="A Pidgin plugin that allows you to define global hotkeys." arch=('i686' 'x86_64') url="http://pidgin-hotkeys.sourceforge.net" diff --git a/community/plank/PKGBUILD b/community/plank/PKGBUILD new file mode 100644 index 000000000..c36204e7b --- /dev/null +++ b/community/plank/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 99220 2013-10-25 21:06:18Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd at gmail dot com> +# Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk> +# Contributor: dcelasun <dcelasun at gmaild dot com> + +pkgname=plank +pkgver=0.4.0 +pkgrel=1 +pkgdesc="Elegant, simple, clean dock" +arch=('i686' 'x86_64') +url="https://launchpad.net/plank" +license=('GPL3') +depends=('bamf' 'libdbusmenu-gtk3' 'libgee' 'python2') +makedepends=('gnome-common' 'intltool' 'vala') +install="${pkgname}.install" +source=("https://launchpad.net/${pkgname}/1.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz") +sha256sums=('b8417bce7d88ac1f339e948c964822049a9261f9d9dedc0d0e636c73442856fe') + +prepare() { + cd ${pkgname}-${pkgver} + + sed -i 's|^#!.*python$|#!/usr/bin/python2|' $(grep -rl '^#!.*python') +} + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/{etc,usr/share/apport} +} + +# vim: ts=2 sw=2 et: diff --git a/community/plank/plank.install b/community/plank/plank.install new file mode 100644 index 000000000..197190dd8 --- /dev/null +++ b/community/plank/plank.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor +} + +post_upgrade() +{ + post_install +} + +post_remove() +{ + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD index 273b36d6d..e506b5ee2 100644 --- a/community/portaudio/PKGBUILD +++ b/community/portaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96889 2013-09-07 11:45:00Z bgyorgy $ +# $Id: PKGBUILD 99139 2013-10-25 01:57:21Z bisson $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Darwin Bautista <djclue917@gmail.com> @@ -6,7 +6,7 @@ pkgname=portaudio pkgver=19_20111121 -pkgrel=2 +pkgrel=3 pkgdesc='A free, cross-platform, open source, audio I/O library.' arch=('i686' 'x86_64') url='http://www.portaudio.com/' diff --git a/community/proxychains/PKGBUILD b/community/proxychains/PKGBUILD index 4237a830b..5b120adc2 100644 --- a/community/proxychains/PKGBUILD +++ b/community/proxychains/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95519 2013-08-13 06:25:46Z fyan $ +# $Id: PKGBUILD 99154 2013-10-25 05:05:19Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Michael Düll <mail@akurei.me> PGP-Key: AAAEE882 # Contributor: Dan Serban @@ -6,20 +6,19 @@ pkgname=proxychains pkgver=3.1 -pkgrel=6 +pkgrel=7 pkgdesc='A program proxifier: Runs programs from behind a proxy server, similar to tsocks. TCP & DNS tunneling. HTTP, SOCKS4 & SOCKS5.' url='http://proxychains.sourceforge.net/' arch=('i686' 'x86_64') license=('GPL') depends=('dnsutils') -options=('!libtool') backup=('etc/proxychains.conf') source=("http://downloads.sourceforge.net/sourceforge/proxychains/proxychains-${pkgver}.tar.gz") build() { cd proxychains-${pkgver} sed -i 's/servlen, unsigned int/servlen, int/' proxychains/libproxychains.c -# sed -i 's#export LD_PRELOAD=libproxychains.so#export LD_PRELOAD=/usr/lib/libproxychains.so#' proxychains/proxychains + #sed -i 's#export LD_PRELOAD=libproxychains.so#export LD_PRELOAD=/usr/lib/libproxychains.so#' proxychains/proxychains ./configure --prefix=/usr make } diff --git a/community/python2-xapian/PKGBUILD b/community/python2-xapian/PKGBUILD index 9e02f497c..d6c8a1882 100644 --- a/community/python2-xapian/PKGBUILD +++ b/community/python2-xapian/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98807 2013-10-19 01:51:15Z fyan $ +# $Id: PKGBUILD 99157 2013-10-25 05:16:11Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: DonVla <donvla/users.sourceforge/net> # Contributor: Hervé Cauwelier <herve/oursours/net> @@ -7,7 +7,7 @@ pkgname=python2-xapian _realname=xapian-bindings pkgver=1.2.15 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for Xapian" arch=(i686 x86_64) url="http://xapian.org/docs/bindings/python/" @@ -18,18 +18,18 @@ source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-$pkgver.tar.gz") build() { cd "$srcdir/${_realname}-$pkgver" - ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \ + LDFLAGS=-lpython2.7 ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \ --prefix=/usr --with-python \ PYTHON=/usr/bin/python2 make } - package() { cd "$srcdir/${_realname}-$pkgver" make DESTDIR="$pkgdir" install } + # vim:set ts=2 sw=2 et: sha512sums=('b3733308f0446fa041dcae677b3d3316bd8e775fcd1a1770ca2fab5b60e40463bbbce210cb1161161f6e9f1ff5e5473d38c2dab922b7f4f2705ac165d991c0ec') diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD index 260b5c4fe..e19179288 100644 --- a/community/rtl-sdr/PKGBUILD +++ b/community/rtl-sdr/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 99108 2013-10-24 13:05:39Z kkeen $ +# $Id: PKGBUILD 99146 2013-10-25 04:57:24Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Michael Düll <mail@akurei.me> pkgname=rtl-sdr # they are just starting to play with tags # consider using tags for the pkgver in the future -pkgver=20130913 -_commit=4914b5d4314b752 -pkgrel=2 +pkgver=20131024 +_commit=dbede4e3c0a +pkgrel=1 pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)." arch=('i686' 'x86_64') url="http://sdr.osmocom.org/trac/wiki/rtl-sdr" @@ -28,8 +28,8 @@ build() { cd "$srcdir/$_gitname" mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -Wno-dev ../ - #cmake ../ -DINSTALL_UDEV_RULES=ON + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DINSTALL_UDEV_RULES=ON -Wno-dev ../ make } diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 327c0f071..9a29bc5e1 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96605 2013-09-02 09:39:10Z arodseth $ +# $Id: PKGBUILD 99178 2013-10-25 10:00:48Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.3.5 +pkgver=3.3.6 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('x86_64' 'i686') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install="$pkgname.install" source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89') +sha256sums=('9f3f9c9867e93af37af7a59e962aad76897c9e816c683c03e922baed6be506a5') prepare() { if [ $?CXXBASEFLAGS == 1 ]; then diff --git a/community/simavr/PKGBUILD b/community/simavr/PKGBUILD index aa2e8370f..4f9a5a82a 100644 --- a/community/simavr/PKGBUILD +++ b/community/simavr/PKGBUILD @@ -1,31 +1,28 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=simavr -pkgver=1.0 -pkgrel=2 +pkgver=1.1 +pkgrel=1 pkgdesc='A lean, mean and hackable AVR simulator' arch=('i686' 'x86_64') url="https://github.com/buserror-uk/simavr" license=('GPL3') depends=('elfutils') -makedepends=('avr-libc') -source=("https://github.com/downloads/buserror-uk/simavr/$pkgname-$pkgver.tar.bz2") +makedepends=('avr-libc' 'git') +source=("${pkgname}::git+https://github.com/buserror-uk/simavr.git#tag=v${pkgver}") options=(!strip) +md5sums=('SKIP') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" - # The original Makefile depends on git, hardcode the version until it's fixed upstream. - sed -i "s/^\(SIMAVR_VERSION\).*/\1 = ${pkgver}/" simavr/Makefile - - make AVR_ROOT=/usr/avr SIMAVR_VERSION=1.0 \ - CFLAGS="-Wall -Wextra -fPIC -std=gnu99 -Wno-sign-compare -Wno-unused-parameter" \ + make AVR_ROOT=/usr/avr RELEASE=1 \ + CFLAGS="-Wall -Wextra -fPIC -O2 -std=gnu99 -Wno-sign-compare -Wno-unused-parameter" \ build-simavr } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make PREFIX="/usr" DESTDIR="$pkgdir/usr" install } -md5sums=('82c9704a4e8569548f01931e32ebfe0c') diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index 2f14f1661..8066854cd 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Michael Düll <mail@akurei.me> pkgname=synergy -pkgver=1.4.14 +pkgver=1.4.15 pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" @@ -17,7 +17,7 @@ license=('GPL2') source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "synergys.socket" "synergys.service") -sha512sums=('3e9ca96f36573e400c9694daba026322cbf36bbabdbf69687cbadb6010834d1afd81845533775564ba7aadbf3a8be8582d9e5b9d33abfa483a174b40e084add4' +sha512sums=('857e8cbfb0b32c7dc325de5765f182f4e4fb198443b4a3e26d38c2d3dec3819e57057b91a202b53c86d4fad18154d1d58b401812dd8fabc384255e44d4b4b01a' 'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad' 'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f') diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD index 7083d92a4..91bc3ff40 100644 --- a/community/xmlrpc-c/PKGBUILD +++ b/community/xmlrpc-c/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87246 2013-03-29 00:18:37Z arodseth $ +# $Id: PKGBUILD 99137 2013-10-25 01:54:42Z bisson $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Vitaliy Berdinskikh <skipper13@root.ua> pkgname=xmlrpc-c -pkgver=1.33.03 +pkgver=1.36.00 pkgrel=1 epoch=1 pkgdesc='XML-RPC for C and C++' @@ -15,8 +15,8 @@ license=('custom') depends=('curl' 'libxml2') makedepends=('libtool' 'setconf') options=('!makeflags' '!libtool' '!emptydirs') -source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar") -sha256sums=('5e52978f4c96591c9732b4e7a336a4abb75550b1403ba0ed59fb3ddd49595309') +source=('svn://svn.code.sf.net/p/xmlrpc-c/code/advanced#revision=2545') +sha1sums=('SKIP') build() { cd "$srcdir/advanced" diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD index db543f2a9..a32bbf391 100644 --- a/community/zathura-pdf-mupdf/PKGBUILD +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -4,16 +4,22 @@ # Contributor: Moritz Lipp <mlq@pwmt.org> pkgname=zathura-pdf-mupdf -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="Adds pdf support to zathura by using the mupdf library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" license=('custom') -depends=('mupdf>=1.1' 'zathura') +depends=('mupdf>=1.3' 'zathura' + 'jbig2dec' 'openjpeg') conflicts=('zathura-pdf-poppler') source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") -md5sums=('aa9667425dab93147dd8605eda020e59') +md5sums=('42dcdf2511ffc8f87ca6baba6c566f91') + +prepare() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|openjp2|openjpeg|g' config.mk +} build() { make -C "${srcdir}/$pkgname-$pkgver" diff --git a/community/zh-autoconvert/PKGBUILD b/community/zh-autoconvert/PKGBUILD index 24afc94ae..66c87cd94 100644 --- a/community/zh-autoconvert/PKGBUILD +++ b/community/zh-autoconvert/PKGBUILD @@ -4,13 +4,12 @@ pkgname=zh-autoconvert pkgver=0.3.16 -pkgrel=2 +pkgrel=3 pkgdesc="An intelligent Chinese Encoding converter" url="http://libhz.googlecode.com/" license=('LGPL') arch=('i686' 'x86_64') depends=('glibc') -makedepends=('pkgconfig') source=(${url}/files/${pkgname}-${pkgver}.tar.gz autoconvert.patch) md5sums=('1f4aa2332afc076910b5d510b8c81966' diff --git a/community/zinnia/PKGBUILD b/community/zinnia/PKGBUILD index 48784f97b..2551cbf5f 100644 --- a/community/zinnia/PKGBUILD +++ b/community/zinnia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81446 2012-12-21 04:42:33Z fyan $ +# $Id: PKGBUILD 99156 2013-10-25 05:05:21Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Humbert Julien <julroy67 [AT] gmail.com> pkgname=zinnia pkgver=0.06 -pkgrel=2 +pkgrel=3 pkgdesc="Simple, customizable and portable online hand recognition system based on Support Vector Machines" arch=('i686' 'x86_64') url="http://zinnia.sourceforge.net/" diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD index 0b5f41665..9a5deba1a 100644 --- a/core/acl/PKGBUILD +++ b/core/acl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188195 2013-06-12 15:53:07Z thomas $ +# $Id: PKGBUILD 197385 2013-10-25 08:24:54Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl pkgver=2.2.52 -pkgrel=1 +pkgrel=2 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/acl" @@ -12,7 +12,6 @@ depends=('attr>=2.4.46') replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') -options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) sha256sums=('179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23' 'SKIP') diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 3cd19c24e..6ed0ff9e7 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196786 2013-10-19 06:54:05Z allan $ +# $Id: PKGBUILD 197286 2013-10-25 01:09:21Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.8.2 -pkgrel=1 +pkgrel=3 #_snapshot=4.8-20130725 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') checkdepends=('dejagnu' 'inetutils') -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 gcc-4.8-filename-output.patch) @@ -131,6 +131,7 @@ package_gcc() pkgdesc="The GNU Compiler Collection - C and C++ frontends" depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog') groups=('base-devel') + options=('staticlibs') install=gcc.install cd ${srcdir}/gcc-build @@ -152,6 +153,10 @@ package_gcc() rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + + # remove static libraries - note libstdc++.a is needed for the binutils and glibc testsuite + rm $pkgdir/usr/lib/lib{asan,gomp,itm,mudflap{,th},quadmath}.a + [[ $CARCH = "x86_64" ]] && rm $pkgdir/usr/lib/libtsan.a # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc @@ -199,6 +204,7 @@ package_gcc-fortran() { pkgdesc="Fortran front-end for GCC" depends=("gcc=$pkgver-$pkgrel") + options=('staticlibs' '!emptydirs') install=gcc-fortran.install cd ${srcdir}/gcc-build @@ -209,12 +215,13 @@ package_gcc-fortran() ln -s gfortran ${pkgdir}/usr/bin/f95 - # remove files included in gcc-libs or gcc + # remove files included in gcc-libs or gcc and unnneeded static lib rm ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so* rm ${pkgdir}/usr/lib/libquadmath.{a,so*} rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*} rm ${pkgdir}/usr/share/info/libquadmath.info rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include + rm ${pkgdir}/usr/lib/libgfortran.a # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ @@ -245,6 +252,7 @@ package_gcc-ada() { pkgdesc="Ada front-end for GCC (GNAT)" depends=("gcc=$pkgver-$pkgrel") + options=('staticlibs' '!emptydirs') install=gcc-ada.install cd ${srcdir}/gcc-build/gcc @@ -252,7 +260,7 @@ package_gcc-ada() install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver ln -s gcc ${pkgdir}/usr/bin/gnatgcc - + # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION @@ -262,12 +270,14 @@ package_gcc-go() { pkgdesc="Go front-end for GCC" depends=("gcc=$pkgver-$pkgrel") + options=('staticlibs' '!emptydirs') install=gcc-go.install cd ${srcdir}/gcc-build make -j1 DESTDIR=$pkgdir install-target-libgo make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 + rm $pkgdir/usr/lib/lib{atomic,go}.a # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index c0cf2112b..a5cbade42 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,12 +1,14 @@ -# $Id: PKGBUILD 195163 2013-09-26 03:20:58Z allan $ +# $Id: PKGBUILD 197285 2013-10-25 01:09:19Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: valgrind requires rebuilt with each major glibc version +# NOTE: adjust version in install script when locale files are updated + pkgname=glibc pkgver=2.18 -pkgrel=5 +pkgrel=8 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -17,13 +19,14 @@ makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen etc/nscd.conf) -options=('!strip') +options=('!strip' 'staticlibs') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.18-make-4.patch glibc-2.18-readdir_r-CVE-2013-4237.patch - glibc-2.18-malloc-corrupt-CVE-2013-4332.patch - glibc-2.18-strcoll-CVE-2012-4412+4424.patch - glibc-2.18-ptr-mangle-CVE-2013-4788.patch + glibc-2.18-malloc-corrupt-CVE-2013-4332.patch + glibc-2.18-strcoll-CVE-2012-4412+4424.patch + glibc-2.18-ptr-mangle-CVE-2013-4788.patch glibc-2.18-strstr-hackfix.patch nscd.service nscd.tmpfiles @@ -31,6 +34,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} locale-gen) md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'SKIP' + 'e1883c2d1b01ff73650db5f5bb5a5a52' '154da6bf5a5248f42a7bf5bf08e01a47' 'b79561ab9dce900e9bbeaf0d49927c2b' 'c7264b99d0f7e51922a4d3126182c40a' @@ -39,11 +43,14 @@ md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'd5fab2cd3abea65aa5ae696ea4a47d6b' 'da662ca76e7c8d7efbc7986ab7acea2d' '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') + 'b5fd017036fb91199ee76f670da8c15b') prepare() { cd ${srcdir}/${pkgname}-${pkgver} - + + # compatibility with make-4.0 (submitted upstream) + patch -p1 -i $srcdir/glibc-2.18-make-4.patch + # upstream commit 91ce4085 patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch @@ -108,7 +115,7 @@ build() { } check() { - # bug to file - the linker commands need to be reordered + # the linker commands need to be reordered - fixed in 2.19 LDFLAGS=${LDFLAGS/--as-needed,/} cd ${srcdir}/glibc-build @@ -140,6 +147,11 @@ package() { sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + # remove the static libraries that have a shared counterpart + cd $pkgdir/usr/lib + # note: keep libc, libdl, libm, libpthread for binutils testsuite + rm lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a + # Do not strip the following files for improved debugging support # ("improved" as in not breaking gdb and valgrind...): # ld-${pkgver}.so diff --git a/core/glibc/glibc-2.18-make-4.patch b/core/glibc/glibc-2.18-make-4.patch new file mode 100644 index 000000000..374933464 --- /dev/null +++ b/core/glibc/glibc-2.18-make-4.patch @@ -0,0 +1,45 @@ +From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +Date: Thu, 10 Oct 2013 14:26:12 +0900 +Subject: [PATCH] configure: allow building with GNU Make 4 + +Currently, configure errors telling make 4 is too old +since it does not match our regexp. + +configure.in: allow GNU Make 4.* + +Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +--- + configure | 2 +- + configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 5e2f4d0..e139bf0 100755 +--- a/configure ++++ b/configure +@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } + ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.79* | 3.[89]*) ++ 3.79* | 3.[89]* | 4.*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +diff --git a/configure.in b/configure.in +index a7f9881..95c36b6 100644 +--- a/configure.in ++++ b/configure.in +@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, + critic_missing="$critic_missing gcc") + AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, + [GNU Make[^0-9]*\([0-9][0-9.]*\)], +- [3.79* | 3.[89]*], critic_missing="$critic_missing make") ++ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") + + AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, + [GNU gettext.* \([0-9]*\.[0-9.]*\)], +-- +1.8.4.1 + diff --git a/core/glibc/glibc.install b/core/glibc/glibc.install index f8147a6cf..6b405486e 100644 --- a/core/glibc/glibc.install +++ b/core/glibc/glibc.install @@ -3,7 +3,10 @@ filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) post_upgrade() { ldconfig -r . - locale-gen + + if [[ $(vercmp 2.18 $2) = 1 ]]; then + locale-gen + fi [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do diff --git a/core/glibc/locale-gen b/core/glibc/locale-gen index 5aff344c4..51191f810 100755 --- a/core/glibc/locale-gen +++ b/core/glibc/locale-gen @@ -4,39 +4,53 @@ set -e LOCALEGEN=/etc/locale.gen LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi +unset POSIXLY_CORRECT - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; +[ -s "$LOCALEGEN" ] || exit 0 # Remove all old locale dir and locale-archive before generating new # locale data. -rm -rf /usr/lib/locale/* || true +rm -rf /usr/lib/locale/* umask 022 -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi +gen() { + local locale=$1 + local charset=$2 + local input= + + if [ -z "$locale" ] || [ -z "$charset" ]; then + echo "error: Bad entry '$locale $charset'" + return + fi + + printf ' %s.%s\n' "$(echo "$locale" | sed 's/\([^.\@]*\).*/\1/')" "$charset" + + if [ -f "$LOCALES/$locale" ]; then + input=$locale + else + input=$(echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/') + fi + + localedef -i "$input" -c -f "$charset" -A /usr/share/locale/locale.alias "$locale" } +maxjobs=$(grep -c processor /proc/cpuinfo 2>/dev/null || echo 1) echo "Generating locales..." while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ + case $locale in + \#*|'') + continue + ;; + esac + gen "$locale" "$charset" & + + # keep no more than $maxjobs jobs in flight + while [ $(jobs | wc -l) -ge $maxjobs ]; do + sleep 0.25 + jobs >/dev/null + done done < $LOCALEGEN +wait + echo "Generation complete." diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD index 7d4a34153..83c9d446c 100644 --- a/extra/a52dec/PKGBUILD +++ b/extra/a52dec/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 191306 2013-07-23 13:24:20Z jgc $ +# $Id: PKGBUILD 197290 2013-10-25 01:17:05Z allan $ # Maintainer: # Contributor: Thomas Baechler <thomas@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=a52dec pkgver=0.7.4 -pkgrel=7 +pkgrel=8 pkgdesc="A free library for decoding ATSC A/52 streams" url="http://liba52.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL2') depends=('glibc') -options=(!libtool) source=("http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz" 'a52dec-0.7.4-build.patch') md5sums=('caa9f5bc44232dc8aeea773fea56be80' diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD index 1528f366b..842672b01 100644 --- a/extra/audiofile/PKGBUILD +++ b/extra/audiofile/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180118 2013-03-17 17:41:49Z schiv $ +# $Id: PKGBUILD 197359 2013-10-25 02:53:59Z bisson $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=audiofile pkgver=0.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="Silicon Graphics Audio File Library" arch=('i686' 'x86_64') url="http://www.68k.org/~michael/audiofile/" diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index bddf6ee59..2692c2c60 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 189244 2013-07-01 10:04:11Z andrea $ +# $Id: PKGBUILD 197384 2013-10-25 03:23:34Z bisson $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=cfitsio pkgver=3.350 -pkgrel=1 +pkgrel=2 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64') -url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" +url="http://heasarc.gsfc.nasa.gov/fitsio/" license=('custom') -depends=('glibc') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") -md5sums=('3e61f17731fe8db503b1b39873e4a8c4') +sha1sums=('e928832708d6a5df21a1e17ae4a63036cab7c1b9') build() { cd ${pkgname} diff --git a/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch b/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch deleted file mode 100644 index 99f084930..000000000 --- a/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cfcad42ff1ddee8e64d120f18016a654152d0215 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Fri, 17 May 2013 11:32:03 +0100 -Subject: [PATCH] Fix failure to start with ENOTSOCK - ---- - CHANGELOG | 6 ++++++ - src/dnsmasq.c | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/dnsmasq.c b/src/dnsmasq.c -index 43b8cb1..b0f984d 100644 ---- a/src/dnsmasq.c -+++ b/src/dnsmasq.c -@@ -248,7 +248,7 @@ int main (int argc, char **argv) - #endif - - #if defined(HAVE_LINUX_NETWORK) && defined(HAVE_DHCP6) -- if (daemon->dhcp6) -+ if (daemon->doing_dhcp6) - bindtodevice(daemon->dhcp6fd); - #endif - } --- -1.8.3.2 - diff --git a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch deleted file mode 100644 index 05223cdb2..000000000 --- a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Thu, 18 Apr 2013 09:47:49 +0100 -Subject: [PATCH] Fix wrong size in memset() call. - -Thanks to Dave Reisner. ---- - src/ipset.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ipset.c b/src/ipset.c -index a34ed96..f175fa4 100644 ---- a/src/ipset.c -+++ b/src/ipset.c -@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr, - return -1; - } - -- memset(buffer, 0, sizeof(buffer)); -+ memset(buffer, 0, BUFF_SZ); - - nlh = (struct nlmsghdr *)buffer; - nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr)); --- -1.8.2.1 - diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 17a247520..e90179183 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189772 2013-07-07 19:08:06Z dreisner $ +# $Id: PKGBUILD 197411 2013-10-25 14:32:42Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.66 -pkgrel=2 +pkgver=2.67 +pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64') @@ -14,28 +14,21 @@ depends=('glibc' 'dbus-core') install=$pkgname.install backup=('etc/dnsmasq.conf') source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" - '0001-Fix-wrong-size-in-memset-call.patch' - '0001-Fix-failure-to-start-with-ENOTSOCK.patch' 'dnsmasq.service') -md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20' - '05ccefefde68ebdebce5e40d2b3c78be' - '98cc950a6b0482eb7e61969dafb4f764' +md5sums=('3560068c6cc644a01924fa089a70bb9c' '7ac45726cabef4145db40d758cc7fedf') prepare() { cd "$pkgname-$pkgver" - patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch" - patch -Np1 <"$srcdir/0001-Fix-failure-to-start-with-ENOTSOCK.patch" + # link against dbus. this ugliness is needed to ensure that the + # compile time opts report properly on startup. yuck. + sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h } build() { cd "$pkgname-$pkgver" - # link against dbus. this ugliness is needed to ensure that the - # compile time opts report properly on startup. yuck. - sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h - make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS" } diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 57a45fb85..5079cac65 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194689 2013-09-22 08:17:23Z lcarlier $ +# $Id: PKGBUILD 197292 2013-10-25 01:24:27Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=elfutils pkgver=0.156 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information" arch=('i686' 'x86_64') url="https://fedorahosted.org/elfutils/" @@ -14,6 +14,7 @@ provides=('libelf') replaces=('libelf') conflicts=('libelf') source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}) +options=('staticlibs') sha1sums=('48b30828eb0fb47787e45d80db05c05bbe0eaa76' 'SKIP') @@ -36,4 +37,6 @@ package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install + + rm "${pkgdir}"/usr/lib/lib{asm,dw,elf}.a } diff --git a/extra/enca/PKGBUILD b/extra/enca/PKGBUILD index 754359963..42b68f841 100644 --- a/extra/enca/PKGBUILD +++ b/extra/enca/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174764 2013-01-07 09:30:41Z giovanni $ +# $Id: PKGBUILD 197393 2013-10-25 11:15:36Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Filip Dvorak <fila@pruda.com> pkgname=enca -pkgver=1.14 +pkgver=1.15 pkgrel=1 pkgdesc="Charset analyser and converter" arch=('i686' 'x86_64') @@ -11,8 +11,9 @@ url="http://cihar.com/software/enca/" options=('!libtool') license=('GPL') depends=('recode') +options=('!docs') source=("http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('03792f25aed003d3ea33b3ce1be1f256') +md5sums=('fef132969d26e649719eae08297a4a52') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD index b91c52182..4f7748b3c 100644 --- a/extra/exiv2/PKGBUILD +++ b/extra/exiv2/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 164832 2012-08-06 23:07:10Z andrea $ +#$Id: PKGBUILD 197371 2013-10-25 03:01:26Z bisson $ # Maintainer: tobias <tobias@arhlinux.org> pkgname=exiv2 pkgver=0.23 -pkgrel=1 +pkgrel=2 pkgdesc="Exif and Iptc metadata manipulation library and tools" arch=('i686' 'x86_64') url="http://exiv2.org" diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD index 6d63a87a5..68ffd41cd 100644 --- a/extra/ffmpeg-compat/PKGBUILD +++ b/extra/ffmpeg-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193811 2013-09-02 08:57:55Z bpiotrowski $ +# $Id: PKGBUILD 197409 2013-10-25 13:13:16Z giovanni $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -7,7 +7,7 @@ pkgname=ffmpeg-compat pkgver=0.10.8 -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix' arch=('i686' 'x86_64') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index f62f62fdb..b5e46a5fa 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196252 2013-10-09 20:32:23Z bpiotrowski $ +# $Id: PKGBUILD 197407 2013-10-25 13:06:38Z giovanni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg pkgver=2.0.2 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD index 54a1c08ee..08943a759 100644 --- a/extra/fftw/PKGBUILD +++ b/extra/fftw/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 176986 2013-02-03 11:04:50Z allan $ +# $Id: PKGBUILD 197299 2013-10-25 01:41:11Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=fftw pkgver=3.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library for computing the discrete Fourier transform (DFT)" arch=('i686' 'x86_64') license=('GPL2') url="http://www.fftw.org/" depends=('glibc' 'bash') makedepends=('gcc-fortran') -options=('!libtool') source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz") install=fftw.install sha1sums=('11487180928d05746d431ebe7a176b52fe205cf9') diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index 0ab4c0cb2..fcfb387ea 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191856 2013-07-31 16:26:31Z bpiotrowski $ +# $Id: PKGBUILD 197300 2013-10-25 01:41:17Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse pkgver=2.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/" @@ -15,7 +15,6 @@ makedepends=('pkg-config') backup=(etc/fuse.conf) source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') -options=(!libtool) sha1sums=('94bd1974a9f2173ac3c2cf122f9fa3c35996b88e' '3b42e37a741d4651099225987dc40e7f02a716ad') diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD index 7dd51bbe8..d2704cdb6 100644 --- a/extra/gd/PKGBUILD +++ b/extra/gd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189861 2013-07-10 07:26:52Z bpiotrowski $ +# $Id: PKGBUILD 197382 2013-10-25 03:14:56Z bisson $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=gd pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64') url="http://www.libgd.org/" diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD index bfef8fbc1..c100284f9 100644 --- a/extra/geoip/PKGBUILD +++ b/extra/geoip/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 194736 2013-09-23 12:28:32Z jgc $ +# $Id: PKGBUILD 197302 2013-10-25 01:44:22Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Manolis Tzanidakis <manolis@archlinux.org> pkgname=geoip pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="Non-DNS IP-to-country resolver C library & utils" arch=('i686' 'x86_64') url="http://www.maxmind.com/app/c" license=('GPL') depends=('zlib' 'geoip-database') backup=('etc/geoip/GeoIP.conf') -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz pkgconfig.patch) sha256sums=('ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731' diff --git a/extra/giblib/PKGBUILD b/extra/giblib/PKGBUILD index 7deebc84e..406d2779d 100644 --- a/extra/giblib/PKGBUILD +++ b/extra/giblib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137679 2011-09-10 11:58:36Z pierre $ +# $Id: PKGBUILD 197352 2013-10-25 02:50:40Z bisson $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=giblib pkgver=1.2.4 -pkgrel=5 +pkgrel=6 pkgdesc="A library that feh uses as a wrapper to imlib2" arch=('i686' 'x86_64') url="http://freshmeat.net/projects/giblib/" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 0ffcc7d61..6ccca8b21 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193808 2013-09-02 08:07:32Z andyrtr $ +# $Id: PKGBUILD 197414 2013-10-25 18:23:04Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.2.4 +pkgver=3.2.5 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('valgrind' 'strace' 'datefudge') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('79ef8538d65128b7ed47046649b98c27' +md5sums=('c7c367ee06f7f05ddb1e36a444a142ed' 'SKIP') build() { diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD index 3df3f01c4..fa9b4a28f 100644 --- a/extra/gsl/PKGBUILD +++ b/extra/gsl/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 171358 2012-11-17 09:32:49Z eric $ +# $Id: PKGBUILD 197374 2013-10-25 03:04:27Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Juergen Hoetzel <juergen.archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gsl pkgver=1.15 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers" url="http://www.gnu.org/software/gsl/gsl.html" -source=("http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz") +source=("http://ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz") install=gsl.install license=('GPL') arch=('i686' 'x86_64') diff --git a/extra/gupnp-igd/PKGBUILD b/extra/gupnp-igd/PKGBUILD index 45297def4..9658f1f09 100644 --- a/extra/gupnp-igd/PKGBUILD +++ b/extra/gupnp-igd/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 183422 2013-04-21 22:11:03Z heftig $ +# $Id: PKGBUILD 197430 2013-10-25 20:13:38Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: William Díaz <wdiaz [at] archlinux [dot] us> pkgname=gupnp-igd pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library to handle UPnP IGD port mapping" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.gupnp.org" -license=(LGPL) -depends=(gupnp python2-gobject2) -makedepends=(gettext) -options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +license=('LGPL') +depends=('gupnp' 'python2-gobject2') +makedepends=('gobject-introspection') +options=('!makeflags') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) sha1sums=('bd24e98b224b3a233b0ab6714638ed4c6bf64b47') build() { - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} PYTHON=python2 ./configure --prefix=/usr make } check() { - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} make check } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD index a8768b8bf..ec3027fcf 100644 --- a/extra/id3lib/PKGBUILD +++ b/extra/id3lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151326 2012-02-25 14:15:27Z pierre $ +# $Id: PKGBUILD 197340 2013-10-25 02:40:25Z bisson $ # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=id3lib pkgver=3.8.3 -pkgrel=12 +pkgrel=13 pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD index b38af74ae..2692d0b60 100644 --- a/extra/imlib2/PKGBUILD +++ b/extra/imlib2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191920 2013-08-01 06:59:49Z bpiotrowski $ +# $Id: PKGBUILD 197304 2013-10-25 02:05:00Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 pkgver=1.4.5 -pkgrel=5 +pkgrel=6 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64') diff --git a/extra/lame/PKGBUILD b/extra/lame/PKGBUILD index 7a090e7b4..6f5ffde79 100644 --- a/extra/lame/PKGBUILD +++ b/extra/lame/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 151868 2012-03-03 15:54:16Z schiv $ +# $Id: PKGBUILD 197314 2013-10-25 02:23:01Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=lame pkgver=3.99.5 -pkgrel=1 +pkgrel=2 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder" arch=('i686' 'x86_64') url="http://lame.sourceforge.net/" depends=('ncurses') makedepends=('nasm') license=('LGPL') -options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('84835b313d4a8b68f5349816d33e07ce') diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD index 7271ad881..3a6e6b248 100644 --- a/extra/lcms/PKGBUILD +++ b/extra/lcms/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 193922 2013-09-06 07:11:54Z bpiotrowski $ +# $Id: PKGBUILD 197316 2013-10-25 02:23:38Z allan $ # Maintainer: Tobias Kieslich <neri@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=lcms pkgver=1.19 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight color management development library/engine" arch=('i686' 'x86_64') license=('custom') depends=('libtiff') url="http://www.littlecms.com" -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz cve-2013-4276.patch) md5sums=('8af94611baf20d9646c7c2c285859818' diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD index 2985c3914..6e5812ea7 100644 --- a/extra/libass/PKGBUILD +++ b/extra/libass/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174504 2013-01-05 07:26:20Z giovanni $ +# $Id: PKGBUILD 197391 2013-10-25 11:10:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=libass -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="A portable library for SSA/ASS subtitles rendering" arch=('i686' 'x86_64') @@ -11,9 +11,8 @@ url="http://code.google.com/p/libass/" license=('BSD') depends=('enca' 'fontconfig' 'fribidi') makedepends=('pkg-config') -options=(!libtool) source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") -md5sums=('0f54b1f3a24fa897ebbbcc5bc744b32a') +md5sums=('ce672ed5629c9708b3401b976f516744') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index 3d665b7a2..cc7b99336 100644 --- a/extra/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 193609 2013-08-25 22:20:49Z allan $ +# $Id: PKGBUILD 197324 2013-10-25 02:28:32Z allan $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=libbsd pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64') url="http://libbsd.freedesktop.org" license=('custom') depends=('glibc') -options=('!libtool') +options=('staticlibs') source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc}) md5sums=('f6c75f0a9818e323a589bcbd560a0eb4' 'SKIP') @@ -32,6 +32,7 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + rm "${pkgdir}"/usr/lib/libbsd.a install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/libcdaudio/PKGBUILD b/extra/libcdaudio/PKGBUILD index 2a287e556..09b8d1ad7 100644 --- a/extra/libcdaudio/PKGBUILD +++ b/extra/libcdaudio/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 150528 2012-02-18 12:08:44Z pierre $ +# $Id: PKGBUILD 197332 2013-10-25 02:34:27Z allan $ # Maintainer: # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libcdaudio pkgver=0.99.12 -pkgrel=6 +pkgrel=7 pkgdesc="Library for controlling Audio CDs and interacting with CDDB" arch=('i686' 'x86_64') url="http://libcdaudio.sourceforge.net/" license=('GPL') depends=('glibc') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/libcdaudio/${pkgname}-${pkgver}.tar.gz" '01-cddb-bufferoverflow.patch' '02-cddb-bufferoverflow.patch') diff --git a/extra/libcddb/PKGBUILD b/extra/libcddb/PKGBUILD index 51b3b7d02..e4d85cd1d 100644 --- a/extra/libcddb/PKGBUILD +++ b/extra/libcddb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137919 2011-09-12 12:54:52Z pierre $ +# $Id: PKGBUILD 197334 2013-10-25 02:35:39Z allan $ # Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libcddb pkgver=1.3.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." url="http://sourceforge.net/projects/libcddb/" diff --git a/extra/libdv/PKGBUILD b/extra/libdv/PKGBUILD index fdeec4a35..770097ca6 100644 --- a/extra/libdv/PKGBUILD +++ b/extra/libdv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150457 2012-02-17 23:44:16Z allan $ +# $Id: PKGBUILD 197341 2013-10-25 02:40:30Z allan $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libdv pkgver=1.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="The Quasar DV codec (libdv) is a software codec for DV video" arch=('i686' 'x86_64') url="http://libdv.sourceforge.net/" @@ -12,7 +12,6 @@ license=('LGPL') depends=('popt') makedepends=('pkg-config' 'gtk' 'libxv') optdepends=('gtk: for using playdv' 'libxv: for using playdv') -options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('f895162161cfa4bb4a94c070a7caa6c7') diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD index d4baabe56..66bb5bc6e 100644 --- a/extra/libebml/PKGBUILD +++ b/extra/libebml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180600 2013-03-24 12:10:12Z giovanni $ +# $Id: PKGBUILD 197369 2013-10-25 03:00:48Z bisson $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: 03/08/04 <lefungus@altern.org> pkgname=libebml pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Extensible Binary Meta Language library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libebml/" diff --git a/extra/libexif/PKGBUILD b/extra/libexif/PKGBUILD index 6fd0d675d..f3b485e78 100644 --- a/extra/libexif/PKGBUILD +++ b/extra/libexif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165030 2012-08-09 08:16:11Z jgc $ +# $Id: PKGBUILD 197336 2013-10-25 02:39:03Z bisson $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libexif pkgver=0.6.21 -pkgrel=1 +pkgrel=2 pkgdesc="A library to parse an EXIF file and read the data from those tags" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD index 61165b225..47e8a7584 100644 --- a/extra/libftdi/PKGBUILD +++ b/extra/libftdi/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 153977 2012-03-21 07:09:24Z eric $ +# $Id: PKGBUILD 197346 2013-10-25 02:47:00Z allan $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libftdi pkgver=0.20 -pkgrel=1 +pkgrel=2 pkgdesc="A library to talk to FTDI chips" arch=('i686' 'x86_64') url="http://www.intra2net.com/en/developer/libftdi/download.php" license=('GPL2' 'LGPL2.1') depends=('libusb-compat' 'gcc-libs') makedepends=('boost') -options=('!libtool') source=(http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz{,.sig}) sha1sums=('4bc6ce70c98a170ada303fbd00b8428d8a2c1aa2' '807d145147c9bee08b4cea4d7ca82ccaf1330f02') diff --git a/extra/libglade/PKGBUILD b/extra/libglade/PKGBUILD index 182b6718e..c72cc5b5c 100644 --- a/extra/libglade/PKGBUILD +++ b/extra/libglade/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 151071 2012-02-24 17:50:27Z ibiru $ +# $Id: PKGBUILD 197348 2013-10-25 02:47:37Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libglade pkgver=2.6.4 -pkgrel=3 +pkgrel=4 pkgdesc="Allows you to load glade interface files in a program at runtime" arch=(i686 x86_64) license=('LGPL') depends=('gtk2>=2.16.0' 'libxml2>=2.7.3') makedepends=('python2' 'pkgconfig') optdepends=('python2: libglade-convert script') -options=('!libtool') install=glade.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2 libglade-2.0.1-nowarning.patch) diff --git a/extra/libid3tag/PKGBUILD b/extra/libid3tag/PKGBUILD index 6f2b92906..68c14b637 100644 --- a/extra/libid3tag/PKGBUILD +++ b/extra/libid3tag/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150540 2012-02-18 12:17:15Z pierre $ +# $Id: PKGBUILD 197319 2013-10-25 02:25:22Z bisson $ # Maintainer: # Contributor: dorphell <dorphell@archlinux.org> pkgname=libid3tag pkgver=0.15.1b -pkgrel=7 +pkgrel=8 pkgdesc="library for id3 tagging" arch=('i686' 'x86_64') url="http://www.underbit.com/products/mad/" diff --git a/extra/libidl2/PKGBUILD b/extra/libidl2/PKGBUILD index d52fb7450..1b279642a 100644 --- a/extra/libidl2/PKGBUILD +++ b/extra/libidl2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 150449 2012-02-17 23:08:28Z allan $ +# $Id: PKGBUILD 197354 2013-10-25 02:51:47Z allan $ # Maintainer: # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=libidl2 pkgver=0.8.14 -pkgrel=2 +pkgrel=3 pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL" arch=('i686' 'x86_64') license=('LGPL') depends=('glib2' 'texinfo') makedepends=('pkg-config') install=libidl2.install -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-${pkgver}.tar.bz2) url="http://www.gnome.org" sha256sums=('c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220') diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD index ad516863b..d94c18904 100644 --- a/extra/libidn/PKGBUILD +++ b/extra/libidn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 194235 2013-09-11 07:58:33Z bpiotrowski $ +# $Id: PKGBUILD 197347 2013-10-25 02:47:29Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jan de Groot <jgc.archlinux.org> # Contributor: Eric Johnson <eric.archlinux.org> pkgname=libidn pkgver=1.28 -pkgrel=1 +pkgrel=2 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications" url="http://www.gnu.org/software/libidn/" arch=('i686' 'x86_64') diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index 97b2b507a..801c1a5ad 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,15 +1,18 @@ -# $Id: PKGBUILD 197089 2013-10-21 18:35:00Z andyrtr $ +# $Id: PKGBUILD 197415 2013-10-25 18:23:05Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia-project.org" arch=('i686' 'x86_64') license=('GPL2') depends=('libburn>=1.3.2' 'libisofs>=1.3.2' 'readline') +optdepends=('tk: for xorriso-tcltk frontend' + 'bwidget: for xorriso-tcltk frontend') +provides=('xorriso' 'xorriso-tcltk') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('7ebee7c1d4e09565daddca15467035af' diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD index 88a3c5b8c..331e7f088 100644 --- a/extra/libmatroska/PKGBUILD +++ b/extra/libmatroska/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180602 2013-03-24 12:53:07Z giovanni $ +# $Id: PKGBUILD 197329 2013-10-25 02:33:41Z bisson $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor 03/08/04 <lefungus@altern.org> pkgname=libmatroska pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Matroska library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libmatroska/" diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 7e1d664aa..c4aa6dab9 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 180848 2013-03-26 23:07:40Z tomegun $ +# $Id: PKGBUILD 197376 2013-10-25 03:06:01Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp pkgver=1.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") url="http://libmtp.sourceforge.net" license=('LGPL') depends=('libusb' 'libgcrypt') -options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") build() { diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD index f9c7b1611..e32bf6c93 100644 --- a/extra/libogg/PKGBUILD +++ b/extra/libogg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186983 2013-06-02 16:07:31Z tomegun $ +# $Id: PKGBUILD 197322 2013-10-25 02:26:33Z bisson $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> pkgname=libogg pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Ogg bitstream and framing library" arch=('i686' 'x86_64') url="http://www.xiph.org/ogg/" diff --git a/extra/libshout/PKGBUILD b/extra/libshout/PKGBUILD index d2f0f675d..22eb626be 100644 --- a/extra/libshout/PKGBUILD +++ b/extra/libshout/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168008 2012-10-05 06:33:28Z eric $ +# $Id: PKGBUILD 197378 2013-10-25 03:06:40Z bisson $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=libshout pkgver=2.3.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Library for accessing a shoutcast/icecast server" arch=('i686' 'x86_64') diff --git a/extra/libunistring/PKGBUILD b/extra/libunistring/PKGBUILD index 5cbc2003a..099684d24 100644 --- a/extra/libunistring/PKGBUILD +++ b/extra/libunistring/PKGBUILD @@ -6,7 +6,7 @@ pkgname=libunistring pkgver=0.9.3 -pkgrel=5 +pkgrel=6 pkgdesc="Library for manipulating Unicode strings and C strings." url="http://www.gnu.org/software/libunistring/" arch=('i686' 'x86_64') diff --git a/extra/libutempter/PKGBUILD b/extra/libutempter/PKGBUILD index 8d5145a0a..bbc27d9b1 100644 --- a/extra/libutempter/PKGBUILD +++ b/extra/libutempter/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libutempter pkgver=1.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files" arch=('i686' 'x86_64') url="ftp://ftp.altlinux.org/pub/people/ldv/utempter" diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD index 9caafb1af..98dfbece2 100644 --- a/extra/libvpx/PKGBUILD +++ b/extra/libvpx/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185107 2013-05-11 07:24:48Z bpiotrowski $ +# $Id: PKGBUILD 197350 2013-10-25 02:49:53Z bisson $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libvpx pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="The VP8 Codec SDK" arch=('i686' 'x86_64') url="http://www.webmproject.org/" diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD index 879d27a35..da462db95 100644 --- a/extra/libwmf/PKGBUILD +++ b/extra/libwmf/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 184410 2013-05-06 19:38:42Z foutrelis $ +# $Id: PKGBUILD 197279 2013-10-25 00:22:10Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libwmf pkgver=0.2.8.4 -pkgrel=10 +pkgrel=12 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" arch=('i686' 'x86_64') url="http://wvware.sourceforge.net/libwmf.html" license=('LGPL') -depends=('libpng' 'libx11' 'libjpeg' 'gsfonts') +depends=('libx11' 'libjpeg' 'gsfonts') makedepends=('gtk2' 'libxt') optdepends=('gdk-pixbuf2: for pixbuf loader') -options=('!libtool' '!docs' '!emptydirs') +options=('!docs' '!emptydirs') install=libwmf.install source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch) @@ -30,7 +30,7 @@ build() { ./configure --prefix=/usr \ --with-gsfontdir=/usr/share/fonts/Type1 \ --with-fontdir=/usr/share/fonts/Type1 \ - --with-gsfontmap=/usr/share/ghostscript/9.07/Resource/Init/Fontmap.GS + --with-gsfontmap=/usr/share/ghostscript/9.10/Resource/Init/Fontmap.GS make } @@ -39,6 +39,4 @@ package() { make DESTDIR="${pkgdir}" install #Remove fonts, these are in gsfonts rm -rf "${pkgdir}/usr/share/fonts" - #Remove static GTK loader, can't use it anyways - rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a } diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD index f325ea772..ba4bf184b 100644 --- a/extra/libxml2/PKGBUILD +++ b/extra/libxml2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187170 2013-06-04 17:39:43Z bpiotrowski $ +# $Id: PKGBUILD 197380 2013-10-25 03:14:08Z bisson $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxml2 pkgver=2.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) license=('MIT') diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD index 10007a312..4b5ddac26 100644 --- a/extra/libxslt/PKGBUILD +++ b/extra/libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184790 2013-05-08 14:12:44Z bpiotrowski $ +# $Id: PKGBUILD 197357 2013-10-25 02:53:25Z bisson $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxslt pkgver=1.1.28 -pkgrel=1 +pkgrel=2 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64') url="http://xmlsoft.org/XSLT/" diff --git a/extra/physfs/PKGBUILD b/extra/physfs/PKGBUILD index 85cbf0fcf..c51501e6b 100644 --- a/extra/physfs/PKGBUILD +++ b/extra/physfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 1214 2009-08-14 01:36:33Z dgriffiths $ +# $Id: PKGBUILD 197284 2013-10-25 00:41:39Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=physfs pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library to provide abstract access to various archives" arch=('i686' 'x86_64') url="http://icculus.org/physfs/" @@ -14,15 +14,16 @@ source=(http://icculus.org/physfs/downloads/${pkgname}-${pkgver}.tar.bz2) sha1sums=('327308c777009a41bbabb9159b18c4c0ac069537') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - cmake . -DCMAKE_BUILD_TYPE=Release \ + mkdir build + cd build + cmake ../${pkgname}-${pkgver} -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DPHYSFS_BUILD_TEST=OFF -DPHYSFS_BUILD_WX_TEST=OFF make all docs } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd build make DESTDIR="${pkgdir}" install install -d "${pkgdir}"/usr/share/{doc/physfs,man/man3} install -m644 docs/html/* "${pkgdir}/usr/share/doc/physfs" @@ -32,5 +33,5 @@ package() { mv "${pkgdir}/usr/share/man/man3/$i.3" "${pkgdir}/usr/share/man/man3/PHYSFS_$i.3" done - install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/portmidi/PKGBUILD b/extra/portmidi/PKGBUILD index ac16436ff..bf08d19b5 100644 --- a/extra/portmidi/PKGBUILD +++ b/extra/portmidi/PKGBUILD @@ -1,46 +1,38 @@ -# $Id: PKGBUILD 170712 2012-11-10 01:03:47Z eric $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Contributor: Denis Martinez <deuns.martinez AT gmail DOT com> +# $Id: PKGBUILD 197308 2013-10-25 02:13:59Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=portmidi pkgver=217 -pkgrel=3 -pkgdesc="Platform independent library for real-time MIDI input/output." +pkgrel=4 +pkgdesc="Platform independent library for real-time MIDI input/output" arch=('i686' 'x86_64') -url='http://portmedia.sourceforge.net/' +url="http://portmedia.sourceforge.net/" license=('GPL') depends=('alsa-lib') makedepends=('cmake' 'java-environment') -source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip" - 'portmidi-217-build-fix.patch') -md5sums=('03f46fd3947e2ef4c8c465baaf832241' - '59cb428b29a33bab3bb5811cda479a9b') - -build() { - cd "${srcdir}/${pkgname}" - - sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py - mkdir -p pm_java/Release - +optdepends=('java-runtime: for using pmdefaults') +source=(http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip + portmidi-217-build-fix.patch) +sha1sums=('f45bf4e247c0d7617deacd6a65d23d9fddae6117' + '7fe10874ea8689e1ba51e8f50da38e79d10b76e1') + +prepare() { + cd ${pkgname} # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118) - patch -p1 -i ../portmidi-217-build-fix.patch - - cmake . -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release + patch -p1 -i "${srcdir}/portmidi-217-build-fix.patch" +} +build() { + cd ${pkgname} + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ + -DPORTMIDI_ENABLE_TEST=OFF -DPORTMIDI_ENABLE_JAVA=ON make } package() { - cd "${srcdir}/${pkgname}" - + cd ${pkgname} make DESTDIR="${pkgdir}" install # Fix missing symlink for libporttime.so (FS#21528). - mv "${pkgdir}/usr/lib/libportmidi_s.a" "${pkgdir}/usr/lib/libportmidi.a" - ln -s "/usr/lib/libportmidi.so" "${pkgdir}/usr/lib/libporttime.so" - ln -s "/usr/lib/libportmidi.a" "${pkgdir}/usr/lib/libporttime.a" + ln -s libportmidi.so "${pkgdir}/usr/lib/libporttime.so" } diff --git a/extra/portmidi/portmidi-217-build-fix.patch b/extra/portmidi/portmidi-217-build-fix.patch index 3e2dfef29..e741e6576 100644 --- a/extra/portmidi/portmidi-217-build-fix.patch +++ b/extra/portmidi/portmidi-217-build-fix.patch @@ -1,29 +1,318 @@ -diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt ---- portmidi.orig/pm_java/CMakeLists.txt 2009-11-04 16:20:44.000000000 +0100 -+++ portmidi/pm_java/CMakeLists.txt 2012-01-24 21:13:08.513182169 +0100 -@@ -15,13 +15,11 @@ if(UNIX) - add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class - COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java - MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java +--- portmidi/CMakeLists.txt ++++ portmidi/CMakeLists.txt +@@ -9,12 +9,11 @@ + set(CMAKE_BUILD_TYPE Release CACHE STRING + "Semicolon-separate list of supported configuration types") + # set default directories but don't override cached values... +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + CACHE STRING "libraries go here") +- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + CACHE STRING "libraries go here") +- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY +- ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} ++ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + CACHE STRING "executables go here") + + else(UNIX) +@@ -68,10 +67,20 @@ + include_directories(pm_common porttime) + add_subdirectory(pm_common) + +-add_subdirectory(pm_test) ++option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON) ++option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF) ++option(PORTMIDI_ENABLE_TEST "Build test programs" ON) ++ ++if(PORTMIDI_ENABLE_TEST) ++ add_subdirectory(pm_test) ++endif(PORTMIDI_ENABLE_TEST) + + add_subdirectory(pm_dylib) + + # Cannot figure out how to make an xcode Java application with CMake +-add_subdirectory(pm_java) ++if(PORTMIDI_ENABLE_JAVA) ++ set(JAR_INSTALL_DIR share/java ++ CACHE STRING "Define directory name for jar installation") ++ add_subdirectory(pm_java) ++endif(PORTMIDI_ENABLE_JAVA) + +--- portmidi/pm_common/CMakeLists.txt ++++ portmidi/pm_common/CMakeLists.txt +@@ -44,9 +44,6 @@ + + # first include the appropriate system-dependent file: + if(UNIX) +- # add the -g switch for Linux and Mac OS X (not used in Win32) +- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" +- CACHE STRING "enable extra checks for debugging" FORCE) + if(APPLE) + set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) + prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) +@@ -62,19 +59,23 @@ + ${COREMIDI_LIB} ${CORESERVICES_LIB} + CACHE INTERNAL "") + +- set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework") +- set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers) ++ if(PORTMIDI_ENABLE_JAVA) ++ set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework") ++ set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers) ++ endif(PORTMIDI_ENABLE_JAVA) + message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) + else(APPLE) + # LINUX settings... +- include(FindJNI) +- message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) +- message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) +- message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2}) +- message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY}) +- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) +- # libjvm.so is found relative to JAVA_INCLUDE_PATH: +- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so) ++ if(PORTMIDI_ENABLE_JAVA) ++ include(FindJNI) ++ message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) ++ message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) ++ message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2}) ++ message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY}) ++ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) ++ # libjvm.so is found relative to JAVA_INCLUDE_PATH: ++ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so) ++ endif(PORTMIDI_ENABLE_JAVA) + + set(LINUXSRC pmlinuxalsa pmlinux finddefault) + prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC}) +@@ -88,10 +89,12 @@ + # /MD is multithread DLL, /MT is multithread. Change to static: + include(../pm_win/static.cmake) + +- include(FindJNI) ++ if(PORTMIDI_ENABLE_JAVA) ++ include(FindJNI) + +- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) +- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) ++ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) ++ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) ++ endif(PORTMIDI_ENABLE_JAVA) + + set(WINSRC pmwin pmwinmm) + prepend_path(LIBSRC ../pm_win/ ${WINSRC}) +@@ -99,29 +102,43 @@ + set(PM_NEEDED_LIBS winmm.lib) + endif(WIN32) + endif(UNIX) +-set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) ++ ++if(PORTMIDI_ENABLE_JAVA) ++ set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) ++endif(PORTMIDI_ENABLE_JAVA) + + # this completes the list of library sources by adding shared code + list(APPEND LIBSRC pmutil portmidi) + + # now add the shared files to make the complete list of library sources +-add_library(portmidi-static ${LIBSRC}) +-set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s") +-target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) +- +-# define the jni library +-include_directories(${JAVA_INCLUDE_PATHS}) +- +-set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) +-add_library(pmjni SHARED ${JNISRC}) +-target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) +-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") ++if(PORTMIDI_ENABLE_STATIC) ++ add_library(portmidi-static ${LIBSRC}) ++ set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi") ++ target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) ++endif(PORTMIDI_ENABLE_STATIC) ++ ++if(PORTMIDI_ENABLE_JAVA) ++ # define the jni library ++ include_directories(${JAVA_INCLUDE_PATHS}) ++ ++ set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) ++ add_library(pmjni SHARED ${JNISRC}) ++ target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) ++ set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") ++endif(PORTMIDI_ENABLE_JAVA) + + # install the libraries (Linux and Mac OS X command line) + if(UNIX) +- INSTALL(TARGETS portmidi-static pmjni +- LIBRARY DESTINATION /usr/local/lib +- ARCHIVE DESTINATION /usr/local/lib) ++ if(PORTMIDI_ENABLE_STATIC) ++ INSTALL(TARGETS portmidi-static ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) ++ endif(PORTMIDI_ENABLE_STATIC) ++ if(PORTMIDI_ENABLE_JAVA) ++ INSTALL(TARGETS pmjni ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) ++ endif(PORTMIDI_ENABLE_JAVA) + # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here + # INSTALL(FILES portmidi.h ../porttime/porttime.h + # DESTINATION /usr/local/include) +--- portmidi/pm_dylib/CMakeLists.txt ++++ portmidi/pm_dylib/CMakeLists.txt +@@ -39,9 +39,6 @@ + + # first include the appropriate system-dependent file: + if(UNIX) +- # add the -g switch for Linux and Mac OS X (not used in Win32) +- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" +- CACHE STRING "enable extra checks for debugging" FORCE) + if(APPLE) + set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) + prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) +@@ -63,7 +60,8 @@ + message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) + else(APPLE) + # LINUX settings... +- include(FindJNI) ++ if(PORTMIDI_ENABLE_JAVA) ++ include(FindJNI) + # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) + # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) + # note: should use JAVA_JVM_LIB_PATH, but it is not set properly +@@ -75,11 +73,8 @@ + # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH + # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation + # because JAVA_INCLUDE_PATH2 is pretty obscure) +- set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN} +- CACHE STRING "where to find Java SDK include directory") +- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux) +- # libjvm.so is found relative to JAVA_INCLUDE_PATH: +- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so) ++ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}) ++ endif(PORTMIDI_ENABLE_JAVA) + + set(LINUXSRC pmlinuxalsa pmlinux finddefault) + prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC}) +@@ -91,13 +86,15 @@ + if(WIN32) + # /MDd is multithread debug DLL, /MTd is multithread debug + # /MD is multithread DLL, /MT is multithread +- +- include(FindJNI) +- # note: should use JAVA_JVM_LIB_PATH, but it is not set properly +- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib) + +- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) +- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) ++ if(PORTMIDI_ENABLE_JAVA) ++ include(FindJNI) ++ # note: should use JAVA_JVM_LIB_PATH, but it is not set properly ++ set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib) ++ ++ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) ++ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) ++ endif(PORTMIDI_ENABLE_JAVA) + + set(WINSRC pmwin pmwinmm) + prepend_path(LIBSRC ../pm_win/ ${WINSRC}) +@@ -106,7 +103,10 @@ + # message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB}) + endif(WIN32) + endif(UNIX) ++ ++if(PORTMIDI_ENABLE_JAVA) + set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB}) ++endif(PORTMIDI_ENABLE_JAVA) + + # this completes the list of library sources by adding shared code + set(SHARED_FILES pmutil portmidi) +@@ -120,8 +120,8 @@ + # install the libraries (Linux and Mac OS X command line) + if(UNIX) + INSTALL(TARGETS portmidi-dynamic +- LIBRARY DESTINATION /usr/local/lib +- ARCHIVE DESTINATION /usr/local/lib) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h +- DESTINATION /usr/local/include) ++ DESTINATION include) + endif(UNIX) +--- portmidi/pm_java/CMakeLists.txt ++++ portmidi/pm_java/CMakeLists.txt +@@ -5,43 +5,24 @@ + # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj + else(APPLE) + # linux +- set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class +- JPortMidiApi.class) +- set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class) +- prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS}) +- prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS}) +- set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2}) +- # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES}) +- add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class +- COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java +- MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java - DEPENDS pmdefaults/PmDefaults.java - WORKING_DIRECTORY pm_java) -+ DEPENDS pmdefaults/PmDefaults.java) - add_custom_command(OUTPUT pmdefaults/PmDefaults.class - COMMAND javac -classpath . pmdefaults/PmDefaults.java - MAIN_DEPENDENCY pmdefaults/PmDefaults.java +- add_custom_command(OUTPUT pmdefaults/PmDefaults.class +- COMMAND javac -classpath . pmdefaults/PmDefaults.java +- MAIN_DEPENDENCY pmdefaults/PmDefaults.java - DEPENDS pmdefaults/PmDefaultsFrame.java - WORKING_DIRECTORY pm_java) -+ DEPENDS pmdefaults/PmDefaultsFrame.java) - add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar - COMMAND cp pmdefaults/portmusic_logo.png . - COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar -@@ -31,8 +29,7 @@ if(UNIX) - COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} - COMMAND rm portmusic_logo.png - MAIN_DEPENDENCY pmdefaults/PmDefaults.class +- add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar +- COMMAND cp pmdefaults/portmusic_logo.png . +- COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar +- pmdefaults/*.class portmusic_logo.png jportmidi/*.class +- COMMAND chmod +x pmdefaults/pmdefaults +- COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +- COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +- COMMAND rm portmusic_logo.png +- MAIN_DEPENDENCY pmdefaults/PmDefaults.class - DEPENDS ${PMDEFAULTS_ALL_CLASSES} - WORKING_DIRECTORY pm_java) -+ DEPENDS ${PMDEFAULTS_ALL_CLASSES}) - add_custom_target(pmdefaults_target ALL - DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) - # message(STATUS "add_custom_target: pmdefaults.jar") +- add_custom_target(pmdefaults_target ALL +- DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) +- # message(STATUS "add_custom_target: pmdefaults.jar") ++ set(JAVA_CLASSES jportmidi pmdefaults) ++ add_custom_command(OUTPUT ${JAVA_CLASSES} ++ COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar ++ DEPENDS ${JAVA_CLASSES} ++ COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar ++ -C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi ++ -C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++ add_custom_target(pmdefaults.jar ALL ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar) + + # install the libraries (Linux only) +- INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar +- DESTINATION /usr/share/java) +- INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults +- DESTINATION /usr/local/bin) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar ++ DESTINATION ${JAR_INSTALL_DIR}) ++ INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults ++ DESTINATION bin) + endif(APPLE) + endif(UNIX) + # In windows, use pm_java/make.bat +--- portmidi/pm_test/CMakeLists.txt ++++ portmidi/pm_test/CMakeLists.txt +@@ -12,8 +12,8 @@ + + macro(make_a_test name) + add_executable(${name} ${name}.c) +- target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS}) +- add_dependencies(${name} portmidi-static) ++ target_link_libraries(${name} portmidi ${PM_NEEDED_LIBS}) ++ add_dependencies(${name} portmidi) + endmacro(make_a_test) + + make_a_test(test) diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index 942959ad4..dead707dd 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193687 2013-08-28 00:06:06Z eric $ +# $Id: PKGBUILD 197418 2013-10-25 18:37:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8b -pkgrel=6 +pkgrel=7 epoch=1 pkgdesc="A cross-platform application and UI framework" arch=('i686' 'x86_64') @@ -16,17 +16,19 @@ optdepends=('qtchooser: set the default Qt toolkit' 'libmariadbclient: MariaDB driver' 'postgresql-libs: PostgreSQL driver' 'unixodbc: ODBC driver') -options=('!libtool' '!docs') +options=('!docs') source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 - eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) + eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch + qt-x11-free-3.3.5-makelibshared.patch) sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' '3d19510c46016a1a211d97bf8f82b01498b1b33c' '33418e5b117458af23c72cdbffc0c339bc34bdc4' '116afa0e737bdf27ea27f9b3653aeb56db9ec151' '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' '1346320614f6f86fbeb10b9fbad721dea29f5b61' - 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') + 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f' + 'e89720eac87c3e925d0efae6a16f334c5159e4f6') # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ # other qt-patches come from fedora and gentoo @@ -49,6 +51,8 @@ prepare() { patch -p1 -i "${srcdir}"/gcc-4.6.patch patch -p0 -i "${srcdir}"/qt3-png15.patch + patch -p1 -i "${srcdir}"/qt-x11-free-3.3.5-makelibshared.patch + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix sed -i "s|read acceptance|acceptance=yes|" configure diff --git a/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch b/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch new file mode 100644 index 000000000..fd4adf7f0 --- /dev/null +++ b/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch @@ -0,0 +1,48 @@ +--- qt-x11-free-3.3.5/tools/assistant/lib/lib.pro.orig 2005-10-21 10:09:12.000000000 -0200 ++++ qt-x11-free-3.3.5/tools/assistant/lib/lib.pro 2005-10-21 10:09:34.000000000 -0200 +@@ -3,8 +3,7 @@ + VERSION = 1.0 + + CONFIG += qt warn_on release +-CONFIG += staticlib +-CONFIG -= dll ++CONFIG += dll + + SOURCES = qassistantclient.cpp + HEADERS += $$QT_SOURCE_TREE/include/qassistantclient.h +*** qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro 2003-12-20 22:48:51.000000000 -0200 +--- qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro.new 2005-12-06 18:47:04.000000000 -0200 +*************** +*** 1,6 **** + TEMPLATE = lib +! CONFIG += qt warn_on staticlib +! CONFIG -= dll + HEADERS = editor.h \ + parenmatcher.h \ + completion.h \ +--- 1,6 ---- + TEMPLATE = lib +! CONFIG += qt warn_on +! CONFIG += dll + HEADERS = editor.h \ + parenmatcher.h \ + completion.h \ +*** qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro 2004-04-29 19:31:32.000000000 -0300 +--- qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro.new 2005-12-06 18:46:29.000000000 -0200 +*************** +*** 1,7 **** + TEMPLATE = lib + +! CONFIG += qt warn_on staticlib qmake_cache +! CONFIG -= dll + !force_static:!win32:contains(QT_PRODUCT,qt-internal) { + CONFIG -= staticlib + CONFIG += dll +--- 1,7 ---- + TEMPLATE = lib + +! CONFIG += qt warn_on qmake_cache +! CONFIG += dll + !force_static:!win32:contains(QT_PRODUCT,qt-internal) { + CONFIG -= staticlib + CONFIG += dll diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 13b3c4a87..63c931ff8 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188995 2013-06-28 01:52:37Z eric $ +# $Id: PKGBUILD 197422 2013-10-25 19:15:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.8 -pkgrel=1 +pkgrel=2 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" @@ -14,22 +14,24 @@ optdepends=('tcl: to use corresponding binding' \ 'python2: to use corresponding binding' \ 'ruby: to use corresponding binding' \ 'lua51: to use corresponding binding') -options=('!libtool' '!emptydirs' '!makeflags') +options=('!emptydirs' '!makeflags') source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz - rrdtool-pangofont.patch) + rrdtool-pangofont.patch rrdtool-systemd.patch) sha1sums=('56d68857f39e70bfa32360947614d8220702ed02' - '8c600285bdab7776c1d5301df7cf486d69eae048') + '8c600285bdab7776c1d5301df7cf486d69eae048' + '963b600f8056d85305b6ff4554fa1e7b9b5a4ae1') prepare() { cd ${pkgname}-${pkgver} # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby - sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in - patch -p1 -i ../rrdtool-pangofont.patch + sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.am + patch -p1 -i "${srcdir}/rrdtool-pangofont.patch" + patch -p1 -i "${srcdir}/rrdtool-systemd.patch" } build() { cd ${pkgname}-${pkgver} - autoconf + autoreconf PYTHON=python2 LUA=/usr/bin/lua5.1 \ LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ diff --git a/extra/rrdtool/rrdtool-systemd.patch b/extra/rrdtool/rrdtool-systemd.patch new file mode 100644 index 000000000..856f9ef54 --- /dev/null +++ b/extra/rrdtool/rrdtool-systemd.patch @@ -0,0 +1,140 @@ +From 78b519eb2ffa786d6427bb13277e9151ef7b111e Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi@oetiker.ch> +Date: Mon, 2 Jul 2012 15:05:32 +0000 +Subject: [PATCH] serviced config etc files for rrdtool + +git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2292 a5681a0c-68f1-0310-ab6d-d61299d08faa +--- + etc/rrdcached.service.in | 19 +++++++++++++++++++ + etc/rrdcached.socket.in | 18 ++++++++++++++++++ + 2 files changed, 37 insertions(+) + create mode 100644 etc/rrdcached.service.in + create mode 100644 etc/rrdcached.socket.in + +diff --git a/etc/rrdcached.service.in b/etc/rrdcached.service.in +new file mode 100644 +index 0000000..3b6f309 +--- /dev/null ++++ b/etc/rrdcached.service.in +@@ -0,0 +1,19 @@ ++# ++# To customize, copy this file to /etc/systemd/system/ ++# and edit there ++# ++ ++[Unit] ++Description=Data caching daemon for rrdtool ++Documentation=man:rrdcached(1) ++ ++[Service] ++# If you enable socket-activable rrdcached.socket, ++# command line socket declarations will be ignored ++ExecStart=@prefix@/bin/rrdcached -g ++#WorkingDirectory= ++#User= ++#Group= ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/etc/rrdcached.socket.in b/etc/rrdcached.socket.in +new file mode 100644 +index 0000000..7a2d63e +--- /dev/null ++++ b/etc/rrdcached.socket.in +@@ -0,0 +1,18 @@ ++# ++# To customize, copy this file to /etc/systemd/system/ ++# and edit there ++# ++ ++[Unit] ++Description=sockets activating rrdcached ++Documentation=man:rrdcached(1) ++ ++[Socket] ++ListenStream=/tmp/rrdcached.sock ++#ListenStream=[::1]:42217 ++#DirectoryMode=0755 ++#SocketMode=0666 ++#BindToDevice= ++ ++[Install] ++WantedBy=sockets.target +-- +1.8.4 + +From 134ed0d33953e7e71c55454591c1078f7ae1db8a Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi@oetiker.ch> +Date: Mon, 2 Jul 2012 14:01:06 +0000 +Subject: [PATCH] wire up systemd support in autoconf -- tomek@pipebreaker.pl + +git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2291 a5681a0c-68f1-0310-ab6d-d61299d08faa +--- + Makefile.am | 6 ++++++ + configure.ac | 12 ++++++++++++ + doc/rrdcached.pod | 2 ++ + 3 files changed, 20 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 20b2e0a..11d16d3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -29,6 +29,12 @@ ACLOCAL_M4= $(top_srcdir)/aclocal.m4 + + # $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/ + ++if HAVE_SYSTEMD ++systemdsystemunit_DATA = \ ++ etc/rrdcached.socket \ ++ etc/rrdcached.service ++endif ++ + site-perl-inst: site-perl-install + + site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile +diff --git a/configure.ac b/configure.ac +index 51c3f81..ab210d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -918,6 +918,17 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory]) + if test -z "$RRDDOCDIR"; then + RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi + ++# systemd check ++PKG_PROG_PKG_CONFIG ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++ AC_OUTPUT([etc/rrdcached.socket etc/rrdcached.service]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + + CONFIGURE_PART(Apply Configuration Information) + +@@ -993,6 +1004,7 @@ echo " Build librrd MT: $enable_pthread" + echo " Use gettext: $USE_NLS" + echo " With libDBI: $have_libdbi" + echo " With libwrap: $have_libwrap" ++echo " With systemd dir: $with_systemdsystemunitdir" + echo + echo " Libraries: $ALL_LIBS" + echo +diff --git a/doc/rrdcached.pod b/doc/rrdcached.pod +index 18adcf1..7c0b30c 100644 +--- a/doc/rrdcached.pod ++++ b/doc/rrdcached.pod +@@ -448,6 +448,8 @@ accepted commands to those needed by external clients. If, for example, + external clients want to draw graphs of the cached data, they should only be + allowed to use the C<FLUSH> command. + ++Authorization does not work when rrcached is socket-activated by systemd. ++ + =head2 Encryption + + There is no encryption. +-- +1.8.4 + diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index 09d5dbdad..d88e4fe08 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190126 2013-07-16 03:23:42Z eric $ +# $Id: PKGBUILD 197306 2013-10-25 02:06:12Z bisson $ # Maintainer: # Contributor: xduugu # Contributor: Elis Hughes <elishughes@googlemail.com> pkgname=rtmpdump pkgver=20121230 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to download rtmp streams" arch=('i686' 'x86_64') url="http://rtmpdump.mplayerhq.hu/" diff --git a/extra/schroedinger/PKGBUILD b/extra/schroedinger/PKGBUILD index 7a8e01134..a5d7d9d64 100644 --- a/extra/schroedinger/PKGBUILD +++ b/extra/schroedinger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149308 2012-02-06 18:45:09Z ibiru $ +# $Id: PKGBUILD 197333 2013-10-25 02:34:53Z bisson $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> # Contributor: rabyte <rabyte__gmail> pkgname=schroedinger pkgver=1.0.11 -pkgrel=1 +pkgrel=2 pkgdesc="An implemenation of the Dirac video codec in ANSI C code" arch=('i686' 'x86_64') url="http://www.diracvideo.org/" diff --git a/extra/sdl2/PKGBUILD b/extra/sdl2/PKGBUILD index c554f2083..0119dd5b9 100644 --- a/extra/sdl2/PKGBUILD +++ b/extra/sdl2/PKGBUILD @@ -1,8 +1,7 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - pkgname=sdl2 -pkgver=2.0.0 -pkgrel=4 +pkgver=2.0.1 +pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)" arch=('i686' 'x86_64') url="http://www.libsdl.org" @@ -12,7 +11,7 @@ makedepends=('alsa-lib' 'mesa' 'libpulse' 'cmake' 'libxrandr' 'libxinerama') optdepends=('alsa-lib: ALSA audio driver' 'libpulse: PulseAudio audio driver') source=("http://www.libsdl.org/release/SDL2-${pkgver}.tar.gz") -md5sums=('beec89afb6edcc6f0abc4114f2e6bcf7') +md5sums=('0eb97039488bf463e775295f7b18b227') build() { cd "${srcdir}/SDL2-${pkgver}" diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD index a7cb7ced6..35ac783df 100644 --- a/extra/sg3_utils/PKGBUILD +++ b/extra/sg3_utils/PKGBUILD @@ -1,15 +1,14 @@ -#$Id: PKGBUILD 188647 2013-06-17 10:00:27Z jgc $ +#$Id: PKGBUILD 197372 2013-10-25 03:01:52Z allan $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=sg3_utils pkgver=1.36 -pkgrel=1 +pkgrel=2 pkgdesc="Generic SCSI utilities" arch=(i686 x86_64) url="http://sg.danny.cz/sg/sg3_utils.html" license=('GPL' 'custom:BSD') depends=('glibc') -options=('!libtool') source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz) md5sums=('5d1846c8aa03a2e39e1368cf05bf1cfd') diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index ae85cd877..8480e03fe 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191908 2013-08-01 06:53:41Z bpiotrowski $ +# $Id: PKGBUILD 197426 2013-10-25 19:25:05Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.4.1 -pkgrel=3 +pkgrel=4 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64') url="http://sox.sourceforge.net/" @@ -16,7 +16,6 @@ optdepends=('libao: for ao plugin' 'libid3tag: for mp3 plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') -options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9') diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD index be5991abc..84b17cd3d 100644 --- a/extra/startup-notification/PKGBUILD +++ b/extra/startup-notification/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160613 2012-06-02 21:14:51Z andyrtr $ +# $Id: PKGBUILD 197310 2013-10-25 02:16:10Z bisson $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=startup-notification pkgver=0.12 -pkgrel=3 +pkgrel=4 pkgdesc="Monitor and display application startup" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/t1lib/PKGBUILD b/extra/t1lib/PKGBUILD index 50d8a4c8e..0e40c7abc 100644 --- a/extra/t1lib/PKGBUILD +++ b/extra/t1lib/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 137602 2011-09-10 01:36:02Z allan $ +# $Id: PKGBUILD 197366 2013-10-25 02:59:44Z allan $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Rainer Moll <renari@arcor.de> pkgname=t1lib pkgver=5.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts" arch=('i686' 'x86_64') url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html" license=('GPL') depends=('libxaw') -options=(!libtool) source=(http://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${pkgver}.tar.gz ) md5sums=('a5629b56b93134377718009df1435f3c') diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD index 4a5debbc0..eed121180 100644 --- a/extra/taglib/PKGBUILD +++ b/extra/taglib/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166944 2012-09-22 20:46:26Z tomegun $ +# $Id: PKGBUILD 197386 2013-10-25 08:45:00Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Ike Devolder <ike.devolder@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=taglib -pkgver=1.8 +pkgver=1.9.1 pkgrel=1 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ license=('LGPL' 'MPL') depends=('sh' 'zlib' 'gcc-libs') makedepends=('cmake' 'pkg-config') options=('!libtool') -source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('dcb8bd1b756f2843e18b1fdf3aaeee15') +source=("http://${pkgname}.github.io/releases/${pkgname}-${pkgver}.tar.gz") +md5sums=('0d35df96822bbd564c5504cb3c2e4d86') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index dae18ef83..0b73c22fe 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194660 2013-09-20 16:55:21Z eric $ +# $Id: PKGBUILD 197360 2013-10-25 02:54:13Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=tcl @@ -9,6 +9,7 @@ arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') depends=('zlib') +options=('staticlibs') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) sha1sums=('5c83d44152cc0496cc0847a2495f659502a30e40') diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index 20e030652..c8dc7bf0c 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194661 2013-09-20 16:55:22Z eric $ +# $Id: PKGBUILD 197364 2013-10-25 02:55:42Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=tk @@ -9,6 +9,7 @@ arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') +options=('staticlibs') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) sha1sums=('ecfcc20833c04d6890b14a7920a04d16f2123a51') diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD index 36a06ccae..9f1ab59c8 100644 --- a/extra/unixodbc/PKGBUILD +++ b/extra/unixodbc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145345 2011-12-21 20:47:39Z andrea $ +# $Id: PKGBUILD 197416 2013-10-25 18:23:06Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=unixodbc -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources" arch=('i686' 'x86_64') @@ -12,17 +12,21 @@ license=('GPL2' 'LGPL2.1') url="http://www.unixodbc.org/" backup=('etc/odbc.ini' 'etc/odbcinst.ini') depends=('readline' 'libltdl') -options=('!libtool') source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz") -md5sums=('86788d4006620fa1f171c13d07fdcaab') +md5sums=('5e4528851eda5d3d4aed249b669bd05b') build() { - cd ${srcdir}/unixODBC-${pkgver} + cd unixODBC-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc make } +check() { + cd unixODBC-${pkgver} + make -k check +} + package() { - cd ${srcdir}/unixODBC-${pkgver} + cd unixODBC-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index c9186597f..87f417a1e 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 195902 2013-10-04 17:29:00Z bpiotrowski $ +# $Id: PKGBUILD 197395 2013-10-25 12:07:13Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD index 026657181..592ae820e 100644 --- a/extra/xmms/PKGBUILD +++ b/extra/xmms/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171126 2012-11-16 19:24:09Z eric $ +# $Id: PKGBUILD 197428 2013-10-25 19:50:15Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xmms pkgver=1.2.11 -pkgrel=6 +pkgrel=7 pkgdesc="The X MultiMedia System - a multimedia player" arch=('i686' 'x86_64') url="http://legacy.xmms2.org/" @@ -14,7 +14,6 @@ optdepends=('libmikmod: for the MikMod input plugin' \ 'libvorbis: for the Ogg Vorbis input plugin' \ 'alsa-lib: for the alsa output plugin' \ 'libgl: for the OpenGL Spectrum analyser visualization plugin') -options=('!libtool') install=xmms.install source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \ xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \ @@ -35,9 +34,8 @@ sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' 'f24071ae484d9b55e61dba076801fa8e7976ff2f' '485c67cb8c8d4678bb3b0b280d2e233b14153b22') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - +prepare() { + cd ${pkgname}-${pkgver} # Fix xmms.desktop patch -p0 < ../xmms-menu.patch # Patch for hang with xmms-crossfade @@ -51,7 +49,10 @@ build() { patch -p1 < ../xmms-1.2.10-fonts.patch patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch patch -p1 < ../xmms-1.2.11-fix-mikmod-driver.patch +} +build() { + cd ${pkgname}-${pkgver} if [ "$CARCH" == "i686" ]; then SIMDOPT="--enable-simd" else @@ -62,7 +63,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 xmms/xmms.desktop "${pkgdir}/usr/share/applications/xmms.desktop" diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD index 2ad0797a5..5ef4629a6 100644 --- a/extra/xvidcore/PKGBUILD +++ b/extra/xvidcore/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194593 2013-09-19 00:27:32Z dan $ +# $Id: PKGBUILD 197326 2013-10-25 02:31:05Z bisson $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=xvidcore pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="XviD is an open source MPEG-4 video codec" arch=('i686' 'x86_64') url="http://www.xvid.org/" diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD index 520ab11ea..d3ba402b8 100644 --- a/extra/zenity/PKGBUILD +++ b/extra/zenity/PKGBUILD @@ -1,26 +1,31 @@ -# $Id: PKGBUILD 183472 2013-04-21 22:12:29Z heftig $ +# $Id: PKGBUILD 197413 2013-10-25 15:49:33Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=zenity -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Display graphical dialog boxes from shell scripts" arch=(i686 x86_64) -license=('LGPL') -depends=('gtk3' 'libnotify') -makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl') +license=(LGPL) +depends=(gtk3 libnotify) +makedepends=(intltool gtk-doc itstool docbook-xsl git gnome-common yelp-tools) url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('94fbf0b71592f26dce0e2c49b82b4401139c8434084ad24c2c6a61ace1e6563f') +source=(git://git.gnome.org/zenity#tag=ZENITY_3_10_0) +sha256sums=('SKIP') + +prepare() { + cd $pkgname + git cherry-pick -n 80bc8ce643979fec201c4ebd5cd6405b6310357f +} build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ + cd $pkgname + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var make } package() { - cd $pkgname-$pkgver + cd $pkgname make DESTDIR="${pkgdir}" install } diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index 0f4741470..aba7152a0 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -3,7 +3,7 @@ # Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=crosstool-ng -pkgver=1.18.0 +pkgver=1.19.0 pkgrel=1 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)" arch=('i686' 'x86_64') @@ -14,7 +14,6 @@ makedepends=('libtool') optdepends=('subversion: for retrieving eglibc sources') source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2) #libc_ports_short_name.patch) -md5sums=('3376d389c632baa77f0bce1db1a196a9') build() { cd $srcdir/$pkgname-$pkgver @@ -30,3 +29,5 @@ package() { install -Dm644 ct-ng.comp ${pkgdir}/usr/share/bash-completion/completions/ct-ng } +sha1sums=('b7ae3e90756b499ff5362064b7d80f8a45d09bfb') +sha256sums=('cd54f20bb8190533b21c9cf7f93c9073c22d59541f52774c3f3053264ba53a93') diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 17d1105e3..465072d3a 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 195012 2013-09-24 14:12:15Z heftig $ +# $Id: PKGBUILD 197399 2013-10-25 12:22:28Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=gst-plugins-bad pkgname=$_pkgname-libre pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls') -makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi') +makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi' + 'gobject-introspection') provides=($_pkgname=$pkgver) conflicts=$_pkgname replaces=$_pkgname diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 329c5186c..593042e3e 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183943 2013-04-29 17:33:53Z bpiotrowski $ +# $Id: PKGBUILD 197398 2013-10-25 12:22:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') pkgver=0.10.23 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index faa53de37..717b56af5 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193127 2013-08-17 00:43:52Z eric $ +# $Id: PKGBUILD 197402 2013-10-25 12:27:32Z giovanni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=36285 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index fe188f50e..a298033c4 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95856 2013-08-17 15:21:03Z foutrelis $ +# $Id: PKGBUILD 99192 2013-10-25 12:40:52Z giovanni $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre pkgver=36265 -pkgrel=4 +pkgrel=5 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" diff --git a/pcr/fsniper/PKGBUILD b/pcr/fsniper/PKGBUILD new file mode 100644 index 000000000..bf7e3a6c3 --- /dev/null +++ b/pcr/fsniper/PKGBUILD @@ -0,0 +1,32 @@ +# Initial Contributor: andrewy +# Actual Contributor: Luca Cesari <luca.cesari@bewq.org> + +arch=(i686 x86_64) +pkgname=fsniper +pkgver=1.3.1 +pkgrel=2 +pkgdesc="Daemon to run scripts based on changes in files monitored by inotify" +url="http://projects.l3ib.org/fsniper/" +license="GPL3" +depends=('pcre' 'file') +source=(http://projects.l3ib.org/fsniper/files/$pkgname-$pkgver.tar.gz) +md5sums=('62f30bb4b00f9499499d83a30281f10f') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install + + install -m644 -D ${srcdir}/$pkgname-$pkgver/README \ + ${pkgdir}/usr/share/${pkgname}/README + install -m644 -D ${srcdir}/$pkgname-$pkgver/example.conf \ + ${pkgdir}/usr/share/${pkgname}/example.conf + +} |