View | Details | Raw Unified | Return to bug 181961 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-11 / +10 lines)
Lines 1-24 Link Here
1
# $FreeBSD: devel/tortoisehg2/Makefile 323196 2013-07-18 05:20:29Z miwi $
1
# $FreeBSD: devel/tortoisehg2/Makefile 323196 2013-07-18 05:20:29Z miwi $
2
2
3
PORTNAME=	tortoisehg
3
PORTNAME=	tortoisehg
4
PORTVERSION=	2.8.2
4
PORTVERSION=	2.9.1
5
CATEGORIES=	devel
5
CATEGORIES=	devel
6
MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
6
MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
7
7
8
MAINTAINER=	6yearold@gmail.com
8
MAINTAINER=	6yearold@gmail.com
9
COMMENT=	THg script from TortoiseHG
9
COMMENT=	THg script from TortoiseHG
10
10
11
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.3:${PORTSDIR}/devel/py-qt4-core \
11
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.10.2:${PORTSDIR}/devel/py-qt4-core \
12
		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=4.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
12
		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.7.2:${PORTSDIR}/devel/py-qt4-qscintilla2 \
13
		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.3:${PORTSDIR}/net/py-qt4-network \
13
		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.10.2:${PORTSDIR}/net/py-qt4-network \
14
		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.3:${PORTSDIR}/x11-toolkits/py-qt4-gui \
14
		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.10.2:${PORTSDIR}/x11-toolkits/py-qt4-gui
15
		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.8.3:${PORTSDIR}/textproc/py-qt4-xml
15
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.10.2:${PORTSDIR}/devel/py-qt4-core \
16
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.3:${PORTSDIR}/devel/py-qt4-core \
16
		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.7.2:${PORTSDIR}/devel/py-qt4-qscintilla2 \
17
		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=4.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
17
		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.10.2:${PORTSDIR}/net/py-qt4-network \
18
		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.3:${PORTSDIR}/net/py-qt4-network \
18
		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.10.2:${PORTSDIR}/x11-toolkits/py-qt4-gui \
19
		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.3:${PORTSDIR}/x11-toolkits/py-qt4-gui \
20
		hg:${PORTSDIR}/devel/mercurial \
19
		hg:${PORTSDIR}/devel/mercurial \
21
		${PYTHON_PKGNAMEPREFIX}iniparse>0:${PORTSDIR}/devel/py-iniparse \
20
		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:${PORTSDIR}/devel/py-iniparse \
22
		pygmentize:${PORTSDIR}/textproc/py-pygments
21
		pygmentize:${PORTSDIR}/textproc/py-pygments
23
22
24
OPTIONS_DEFINE=	NAUTILUS
23
OPTIONS_DEFINE=	NAUTILUS
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (tortoisehg-2.8.2.tar.gz) = 57fccb8cf5a6a44fc8e95cd5f3d139d11c01c7da3a07767acb2cd8655494329f
1
SHA256 (tortoisehg-2.9.1.tar.gz) = 5b1433df6129e0668cc945685b17d044210b4eb54f26aaa30c38cee600cc8e66
2
SIZE (tortoisehg-2.8.2.tar.gz) = 9094811
2
SIZE (tortoisehg-2.9.1.tar.gz) = 8682337
(-)./files/patch-contrib-thg.desktop (+11 lines)
Line 0 Link Here
1
--- /dev/null	2013-09-09 09:16:06.000000000 +0400
2
+++ contrib/tortoisehg.desktop	2013-09-09 09:15:52.767575878 +0400
3
@@ -0,0 +1,8 @@
4
+[Desktop Entry]
5
+Type=Application
6
+Name=TortoiseHg
7
+GenericName=Version Control GUI
8
+Comment=GUI application for using Mercurial
9
+Icon=%%PREFIX%%/share/pixmaps/tortoisehg/icons/thg_logo.ico
10
+Exec=thg --nofork
11
+Categories=Development;RevisionControl;
(-)./files/patch-contrib-tortoisehg.desktop (-10 lines)
Lines 1-10 Link Here
1
--- contrib/tortoisehg_.desktop	2011-05-04 08:03:56.000000000 +0400
2
+++ contrib/tortoisehg.desktop	2011-11-08 14:10:42.167216155 +0400
3
@@ -3,6 +3,6 @@
4
 Name=TortoiseHg
5
 GenericName=Version Control GUI
6
 Comment=GUI application for using Mercurial
7
-Icon=thg_logo
8
+Icon=%%PREFIX%%/share/pixmaps/tortoisehg/icons/thg_logo.ico
9
 Exec=thg --nofork
10
 Categories=Development;RevisionControl;
(-)./files/patch-setup.py (-6 / +6 lines)
Lines 1-6 Link Here
1
--- setup_.py	2012-09-05 19:36:36.000000000 +0400
1
--- setup_.py	2013-09-06 04:45:26.000000000 +0400
2
+++ setup.py	2012-09-07 10:16:47.929179472 +0400
2
+++ setup.py	2013-09-09 09:31:13.148575638 +0400
3
@@ -280,7 +280,7 @@
3
@@ -362,7 +362,7 @@
4
 class build(_build_orig):
4
 class build(_build_orig):
5
     sub_commands = [
5
     sub_commands = [
6
         ('build_qt', None),
6
         ('build_qt', None),
Lines 9-24 Link Here
9
         ] + _build_orig.sub_commands
9
         ] + _build_orig.sub_commands
10
 
10
 
11
 class clean(_clean_orig):
11
 class clean(_clean_orig):
12
@@ -299,7 +299,7 @@
12
@@ -381,7 +381,7 @@
13
         'build_mo': build_mo ,
13
         'build_mo': build_mo ,
14
         'clean': clean,
14
         'clean': clean,
15
         'clean_local': clean_local,
15
         'clean_local': clean_local,
16
-        'update_pot': update_pot ,
16
-        'update_pot': update_pot ,
17
+%%NLS%%        'update_pot': update_pot ,
17
+%%NLS%%        'update_pot': update_pot ,
18
         'import_po': import_po
18
     }
19
     }
19
 
20
 
20
 def setup_windows(version):
21
@@ -501,11 +501,11 @@
21
@@ -418,11 +418,11 @@
22
     _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),
22
     _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),
23
         [os.path.join(root, file_) for file_ in files])
23
         [os.path.join(root, file_) for file_ in files])
24
         for root, dirs, files in os.walk('icons')]
24
         for root, dirs, files in os.walk('icons')]
(-)./pkg-plist (-3 / +14 lines)
Lines 57-65 Link Here
57
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.py
57
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.py
58
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.pyc
58
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.pyc
59
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.pyo
59
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.pyo
60
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/dnd.py
61
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/dnd.pyc
62
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/dnd.pyo
63
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.py
60
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.py
64
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.pyc
61
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.pyc
65
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.pyo
62
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.pyo
Lines 198-203 Link Here
198
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.py
195
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.py
199
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.pyc
196
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.pyc
200
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.pyo
197
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.pyo
198
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtapp.py
199
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtapp.pyc
200
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtapp.pyo
201
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.py
201
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.py
202
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.pyc
202
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.pyc
203
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.pyo
203
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.pyo
Lines 273-278 Link Here
273
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/shelve.py
273
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/shelve.py
274
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/shelve.pyc
274
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/shelve.pyc
275
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/shelve.pyo
275
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/shelve.pyo
276
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/sign.py
277
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/sign.pyc
278
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/sign.pyo
276
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/status.py
279
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/status.py
277
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/status.pyc
280
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/status.pyc
278
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/status.pyo
281
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/status.pyo
Lines 336-341 Link Here
336
%%PYTHON_SITELIBDIR%%/tortoisehg/util/editor.py
339
%%PYTHON_SITELIBDIR%%/tortoisehg/util/editor.py
337
%%PYTHON_SITELIBDIR%%/tortoisehg/util/editor.pyc
340
%%PYTHON_SITELIBDIR%%/tortoisehg/util/editor.pyc
338
%%PYTHON_SITELIBDIR%%/tortoisehg/util/editor.pyo
341
%%PYTHON_SITELIBDIR%%/tortoisehg/util/editor.pyo
342
%%PYTHON_SITELIBDIR%%/tortoisehg/util/gpg.py
343
%%PYTHON_SITELIBDIR%%/tortoisehg/util/gpg.pyc
344
%%PYTHON_SITELIBDIR%%/tortoisehg/util/gpg.pyo
339
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.py
345
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.py
340
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyc
346
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyc
341
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyo
347
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyo
Lines 348-353 Link Here
348
%%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.py
354
%%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.py
349
%%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.pyc
355
%%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.pyc
350
%%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.pyo
356
%%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.pyo
357
%%PYTHON_SITELIBDIR%%/tortoisehg/util/obsoleteutil.py
358
%%PYTHON_SITELIBDIR%%/tortoisehg/util/obsoleteutil.pyc
359
%%PYTHON_SITELIBDIR%%/tortoisehg/util/obsoleteutil.pyo
351
%%PYTHON_SITELIBDIR%%/tortoisehg/util/patchctx.py
360
%%PYTHON_SITELIBDIR%%/tortoisehg/util/patchctx.py
352
%%PYTHON_SITELIBDIR%%/tortoisehg/util/patchctx.pyc
361
%%PYTHON_SITELIBDIR%%/tortoisehg/util/patchctx.pyc
353
%%PYTHON_SITELIBDIR%%/tortoisehg/util/patchctx.pyo
362
%%PYTHON_SITELIBDIR%%/tortoisehg/util/patchctx.pyo
Lines 407-412 Link Here
407
%%NLS%%share/locale/uk/LC_MESSAGES/tortoisehg.mo
416
%%NLS%%share/locale/uk/LC_MESSAGES/tortoisehg.mo
408
%%NLS%%share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
417
%%NLS%%share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
409
%%NLS%%share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
418
%%NLS%%share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
419
share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
410
share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
420
share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
411
share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
421
share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
412
share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
422
share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
Lines 415-420 Link Here
415
share/pixmaps/tortoisehg/icons/24x24/actions/hg-pull.png
425
share/pixmaps/tortoisehg/icons/24x24/actions/hg-pull.png
416
share/pixmaps/tortoisehg/icons/24x24/actions/hg-push.png
426
share/pixmaps/tortoisehg/icons/24x24/actions/hg-push.png
417
share/pixmaps/tortoisehg/icons/32x32/actions/hg-bookmarks.png
427
share/pixmaps/tortoisehg/icons/32x32/actions/hg-bookmarks.png
428
share/pixmaps/tortoisehg/icons/32x32/actions/hg-sign.png
418
share/pixmaps/tortoisehg/icons/README.txt
429
share/pixmaps/tortoisehg/icons/README.txt
419
share/pixmaps/tortoisehg/icons/TortoiseMerge.ico
430
share/pixmaps/tortoisehg/icons/TortoiseMerge.ico
420
share/pixmaps/tortoisehg/icons/branch.ico
431
share/pixmaps/tortoisehg/icons/branch.ico

Return to bug 181961