From owner-svn-ports-all@freebsd.org Fri Nov 23 10:46:15 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D47461142B63; Fri, 23 Nov 2018 10:46:14 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A4F48315F; Fri, 23 Nov 2018 10:46:14 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 56C871D776; Fri, 23 Nov 2018 10:46:14 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wANAkEGH047364; Fri, 23 Nov 2018 10:46:14 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wANAkD4p047360; Fri, 23 Nov 2018 10:46:13 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <201811231046.wANAkD4p047360@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Fri, 23 Nov 2018 10:46:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485649 - in head/devel/tortoisehg: . files X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: in head/devel/tortoisehg: . files X-SVN-Commit-Revision: 485649 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7A4F48315F X-Spamd-Result: default: False [1.82 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.42)[0.420,0]; NEURAL_SPAM_MEDIUM(0.74)[0.738,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.66)[0.657,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2018 10:46:15 -0000 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 (a link to a necessary patch) Reviewed by: Nathan Owens , 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