diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-03 23:14:43 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-03 23:14:43 +0000 |
| commit | d1d68784dc66793601c239fa64cc0e02ebd9444e (patch) | |
| tree | 15179b96ec3e632fad3cc528115d83c0fe47e5bd /extra/zsh | |
| parent | 48c96871761a4aad193d814e87ddb87c322e17d2 (diff) | |
Tue Jan 3 23:14:42 UTC 2012
Diffstat (limited to 'extra/zsh')
| -rw-r--r-- | extra/zsh/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/zsh/svn-1.7.patch | 34 |
2 files changed, 40 insertions, 4 deletions
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 <pierre@archlinux.de> 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 |