Merge pull request #3127 from lazka/mercurial-6.2.1

mercurial: Update to 6.2.1

mercurial/PKGBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=mercurial
-pkgver=6.1.4
-pkgrel=2
+pkgver=6.2.1
+pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
 url="https://www.mercurial-scm.org/"
@@ -13,12 +13,10 @@ makedepends=('python-devel' 'gcc')
 #optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("https://mercurial-scm.org/release/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        'mercurial.profile'
-        'mercurial-4.3.1-msys2.patch')
-sha256sums=('f361f9802b36e357ac019ceb712ca11de8332b07deadeed8dfa904f05bf7ca78'
+        'mercurial.profile')
+sha256sums=('8ac5d7a20d1c2ad54d4c263d134164646dc34a8e3a6bed69cfbeabaf8d3882da'
             'SKIP'
-            '87427151713e689cd87dc50d50c048e0e58285815e4eb61962b50583532cbde5'
-            '1a35962837bb1eb8893e4ab8aa3a49bb18023b632d4c3a2fa903ebfdd7e598ce')
+            '87427151713e689cd87dc50d50c048e0e58285815e4eb61962b50583532cbde5')
 validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5
               3A8155163D0E20A530FCB78647A67FFAA346AACE
               EB851395B4223EE2F7BA0B28DA54740BF08732BA
@@ -27,13 +25,11 @@ validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ${srcdir}/mercurial-4.3.1-msys2.patch
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   python3 setup.py install --root="${pkgdir}/" --prefix=/usr --optimize=1
 
   install -d ${pkgdir}/usr/share/man/{man1,man5}

mercurial/mercurial-4.3.1-msys2.patch

@@ -1,12 +0,0 @@
-diff -Naur mercurial-5.2-orig/mercurial/posix.py mercurial-5.2/mercurial/posix.py
---- mercurial-5.2-orig/mercurial/posix.py	2013-05-14 23:43:40.000000000 +0000
-+++ mercurial-5.2/mercurial/posix.py	2013-05-16 09:11:10.796875000 +0000
-@@ -468,7 +468,7 @@
-         return encoding.hfsignoreclean(enc)
- 
- 
--if pycompat.sysplatform == b'cygwin':
-+if pycompat.sysplatform in [b'cygwin', b'msys']:
-     # workaround for cygwin, in which mount point part of path is
-     # treated as case sensitive, even though underlying NTFS is case
-     # insensitive.