diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-25 13:34:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-25 13:34:49 +0100 |
commit | 416f65d4b97ff26629ddfa1b40ea2041c3e75358 (patch) | |
tree | 61e28b785eb3aa9e55ea269e170277b3d3b6e1fa /community | |
parent | b14277452871db749ef4faa7db7e69bfce39f1a7 (diff) | |
parent | 6fbdd2899f39266e458531dcffefb85b9ce8d1b9 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libnewt/PKGBUILD
community/luasec/PKGBUILD
extra/expect/PKGBUILD
extra/fribidi/PKGBUILD
extra/goffice/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
Diffstat (limited to 'community')
32 files changed, 197 insertions, 113 deletions
diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD index 86070b157..741d4beef 100644 --- a/community/distcc/PKGBUILD +++ b/community/distcc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81014 2012-12-10 10:16:44Z spupykin $ +# $Id: PKGBUILD 81575 2012-12-24 15:00:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=distcc pkgver=3.1 -pkgrel=9 +pkgrel=10 pkgdesc="A distributed C, C++, Obj C compiler" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/distcc/" @@ -14,7 +14,8 @@ depends=('gcc' 'popt' 'avahi') makedepends=('gtk2' 'pkgconfig' 'python2' 'dbus') optdepends=('gtk2: for distccmon-gnome' 'python2') -backup=(etc/conf.d/distccd) +backup=('etc/conf.d/distccd' + 'etc/distcc/hosts') source=(http://distcc.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 distccd distccd.conf.d diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD index a9ef5470d..a13168cf5 100644 --- a/community/extremetuxracer/PKGBUILD +++ b/community/extremetuxracer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77630 2012-10-13 11:42:09Z allan $ +# $Id: PKGBUILD 81603 2012-12-25 00:34:08Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Eric Belanger <eric.archlinux.org> # Contributor: Fabio Scotoni <CCuleX.gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=extremetuxracer pkgver=0.4 -pkgrel=4 +pkgrel=5 pkgdesc="Downhill racing game starring Tux" arch=('i686' 'x86_64' 'mips64el') url="http://www.extremetuxracer.com" diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index c8cadf107..5df0d8411 100644 --- a/community/gnunet-gtk/PKGBUILD +++ b/community/gnunet-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79553 2012-11-07 10:36:11Z spupykin $ +# $Id: PKGBUILD 81579 2012-12-24 15:01:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet-gtk -pkgver=0.9.4 +pkgver=0.9.5 pkgrel=1 pkgdesc="A frontend for GNUnet" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('gnunet' 'glade' 'adns') makedepends=('pkgconfig') source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz) -md5sums=('cf4c949c20033fe2b392f1b478ce2522') +md5sums=('2e48a1e92de99b14c936a270bb05309a') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index bb716752f..57cf6657f 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79549 2012-11-07 09:34:47Z spupykin $ +# $Id: PKGBUILD 81577 2012-12-24 15:00:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet -pkgver=0.9.4 +pkgver=0.9.5 pkgrel=1 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz{,.sig} gnunet.service gnunet.conf.d defaults.conf) -md5sums=('ad4fa34cea8a9e905f1353b68db179ea' +md5sums=('9f617b1d5955283e5487e30bd661d3b5' '5baf691913b007fb33e365239e3f7217' '54cce3d2415d95b2e5bd1bd88db3a0ea' 'f161b46915736e4017e77ad735521453' diff --git a/community/gpsmanshp/PKGBUILD b/community/gpsmanshp/PKGBUILD index 0236d453a..312c95c5d 100644 --- a/community/gpsmanshp/PKGBUILD +++ b/community/gpsmanshp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67943 2012-03-16 11:12:57Z giovanni $ +# $Id: PKGBUILD 81604 2012-12-25 00:34:09Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=gpsmanshp pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Tcl package to read and write shapefiles" arch=('i686' 'x86_64' 'mips64el') url="http://gpsmanshp.sourceforge.net/" @@ -24,8 +24,8 @@ build() { # set install path sed -i -e "s|/usr/lib/tcl\$(TCLVERSION)|${pkgdir}/usr/lib/gpsmanshp|g" Makefile sed -i -e "s|tclsh\$(TCLVERSION)|tclsh|g" Makefile - sed -i "s|package-8.3.tcl|/usr/lib/tcl8.5/package.tcl|g" Makefile - sed -i "s|8.4|8.5|g" Makefile + sed -i "s|package-8.3.tcl|/usr/lib/tcl8.6/package.tcl|g" Makefile + sed -i "s|8.4|8.6|g" Makefile make } diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index ccba4b0c7..318020e6a 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81166 2012-12-12 17:43:14Z ttoepper $ +# $Id: PKGBUILD 81566 2012-12-24 12:23:53Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 pkgver=4.4 -pkgrel=1 +pkgrel=2 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') url="http://i3wm.org/" @@ -48,6 +48,17 @@ package() { ${pkgdir}/usr/share/man/man1/i3-migrate-config-to-v4.1 install -Dm644 man/i3-nagbar.1 \ ${pkgdir}/usr/share/man/man1/i3-nagbar.1 + install -Dm644 man/i3-dmenu-desktop.1 \ + ${pkgdir}/usr/share/man/man1/i3-dmenu-desktop.1 + install -Dm644 man/i3-dump-log.1 \ + ${pkgdir}/usr/share/man/man1/i3-dump-log.1 + install -Dm644 man/i3-sensible-editor.1 \ + ${pkgdir}/usr/share/man/man1/i3-sensible-editor.1 + install -Dm644 man/i3-sensible-pager.1 \ + ${pkgdir}/usr/share/man/man1/i3-sensible-pager.1 + install -Dm644 man/i3-sensible-terminal.1 \ + ${pkgdir}/usr/share/man/man1/i3-sensible-terminal.1 + install -Dm644 LICENSE \ ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE diff --git a/community/libnewt/PKGBUILD b/community/libnewt/PKGBUILD index b0493cd1f..8dc497fb9 100644 --- a/community/libnewt/PKGBUILD +++ b/community/libnewt/PKGBUILD @@ -1,35 +1,39 @@ +# $Id: PKGBUILD 81605 2012-12-25 00:34:10Z foutrelis $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tom Killian <tomk@runbox.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libnewt pkgver=0.52.12 -pkgrel=4 +_tclver=8.6 +pkgrel=5 pkgdesc="Not Erik's Windowing Toolkit - text mode windowing with slang" arch=('i686' 'x86_64' 'mips64el') -url="http://www.redhat.com" +url='http://www.redhat.com/' license=('GPL') depends=('slang' 'popt' 'gpm') -makedepends=('tcl' 'python2') +makedepends=("tcl>=$_tclver" 'python2') optdepends=('tcl: whiptcl support' \ 'python2: libnewt api through _snack module') options=('!makeflags') -source=(https://fedorahosted.org/releases/n/e/newt/newt-${pkgver}.tar.gz) -md5sums=('51b04128d9e1bf000fa769c417b74486') +source=("https://fedorahosted.org/releases/n/e/newt/newt-$pkgver.tar.gz") +sha256sums=('2ba88dc3d118daf509c58e3707c43ad57dd3415d8164054e93fe76439f348529') build() { - cd ${srcdir}/newt-${pkgver} - - sed -i "s:tcl8.4:tcl8.5:" Makefile.in - sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:" *.py - sed -i "s:/usr/bin/install:/bin/install:" po/Makefile - - ./configure --prefix=/usr --with-gpm-support - make + cd "$srcdir/newt-$pkgver" + + sed -i "s:tcl8.4:tcl$_tclver:" Makefile.in + sed -i 's:bin/python:bin/python2:' *.py + ./configure --prefix=/usr --with-gpm-support + echo '#define USE_INTERP_RESULT 1' >> config.h + make } package() { - cd ${srcdir}/newt-${pkgver} - - make prefix=${pkgdir}/usr install + cd "$srcdir/newt-$pkgver" + + make prefix="$pkgdir/usr" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD index f8c3089bc..f3276cc50 100644 --- a/community/luasec/PKGBUILD +++ b/community/luasec/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81272 2012-12-15 14:51:01Z seblu $ +# $Id: PKGBUILD 81569 2012-12-24 14:48:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.1@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> @@ -11,9 +11,8 @@ pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' arch=('i686' 'x86_64' 'mips64el') url='http://luasec.luaforge.net/' license=('MIT') -makedepends=('openssl' 'lua' 'lua51' 'lua51-socket') -conflicts=('luasec') -replaces=('luasec') +#makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket') +makedepends=('openssl' 'lua51' 'lua51-socket') source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/luasec-$pkgver.tar.gz") md5sums=('b8a5fde3b3fdb6174f54cd51d7f53e12') @@ -38,6 +37,8 @@ build() { package_lua51-sec() { depends=('openssl' 'lua51' 'lua51-socket') + conflicts=('luasec') + replaces=('luasec') install -dm755 "$pkgdir/usr/lib/lua/5.1" cd luasec-$pkgver-51 diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index d47ac8e7a..f34697d7a 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80710 2012-11-30 12:11:12Z stephane $ +# $Id: PKGBUILD 81606 2012-12-25 00:34:11Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -7,7 +7,7 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') pkgver=1.2.0 -pkgrel=6 +pkgrel=8 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64') url='http://matplotlib.org' diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD index a4c727873..fbe0466a0 100644 --- a/community/python2-imaging/PKGBUILD +++ b/community/python2-imaging/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78281 2012-10-17 10:28:39Z allan $ +# $Id: PKGBUILD 81607 2012-12-25 00:34:12Z foutrelis $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,7 +6,7 @@ pkgname=python2-imaging pkgver=1.1.7 -pkgrel=5 +pkgrel=6 pkgdesc="PIL. Provides image processing capabilities for python" arch=('i686' 'x86_64' 'mips64el') url="http://www.pythonware.com/products/pil/index.htm" diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index d9728ce84..1093b1bc1 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80475 2012-11-22 15:02:06Z spupykin $ +# $Id: PKGBUILD 81583 2012-12-24 15:02:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot pkgver=1.6.3 -pkgrel=3 +pkgrel=4 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') @@ -21,25 +21,28 @@ backup=('etc/schroot/schroot.conf' 'etc/schroot/arch32/nssdatabases') options=(!libtool) source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" - 'pam.d.schroot.patch' 'arch32-example' 'arch32-config' 'arch32-copyfiles' 'arch32-mount' 'arch32-nssdatabases' + 'pam.d.schroot.patch' + 'colon-completion.patch' 'fix-bash-completion.patch') md5sums=('f6b1badef213ce8e9ef37bb3fc213390' - 'a8d77cac806a0a9adef3f93cdbeb280a' '54239847f89b9a4772910415bde6276a' '5a3f7b839c7e0b8933748da7c5b6385b' 'ddb2f09c02b24dab777110f9808472e1' 'f0d5d5b5e34a860f6f90b5628c680f46' 'af1da6edd8c8c0dafeeb2c2c4e0c840b' + 'a8d77cac806a0a9adef3f93cdbeb280a' + '8502fcc9112c2971bcae35373d2ff42f' '5ba775d4f401e2c167414caa548b71e5') build() { cd ${pkgname}-${pkgver} patch -p1 -i ${srcdir}/fix-bash-completion.patch + patch -p1 -i ${srcdir}/colon-completion.patch export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" ./configure \ --prefix=/usr \ diff --git a/community/schroot/colon-completion.patch b/community/schroot/colon-completion.patch new file mode 100644 index 000000000..5cd8f8996 --- /dev/null +++ b/community/schroot/colon-completion.patch @@ -0,0 +1,38 @@ +From 1563e1ba9bc2b317390ef305ae9af56a4b976940 Mon Sep 17 00:00:00 2001 +From: Peter Wu <lekensteyn@gmail.com> +Date: Sat, 22 Dec 2012 16:37:00 +0100 +Subject: [PATCH] etc: make bash completion work for colon values + +--chroot (and -c) accept values like chroot:foo and session:foo-abc. Standard +bash completion treats colons as whitespace, hence we need a way to force that +off. + +Fix based on http://stackoverflow.com/q/10528695/427545 (thanks Radu Gasler!) +--- + etc/bash_completion/schroot | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/etc/bash_completion/schroot b/etc/bash_completion/schroot +index 035f0b3..7cda29b 100644 +--- a/etc/bash_completion/schroot ++++ b/etc/bash_completion/schroot +@@ -21,14 +21,14 @@ _schroot() + local cur prev options + + COMPREPLY=() +- cur=${COMP_WORDS[COMP_CWORD]} +- prev=${COMP_WORDS[COMP_CWORD-1]} ++ _get_comp_words_by_ref -n : cur prev + + # Select precisely the tokens from schroot --help that begin with a dash + options=$(schroot --help | sed 's/\(^\|[[:space:]]\)[^[:space:]-][^[:space:]]*//g') + + if [ "$prev" = "-c" ] || [ "$prev" = "--chroot" ]; then + COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) ++ __ltrim_colon_completions "$cur" + else + COMPREPLY=( $(compgen -W "$options" -- $cur) ) + fi +-- +1.8.0.2 + diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index 4e84fe2d1..64b1b7032 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 78374 2012-10-17 15:45:43Z spupykin $ +# $Id: PKGBUILD 81608 2012-12-25 00:34:13Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ConnorBehan <connor.behan@gmail.com> pkgname=sk1 pkgver=0.9.1 -pkgrel=8 +pkgrel=9 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64 'mips64el') url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl>=7.6' 'tk>=4.2' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') +depends=('tcl' 'tk' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') license=('GPL' 'LGPL') source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz sk1.desktop build-fix.patch) md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' 'bbf6f10b8155838eede93b5abed724f5' - 'de144f0193cf1cd61771ce7bc782dba2') + 'b22c3c7b6a979c0a4e59ecaa2bd2182b') build() { local _tclver=`pacman -Q tcl` diff --git a/community/sk1/build-fix.patch b/community/sk1/build-fix.patch index 37bc8e135..caf3369ee 100644 --- a/community/sk1/build-fix.patch +++ b/community/sk1/build-fix.patch @@ -8,7 +8,7 @@ diff -wbBur sK1-0.9.1pre/setup.py sK1-0.9.1pre.my/setup.py - tcl_include_dirs = [] - tcl_ver='' + tcl_include_dirs = ['/usr/include'] -+ tcl_ver='8.5' ++ tcl_ver='8.6' if os.path.isdir('/usr/include/tcl8.5'): tcl_include_dirs = ['/usr/include/tcl8.5'] tcl_ver ='8.5' diff --git a/community/slrn/PKGBUILD b/community/slrn/PKGBUILD index a2f51379d..cb243eb12 100644 --- a/community/slrn/PKGBUILD +++ b/community/slrn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65449 2012-02-21 05:51:03Z spupykin $ +# $Id: PKGBUILD 81585 2012-12-24 15:02:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> pkgname=slrn -pkgver=0.9.9p1 -pkgrel=7 +pkgver=1.0.1 +pkgrel=1 pkgdesc="An open source text-based news client" arch=('i686' 'x86_64' 'mips64el') url="http://www.slrn.org/" @@ -15,7 +15,7 @@ optdepends=('metamail') options=('!makeflags' 'docs' 'zipman') backup=(etc/slrnrc) source=(http://downloads.sourceforge.net/slrn/$pkgname-$pkgver.tar.gz) -md5sums=('6cc8ac6baaff7cc2a8b78f7fbbe3187f') +md5sums=('232670ab76a045967b137e5124b3d681') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD index 33c81da15..d6f876680 100644 --- a/community/smalltalk/PKGBUILD +++ b/community/smalltalk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70029 2012-04-28 09:24:19Z allan $ +# $Id: PKGBUILD 81609 2012-12-25 00:34:14Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mrshpot <mrshpot at gmail dot com> @@ -6,14 +6,14 @@ pkgname=smalltalk pkgver=3.2.4 -pkgrel=7 +pkgrel=8 pkgdesc='Implementation of Smalltalk-80' url='http://smalltalk.gnu.org/' license=('GPL' 'LGPL') arch=('i686' 'x86_64' 'mips64el') options=('!libtool' '!emptydirs') depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl') -makedepends=('gdbm' 'gtk2' 'sqlite' 'tk' 'zip') +makedepends=('gdbm' 'gtk2' 'sqlite' 'tk>=8.6' 'zip') install=smalltalk.install source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") sha256sums=('901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc1eb1b3') @@ -37,21 +37,20 @@ build() { --with-tk \ --with-x \ --without-emacs - + echo '#define USE_INTERP_RESULT 1' >> config.h make } check() { cd "$srcdir/$pkgname-$pkgver" -# make check + #make check } package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - # fix manpage symlink rm -f "$pkgdir/usr/share/man/man1/gst-reload.1" ln -s gst-load.1 "$pkgdir/usr/share/man/man1/gst-reload.1" diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index d2158b718..70abb0e20 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81186 2012-12-12 20:10:52Z bpiotrowski $ +# $Id: PKGBUILD 81564 2012-12-24 11:13:50Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.8.3 -pkgrel=2 +pkgver=0.8.4 +pkgrel=1 pkgdesc='Multi-panel tabbed file manager' arch=('i686' 'x86_64' 'mips64el') url='http://ignorantguru.github.com/spacefm/' @@ -21,7 +21,7 @@ optdepends=('lsof: device processes' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz) -md5sums=('247165245bb3d6f5afbff07649fe8f57') +md5sums=('6ba8170c61c6cbe81b3daa67e617068a') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index 1552be656..e4bce6f69 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77464 2012-10-10 16:04:46Z spupykin $ +# $Id: PKGBUILD 81587 2012-12-24 15:03:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.1.2 +pkgver=10.1.3 pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat' source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat sysstat.service) -md5sums=('c40626b96cc2b4cf303cbcf1efc96eba' +md5sums=('e08b5665956930ad12b10ed6e0a08b10' '3ce41ebf7330aba01e70b38658afed1f' '12ba479c606620193e8b7c6e982d5088') diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 74342dab5..0238e2885 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81096 2012-12-11 19:14:52Z spupykin $ +# $Id: PKGBUILD 81589 2012-12-24 15:03:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=33.4.0 +pkgver=33.5.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('5e553e3061b978b368e1dc70ee369c8d' +md5sums=('7a55b22b1ce0fda61d6be6244ec4c3db' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/tksystray/PKGBUILD b/community/tksystray/PKGBUILD index bbb1b64c1..501e1087f 100644 --- a/community/tksystray/PKGBUILD +++ b/community/tksystray/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65405 2012-02-21 03:27:16Z spupykin $ +# $Id: PKGBUILD 81610 2012-12-25 00:34:16Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Pavel Borzenkov <pavel.borzenkov@gmail.com> pkgname=tksystray pkgver=0.1 -pkgrel=5 +pkgrel=6 pkgdesc="tksystray is compatible with freedesktop.org standarts systray for Tk" arch=('i686' 'x86_64' 'mips64el') url="http://tkabber.jabber.ru/tksystray" diff --git a/community/tktheme/PKGBUILD b/community/tktheme/PKGBUILD index 75e103881..dad5be087 100644 --- a/community/tktheme/PKGBUILD +++ b/community/tktheme/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65407 2012-02-21 03:28:00Z spupykin $ +# $Id: PKGBUILD 81611 2012-12-25 00:34:17Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: slubman <slubman@slubman.net> pkgname=tktheme pkgver=0.23 -pkgrel=7 +pkgrel=8 pkgdesc="A library to allow Tkabber docking in the system tray." arch=('i686' 'x86_64' 'mips64el') depends=('tk' 'libxpm' 'libxmu') diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index e172e043a..c6aa0d0fc 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 78917 2012-10-27 18:38:36Z seblu $ +# $Id: PKGBUILD 81591 2012-12-24 16:25:33Z seblu $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') -pkgver=4.2.4 +pkgver=4.2.6 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-lts-headers' - "virtualbox-host-source>=$pkgver" - "virtualbox-guest-source>=$pkgver" + "virtualbox-host-dkms>=$pkgver" + "virtualbox-guest-dkms>=$pkgver" 'expac') build() { diff --git a/community/virtualbox-modules-lts/build.sh b/community/virtualbox-modules-lts/build.sh index bbf855c1a..961a6afab 100755 --- a/community/virtualbox-modules-lts/build.sh +++ b/community/virtualbox-modules-lts/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 338b4763d..a3f87ede8 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 79182 2012-10-31 07:25:55Z tpowa $ +# $Id: PKGBUILD 81593 2012-12-24 16:28:35Z seblu $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.4 -pkgrel=2 +pkgver=4.2.6 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-headers' - "virtualbox-host-source>=$pkgver" - "virtualbox-guest-source>=$pkgver" + "virtualbox-host-dkms>=$pkgver" + "virtualbox-guest-dkms>=$pkgver" 'expac') build() { # current kernel version + _kernver=3.7.0-1-ARCH _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.6.0-1-ARCH # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -31,13 +31,13 @@ build() { package_virtualbox-host-modules(){ pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.6' 'linux<3.7') + depends=('linux>=3.7' 'linux<3.8') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install + _kernver=3.7.0-1-ARCH _kernver=$(expac -Q '%v' linux-headers)-ARCH - # _kernver=3.6.0-1-ARCH _extraver=extramodules-${_kernver%.*}-ARCH install -dm755 "$pkgdir/usr/lib/modules/$_extraver" @@ -50,13 +50,13 @@ package_virtualbox-host-modules(){ package_virtualbox-guest-modules(){ pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.6' 'linux<3.7') + depends=('linux>=3.7' 'linux<3.8') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install + _kernver=3.7.0-1-ARCH _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.6.0-1-ARCH _extraver=extramodules-${_kernver%.*}-ARCH install -dm755 "$pkgdir/usr/lib/modules/$_extraver" diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh index 371c9b982..476449541 100755 --- a/community/virtualbox-modules/build.sh +++ b/community/virtualbox-modules/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index e5d1038af..110042ad7 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 3f2ed4a10..b32e5c46e 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 6b53c1faf..b322bb75a 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79495 2012-11-06 06:33:11Z aginiewicz $ +# $Id: PKGBUILD 81612 2012-12-25 00:34:18Z foutrelis $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -10,7 +10,7 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=1 +pkgrel=2 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' @@ -24,18 +24,20 @@ optdepends=('python2: python bindings' 'graphviz: drawing tools') source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz" - ffmpeg-0.8.diff ffmpeg-0.11.diff) + ffmpeg-0.8.diff ffmpeg-0.11.diff tcl-8.6.diff) md5sums=('264b0052e65bd6571a84727113508789' 'b6355063264cd56bcd1396c92f6ca59a' 'e992321c9d1def6034d0fa6607b40c5a' - '81922ea61989e5591135f233a0400694') + '81922ea61989e5591135f233a0400694' + 'a804a9f034e24ef1a8b28542c15ce1a1') build() { cd "${srcdir}"/VTK$pkgver - # fix compilation error: + # fix compilation errors: patch -Np1 -i "${srcdir}/ffmpeg-0.8.diff" patch -Np1 -i "${srcdir}/ffmpeg-0.11.diff" + patch -Np1 -i "${srcdir}/tcl-8.6.diff" cd "${srcdir}" diff --git a/community/vtk/tcl-8.6.diff b/community/vtk/tcl-8.6.diff new file mode 100644 index 000000000..6152a8fa7 --- /dev/null +++ b/community/vtk/tcl-8.6.diff @@ -0,0 +1,13 @@ +--- VTK5.10.1/Common/vtkTcl.h 2012-10-15 22:33:21.000000000 +0200 ++++ VTK5.10.1/Common/vtkTcl.h.new 2012-12-22 12:27:56.176482722 +0100 +@@ -17,6 +17,10 @@ + + #include "vtkConfigure.h" + ++// see http://paraview.org/Bug/view.php?id=11810 ++#define USE_INTERP_RESULT ++#define USE_INTERP_ERRORLINE ++ + #ifdef VTK_TCL_TK_STATIC + # ifndef STATIC_BUILD + # define STATIC_BUILD diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index 8e0309a83..e3d81614f 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65237 2012-02-20 12:28:08Z spupykin $ +# $Id: PKGBUILD 81613 2012-12-25 00:34:18Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: simo <simo@archlinux.org> pkgname=xcircuit pkgver=3.7.26 -pkgrel=2 +pkgrel=3 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64' 'mips64el') url="http://opencircuitdesign.com/xcircuit" diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index be2f06dcb..0cbac9901 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80926 2012-12-07 02:04:08Z seblu $ +# $Id: PKGBUILD 81614 2012-12-25 00:34:19Z foutrelis $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc pkgver=1.0 -pkgrel=2 +pkgrel=4 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') diff --git a/community/znc/znc.install b/community/znc/znc.install index 92bc0572a..e5dd6575a 100644 --- a/community/znc/znc.install +++ b/community/znc/znc.install @@ -3,7 +3,19 @@ # arg 1: the new package version post_install() { getent group znc >/dev/null || groupadd -g 136 znc - getent passwd znc >/dev/null || useradd -d /var/empty -u 136 -g 136 znc + getent passwd znc >/dev/null || useradd -r -d /var/lib/znc -u 136 -g 136 znc + [ -d /var/lib/znc ] || install -dm 750 -o znc -g znc /var/lib/znc + echo "==> Use 'znc --makeconf' as user znc to generate your first config" + true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "`vercmp $2 1.0-4`" -lt 0 ]; then + [ -d /var/lib/znc ] || install -dm 750 -o znc -g znc /var/lib/znc + usermod -d /var/lib/znc znc 2>/dev/null && echo '==> znc home directory has moved to /var/lib/znc' + fi true } |