git: Update tp 2.11.0
This commit is contained in:
14
git/PKGBUILD
14
git/PKGBUILD
@@ -2,7 +2,7 @@
|
||||
# Maintainer: Ray Donnelly <mingw.android@gmail.com>
|
||||
|
||||
pkgname=git
|
||||
pkgver=2.10.2
|
||||
pkgver=2.11.0
|
||||
pkgrel=1
|
||||
pkgdesc="The fast distributed version control system"
|
||||
arch=('i686' 'x86_64')
|
||||
@@ -53,10 +53,8 @@ source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkg
|
||||
git-prevent_xss-default.patch
|
||||
git-bash-completion-egrep-color-fix.patch
|
||||
git-tcsh-completion-fixes.patch
|
||||
git-zsh-completion-fixes.patch
|
||||
git-tclIndex.patch
|
||||
git-setup-i18n-fix.patch)
|
||||
sha256sums=('5e0e5034d39a6cfd768726ec87ec6ed0c724a4d28d2ad2b426227335ba3adff0'
|
||||
git-zsh-completion-fixes.patch)
|
||||
sha256sums=('db74eaab3cc736f9e8c71f7d0d894aaa3ca1aaa7f0d09f6af8f4b4d636fb1172'
|
||||
'c5e735d829e11f79e2d508b663d0924030498f48fc716881031fb975dbf187a5'
|
||||
'c57837c3e169e5c2a9f8411d6870443efe145c95490fc03f82e8089292507f76'
|
||||
'a82df3fc9a80b9f9003a9b9feca063413b14630c043c0b2b88bf2c61c46154cc'
|
||||
@@ -65,9 +63,7 @@ sha256sums=('5e0e5034d39a6cfd768726ec87ec6ed0c724a4d28d2ad2b426227335ba3adff0'
|
||||
'bbe523015863a4b2459624dcc4ad5c675c779c1134c8617f90d65a541b74e194'
|
||||
'bc6ef4a066a8b206fbc162387918f801ef95c7a691fdaf284f895bc303a1ee01'
|
||||
'b28b3e13de08911f027d19a557967fc21128318a8d6ca74b20b26ee997a9b992'
|
||||
'261438a4bedd5563c702533c34792581ccfa46db873ca3e105e6c1ab803a3107'
|
||||
'9543aeb4194f1996744884784dbd39e7d2ad713df0e0629899ef581469c3cace'
|
||||
'94fc6958962fffd0f857ed1c312ede7ce65ab267005d2a1db38d9a2830d341cd')
|
||||
'261438a4bedd5563c702533c34792581ccfa46db873ca3e105e6c1ab803a3107')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
@@ -82,8 +78,6 @@ prepare() {
|
||||
patch -p1 -i "${srcdir}"/git-bash-completion-egrep-color-fix.patch
|
||||
patch -p1 -i "${srcdir}"/git-tcsh-completion-fixes.patch
|
||||
patch -p1 -i "${srcdir}"/git-zsh-completion-fixes.patch
|
||||
patch -p1 -i "${srcdir}"/git-tclIndex.patch
|
||||
patch -p1 -i "${srcdir}"/git-setup-i18n-fix.patch
|
||||
|
||||
|
||||
local _arch=
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: git-2.10.0/git-sh-setup.sh
|
||||
===================================================================
|
||||
--- git-2.10.0.orig/git-sh-setup.sh 2016-09-03 03:59:09.000000000 +0200
|
||||
+++ git-2.10.0/git-sh-setup.sh 2016-09-07 17:24:58.817642893 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
# a few helper shell functions.
|
||||
|
||||
# Source git-sh-i18n for gettext support.
|
||||
-. git-sh-i18n
|
||||
+. "$(git --exec-path)/git-sh-i18n"
|
||||
|
||||
# Having this variable in your environment would break scripts because
|
||||
# you would cause "cd" to be taken to unexpected places. If you
|
||||
@@ -1,19 +0,0 @@
|
||||
ALL_LIBFILES uses wildcard, which provides the result in directory
|
||||
order. This order depends on the underlying filesystem on the
|
||||
buildhost. To get reproducible builds it is required to sort such list
|
||||
before using them.
|
||||
---
|
||||
git-gui/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/git-gui/Makefile
|
||||
+++ b/git-gui/Makefile
|
||||
@@ -259,7 +259,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VA
|
||||
rm -f $@ ; \
|
||||
echo '# Autogenerated by git-gui Makefile' >$@ && \
|
||||
echo >>$@ && \
|
||||
- $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
|
||||
+ $(foreach p,$(PRELOAD_FILES) $(sort $(ALL_LIBFILES)),echo '$(subst lib/,,$p)' >>$@ &&) \
|
||||
echo >>$@ ; \
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user