Github messages for voidlinux
 help / color / mirror / Atom feed
From: mobinmob <mobinmob@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mercurial: update to 5.7.1.
Date: Fri, 09 Apr 2021 23:41:24 +0200	[thread overview]
Message-ID: <20210409214124.VxyFhW9RK0acDzsy3qOaySeompo62tJi4a8a6CG605w@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30109@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages mercurial
https://github.com/void-linux/void-packages/pull/30109

mercurial: update to 5.7.1.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30109.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mercurial-30109.patch --]
[-- Type: text/x-diff, Size: 2068 bytes --]

From 3233a359f6074f9f287eec9bf9cfa39a6a9895f9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 9 Apr 2021 13:06:15 +0300
Subject: [PATCH] mercurial: update to 5.7.1.

---
 srcpkgs/mercurial/template | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index a8b24bffbee2..9b8cadbcfb88 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,23 +1,37 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.6.1
+version=5.7.1
 revision=1
 build_style=python3-module
-hostmakedepends="python3 python3-setuptools python3-devel"
+hostmakedepends="python3 python3-setuptools python3-devel gettext"
 makedepends="python3-devel"
 depends="python3 ca-certificates"
-checkdepends="iana-etc tar unzip which xz"
+# cvs tests fail
+checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
+ python3-Pygments"
 short_desc="Fast, lightweight source control management system"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=e55c254f4904c45226a106780e57f4279aee03368f6ff6a981d5d2a38243ffad
+checksum=cb5139144ccb2ef648f36963c8606d47dea1cb0e22aa2c055d6f860ce3fde7b0
+
+pre_check() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		# fix hardcoded strerror() value from glibc
+		vsed -e 's/Address already in use/Address in use/' -i tests/common-pattern.py
+	fi
+}
 
 do_check() {
-	cd tests
-	rm test-doctest.py test-hghave.t test-https.t test-merge-tools.t test-persistent-nodemap.t
-	python3 run-tests.py ${makejobs}
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		_additional_test=--allow-slow-tests
+	fi
+
+ 	cd tests
+	rm test-doctest.py test-hghave.t test-https.t test-merge-tools.t \
+	 test-merge-combination.t test-persistent-nodemap.t test-archive.t
+	python3 run-tests.py ${makejobs} ${_additional_test}
 }
 
 post_install() {

  parent reply	other threads:[~2021-04-09 21:41 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-09 10:07 [PR PATCH] " mobinmob
2021-04-09 16:41 ` Chocimier
2021-04-09 16:50 ` ericonr
2021-04-09 16:51 ` ericonr
2021-04-09 17:17 ` ericonr
2021-04-09 17:18 ` ericonr
2021-04-09 17:33 ` ericonr
2021-04-09 21:41 ` mobinmob [this message]
2021-04-09 22:59 ` [PR REVIEW] " Chocimier
2021-04-09 22:59 ` Chocimier
2021-04-17 19:35 ` Chocimier
2021-04-17 19:56 ` ericonr
2021-05-15 20:12 ` mobinmob
2021-05-15 20:12 ` [PR PATCH] [Closed]: " mobinmob

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210409214124.VxyFhW9RK0acDzsy3qOaySeompo62tJi4a8a6CG605w@z \
    --to=mobinmob@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).