haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

mercurial: update to 4.9.1 (#6135)

Browse Source 
Co-authored-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
Simeon Dimov
2021-08-24 12:12:56 +03:00
committed by GitHub
parent 94684d7a10
commit c8eec69476
3 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dev-vcs/mercurial/mercurial-4.8.1.recipe → dev-vcs/mercurial/mercurial-4.9.1.recipe
View File

@@ -2,12 +2,12 @@ SUMMARY="Free, distributed source control management tool"
DESCRIPTION="Mercurial (hg) is a free, distributed source control management \
tool."
HOMEPAGE="https://www.mercurial-scm.org/"
COPYRIGHT="2005-2018 Matt Mackall et al."
COPYRIGHT="2005-2019 Matt Mackall et al."
LICENSE="GNU GPL v2"
REVISION="2"
SOURCE_URI="https://www.mercurial-scm.org/release/mercurial-4.8.1.tar.gz"
CHECKSUM_SHA256="48a45f5cde9104fbc2daf310d710d4ebf286d879b89fa327d24b005434b0fa21"
PATCHES="mercurial-4.8.1.patch"
REVISION="1"
SOURCE_URI="https://www.mercurial-scm.org/release/mercurial-4.9.1.tar.gz"
CHECKSUM_SHA256="1bdd21bb87d1e05fb5cd395d488d0e0cc2f2f90ce0fd248e31a03595da5ccb47"
PATCHES="mercurial-4.9.1.patch"
ARCHITECTURES="x86_gcc2 x86 x86_64"

40
dev-vcs/mercurial/patches/mercurial-4.8.1.patch
View File

@@ -1,40 +0,0 @@
diff -ur mercurial-4.8.1-orig/contrib/python-zstandard/setup_zstd.py mercurial-4.8.1/contrib/python-zstandard/setup_zstd.py
--- mercurial-4.8.1-orig/contrib/python-zstandard/setup_zstd.py 2018-12-04 19:04:15.000000000 -0300
+++ mercurial-4.8.1/contrib/python-zstandard/setup_zstd.py 2019-01-05 01:29:50.432396926 -0300
@@ -159,8 +159,8 @@
extra_args.append('-DZDICTLIB_VISIBILITY=')
extra_args.append('-DZSTDERRORLIB_VISIBILITY=')
- if compiler_type == 'unix':
- extra_args.append('-fvisibility=hidden')
+# if compiler_type == 'unix':
+# extra_args.append('-fvisibility=hidden')
if not system_zstd and support_legacy:
extra_args.append('-DZSTD_LEGACY_SUPPORT=1')
diff -ur mercurial-4.8.1-orig/mercurial/cext/osutil.c mercurial-4.8.1/mercurial/cext/osutil.c
--- mercurial-4.8.1-orig/mercurial/cext/osutil.c 2018-12-04 19:04:15.000000000 -0300
+++ mercurial-4.8.1/mercurial/cext/osutil.c 2019-01-05 01:26:32.297876574 -0300
@@ -1159,9 +1159,9 @@
{
int sig = 0;
int r;
+ sigset_t set;
if (!PyArg_ParseTuple(args, "i", &sig))
return NULL;
- sigset_t set;
r = sigemptyset(&set);
if (r != 0)
return PyErr_SetFromErrno(PyExc_OSError);
diff -ur mercurial-4.8.1-orig/mercurial/ui.py mercurial-4.8.1/mercurial/ui.py
--- mercurial-4.8.1-orig/mercurial/ui.py 2018-12-04 19:04:15.000000000 -0300
+++ mercurial-4.8.1/mercurial/ui.py 2019-01-05 01:33:09.805735796 -0300
@@ -1592,7 +1592,7 @@
# avoid confusion.
editor = 'E'
else:
- editor = 'vi'
+ editor = 'nano'
return (encoding.environ.get("HGEDITOR") or
self.config("ui", "editor", editor))

28
dev-vcs/mercurial/patches/mercurial-4.9.1.patch Normal file
View File

@@ -0,0 +1,28 @@
diff --git a/contrib/python-zstandard/setup_zstd.py b/contrib/python-zstandard/setup_zstd.py
index 23b6fa1..9cb9713 100644
--- a/contrib/python-zstandard/setup_zstd.py
+++ b/contrib/python-zstandard/setup_zstd.py
@@ -159,8 +159,8 @@ def get_c_extension(support_legacy=False, system_zstd=False, name='zstd',
extra_args.append('-DZDICTLIB_VISIBILITY=')
extra_args.append('-DZSTDERRORLIB_VISIBILITY=')
- if compiler_type == 'unix':
- extra_args.append('-fvisibility=hidden')
+ #if compiler_type == 'unix':
+ # extra_args.append('-fvisibility=hidden')
if not system_zstd and support_legacy:
extra_args.append('-DZSTD_LEGACY_SUPPORT=1')
diff --git a/mercurial/ui.py b/mercurial/ui.py
index 63ecc01..b76dd92 100644
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -1722,7 +1722,7 @@ class ui(object):
# avoid confusion.
editor = 'E'
else:
- editor = 'vi'
+ editor = 'nano'
return (encoding.environ.get("HGEDITOR") or
self.config("ui", "editor", editor))