diff options
| -rw-r--r-- | system/git/APKBUILD | 8 | ||||
| -rw-r--r-- | system/git/dont-test-other-encodings.patch | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 4b721680d..eccdfc3c1 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.34.1 +pkgver=2.35.1 pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com/" @@ -19,7 +19,7 @@ subpackages="$pkgname-doc $pkgname-cvs::noarch $pkgname-p4::noarch $pkgname-daemon - $pkgname-gitweb + $pkgname-gitweb::noarch $pkgname-subtree::noarch $pkgname-lang " @@ -167,8 +167,8 @@ subtree() { make install prefix=/usr DESTDIR="$subpkgdir" } -sha512sums="a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db git-2.34.1.tar.xz -0a0935d876024d96156df3aeec06b47fd9e370484d4552786c450cb500ae671a631e64c30994ec39f43a2f313f75d68909688ea92b47327d1af65e365dc77480 dont-test-other-encodings.patch +sha512sums="926c6813ef61931e1a1c43dfd7b15e20dc5878c1752876bd08f039249c9ed09f20f096b2f01947de9c9522c942e9fa8c1363d7d31a488bbe3f93c0cff31fcbcb git-2.35.1.tar.xz +4bcc8367478601c856e0977d46fc4842f62daf300093a576704ad27ccd9fae975f95d3fbfcb00e9fa7254b1db64cd074f49a94fb5cf0abd8d72d7edc9ab8798c dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd 6d7cbb701584a078328056a67bfd32dde5795a80c0911734b38bd534699fb0165ac2b486b267c5c39b90bbb0d7c5ab0ab6ada1d068748865617326da28304eb4 disable-t2082-2.patch" diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch index 7d176d57a..fed4a6e21 100644 --- a/system/git/dont-test-other-encodings.patch +++ b/system/git/dont-test-other-encodings.patch @@ -58,7 +58,7 @@ We can't support Japanese people using musl summary $UTF8_MSG --- git-2.21.0/t/t0028-working-tree-encoding.sh.old 2019-02-24 16:31:46.000000000 +0000 +++ git-2.21.0/t/t0028-working-tree-encoding.sh 2019-03-08 00:49:07.580000000 +0000 -@@ -71,14 +71,6 @@ +@@ -51,14 +51,6 @@ test_cmp_bin test.utf8.raw test.utf16.git ' @@ -73,7 +73,7 @@ We can't support Japanese people using musl test_expect_success 're-encode to UTF-16-LE-BOM on checkout' ' rm test.utf16lebom && git checkout test.utf16lebom && -@@ -143,41 +135,6 @@ +@@ -123,41 +115,6 @@ test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out && test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out ' |