[arch-commits] Commit in zsh/trunk (PKGBUILD svn-1.7.patch)
Pierre Schmitz
pierre at archlinux.org
Mon Jan 2 12:42:51 UTC 2012
Date: Monday, January 2, 2012 @ 07:42:51
Author: pierre
Revision: 145826
Fix support for svn 1.7
See http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=commitdiff;h=ee03cac7fea67062eff3340b018b8d38c35f6a95
Added:
zsh/trunk/svn-1.7.patch
Modified:
zsh/trunk/PKGBUILD
---------------+
PKGBUILD | 8 +++++---
svn-1.7.patch | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-01-02 11:52:31 UTC (rev 145825)
+++ PKGBUILD 2012-01-02 12:42:51 UTC (rev 145826)
@@ -3,7 +3,7 @@
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 @@
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 \
Added: svn-1.7.patch
===================================================================
--- svn-1.7.patch (rev 0)
+++ svn-1.7.patch 2012-01-02 12:42:51 UTC (rev 145826)
@@ -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
More information about the arch-commits
mailing list