From 050bb4778239d2b4828ea9699e46c3a3d9d87c05 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 26 Jan 2025 16:02:22 +0000
Subject: [PATCH 1/2] mercurial: Update hg from 6.5 to version 6.9.1 and python
 3.12

---
 spk/mercurial/Makefile                      | 8 ++++----
 spk/mercurial/src/requirements-crossenv.txt | 2 +-
 spk/mercurial/src/requirements-pure.txt     | 2 +-
 spk/mercurial/src/service-setup.sh          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spk/mercurial/Makefile b/spk/mercurial/Makefile
index 24c77fd5c9b..3ce2c6580b2 100644
--- a/spk/mercurial/Makefile
+++ b/spk/mercurial/Makefile
@@ -1,10 +1,10 @@
 SPK_NAME = mercurial
-SPK_VERS = 6.5
-SPK_REV = 9
+SPK_VERS = 6.9.1
+SPK_REV = 10
 SPK_ICON = src/mercurial.png
 
 PYTHON_PACKAGE = python311
-SPK_DEPENDS = "python311>=3.11.5-8"
+SPK_DEPENDS = "python312"
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
 WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
@@ -13,7 +13,7 @@ MAINTAINER = SynoCommunity
 DESCRIPTION = Mercurial is a free, distributed source control management tool
 STARTABLE = no
 DISPLAY_NAME = Mercurial
-CHANGELOG = "1. Update mercurial to 6.5.<br/>2. Update to Python 3.11."
+CHANGELOG = "1. Update mercurial to 6.9.1.<br/>2. Update to Python 3.12."
 
 HOMEPAGE = https://www.mercurial-scm.org/
 LICENSE  = MPL1.1
diff --git a/spk/mercurial/src/requirements-crossenv.txt b/spk/mercurial/src/requirements-crossenv.txt
index 0d4af4f0fd6..27a0f53fbf3 100644
--- a/spk/mercurial/src/requirements-crossenv.txt
+++ b/spk/mercurial/src/requirements-crossenv.txt
@@ -1 +1 @@
-mercurial==6.5
+mercurial==6.9.1
diff --git a/spk/mercurial/src/requirements-pure.txt b/spk/mercurial/src/requirements-pure.txt
index 7f3ba55d40c..1aa2a29df72 100644
--- a/spk/mercurial/src/requirements-pure.txt
+++ b/spk/mercurial/src/requirements-pure.txt
@@ -1 +1 @@
-docutils==0.20.1
+docutils==0.21.2
diff --git a/spk/mercurial/src/service-setup.sh b/spk/mercurial/src/service-setup.sh
index 10b82130091..9dfa13ebaeb 100644
--- a/spk/mercurial/src/service-setup.sh
+++ b/spk/mercurial/src/service-setup.sh
@@ -1,4 +1,4 @@
-PYTHON_DIR="/var/packages/python311/target/bin"
+PYTHON_DIR="/var/packages/python312/target/bin"
 PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}:${PATH}"
 
 service_postinst ()

From c5dbf20245d16086d735028eb8c499ebf778e2ed Mon Sep 17 00:00:00 2001
From: th0ma7 <th0ma7@users.noreply.github.com>
Date: Sun, 26 Jan 2025 15:22:25 -0500
Subject: [PATCH 2/2] Update spk/mercurial/Makefile

Co-authored-by: Michael Reid <michael_reid@email.com>
---
 spk/mercurial/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spk/mercurial/Makefile b/spk/mercurial/Makefile
index 3ce2c6580b2..195d29c78ec 100644
--- a/spk/mercurial/Makefile
+++ b/spk/mercurial/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 6.9.1
 SPK_REV = 10
 SPK_ICON = src/mercurial.png
 
-PYTHON_PACKAGE = python311
+PYTHON_PACKAGE = python312
 SPK_DEPENDS = "python312"
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)