summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD10
-rw-r--r--vcs_info.patch35
3 files changed, 11 insertions, 52 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b4373557390..7a0cfe940fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = zsh-athame-git
- pkgver = 5.7
+ pkgver = 5.7.1
pkgrel = 1
url = http://github.com/ardagnir/athame/
arch = x86_64
@@ -10,25 +10,23 @@ pkgbase = zsh-athame-git
makedepends = libcap
makedepends = gdbm
makedepends = git
- provides = zsh=5.7
+ provides = zsh=5.7.1
conflicts = zsh
- source = https://www.zsh.org/pub/zsh-5.7.tar.xz
- source = https://www.zsh.org/pub/zsh-5.7.tar.xz.asc
- source = https://www.zsh.org/pub/zsh-5.7-doc.tar.xz
- source = https://www.zsh.org/pub/zsh-5.7-doc.tar.xz.asc
+ source = https://www.zsh.org/pub/zsh-5.7.1.tar.xz
+ source = https://www.zsh.org/pub/zsh-5.7.1.tar.xz.asc
+ source = https://www.zsh.org/pub/zsh-5.7.1-doc.tar.xz
+ source = https://www.zsh.org/pub/zsh-5.7.1-doc.tar.xz.asc
source = zprofile
- source = vcs_info.patch
source = git://github.com/ardagnir/athame
source = git://github.com/ardagnir/vimbed
validpgpkeys = F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3
validpgpkeys = E96646BE08C0AF0AA0F90788A5FEEE3AC7937444
validpgpkeys = 7CA7ECAAF06216B90F894146ACF8146CAE8CBBC4
- sha512sums = cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958
+ sha512sums = a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0
sha512sums = SKIP
- sha512sums = 4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395
+ sha512sums = e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c
sha512sums = SKIP
sha512sums = b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034
- sha512sums = f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353
sha512sums = SKIP
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 039390ffefc..7598df4e5aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=('zsh-athame-git')
-pkgver=5.7
+pkgver=5.7.1
pkgrel=1
arch=('x86_64')
conflicts=('zsh')
@@ -12,15 +12,13 @@ license=('custom' 'GPL' 'AGPL')
makedepends=('pcre' 'libcap' 'gdbm' 'git')
source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
'zprofile'
- 'vcs_info.patch'
'git://github.com/ardagnir/athame'
'git://github.com/ardagnir/vimbed')
-sha512sums=('cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958'
+sha512sums=('a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0'
'SKIP'
- '4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395'
+ 'e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c'
'SKIP'
'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034'
- 'f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353'
'SKIP'
'SKIP')
validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3'
@@ -48,8 +46,6 @@ prepare() {
done
rm Completion/Linux/Command/_{pkgtool,rpmbuild}
- patch -p1 -i "${srcdir}/vcs_info.patch"
-
# Remove tests that don't work with the new athame behavior.
rm Test/[XY]*.ztst
diff --git a/vcs_info.patch b/vcs_info.patch
deleted file mode 100644
index 042b948b23d..00000000000
--- a/vcs_info.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001
-From: dana <dana@dana.is>
-Date: Sun, 27 Jan 2019 00:26:31 -0600
-Subject: [PATCH] 44020: VCS_INFO_detect_p4: Fix infinite recursion
-
----
- ChangeLog | 5 +++++
- Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 1 -
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 81668ccc9..be243c1b8 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2018-01-27 dana <dana@dana.is>
-+
-+ * 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix
-+ infinite recursion
-+
- 2018-01-24 dana <dana@dana.is>
-
- * unposted: Config/version.mk: Post-release version bump
-diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-index d171c68ee..5ec21da9f 100644
---- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-+++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
- }
-
-
--(( ${+functions[VCS_INFO_detect_p4]} )) ||
- VCS_INFO_detect_p4() {
- local serverport p4where
-