Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Nov 2018 10:46:13 +0000 (UTC)
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r485649 - in head/devel/tortoisehg: . files
Message-ID:  <201811231046.wANAkD4p047360@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arrowd
Date: Fri Nov 23 10:46:13 2018
New Revision: 485649
URL: https://svnweb.freebsd.org/changeset/ports/485649

Log:
  devel/tortoisehg: Update to 4.8.
  
  Submitted by:	Joan Picanyol i Puig <pica@biaix.org> (a link to a necessary patch)
  Reviewed by:	Nathan Owens <ndowens@yahoo.com>, tcberner
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D18042

Added:
  head/devel/tortoisehg/files/patch-tortoisehg_hgqt_qtlib.py   (contents, props changed)
Modified:
  head/devel/tortoisehg/Makefile
  head/devel/tortoisehg/distinfo
  head/devel/tortoisehg/pkg-plist

Modified: head/devel/tortoisehg/Makefile
==============================================================================
--- head/devel/tortoisehg/Makefile	Fri Nov 23 10:29:53 2018	(r485648)
+++ head/devel/tortoisehg/Makefile	Fri Nov 23 10:46:13 2018	(r485649)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tortoisehg
-DISTVERSION=	4.6
-PORTREVISION=	2
+DISTVERSION=	4.8
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/tortoisehg/targz/downloads/
 
@@ -16,23 +15,21 @@ RUN_DEPENDS=	hg:devel/mercurial \
 		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
 
-OPTIONS_DEFINE=	NAUTILUS NLS
-NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
-OPTIONS_SUB=	yes
-
 USES=		pyqt:5 python:2.7
 USE_PYQT=	core gui network qscintilla2 xml
-NLS_USES=	gettext
-
-INSTALLS_ICONS=	yes
-
 USE_PYTHON=	distutils
-NO_ARCH=	yes
 
+NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
 EXTRACT_AFTER_ARGS=	--exclude ${DISTNAME}/hgext3rd/__init__.py
+
+OPTIONS_DEFINE=	NAUTILUS NLS
+NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e '/_path/ s|/usr|${PREFIX}|' ${WRKSRC}/${PYSETUP}

Modified: head/devel/tortoisehg/distinfo
==============================================================================
--- head/devel/tortoisehg/distinfo	Fri Nov 23 10:29:53 2018	(r485648)
+++ head/devel/tortoisehg/distinfo	Fri Nov 23 10:46:13 2018	(r485649)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529005498
-SHA256 (tortoisehg-4.6.tar.gz) = b3d21a3b331e757b1aab0a5e28e016739f96acbccb5f7150ba50db1be791b98c
-SIZE (tortoisehg-4.6.tar.gz) = 7947478
+TIMESTAMP = 1542624214
+SHA256 (tortoisehg-4.8.tar.gz) = f079051a60e0f20794efe71761879f19adde629ec7fda268c6005f229625e7fe
+SIZE (tortoisehg-4.8.tar.gz) = 7948435

Added: head/devel/tortoisehg/files/patch-tortoisehg_hgqt_qtlib.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/tortoisehg/files/patch-tortoisehg_hgqt_qtlib.py	Fri Nov 23 10:46:13 2018	(r485649)
@@ -0,0 +1,8 @@
+--- tortoisehg/hgqt/qtlib.py.orig	2018-11-19 10:53:15 UTC
++++ tortoisehg/hgqt/qtlib.py
+@@ -1470,5 +1470,3 @@ class PaletteSwitcher(object):
+ def setContextMenuShortcut(action, shortcut):
+     """Set shortcut for a context menu action, making sure it's visible"""
+     action.setShortcut(shortcut)
+-    if QT_VERSION >= 0x50a00:
+-        action.setShortcutVisibleInContextMenu(True)

Modified: head/devel/tortoisehg/pkg-plist
==============================================================================
--- head/devel/tortoisehg/pkg-plist	Fri Nov 23 10:29:53 2018	(r485648)
+++ head/devel/tortoisehg/pkg-plist	Fri Nov 23 10:46:13 2018	(r485649)
@@ -167,9 +167,6 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qfold.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qfold.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qfold.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qrename.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qrename.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qrename.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qsci.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qsci.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qsci.pyo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811231046.wANAkD4p047360>