[arch-commits] Commit in zsh/trunk (PKGBUILD svn-1.7.patch)

Pierre Schmitz pierre at archlinux.org
Sun Feb 19 15:57:53 EST 2012


    Date: Sunday, February 19, 2012 @ 15:57:52
  Author: pierre
Revision: 150665

upgpkg: zsh 4.3.16-1

upstream update

Modified:
  zsh/trunk/PKGBUILD
Deleted:
  zsh/trunk/svn-1.7.patch

---------------+
 PKGBUILD      |   14 +++++---------
 svn-1.7.patch |   34 ----------------------------------
 2 files changed, 5 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-19 17:21:32 UTC (rev 150664)
+++ PKGBUILD	2012-02-19 20:57:52 UTC (rev 150665)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=zsh
-pkgver=4.3.15
-pkgrel=3
+pkgver=4.3.16
+pkgrel=1
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
@@ -11,15 +11,13 @@
 depends=('pcre' 'libcap' 'gdbm')
 install=zsh.install
 source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
-        'zprofile' 'svn-1.7.patch')
+        'zprofile')
 backup=('etc/zsh/zprofile')
-md5sums=('11766b0dd674a513810903cd33ffcac4'
-         '24a9335edf77252a7b5f52e079f7aef7'
-         '4fcbc119fdb624a8c483a278f3a82efd')
+md5sums=('4bf0b8947b5acc0ac4334d75adc87239'
+         '24a9335edf77252a7b5f52e079f7aef7')
 
 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 \
@@ -48,8 +46,6 @@
 
 check() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	# This test wont work with the noatime mount option
-	rm Test/C02cond.ztst
 	HOME="${srcdir}" make check
 }
 

Deleted: svn-1.7.patch
===================================================================
--- svn-1.7.patch	2012-02-19 17:21:32 UTC (rev 150664)
+++ svn-1.7.patch	2012-02-19 20:57:52 UTC (rev 150665)
@@ -1,34 +0,0 @@
-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