From d1d68784dc66793601c239fa64cc0e02ebd9444e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 3 Jan 2012 23:14:43 +0000 Subject: Tue Jan 3 23:14:42 UTC 2012 --- extra/bluefish/PKGBUILD | 12 +++++++----- extra/feh/PKGBUILD | 6 +++--- extra/zsh/PKGBUILD | 10 ++++++---- extra/zsh/svn-1.7.patch | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 extra/zsh/svn-1.7.patch (limited to 'extra') diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD index 7b2d84942..fcf9f4d25 100644 --- a/extra/bluefish/PKGBUILD +++ b/extra/bluefish/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 143599 2011-11-26 23:39:41Z eric $ +# $Id: PKGBUILD 145843 2012-01-02 20:31:09Z eric $ # Maintainer: Eric Bélanger pkgname=bluefish -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="A powerful HTML editor for experienced web designers and programmers" arch=('i686' 'x86_64') url="http://bluefish.openoffice.nl/" license=('GPL3') -depends=('gtk3' 'enchant' 'desktop-file-utils') +depends=('gtk3' 'enchant' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('gucharmap' 'intltool') optdepends=('gucharmap: for using the charmap plugin') options=('!libtool') install=bluefish.install source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig}) -sha1sums=('b8f5dad17c7365bc6f4342b6c22bdc328e31d20d' - 'faf37ece57fc155c3510e5d6cec5679f22cd11f4') +sha1sums=('f7b2e9915e196c971c6bcca04d8d6b87efab1ae6' + '89d5130d91999ff0319b709f0ed2cbcf7aa028d6') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + src/plugin_zencoding/zencoding/{,filters/,actions/}*.py ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-spell-check --disable-update-databases --disable-xml-catalog-update make diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 8f7577438..bb7f1e9ca 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141903 2011-11-03 00:30:00Z bisson $ +# $Id: PKGBUILD 145829 2012-01-02 13:33:45Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andrea Scarpino # Contributor: dorphell # Contributor: Tom Newsom pkgname=feh -pkgver=2.1 +pkgver=2.2 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('a5964122bf2ee2675eb9423dea7839410806fee9') +sha1sums=('655db5f558cdb268ff55cb088994d78331bd39aa') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 832edd85d..f34e49306 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145146 2011-12-18 00:41:44Z pierre $ +# $Id: PKGBUILD 145827 2012-01-02 12:43:36Z pierre $ # Maintainer: Pierre Schmitz pkgname=zsh pkgver=4.3.15 -pkgrel=1 +pkgrel=2 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64') url='http://www.zsh.org/' @@ -11,13 +11,15 @@ license=('custom') depends=('pcre' 'libcap' 'gdbm') install=zsh.install source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" - 'zprofile') + 'zprofile' 'svn-1.7.patch') backup=('etc/zsh/zprofile') md5sums=('11766b0dd674a513810903cd33ffcac4' - '24a9335edf77252a7b5f52e079f7aef7') + '24a9335edf77252a7b5f52e079f7aef7' + '4fcbc119fdb624a8c483a278f3a82efd') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/svn-1.7.patch" # FS#16360 sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ Doc/zsh.texi \ diff --git a/extra/zsh/svn-1.7.patch b/extra/zsh/svn-1.7.patch new file mode 100644 index 000000000..5ef314cc9 --- /dev/null +++ b/extra/zsh/svn-1.7.patch @@ -0,0 +1,34 @@ +diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn +index b1cb730..41cc3e7 100644 +--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn ++++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn +@@ -6,12 +6,28 @@ + + setopt localoptions noksharrays extendedglob NO_shwordsplit + local svnbase svnbranch a b rrn ++local -i rc + local -A svninfo parentinfo + local -xA hook_com + + svnbase="."; + svninfo=() +-${vcs_comm[cmd]} info --non-interactive | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done ++# Unfortunately, `$pipestatus' is broken currently. Until that problem is ++# resolved, here is a workaround that will get things done, without using it. ++# Clumsily, but that's life. ++local -a dat ++dat=( ${(f)"$(${vcs_comm[cmd]} info --non-interactive 2>&1)"} ) ++rc=$? ++(( rc != 0 )) && return 1 ++# The following line is the real code, the following is the workaround. ++#${vcs_comm[cmd]} info --non-interactive \ ++print -l "${dat[@]}" \ ++|& while IFS=: read a b; do ++ svninfo[${a// /_}]="${b## #}" ++done ++#rc=${pipestatus[1]} ++#(( rc != 0 )) && return 1 ++ + while [[ -d "${svnbase}/../.svn" ]]; do + parentinfo=() + ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done -- cgit v1.2.3-54-g00ecf