diff options
| author | root <root@rshg054.dnsready.net> | 2012-12-25 02:32:08 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-12-25 02:32:08 -0800 |
| commit | 6fbdd2899f39266e458531dcffefb85b9ce8d1b9 (patch) | |
| tree | 7d290e717ddd4dab90362a017be197c551dd2ae0 | |
| parent | 6003fa8908f984a4696fade78b69a8803eabcc6c (diff) | |
Tue Dec 25 02:27:55 PST 2012
58 files changed, 377 insertions, 260 deletions
diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD index 367110407..4c3bd645e 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') 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 46e21f075..0cfcb0613 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=('x86_64' 'i686') url="http://www.extremetuxracer.com" diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index b7233f509..618d79414 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') @@ -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 a75b774cc..c579825ee 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') @@ -20,7 +20,7 @@ source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz 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 972e8f837..a34ddd3a9 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') 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 b59fdb11d..071f832f3 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') 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 0c90df25b..3719e587e 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') -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 7c61dc84c..ac93b46cb 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') url='http://luasec.luaforge.net/' license=('MIT') -makedepends=('openssl' 'lua' 'lua-socket' '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 49b368ada..aa479aafc 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') url="http://www.pythonware.com/products/pil/index.htm" diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 3e850460d..f9b2fdeb3 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 a88efc2db..ce9d43be2 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) 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 9daf9d968..598c62561 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') 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 50f5808b5..611f57912 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=('x86_64' 'i686') 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 141c92db8..e453a647e 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') 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 0c7867a38..12bb3329e 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') @@ -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 4963b8e0c..592665ab0 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') @@ -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 b55b0a68d..e3fff8ef4 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') url="http://tkabber.jabber.ru/tksystray" diff --git a/community/tktheme/PKGBUILD b/community/tktheme/PKGBUILD index b9eb32549..869dfe6ee 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') 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 092bcbb53..3cc2b9c2b 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') url="http://opencircuitdesign.com/xcircuit" diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 049b311dc..b3edff7b1 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 } diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index de38d7e18..87de7f300 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172193 2012-12-02 04:25:56Z stephane $ +# $Id: PKGBUILD 173838 2012-12-25 00:34:16Z foutrelis $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.4 -pkgrel=1 +pkgrel=2 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64') url="http://mielke.cc/brltty" @@ -26,6 +26,7 @@ md5sums=('8ebe96efe679f5f6ccff08928fec5b26' '7acecd700b9f94d76fe4a6ad56cb0448') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i 's|/usr/bin/python|/usr/bin/python2|' Tables/latex-access.ctb ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ diff --git a/extra/expect/PKGBUILD b/extra/expect/PKGBUILD index 140b4a43f..5af97256a 100644 --- a/extra/expect/PKGBUILD +++ b/extra/expect/PKGBUILD @@ -1,32 +1,20 @@ -# $Id: PKGBUILD 151250 2012-02-25 10:00:44Z allan $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 173839 2012-12-25 00:34:18Z foutrelis $ +# Maintainer: Allan McRae <allan@archlinux.org> pkgname=expect pkgver=5.45 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for automating interactive applications" arch=('i686' 'x86_64') url="http://www.nist.gov/el/msid/expect.cfm" license=('custom') -depends=('tcl>=8.5.3') -conflicts=('expectk') -install=expect.install -changelog=ChangeLog +depends=('tcl') source=(http://downloads.sourceforge.net/project/expect/Expect/${pkgver}/expect${pkgver}.tar.gz) -# CVS checkout on gerolde. -#source=(ftp://ftp.archlinux.org/other/expect/expect-${pkgver}.tar.bz2) -# old nist source=(http://expect.nist.gov/src/expect-${pkgver}.tar.bz2) md5sums=('44e1a4f4c877e9ddc5a542dfa7ecc92b') build() { cd ${srcdir}/expect${pkgver} - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --mandir=/usr/share/man --with-tcl=/usr/lib \ - --with-tclinclude=/usr/include - - # Keep $startdir/pkg out of library search paths. - sed -e 's/-rpath,${LIB_RUNTIME_DIR}:/-rpath,/' -i Makefile + ./configure --prefix=/usr --mandir=/usr/share/man make } @@ -34,9 +22,5 @@ package() { cd ${srcdir}/expect${pkgver} make DESTDIR=${pkgdir} install - # license. install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README - - (cd ${pkgdir}/usr/lib; - ln -s expect${pkgver}/libexpect${pkgver}.so libexpect.so) } diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index a19e91469..2373b5e23 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 173148 2012-12-11 16:53:09Z pierre $ +# $Id: PKGBUILD 173827 2012-12-24 15:21:34Z pierre $ pkgname=fetchmail -pkgver=6.3.23 +pkgver=6.3.24 pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64') @@ -17,8 +17,8 @@ install='fetchmail.install' source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz" "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" 'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service') -sha1sums=('ac3a4a16dff60fe2651fdcf3d146c91399af2a27' - 'ec1268dad146d55b45dd3fb043613a7af77b890d' +sha1sums=('8cb2aa3a85dd307ccd1899ddbb4463e011048535' + 'dff091c04ab64c25f7b6af758f93a75b969117e0' 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88' '30401729386d6f774c6c36ab8530842166de54a8' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD index 3bd5ad3b8..d6ee77d99 100644 --- a/extra/fribidi/PKGBUILD +++ b/extra/fribidi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165893 2012-09-03 05:58:50Z giovanni $ +# $Id: PKGBUILD 173837 2012-12-24 18:38:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Nezmer <Nezmer@gmail.com> pkgname=fribidi -pkgver=0.19.4 +pkgver=0.19.5 pkgrel=1 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://fribidi.org" depends=('glibc') options=('!libtool') source=("http://fribidi.org/download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0173f98ff929782d45819fc4a813c175') +md5sums=('925bafb97afee8a2fc2d0470c072a155') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 95b16c353..8841c00a9 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165143 2012-08-11 18:49:18Z eric $ +# $Id: PKGBUILD 173829 2012-12-24 16:03:19Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash pkgver=2.4.11 -pkgrel=1 +pkgrel=2 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') url="http://www.gnucash.org" license=("GPL") -depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') +depends=('gtkhtml' 'slib' 'goffice0.8' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') makedepends=('intltool') optdepends=('evince: for print preview' 'perl-finance-quote: for stock information lookups' diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 7b72f42ab..97721c542 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 160479 2012-06-02 10:26:10Z bluewind $ +# $Id: PKGBUILD 173830 2012-12-24 16:09:54Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.10.17 -pkgrel=2 +pkgver=1.12.0 +pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/gnumeric/" license=('GPL') -depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gnome-doc-utils' 'pygobject' 'psiconv') -optdepends=('pygobject: for python plugin support' +depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils') +optdepends=('python2-gobject: for python plugin support' + 'perl: for perl plugin support' 'psiconv: for Psion 5 file support' 'yelp: for viewing the help manual') install=gnumeric.install -options=('libtool') +options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963') +sha256sums=('037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,15 +26,11 @@ build() { sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-schemas-install --enable-ssindex + --enable-ssindex --disable-schemas-compile make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnumeric "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -rf "${pkgdir}/etc/gconf" } diff --git a/extra/gnumeric/gnumeric.install b/extra/gnumeric/gnumeric.install index 50ee0a7e2..b4b8223dd 100644 --- a/extra/gnumeric/gnumeric.install +++ b/extra/gnumeric/gnumeric.install @@ -1,26 +1,19 @@ -pkgname=gnumeric - post_install() { usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q } pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/gnumeric.schemas ]; then + usr/sbin/gconfpkg --uninstall gnumeric + fi } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q + post_install } diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index a7a8f4fe9..835e9bf90 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 139546 2011-10-03 12:22:52Z jgc $ +# $Id: PKGBUILD 173831 2012-12-24 16:09:55Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.8.17 +pkgver=0.10.0 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64') url="http://www.gnome.org" license=('GPL') options=('!libtool') -depends=('gtk2' 'gconf' 'libgsf') -makedepends=('pkgconfig' 'intltool' 'gtk-doc') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - use-apiver-for-dirs.patch) -sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15' - '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270') +makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') +depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch" - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static --enable-introspection make } diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index b4f6cbf32..0ff14bf1d 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173173 2012-12-12 00:31:48Z eric $ +# $Id: PKGBUILD 173840 2012-12-25 00:34:21Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.28.0 -pkgrel=11 +pkgrel=12 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 0e8b300c4..d86e739e0 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 168480 2012-10-12 13:08:15Z tpowa $ +# $Id: PKGBUILD 173841 2012-12-25 00:34:23Z foutrelis $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' pkgname=('ocaml' 'ocaml-compiler-libs') pkgver=4.00.1 -pkgrel=1 +pkgrel=2 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') license=('LGPL2' 'custom: QPL-1.0') url="http://caml.inria.fr/" depends=('gdbm') -makedepends=('tk' 'ncurses>=5.6-7' 'libx11') +makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz) options=('!makeflags' '!emptydirs') diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index f946082a9..57d3b44e2 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169990 2012-10-30 23:00:51Z heftig $ +# $Id: PKGBUILD 173842 2012-12-25 00:34:26Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.6 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index b2499c72f..b6134b23d 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 166985 2012-09-24 14:37:09Z dan $ +# $Id: PKGBUILD 173844 2012-12-25 00:34:31Z foutrelis $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade pkgver=9.1.6 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0') -makedepends=('krb5' 'python2' 'perl' 'tcl') +makedepends=('krb5' 'python2' 'perl' 'tcl>=8.6.0') source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2) build() { diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 6bf31a402..50923c5c4 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 172927 2012-12-06 22:05:16Z dan $ +# $Id: PKGBUILD 173843 2012-12-25 00:34:29Z foutrelis $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.2.2 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') -makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') +makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0') source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 postgresql-run-socket.patch postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index a0d91ef66..36838775b 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 173215 2012-12-13 12:39:30Z stephane $ +# $Id: PKGBUILD 173845 2012-12-25 00:34:33Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python pkgver=3.3.0 -pkgrel=2 +pkgrel=3 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64') license=('custom') url="http://www.python.org/" depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk' 'sqlite' 'valgrind' 'bluez') +makedepends=('tk>=8.6.0' 'sqlite' 'valgrind' 'bluez') optdepends=('tk: for tkinter' 'sqlite') provides=('python3') replaces=('python3') diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 371909ecc..eedc2a87d 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 173214 2012-12-13 12:39:26Z stephane $ +# $Id: PKGBUILD 173846 2012-12-25 00:34:35Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 pkgver=2.7.3 -pkgrel=3 +pkgrel=4 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') license=('PSF') url="http://www.python.org/" depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') -makedepends=('tk' 'bluez') +makedepends=('tk>=8.6.0' 'bluez') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 2a04dc148..2c63cf703 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172476 2012-12-03 18:59:33Z ronald $ +# $Id: PKGBUILD 173847 2012-12-25 00:34:38Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r pkgver=2.15.2 -pkgrel=1 +pkgrel=2 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64') license=('GPL') @@ -13,7 +13,7 @@ url=('http://www.r-project.org/') depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils') -makedepends=('openjdk6' 'gcc-fortran' 'tk') +makedepends=('openjdk6' 'gcc-fortran' 'tk>=8.6.0') optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files') backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') options=('!makeflags' '!emptydirs') diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 4a1e736ae..83975e00e 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('ruby' 'ruby-docs') pkgver=1.9.3_p327 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' license=('BSD' 'custom') diff --git a/extra/serd/PKGBUILD b/extra/serd/PKGBUILD index 581d2b891..f191b5125 100644 --- a/extra/serd/PKGBUILD +++ b/extra/serd/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: speps <speps at aur dot archlinux dot org> pkgname=serd -pkgver=0.18.0 +pkgver=0.18.2 pkgrel=1 pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples." arch=(i686 x86_64) @@ -12,7 +12,7 @@ license=('custom:ISC') depends=('glibc') makedepends=('python2') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('96dbade2c81d6df8100a9ef605ce35f8') +md5sums=('0569c21860b2ed2744e42884069a40a2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD index b0196005d..d6aa46e7a 100644 --- a/extra/suil/PKGBUILD +++ b/extra/suil/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: speps <speps at aur dot archlinux dot org> pkgname=suil -pkgver=0.6.6 +pkgver=0.6.10 pkgrel=1 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=('python2' 'qt' 'gtk2') optdepends=('qt: Qt UIs wrapping support' 'gtk2: Gtk2 UIs wrapping support') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('6b596ad806b7bf34dfba34afb48bb758') +md5sums=('735e3cc4d539059cf3948d3dba75807e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index 19b78fc17..e0072eeb2 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 170721 2012-11-10 04:48:01Z allan $ +# $Id: PKGBUILD 173849 2012-12-25 00:34:44Z foutrelis $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=tcl -pkgver=8.5.13 +pkgver=8.6.0 pkgrel=1 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -md5sums=('fa3a9bf9b2d6ed2431f1baa46f4058b8') +md5sums=('669b0103431babff2494f3f2637eb864') build() { cd ${srcdir}/tcl${pkgver}/unix - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit - fi + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT make } @@ -34,19 +31,11 @@ package() cd ${srcdir}/tcl${pkgver}/unix make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh + ln -sf tclsh8.6 ${pkgdir}/usr/bin/tclsh # install license install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE # remove buildroot traces - sed -i \ - -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \ - -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/include'," \ - -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \ - -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \ - -e "s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.5\$\{TCL_DBGX\}.so\"," \ - -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib'," \ - -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \ - ${pkgdir}/usr/lib/tclConfig.sh + sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh } diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD index 37f707e9e..bbcf6a742 100644 --- a/extra/timidity++/PKGBUILD +++ b/extra/timidity++/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165513 2012-08-21 19:57:50Z eric $ +# $Id: PKGBUILD 173850 2012-12-25 00:34:49Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=timidity++ pkgver=2.14.0 -pkgrel=3 +pkgrel=4 pkgdesc="A MIDI to WAVE converter and player" arch=('i686' 'x86_64') url="http://timidity.sourceforge.net" license=('GPL') -depends=('libao' 'libvorbis' 'jack' 'ncurses') -makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw') +depends=('libao' 'jack') +makedepends=('xaw3d' 'gtk2' 'tk' 'libxaw') optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \ 'xaw3d: for using the Xaw interface') backup=('etc/timidity++/timidity.cfg') @@ -22,6 +22,8 @@ sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b' build() { cd "${srcdir}/TiMidity++-${pkgver}" + sed -i -e 's/tcl8.5/tcl8.6 tcl8.5/' -e 's/tk8.5/tk8.6 tk8.5/' configure + sed -i 's/my_interp->result/(char *) Tcl_GetObjResult(my_interp)/' interface/tk_c.c ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \ --enable-server --enable-alsaseq --enable-spectrogram --enable-network --enable-xft \ --enable-audio=alsa,oss,ao,vorbis,flac,jack \ diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index b9bf23732..5ae48ad4a 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170723 2012-11-10 04:52:11Z allan $ +# $Id: PKGBUILD 173851 2012-12-25 00:34:54Z foutrelis $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tk -pkgver=8.5.13 +pkgver=8.6.0 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64') @@ -11,16 +11,13 @@ url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('1fc7dbb7495160756dbc805224afa360') +md5sums=('b883a1a3c489c17413fb602a94bf54e8') build() { cd ${srcdir}/tk${pkgver}/unix - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit - fi + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT make } @@ -34,23 +31,12 @@ package() { cd ${srcdir}/tk${pkgver}/unix make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf wish8.5 ${pkgdir}/usr/bin/wish - - # install private headers (FS#14388) - cd ${srcdir}/tk${pkgver} - for dir in compat generic generic/ttk unix; do - install -dm755 ${pkgdir}/usr/include/tk-private/$dir - install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h - done + ln -sf wish8.6 ${pkgdir}/usr/bin/wish # install license install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE # remove buildroot traces - sed -i \ - -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \ - -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \ - ${pkgdir}/usr/lib/tkConfig.sh + sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/tkConfig.sh + } diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index 7de13e63e..de0f280e3 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 173180 2012-12-12 00:32:10Z eric $ +# $Id: PKGBUILD 173852 2012-12-25 00:34:59Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat pkgver=0.3.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') url="http://www.weechat.org/" license=('GPL') depends=('gnutls' 'curl' 'libgcrypt') -makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 28bd195f9..2ec03a9e5 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171491 2012-11-18 04:23:42Z eric $ +# $Id: PKGBUILD 173826 2012-12-24 15:21:31Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh -pkgver=5.0.0 -pkgrel=3 +pkgver=5.0.2 +pkgrel=1 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64') url='http://www.zsh.org/' @@ -13,7 +13,7 @@ backup=('etc/zsh/zprofile') install=zsh.install source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'zprofile') -md5sums=('e8484468925cec8d9a84b8b04797e764' +md5sums=('b8f2ad691acf58b3252225746480dcad' '24a9335edf77252a7b5f52e079f7aef7') build() { diff --git a/multilib-staging/lib32-libphobos-ldc/PKGBUILD b/multilib-staging/lib32-libphobos-ldc/PKGBUILD new file mode 100644 index 000000000..aa67ac275 --- /dev/null +++ b/multilib-staging/lib32-libphobos-ldc/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 72029 2012-06-06 11:58:40Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=lib32-libphobos-ldc +pkgver=20121225 +pkgrel=1 +pkgdesc="libphobos for ldc (32-bit)" +arch=('x86_64') +url="http://www.dsource.org/projects/ldc" +license=('BSD') +depends=('llvm' 'libconfig') +makedepends=('git' 'cmake') +source=(fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch) +md5sums=('0dacd8e4b8f88030c107dbb2a35bcc42') + +_gitroot=git://github.com/ldc-developers/ldc.git +_gitname=ldc +_gitbranch=master + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone --branch "$_gitbranch" "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone --recursive "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + # llvm/Support/IRBuilder.h was relocated in LLVM 3.2 + patch -Np1 -i "$srcdir/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch" + + mkdir build && cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINCLUDE_INSTALL_DIR=/usr/include/d/std-ldc \ + -DMULTILIB=ON \ + .. + make +} + +package() { + cd "$srcdir/$_gitname-build" + + cd build + make DESTDIR=$pkgdir install + cd .. + + # We don't want anything but the 32-bit libs + rm -rf $pkgdir/usr/{share,lib,include,bin} $pkgdir/etc + + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/multilib-staging/lib32-libphobos-ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch b/multilib-staging/lib32-libphobos-ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch new file mode 100644 index 000000000..f5977e4a4 --- /dev/null +++ b/multilib-staging/lib32-libphobos-ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch @@ -0,0 +1,25 @@ +From 984207e348fe9ef1444cbec897cb8c429859a9c0 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Tue, 25 Dec 2012 04:55:30 +0200 +Subject: [PATCH] Fix llvm/IRBuilder.h include when using LLVM 3.2 + +--- + gen/passes/GarbageCollect2Stack.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gen/passes/GarbageCollect2Stack.cpp b/gen/passes/GarbageCollect2Stack.cpp +index f20bdd4..9927615 100644 +--- a/gen/passes/GarbageCollect2Stack.cpp ++++ b/gen/passes/GarbageCollect2Stack.cpp +@@ -27,7 +27,7 @@ + #include "llvm/Intrinsics.h" + #include "llvm/Support/CallSite.h" + #include "llvm/Support/CommandLine.h" +-#if LDC_LLVM_VER >= 303 ++#if LDC_LLVM_VER >= 302 + #include "llvm/IRBuilder.h" + #else + #include "llvm/Support/IRBuilder.h" +-- +1.8.0.2 + |