2 files changed, 3 insertions(+), 16 deletions(-)

M sr.ht/mercurial/APKBUILD
D sr.ht/mercurial/muslhotfix.patch

@@ 1,7 1,7 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mercurial
-pkgver=5.0
+pkgver=5.1
 pkgrel=1
 pkgdesc="Scalable distributed SCM tool"
 url="https://www.mercurial-scm.org"


@@ 14,7 14,7 @@ subpackages="
 	$pkgname-vim:vim:noarch
 	$pkgname-zsh-completion:zshcomp:noarch
 	$pkgname-bash-completion:bashcomp:noarch"
-source="https://www.mercurial-scm.org/release/$pkgname-$pkgver.tar.gz muslhotfix.patch"
+source="https://www.mercurial-scm.org/release/$pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$pkgname-$pkgver
 
 build() {


@@ 63,5 63,4 @@ bashcomp() {
 		"$subpkgdir"/usr/share/bash-completion/completions/${pkgname}
 }
 
-sha512sums="fa193bdf3957bbd6625c41aa210292bf1fca7125e05977467b3dc85420cea1e952b89cd861613564ec05f9e93ff51bad652f5b875beb2e3b0d28e524c8b64bad  mercurial-5.0.tar.gz
-bd6f5a6868aed52289904e6467d4d49b42090d498f128bf09511f398fadc3d6540f40dd8e08ed220e014be50da60511600812eb5445c5d11f7caa6bf23fb1c3c  muslhotfix.patch"
+sha512sums="cf7a64a181eeb3dc8f24067ea032fb17504358a9ed08cb50ac041e66ef20426c060d997cb5d30e7582874135b0a351b3e58d7297aaa4e009aabbf562a1ab9fae  mercurial-5.1.tar.gz"

@@ 1,12 0,0 @@
-diff -r 07e479ef7c96 mercurial/obsolete.py
---- a/mercurial/obsolete.py	Thu Apr 25 19:17:02 2019 +0200
-+++ b/mercurial/obsolete.py	Thu Jul 04 05:19:36 2019 +0000
-@@ -635,6 +635,8 @@
-         if new:
-             f = self.svfs('obsstore', 'ab')
-             try:
-+                import os
-+                f.seek(0, os.SEEK_END)
-                 offset = f.tell()
-                 transaction.add('obsstore', offset)
-                 # offset == 0: new file - add the version header