update mercurial to v5.7.1 and python 3.8 (SynoCommunity#4591)

AlexPresso · May 9, 2021 · dd9d9a3 · dd9d9a3
1 parent 05ff107
commit dd9d9a3
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 136 deletions.
diff --git a/cross/mercurial/Makefile b/cross/mercurial/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = mercurial
-PKG_VERS = 4.8.1
+PKG_VERS = 5.7.1
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.mercurial-scm.org/release

diff --git a/cross/mercurial/digests b/cross/mercurial/digests
@@ -1,3 +1,3 @@
-mercurial-4.8.1.tar.gz SHA1 108254a9f2dddd9478cdbc7d3127108b22facb7c
-mercurial-4.8.1.tar.gz SHA256 48a45f5cde9104fbc2daf310d710d4ebf286d879b89fa327d24b005434b0fa21
-mercurial-4.8.1.tar.gz MD5 2da7ead4517ddb65f997bc27c6483686
+mercurial-5.7.1.tar.gz SHA1 44f2d2dbdbebeb86358d9e6bac0867f43ae06178
+mercurial-5.7.1.tar.gz SHA256 cb5139144ccb2ef648f36963c8606d47dea1cb0e22aa2c055d6f860ce3fde7b0
+mercurial-5.7.1.tar.gz MD5 0f99d4308e5a5a60198d7b6befd930c4
diff --git a/cross/mercurial/patches/001-fix-python-path.patch b/cross/mercurial/patches/001-fix-python-path.patch
diff --git a/spk/mercurial/Makefile b/spk/mercurial/Makefile
@@ -1,25 +1,25 @@
 SPK_NAME = mercurial
-SPK_VERS = 4.8.1
-SPK_REV = 6
+SPK_VERS = 5.7.1
+SPK_REV = 7
 SPK_ICON = src/mercurial.png
 
-BUILD_DEPENDS = cross/python2 cross/setuptools cross/pip_py2 cross/wheel
+BUILD_DEPENDS = cross/python38 cross/setuptools cross/pip cross/wheel
 BUILD_DEPENDS += cross/$(SPK_NAME)
+
 WHEELS = src/requirements.txt
-SPK_DEPENDS = "python>=2.7.6-8"
+SPK_DEPENDS = "python38"
 
 MAINTAINER = Dr-Bean
 DESCRIPTION = Mercurial is a free, distributed source control management tool
 STARTABLE = no
 DISPLAY_NAME = Mercurial
-CHANGELOG = Update to 4.8.1
+CHANGELOG = Update mercurial to 5.7.1 with python 3.8
 
 HOMEPAGE = https://www.mercurial-scm.org/
 LICENSE  = MPL1.1
 
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
+SERVICE_SETUP = src/service-setup.sh
 
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
+SPK_USR_LOCAL_LINKS = bin:env/bin/hg
 
 include ../../mk/spksrc.spk.mk
diff --git a/spk/mercurial/src/dsm-control.sh b/spk/mercurial/src/dsm-control.sh
diff --git a/spk/mercurial/src/installer.sh b/spk/mercurial/src/installer.sh
diff --git a/spk/mercurial/src/mercurial.png b/spk/mercurial/src/mercurial.png
diff --git a/spk/mercurial/src/requirements.txt b/spk/mercurial/src/requirements.txt
@@ -1 +1 @@
-docutils==0.12
+docutils==0.17.1
diff --git a/spk/mercurial/src/service-setup.sh b/spk/mercurial/src/service-setup.sh
@@ -0,0 +1,15 @@
+
+PYTHON_DIR="/var/packages/python38/target/bin"
+VIRTUALENV="${PYTHON_DIR}/python3 -m venv"
+PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}:${PATH}"
+
+service_postinst ()
+{
+    # Create a Python virtualenv
+    ${VIRTUALENV} --system-site-packages ${SYNOPKG_PKGDEST}/env
+
+    # Install the wheels
+    wheelhouse=${SYNOPKG_PKGDEST}/share/wheelhouse
+    ${SYNOPKG_PKGDEST}/env/bin/pip install --no-deps --no-input --upgrade --no-index --find-links ${wheelhouse} ${wheelhouse}/*.whl
+}
+