| Newsgroups |
gmane.linux.lfs.beyond.book |
| Message-ID |
<[email protected]> |
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch trunk
in repository blfs.
commit ddb5104c188fb227cdce77868b5a227b68a4615d
Author: Bruce Dubbs <[email protected]>
AuthorDate: Thu May 21 19:17:33 2026 -0500
Update to mercurial-7.2.2.
---
general/prog/mercurial.xml | 44 ++++++++++++++++++++++++++++----------
introduction/welcome/changelog.xml | 4 ++++
packages.ent | 2 +-
3 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/general/prog/mercurial.xml b/general/prog/mercurial.xml
index 9348b53313..4f44e47d08 100644
--- a/general/prog/mercurial.xml
+++ b/general/prog/mercurial.xml
@@ -6,10 +6,10 @@
<!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
<!ENTITY mercurial-download-ftp " ">
- <!ENTITY mercurial-md5sum "1b7fd8be6664ba24e47c29f31dc1ac26">
+ <!ENTITY mercurial-md5sum "9a637d4fc411da358cfa341cd18d0a12">
<!ENTITY mercurial-size "8.8 MB">
- <!ENTITY mercurial-buildsize "127 MB (with docs, add 2.5 GB for tests)">
- <!ENTITY mercurial-time "0.3 SBU (with docs; add 30 SBU for tests; both using parallelism=4)">
+ <!ENTITY mercurial-buildsize "124 MB (with docs, add 2.5 GB for tests)">
+ <!ENTITY mercurial-time "0.3 SBU (with docs; add 24 SBU for tests; both using parallelism=4)">
]>
<sect1 id="mercurial" xreflabel="mercurial-&mercurial-version;">
@@ -85,7 +85,8 @@
<xref role="runtime" linkend="openssh"/>
(runtime, to access ssh://... repositories),
<xref linkend="pygments"/>,
- <xref linkend="rust"/> (see <filename>rust/README.rst</filename> and <filename>rust/rhg/README.md</filename>),
+ <xref linkend="rust"/> (see <filename>rust/README.rst</filename> and
+ <filename>rust/rhg/README.md</filename>),
<xref linkend="subversion"/> (with Python bindings),
<xref linkend="uv_build"/> (for an alternate build method),
<xref linkend="which"/> (used in one test),
@@ -99,6 +100,12 @@
<sect2 role="installation">
<title>Installation of Mercurial</title>
+ <para>
+ First, remove some commands that conflict with openssl4:
+ </para>
+
+<screen role="root"><userinput>sed -i "15,23 s/^/#/" setup.py</userinput></screen>
+
<para>
<application>Mercurial</application> is built and installed
in a single command as the &root; user:
@@ -116,20 +123,23 @@
remap="doc"><userinput>mkdir /usr/share/doc/mercurial-&mercurial-version; &&
cp -R doc/html /usr/share/doc/mercurial-&mercurial-version;</userinput></screen>
+<!--
<para>
If you wish to run the tests, the rust sources have to be fixed for the
most recent rust version:
</para>
<screen remap="test"><userinput>pushd rust &&
-cargo fix --workspace --allow-no-scm &&
+cargo fix - -workspace - -allow-no-scm &&
popd</userinput></screen>
+-->
<para>
- There is also a problem with permissions in the build directory, since
- the above <command>install</command> command has created files owned
- by &root;, that one test tries to modify. To remedy this, issue, as the
- &root; user:
+ In order to run the tests, make sure all the files are owned by
+ an unprivileged user. This fixes a problem with permissions in
+ the build directory since the above <command>install</command>
+ command has created files owned by &root;.
+ To remedy this, issue, as the &root; user:
</para>
<screen remap="test"
@@ -137,7 +147,18 @@ popd</userinput></screen>
<para>
Where <replaceable>username</replaceable> should be replaced with the
- user name of the person running the tests. To run the test suite, issue:
+ user name of the person running the tests.
+ </para>
+
+ <para>
+ The test suite tries to run some tests that are incompatible
+ with <xref linkend="rust"/>. Remove them with:
+ </para>
+
+<screen remap="test"><userinput>sed -i "177,181 s/^/#/" Makefile</userinput></screen>
+
+ <para>
+ Now, run the test suite with:
</para>
<screen remap="test"><userinput>TESTFLAGS="-j<replaceable><N></replaceable> --with-hg /usr/bin/hg" make check</userinput></screen>
@@ -174,6 +195,7 @@ popd</userinput></screen>
# Ran 974 tests, 58 skipped, 14 failed. -pierre 22 Nov 25 (mercurial-7.1.2 with python-3.14).
# Ran 1006 tests, 60 skipped, 3 failed. -renodr 11 Feb 26 (mercurial-7.2 with python-3.14).
# Ran 1001 tests, 67 skipped, 0 failed. -pierre 7 Apr 26 (mercurial-7.2.1).
+ # Ran 998 tests, 71 skipped, 0 failed. -bdubbs 21 May 26 (mercurial-7.2.2).
-->
<para>
In order to
@@ -277,7 +299,7 @@ EOF</userinput></screen>
hg
</seg>
<seg>
- several internal modules under
+ numerous internal modules under
/usr/lib/python&python3-majorver;/site-packages/mercurial
</seg>
<seg>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 542367fdc7..808ca30f39 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,10 @@
<listitem>
<para>May 21st, 2026</para>
<itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to mercurial-7.2.2. Fixes
+ <ulink url="&blfs-ticket-root;23261">#23261</ulink>.</para>
+ </listitem>
<listitem>
<para>[bdubbs] - Update to xfsprogs-7.0.0. Fixes
<ulink url="&blfs-ticket-root;23263">#23263</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index f2aef67280..3926115990 100644
--- a/packages.ent
+++ b/packages.ent
@@ -383,7 +383,7 @@
<!ENTITY lua-version "5.4.8">
<!ENTITY luajit-version "20260213">
<!--<!ENTITY lua52-version "5.2.4">-->
-<!ENTITY mercurial-version "7.2.1">
+<!ENTITY mercurial-version "7.2.2">
<!ENTITY nasm-version "3.01">
<!ENTITY patchelf-version "0.18.0">
<!ENTITY php-version "8.5.6">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
--
http://lists.linuxfromscratch.org/sympa/info/blfs-book
Unsubscribe: See the above information page