Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Sep 2013 09:03:40 GMT
From:      arrowdodger <6yearold@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/181961: [MAINTAINER UPDATE] devel/tortoisehg2: Update 2.8.2 -> 2.9.1
Message-ID:  <201309090903.r8993e7C003654@oldred.freebsd.org>
Resent-Message-ID: <201309090910.r899A0Fx012244@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         181961
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] devel/tortoisehg2: Update 2.8.2 -> 2.9.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 09 09:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     arrowdodger
>Release:        9-stable
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/devel/tortoisehg2/Makefile ./Makefile
--- /usr/ports/devel/tortoisehg2/Makefile	2013-07-18 09:20:29.000000000 +0400
+++ ./Makefile	2013-09-09 11:17:45.703783077 +0400
@@ -1,24 +1,23 @@
 # $FreeBSD: devel/tortoisehg2/Makefile 323196 2013-07-18 05:20:29Z miwi $
 
 PORTNAME=	tortoisehg
-PORTVERSION=	2.8.2
+PORTVERSION=	2.9.1
 CATEGORIES=	devel
 MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
 
 MAINTAINER=	6yearold@gmail.com
 COMMENT=	THg script from TortoiseHG
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.3:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=4.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.3:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.3:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.8.3:${PORTSDIR}/textproc/py-qt4-xml
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.3:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=4.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.3:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.3:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.10.2:${PORTSDIR}/devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.7.2:${PORTSDIR}/devel/py-qt4-qscintilla2 \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.10.2:${PORTSDIR}/net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.10.2:${PORTSDIR}/x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.10.2:${PORTSDIR}/devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.7.2:${PORTSDIR}/devel/py-qt4-qscintilla2 \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.10.2:${PORTSDIR}/net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.10.2:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		hg:${PORTSDIR}/devel/mercurial \
-		${PYTHON_PKGNAMEPREFIX}iniparse>0:${PORTSDIR}/devel/py-iniparse \
+		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:${PORTSDIR}/devel/py-iniparse \
 		pygmentize:${PORTSDIR}/textproc/py-pygments
 
 OPTIONS_DEFINE=	NAUTILUS
diff -ruN /usr/ports/devel/tortoisehg2/distinfo ./distinfo
--- /usr/ports/devel/tortoisehg2/distinfo	2013-07-18 09:20:29.000000000 +0400
+++ ./distinfo	2013-09-09 09:09:00.763575958 +0400
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-2.8.2.tar.gz) = 57fccb8cf5a6a44fc8e95cd5f3d139d11c01c7da3a07767acb2cd8655494329f
-SIZE (tortoisehg-2.8.2.tar.gz) = 9094811
+SHA256 (tortoisehg-2.9.1.tar.gz) = 5b1433df6129e0668cc945685b17d044210b4eb54f26aaa30c38cee600cc8e66
+SIZE (tortoisehg-2.9.1.tar.gz) = 8682337
diff -ruN /usr/ports/devel/tortoisehg2/files/patch-contrib-thg.desktop ./files/patch-contrib-thg.desktop
--- /usr/ports/devel/tortoisehg2/files/patch-contrib-thg.desktop	1970-01-01 03:00:00.000000000 +0300
+++ ./files/patch-contrib-thg.desktop	2013-09-09 09:19:20.301571638 +0400
@@ -0,0 +1,11 @@
+--- /dev/null	2013-09-09 09:16:06.000000000 +0400
++++ contrib/tortoisehg.desktop	2013-09-09 09:15:52.767575878 +0400
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++Type=Application
++Name=TortoiseHg
++GenericName=Version Control GUI
++Comment=GUI application for using Mercurial
++Icon=%%PREFIX%%/share/pixmaps/tortoisehg/icons/thg_logo.ico
++Exec=thg --nofork
++Categories=Development;RevisionControl;
diff -ruN /usr/ports/devel/tortoisehg2/files/patch-contrib-tortoisehg.desktop ./files/patch-contrib-tortoisehg.desktop
--- /usr/ports/devel/tortoisehg2/files/patch-contrib-tortoisehg.desktop	2012-07-14 17:54:48.000000000 +0400
+++ ./files/patch-contrib-tortoisehg.desktop	1970-01-01 03:00:00.000000000 +0300
@@ -1,10 +0,0 @@
---- contrib/tortoisehg_.desktop	2011-05-04 08:03:56.000000000 +0400
-+++ contrib/tortoisehg.desktop	2011-11-08 14:10:42.167216155 +0400
-@@ -3,6 +3,6 @@
- Name=TortoiseHg
- GenericName=Version Control GUI
- Comment=GUI application for using Mercurial
--Icon=thg_logo
-+Icon=%%PREFIX%%/share/pixmaps/tortoisehg/icons/thg_logo.ico
- Exec=thg --nofork
- Categories=Development;RevisionControl;
diff -ruN /usr/ports/devel/tortoisehg2/files/patch-setup.py ./files/patch-setup.py
--- /usr/ports/devel/tortoisehg2/files/patch-setup.py	2012-09-10 16:56:16.000000000 +0400
+++ ./files/patch-setup.py	2013-09-09 09:53:32.235574917 +0400
@@ -1,6 +1,6 @@
---- setup_.py	2012-09-05 19:36:36.000000000 +0400
-+++ setup.py	2012-09-07 10:16:47.929179472 +0400
-@@ -280,7 +280,7 @@
+--- setup_.py	2013-09-06 04:45:26.000000000 +0400
++++ setup.py	2013-09-09 09:31:13.148575638 +0400
+@@ -362,7 +362,7 @@
  class build(_build_orig):
      sub_commands = [
          ('build_qt', None),
@@ -9,16 +9,16 @@
          ] + _build_orig.sub_commands
  
  class clean(_clean_orig):
-@@ -299,7 +299,7 @@
+@@ -381,7 +381,7 @@
          'build_mo': build_mo ,
          'clean': clean,
          'clean_local': clean_local,
 -        'update_pot': update_pot ,
 +%%NLS%%        'update_pot': update_pot ,
+         'import_po': import_po
      }
  
- def setup_windows(version):
-@@ -418,11 +418,11 @@
+@@ -501,11 +501,11 @@
      _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),
          [os.path.join(root, file_) for file_ in files])
          for root, dirs, files in os.walk('icons')]
diff -ruN /usr/ports/devel/tortoisehg2/pkg-plist ./pkg-plist
--- /usr/ports/devel/tortoisehg2/pkg-plist	2013-07-18 09:20:29.000000000 +0400
+++ ./pkg-plist	2013-09-09 12:08:02.007788996 +0400
@@ -57,9 +57,6 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/dnd.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/dnd.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/dnd.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.pyo
@@ -198,6 +195,9 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.pyo
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtapp.py
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtapp.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtapp.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.pyo
@@ -273,6 +273,9 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/shelve.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/shelve.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/shelve.pyo
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/sign.py
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/sign.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/sign.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/status.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/status.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/status.pyo
@@ -336,6 +339,9 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/editor.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/editor.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/editor.pyo
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/gpg.py
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/gpg.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/gpg.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyo
@@ -348,6 +354,9 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.pyo
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/obsoleteutil.py
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/obsoleteutil.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/obsoleteutil.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/patchctx.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/patchctx.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/patchctx.pyo
@@ -407,6 +416,7 @@
 %%NLS%%share/locale/uk/LC_MESSAGES/tortoisehg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
+share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
 share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
 share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
 share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
@@ -415,6 +425,7 @@
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-pull.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-push.png
 share/pixmaps/tortoisehg/icons/32x32/actions/hg-bookmarks.png
+share/pixmaps/tortoisehg/icons/32x32/actions/hg-sign.png
 share/pixmaps/tortoisehg/icons/README.txt
 share/pixmaps/tortoisehg/icons/TortoiseMerge.ico
 share/pixmaps/tortoisehg/icons/branch.ico


>Release-Note:
>Audit-Trail:
>Unformatted:



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