nponeccop

mercurial-server fixed PKGBUILD for Arch Linux

Jul 15th, 2020
485
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.20 KB | None | 0 0
  1. diff --git a/PKGBUILD b/PKGBUILD
  2. index d76084f..93b19dd 100644
  3. --- a/PKGBUILD
  4. +++ b/PKGBUILD
  5. @@ -1,30 +1,36 @@
  6.  #Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
  7.  #Contributor: Brennan Frydl <me@bfrydl.com>
  8. +#Contributor: Andy Melnikov <andy.melnikov@gmail.com>
  9.  
  10.  pkgname='mercurial-server'
  11.  pkgver=1.3
  12. -pkgrel=1
  13. +pkgrel=2
  14.  pkgdesc='Provides easily administered shared SSH access to Mercurial repositories.'
  15.  arch=('any')
  16.  url='http://www.lshift.net/mercurial-server.html'
  17.  license=('GPL')
  18. -depends=('mercurial')
  19. +depends=('mercurial' 'python2')
  20.  makedepends=('python2-distribute')
  21.  install='mercurial-server.install'
  22. -source=("http://dev.lshift.net/paul/mercurial-server/mercurial-server_$pkgver.tar.gz")
  23. -md5sums=('7cb8e5eb12e7e7a6a9434d7eb67b97d0')
  24. +source=("https://bitbucket.org/lshift/mercurial-server/get/release_${pkgver}.tar.bz2"
  25. +       compat.patch)
  26. +md5sums=('a1ff2cdd9e0e813af61ef0d3020f3dd7'
  27. +         '69362f2128ef1ce46783e7ea8e5324bb')
  28.  
  29. -build() {
  30. -       cd "$srcdir"/mercurial-server-$pkgver
  31. -       sed -i 's/python setup.py/python2 setup.py/' Makefile
  32. +prepare() {
  33. +       cd "$srcdir"/lshift-mercurial-server-*
  34. +       sed -i 's/python setup.py/python2 setup.py/;s/setup.py install \\/setup.py install --optimize=1 --skip-build \\/' Makefile
  35.         find ./src -type f | xargs sed -i 's/env python/env python2/'
  36. +       patch -R --strip=1 --input="${srcdir}/compat.patch"
  37. +}
  38.  
  39. +build() {
  40. +       cd "$srcdir"/lshift-mercurial-server-*
  41.         make pythonbuild
  42.  }
  43.  
  44.  package() {
  45. -       cd "$srcdir"/mercurial-server-$pkgver
  46. -
  47. +       cd "$srcdir"/lshift-mercurial-server-*
  48.         make PREFIX='/usr/share' DESTDIR="$pkgdir/" installetc pythoninstall
  49.  }
  50.  
  51. diff --git a/compat.patch b/compat.patch
  52. new file mode 100644
  53. index 0000000..c5d3a80
  54. --- /dev/null
  55. +++ b/compat.patch
  56. @@ -0,0 +1,15 @@
  57. +--- a/src/mercurialserver/changes.py   2020-07-15 15:27:56.260000000 +0000
  58. ++++ b/src/mercurialserver/changes.py   2020-07-15 15:26:59.850000000 +0000
  59. +@@ -3,10 +3,10 @@
  60. + """
  61. +
  62. + def changes(repo, node):
  63. +-    start = repo[node].rev()
  64. ++    start = repo.changectx(node).rev()
  65. +     try:
  66. +         end = len(repo.changelog)
  67. +     except:
  68. +         end = repo.changelog.count()
  69. +     for rev in xrange(start, end):
  70. +-        yield repo[rev]
  71. ++        yield repo.changectx(rev)
Add Comment
Please, Sign In to add comment