mercurial: Update to 4.3.1

This commit is contained in:
Alexey Pavlov
2017-09-13 23:47:16 +03:00
parent 89f462b599
commit 60880f66d7
3 changed files with 17 additions and 29 deletions

View File

@@ -1,7 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=mercurial
pkgver=4.0.2
pkgver=4.3.1
pkgrel=1
pkgdesc="A scalable distributed SCM tool"
arch=('i686' 'x86_64')
@@ -13,15 +13,15 @@ depends=('python2')
backup=('etc/mercurial/hgrc')
source=("https://mercurial-scm.org/release/${pkgname}-${pkgver}.tar.gz"{,.asc}
'mercurial.profile'
'mercurial-2.6.1-msys2.patch')
sha256sums=('ae6659dba27508a9a6417d535a89e282d5c8a5ea77b6e00af102822145b06d02'
'mercurial-4.3.1-msys2.patch')
sha256sums=('2b12f02e3a452adff4ec9cf007017bab0cadb3f37eaf12f4b25a662df73618a2'
'SKIP'
'87427151713e689cd87dc50d50c048e0e58285815e4eb61962b50583532cbde5'
'ea2bcabcd85968c23b1930de379d6c620a4a669c4419297238d94b31682f9fd2')
'656f76a407860dce525136e798281c8032c6b05783bc72cf27cf72d668b75fb9')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ${srcdir}/mercurial-2.6.1-msys2.patch
patch -p1 -i ${srcdir}/mercurial-4.3.1-msys2.patch
}
package() {

View File

@@ -1,24 +0,0 @@
diff -Naur mercurial-2.6.1-orig/hgext/win32mbcs.py mercurial-2.6.1/hgext/win32mbcs.py
--- mercurial-2.6.1-orig/hgext/win32mbcs.py 2013-05-14 23:43:41.000000000 +0000
+++ mercurial-2.6.1/hgext/win32mbcs.py 2013-05-16 09:07:02.149414100 +0000
@@ -159,7 +159,7 @@
def extsetup(ui):
# TODO: decide use of config section for this extension
if ((not os.path.supports_unicode_filenames) and
- (sys.platform != 'cygwin')):
+ ((sys.platform != 'cygwin') or (sys.paltform != 'msys'))):
ui.warn(_("[win32mbcs] cannot activate on this platform.\n"))
return
# determine encoding for filename
diff -Naur mercurial-2.6.1-orig/mercurial/posix.py mercurial-2.6.1/mercurial/posix.py
--- mercurial-2.6.1-orig/mercurial/posix.py 2013-05-14 23:43:40.000000000 +0000
+++ mercurial-2.6.1/mercurial/posix.py 2013-05-16 09:11:10.796875000 +0000
@@ -304,7 +304,7 @@
# Fallback to the likely inadequate Python builtin function.
realpath = os.path.realpath
-if sys.platform == 'cygwin':
+if sys.platform in ['cygwin', 'msys']:
# workaround for cygwin, in which mount point part of path is
# treated as case sensitive, even though underlying NTFS is case
# insensitive.

View File

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