Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 94684d7a1056
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c8eec69476f5
Choose a head ref
  • 1 commit
  • 3 files changed
  • 2 contributors

Commits on Aug 24, 2021

  1. mercurial: update to 4.9.1 (#6135) 

    Co-authored-by: Jérôme Duval <jerome.duval@gmail.com>
    @congocongocongo @korli
    congocongocongo and korli authored Aug 24, 2021
    Copy the full SHA
    c8eec69 View commit details
10 changes: 5 additions & 5 deletions dev-vcs/mercurial/mercurial-4.8.1.recipe → dev-vcs/mercurial/mercurial-4.9.1.recipe
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 40 deletions dev-vcs/mercurial/patches/mercurial-4.8.1.patch
View file

This file was deleted.

28 changes: 28 additions & 0 deletions dev-vcs/mercurial/patches/mercurial-4.9.1.patch
View file
Original file line number Diff line number Diff line change
@@ -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))