Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/PKGBUILD b/PKGBUILD
- index d76084f..93b19dd 100644
- --- a/PKGBUILD
- +++ b/PKGBUILD
- @@ -1,30 +1,36 @@
- #Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
- #Contributor: Brennan Frydl <me@bfrydl.com>
- +#Contributor: Andy Melnikov <andy.melnikov@gmail.com>
- pkgname='mercurial-server'
- pkgver=1.3
- -pkgrel=1
- +pkgrel=2
- pkgdesc='Provides easily administered shared SSH access to Mercurial repositories.'
- arch=('any')
- url='http://www.lshift.net/mercurial-server.html'
- license=('GPL')
- -depends=('mercurial')
- +depends=('mercurial' 'python2')
- makedepends=('python2-distribute')
- install='mercurial-server.install'
- -source=("http://dev.lshift.net/paul/mercurial-server/mercurial-server_$pkgver.tar.gz")
- -md5sums=('7cb8e5eb12e7e7a6a9434d7eb67b97d0')
- +source=("https://bitbucket.org/lshift/mercurial-server/get/release_${pkgver}.tar.bz2"
- + compat.patch)
- +md5sums=('a1ff2cdd9e0e813af61ef0d3020f3dd7'
- + '69362f2128ef1ce46783e7ea8e5324bb')
- -build() {
- - cd "$srcdir"/mercurial-server-$pkgver
- - sed -i 's/python setup.py/python2 setup.py/' Makefile
- +prepare() {
- + cd "$srcdir"/lshift-mercurial-server-*
- + sed -i 's/python setup.py/python2 setup.py/;s/setup.py install \\/setup.py install --optimize=1 --skip-build \\/' Makefile
- find ./src -type f | xargs sed -i 's/env python/env python2/'
- + patch -R --strip=1 --input="${srcdir}/compat.patch"
- +}
- +build() {
- + cd "$srcdir"/lshift-mercurial-server-*
- make pythonbuild
- }
- package() {
- - cd "$srcdir"/mercurial-server-$pkgver
- -
- + cd "$srcdir"/lshift-mercurial-server-*
- make PREFIX='/usr/share' DESTDIR="$pkgdir/" installetc pythoninstall
- }
- diff --git a/compat.patch b/compat.patch
- new file mode 100644
- index 0000000..c5d3a80
- --- /dev/null
- +++ b/compat.patch
- @@ -0,0 +1,15 @@
- +--- a/src/mercurialserver/changes.py 2020-07-15 15:27:56.260000000 +0000
- ++++ b/src/mercurialserver/changes.py 2020-07-15 15:26:59.850000000 +0000
- +@@ -3,10 +3,10 @@
- + """
- +
- + def changes(repo, node):
- +- start = repo[node].rev()
- ++ start = repo.changectx(node).rev()
- + try:
- + end = len(repo.changelog)
- + except:
- + end = repo.changelog.count()
- + for rev in xrange(start, end):
- +- yield repo[rev]
- ++ yield repo.changectx(rev)
Add Comment
Please, Sign In to add comment