pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/py-tortoisehg py-tortoisehg: update to 5.6.
details: https://anonhg.NetBSD.org/pkgsrc/rev/f3b9a94f669b
branches: trunk
changeset: 441628:f3b9a94f669b
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Nov 07 16:32:13 2020 +0000
description:
py-tortoisehg: update to 5.6.
5.6: not documented
= TortoiseHg 5.5.2 =
TortoiseHg 5.5.2 is a regularly scheduled bug-fix release
== Bug Fixes ==
py3: fix a bytes + str concatenation when running the resolve tool (fixes #5596 (closed))
resolve: fix a bytes vs str issue when performing a merge without auto-resolve
bugreport: fix a bytes vs str issue for a SettingsDialog argument
wix: fix the 32-bit installation (fixes #5622 (closed))
py3: ensure qtlib._styles is str (ref #810, #5599 (closed))
= TortoiseHg 5.5.1 =
TortoiseHg 5.5.1 is a regularly scheduled bug-fix release
= TortoiseHg 5.5 =
TortoiseHg 5.5 is a quarterly feature release
== Bug Fixes ==
hgcommands: don't index **opts with bytes (fixes #5567 (closed))
fileview: fix UI freezes on newer version of QScintilla
py3: numerous python3 fixes
== Improvements ==
cleanup: remove BitBucket references
topics: improve support for the topic extension
= TortoiseHg 5.1 through 5.4.2 =
TODO
diffstat:
devel/py-tortoisehg/Makefile | 17 ++-
devel/py-tortoisehg/PLIST | 43 ++++----
devel/py-tortoisehg/distinfo | 13 +-
devel/py-tortoisehg/patches/patch-setup.py | 48 ----------
devel/py-tortoisehg/patches/patch-tortoisehg_util_hgversion.py | 13 --
devel/py-tortoisehg/patches/patch-tortoisehg_util_paths.py | 18 ---
6 files changed, 37 insertions(+), 115 deletions(-)
diffs (296 lines):
diff -r d22932b10462 -r f3b9a94f669b devel/py-tortoisehg/Makefile
--- a/devel/py-tortoisehg/Makefile Sat Nov 07 15:46:13 2020 +0000
+++ b/devel/py-tortoisehg/Makefile Sat Nov 07 16:32:13 2020 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.66 2020/11/05 09:07:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2020/11/07 16:32:13 wiz Exp $
-DISTNAME= tortoisehg-5.0.2
-PKGREVISION= 8
+DISTNAME= tortoisehg-5.6
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel python
-MASTER_SITES= http://bitbucket.org/tortoisehg/targz/downloads/
+MASTER_SITES= https://www.mercurial-scm.org/release/tortoisehg/targz/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://tortoisehg.bitbucket.io/
@@ -18,8 +17,6 @@
DEPENDS+= ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
DEPENDS+= ${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial
-PYTHON_VERSIONS_ACCEPTED= 27 # py-iniparse, py-mercurial
-
thg_icon= /share/pixmaps/tortoisehg/icons/thg_logo.ico
SUBST_CLASSES+= df
SUBST_STAGE.df= post-configure
@@ -27,6 +24,9 @@
SUBST_FILES.df= contrib/thg.desktop
SUBST_SED.df= -e 's:thg_logo:${PREFIX}${thg_icon}:1'
+INSTALLATION_DIRS+= share/applications
+INSTALLATION_DIRS+= share/doc/tortoisehg
+
pre-build:
${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} html
${RUN} rm ${WRKSRC}/doc/build/html/.buildinfo
@@ -34,6 +34,11 @@
# https://bitbucket.org/tortoisehg/thg/issues/4629/tortoisehg-file-name-conflict-with
${RM} ${WRKSRC}/hgext3rd/__init__.py
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/contrib/thg.desktop ${DESTDIR}${PREFIX}/share/applications/thg.desktop
+ ${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${DESTDIR}${PREFIX}/share/doc/tortoisehg
+ cd ${WRKSRC}/doc/build && pax -pp -rw html ${DESTDIR}${PREFIX}/share/doc/tortoisehg
+
.include "../../lang/python/application.mk"
.include "../../lang/python/distutils.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff -r d22932b10462 -r f3b9a94f669b devel/py-tortoisehg/PLIST
--- a/devel/py-tortoisehg/PLIST Sat Nov 07 15:46:13 2020 +0000
+++ b/devel/py-tortoisehg/PLIST Sat Nov 07 16:32:13 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2019/09/20 10:55:55 nros Exp $
+@comment $NetBSD: PLIST,v 1.17 2020/11/07 16:32:13 wiz Exp $
bin/thg
${PYSITELIB}/hgext3rd/thg.py
${PYSITELIB}/hgext3rd/thg.pyc
@@ -40,6 +40,9 @@
${PYSITELIB}/tortoisehg/hgqt/clone.py
${PYSITELIB}/tortoisehg/hgqt/clone.pyc
${PYSITELIB}/tortoisehg/hgqt/clone.pyo
+${PYSITELIB}/tortoisehg/hgqt/close_branch.py
+${PYSITELIB}/tortoisehg/hgqt/close_branch.pyc
+${PYSITELIB}/tortoisehg/hgqt/close_branch.pyo
${PYSITELIB}/tortoisehg/hgqt/cmdcore.py
${PYSITELIB}/tortoisehg/hgqt/cmdcore.pyc
${PYSITELIB}/tortoisehg/hgqt/cmdcore.pyo
@@ -97,6 +100,9 @@
${PYSITELIB}/tortoisehg/hgqt/guess.py
${PYSITELIB}/tortoisehg/hgqt/guess.pyc
${PYSITELIB}/tortoisehg/hgqt/guess.pyo
+${PYSITELIB}/tortoisehg/hgqt/hgconfig.py
+${PYSITELIB}/tortoisehg/hgqt/hgconfig.pyc
+${PYSITELIB}/tortoisehg/hgqt/hgconfig.pyo
${PYSITELIB}/tortoisehg/hgqt/hgemail.py
${PYSITELIB}/tortoisehg/hgqt/hgemail.pyc
${PYSITELIB}/tortoisehg/hgqt/hgemail.pyo
@@ -148,15 +154,15 @@
${PYSITELIB}/tortoisehg/hgqt/p4pending.py
${PYSITELIB}/tortoisehg/hgqt/p4pending.pyc
${PYSITELIB}/tortoisehg/hgqt/p4pending.pyo
-${PYSITELIB}/tortoisehg/hgqt/pbranch.py
-${PYSITELIB}/tortoisehg/hgqt/pbranch.pyc
-${PYSITELIB}/tortoisehg/hgqt/pbranch.pyo
${PYSITELIB}/tortoisehg/hgqt/phabreview.py
${PYSITELIB}/tortoisehg/hgqt/phabreview.pyc
${PYSITELIB}/tortoisehg/hgqt/phabreview.pyo
${PYSITELIB}/tortoisehg/hgqt/phabreview_ui.py
${PYSITELIB}/tortoisehg/hgqt/phabreview_ui.pyc
${PYSITELIB}/tortoisehg/hgqt/phabreview_ui.pyo
+${PYSITELIB}/tortoisehg/hgqt/pick.py
+${PYSITELIB}/tortoisehg/hgqt/pick.pyc
+${PYSITELIB}/tortoisehg/hgqt/pick.pyo
${PYSITELIB}/tortoisehg/hgqt/postreview.py
${PYSITELIB}/tortoisehg/hgqt/postreview.pyc
${PYSITELIB}/tortoisehg/hgqt/postreview.pyo
@@ -250,9 +256,6 @@
${PYSITELIB}/tortoisehg/hgqt/run.py
${PYSITELIB}/tortoisehg/hgqt/run.pyc
${PYSITELIB}/tortoisehg/hgqt/run.pyo
-${PYSITELIB}/tortoisehg/hgqt/rupdate.py
-${PYSITELIB}/tortoisehg/hgqt/rupdate.pyc
-${PYSITELIB}/tortoisehg/hgqt/rupdate.pyo
${PYSITELIB}/tortoisehg/hgqt/serve.py
${PYSITELIB}/tortoisehg/hgqt/serve.pyc
${PYSITELIB}/tortoisehg/hgqt/serve.pyo
@@ -289,12 +292,15 @@
${PYSITELIB}/tortoisehg/hgqt/thgstrip.py
${PYSITELIB}/tortoisehg/hgqt/thgstrip.pyc
${PYSITELIB}/tortoisehg/hgqt/thgstrip.pyo
-${PYSITELIB}/tortoisehg/hgqt/topics.py
-${PYSITELIB}/tortoisehg/hgqt/topics.pyc
-${PYSITELIB}/tortoisehg/hgqt/topics.pyo
+${PYSITELIB}/tortoisehg/hgqt/topic.py
+${PYSITELIB}/tortoisehg/hgqt/topic.pyc
+${PYSITELIB}/tortoisehg/hgqt/topic.pyo
${PYSITELIB}/tortoisehg/hgqt/update.py
${PYSITELIB}/tortoisehg/hgqt/update.pyc
${PYSITELIB}/tortoisehg/hgqt/update.pyo
+${PYSITELIB}/tortoisehg/hgqt/updatecheck.py
+${PYSITELIB}/tortoisehg/hgqt/updatecheck.pyc
+${PYSITELIB}/tortoisehg/hgqt/updatecheck.pyo
${PYSITELIB}/tortoisehg/hgqt/visdiff.py
${PYSITELIB}/tortoisehg/hgqt/visdiff.pyc
${PYSITELIB}/tortoisehg/hgqt/visdiff.pyo
@@ -385,6 +391,9 @@
${PYSITELIB}/tortoisehg/util/thread2.py
${PYSITELIB}/tortoisehg/util/thread2.pyc
${PYSITELIB}/tortoisehg/util/thread2.pyo
+${PYSITELIB}/tortoisehg/util/typelib.py
+${PYSITELIB}/tortoisehg/util/typelib.pyc
+${PYSITELIB}/tortoisehg/util/typelib.pyo
${PYSITELIB}/tortoisehg/util/version.py
${PYSITELIB}/tortoisehg/util/version.pyc
${PYSITELIB}/tortoisehg/util/version.pyo
@@ -415,7 +424,6 @@
share/doc/tortoisehg/html/_images/nautilus.png
share/doc/tortoisehg/html/_images/overlayicons.png
share/doc/tortoisehg/html/_images/patchqueue.png
-share/doc/tortoisehg/html/_images/pbranch.png
share/doc/tortoisehg/html/_images/rejects.png
share/doc/tortoisehg/html/_images/repository-menu.png
share/doc/tortoisehg/html/_images/serve.png
@@ -456,19 +464,13 @@
share/doc/tortoisehg/html/_sources/sync.txt
share/doc/tortoisehg/html/_sources/whatsnew.txt
share/doc/tortoisehg/html/_sources/workbench.txt
-share/doc/tortoisehg/html/_static/ajax-loader.gif
share/doc/tortoisehg/html/_static/alabaster.css
share/doc/tortoisehg/html/_static/basic.css
-share/doc/tortoisehg/html/_static/comment-bright.png
-share/doc/tortoisehg/html/_static/comment-close.png
-share/doc/tortoisehg/html/_static/comment.png
share/doc/tortoisehg/html/_static/custom.css
share/doc/tortoisehg/html/_static/doctools.js
share/doc/tortoisehg/html/_static/documentation_options.js
-share/doc/tortoisehg/html/_static/down-pressed.png
-share/doc/tortoisehg/html/_static/down.png
share/doc/tortoisehg/html/_static/file.png
-share/doc/tortoisehg/html/_static/jquery-3.2.1.js
+share/doc/tortoisehg/html/_static/jquery-3.4.1.js
share/doc/tortoisehg/html/_static/jquery.js
share/doc/tortoisehg/html/_static/language_data.js
share/doc/tortoisehg/html/_static/minus.png
@@ -479,9 +481,6 @@
share/doc/tortoisehg/html/_static/tortoisehg.css
share/doc/tortoisehg/html/_static/underscore-1.3.1.js
share/doc/tortoisehg/html/_static/underscore.js
-share/doc/tortoisehg/html/_static/up-pressed.png
-share/doc/tortoisehg/html/_static/up.png
-share/doc/tortoisehg/html/_static/websupport.js
share/doc/tortoisehg/html/archive.html
share/doc/tortoisehg/html/clone.html
share/doc/tortoisehg/html/commit.html
@@ -549,6 +548,7 @@
share/locale/uk/LC_MESSAGES/tortoisehg.mo
share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
+share/nautilus-python/extensions/nautilus-thg.py
share/pixmaps/tortoisehg/icons/16x16/actions/hg-add.png
share/pixmaps/tortoisehg/icons/16x16/actions/thg-repoconfig.png
share/pixmaps/tortoisehg/icons/16x16/actions/thg-userconfig.png
@@ -727,4 +727,3 @@
share/pixmaps/tortoisehg/icons/shelve.ico
share/pixmaps/tortoisehg/icons/thg_logo.ico
share/pixmaps/tortoisehg/icons/thg_logo_92x50.png
-share/tortoisehg/mergetools.rc
diff -r d22932b10462 -r f3b9a94f669b devel/py-tortoisehg/distinfo
--- a/devel/py-tortoisehg/distinfo Sat Nov 07 15:46:13 2020 +0000
+++ b/devel/py-tortoisehg/distinfo Sat Nov 07 16:32:13 2020 +0000
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.45 2019/09/20 10:55:55 nros Exp $
+$NetBSD: distinfo,v 1.46 2020/11/07 16:32:13 wiz Exp $
-SHA1 (tortoisehg-5.0.2.tar.gz) = 776860a157a6883b7a3cd004d5e38a1f4eebea63
-RMD160 (tortoisehg-5.0.2.tar.gz) = 4416c61f2854d74682e14c9d079109b9f34cd524
-SHA512 (tortoisehg-5.0.2.tar.gz) = d33916cf3215360cada06de62db46e70c555b1f4cd509f0b863e2baa633e2c5df99f09f3a103444c30aa0a6e15e2acd7134f045cb3846cccc7b727482d94e650
-Size (tortoisehg-5.0.2.tar.gz) = 8002109 bytes
-SHA1 (patch-setup.py) = 8a8f2df84ed99481af7c95327a05354099c1c7c5
-SHA1 (patch-tortoisehg_util_hgversion.py) = 17ea2a2f90395a007e4a3841908d652bf33a0956
-SHA1 (patch-tortoisehg_util_paths.py) = 0fbe6b583b3d6d60f4c8d96f81d633f454230f81
+SHA1 (tortoisehg-5.6.tar.gz) = 23d595ec4927c70da34756961da650a1733157b0
+RMD160 (tortoisehg-5.6.tar.gz) = c4a887efcb6698469f098154b631ecd53db5a36d
+SHA512 (tortoisehg-5.6.tar.gz) = 30013a776ea7e8b1167280350b64a993ebccbf82486f93164a1eaa42e98587719503c3dd939f9ea682d4302532216575ad7a20e9e2122315f63af7d002d08b03
+Size (tortoisehg-5.6.tar.gz) = 8920111 bytes
diff -r d22932b10462 -r f3b9a94f669b devel/py-tortoisehg/patches/patch-setup.py
--- a/devel/py-tortoisehg/patches/patch-setup.py Sat Nov 07 15:46:13 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-$NetBSD: patch-setup.py,v 1.4 2018/04/22 22:21:09 wiz Exp $
-
-* in config.py: adjust license filename and add doc_path
- to point at the local docs
-* nautilus-python is not available in pkgsrc so don't install
- the nautilus extension.
-* Install html documention, desktop file and license file.
-
---- setup.py.orig 2018-02-02 17:35:52.000000000 +0000
-+++ setup.py
-@@ -11,6 +11,7 @@ import sys
- import os
- import shutil
- import cgi
-+import string
- import tempfile
- import re
- import tarfile
-@@ -213,10 +214,11 @@ class build_config(Command):
- data = {
- 'bin_path': installcmd.install_scripts[rootlen:],
- 'license_path': os.path.join(sharedir, 'doc', 'tortoisehg',
-- 'Copying.txt.gz'),
-+ 'COPYING.txt'),
- 'locale_path': os.path.join(sharedir, 'locale'),
- 'icon_path': os.path.join(sharedir, 'pixmaps', 'tortoisehg',
- 'icons'),
-+ 'doc_path' : os.path.join(sharedir, 'doc', 'tortoisehg'),
- 'nofork': True,
- 'qt_api': qtcore._detectapi(),
- }
-@@ -722,8 +724,14 @@ def setup_posix():
- [os.path.join(root, f) for f in files]))
- _data_files.extend((os.path.join('share', modir), [mofile])
- for pofile, modir, mofile in _walklocales())
-- _data_files += [('share/nautilus-python/extensions',
-- ['contrib/nautilus-thg.py'])]
-+
-+ _data_files += [(os.path.join('share/doc/tortoisehg',
-+ string.replace(root,'doc/build/html','html',1)),
-+ [os.path.join(root, file_) for file_ in files])
-+ for root, dirs, files in os.walk('doc/build/html')]
-+ _data_files += [('share/doc/tortoisehg/',['COPYING.txt'])]
-+ _data_files += [('share/applications', ['contrib/thg.desktop'])]
-+ _data_files += [('share/tortoisehg', ['contrib/mergetools.rc'])]
-
- return _scripts, _packages, _data_files, _extra
-
diff -r d22932b10462 -r f3b9a94f669b devel/py-tortoisehg/patches/patch-tortoisehg_util_hgversion.py
--- a/devel/py-tortoisehg/patches/patch-tortoisehg_util_hgversion.py Sat Nov 07 15:46:13 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-tortoisehg_util_hgversion.py,v 1.1 2019/09/20 10:55:55 nros Exp $
-* make tortosiehg run with mercurial 5.1
---- tortoisehg/util/hgversion.py.orig 2019-09-19 21:06:02.537267989 +0000
-+++ tortoisehg/util/hgversion.py
-@@ -16,7 +16,7 @@ except AttributeError:
- from mercurial import version
- hgversion = version.get_version()
-
--testedwith = '4.9 5.0'
-+testedwith = '4.9 5.0 5.1'
-
- def checkhgversion(v):
- """range check the Mercurial version"""
diff -r d22932b10462 -r f3b9a94f669b devel/py-tortoisehg/patches/patch-tortoisehg_util_paths.py
--- a/devel/py-tortoisehg/patches/patch-tortoisehg_util_paths.py Sat Nov 07 15:46:13 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-tortoisehg_util_paths.py,v 1.2 2016/08/02 23:33:57 wiz Exp $
-
-* include doc_path in paths
-
---- tortoisehg/util/paths.py.orig 2016-08-02 17:08:10.000000000 +0000
-+++ tortoisehg/util/paths.py
-@@ -7,9 +7,9 @@
-
- try:
- from tortoisehg.util.config import (icon_path, bin_path, license_path,
-- locale_path)
-+ locale_path, doc_path)
- except ImportError:
-- icon_path, bin_path, license_path, locale_path = None, None, None, None
-+ icon_path, bin_path, license_path, locale_path , doc_path = None, None, None, None, None
-
- import os, sys, shlex
- import mercurial
Home |
Main Index |
Thread Index |
Old Index