summaryrefslogtreecommitdiff
path: root/system/git/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'system/git/APKBUILD')
-rw-r--r--system/git/APKBUILD20
1 files changed, 9 insertions, 11 deletions
diff --git a/system/git/APKBUILD b/system/git/APKBUILD
index 0562bfba2..2b9c75221 100644
--- a/system/git/APKBUILD
+++ b/system/git/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=git
-pkgver=2.40.0
-pkgrel=1
+pkgver=2.49.0
+pkgrel=0
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
arch="all"
@@ -26,11 +26,9 @@ subpackages="$pkgname-doc
replaces="git-perl perl-git"
source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
dont-test-other-encodings.patch
+ endian.patch
git-daemon.initd
git-daemon.confd
-
- disable-t2082-2.patch
- perl-getopt-long.patch
"
_gitcoredir=/usr/libexec/git-core
@@ -59,6 +57,7 @@ prepare() {
cat >> config.mak <<-EOF
NO_SVN_TESTS=YesPlease
NO_REGEX=YesPlease
+ NO_ICONV=YesPlease
USE_ASCIIDOCTOR=1
USE_LIBPCRE2=YesPlease
NO_NSEC=YesPlease
@@ -72,7 +71,7 @@ build() {
}
check() {
- make prefix=/usr DESTDIR="$pkgdir" -j1 test
+ GIT_SKIP_TESTS='t5564.6' make prefix=/usr DESTDIR="$pkgdir" -j1 test
}
package() {
@@ -168,9 +167,8 @@ subtree() {
make install prefix=/usr DESTDIR="$subpkgdir"
}
-sha512sums="a2720f8f9a0258c0bb5e23badcfd68a147682e45a5d039a42c47128296c508109d5039029db89311a35db97a9008585e84ed11b400846502c9be913d67f0fd90 git-2.40.0.tar.xz
-4bcc8367478601c856e0977d46fc4842f62daf300093a576704ad27ccd9fae975f95d3fbfcb00e9fa7254b1db64cd074f49a94fb5cf0abd8d72d7edc9ab8798c dont-test-other-encodings.patch
+sha512sums="81a16415890305fc6cfd14ade8bee76779feba01f51c5446f40c14211654342c68ef0911859fa6e8e9ff0a718847bb44ee4156d03a19c9165df19ba91e09e1f0 git-2.49.0.tar.xz
+829d7a5cb1cfc162eee2920cfcd09798af967657751a9040f18046c9537d0b7a7b314fb84edef1ebe4114cdabafb41253cff60709779ecf91cfa49cd7542f923 dont-test-other-encodings.patch
+e8c63db09327ff01527f4d5f56185c602ef8cb10e2c24f0e3e02b567166ae226053fc1428263ddecd2708d89e6ea8d99d8bf4c1f19541b7a4d4c367898e1777f endian.patch
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
-fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd
-6d7cbb701584a078328056a67bfd32dde5795a80c0911734b38bd534699fb0165ac2b486b267c5c39b90bbb0d7c5ab0ab6ada1d068748865617326da28304eb4 disable-t2082-2.patch
-9800318f9e6a8b6bfd8c700cce5cc326522a607b89236a868ef46940efe0566fdadf5d69dc3e72f989d61df66be8510b8989bd4ce3fc780f017f30652c7e9efa perl-getopt-long.patch"
+fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd"