Date: Mon, 17 May 2021 19:52:26 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0d3a8f965dbb - main - devel/tortoisehg: Update to 5.8 Message-ID: <202105171952.14HJqQGa047342@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d3a8f965dbb4f54f91d72e5eb41d22b005b865b commit 0d3a8f965dbb4f54f91d72e5eb41d22b005b865b Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2021-05-17 19:49:59 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2021-05-17 19:51:51 +0000 devel/tortoisehg: Update to 5.8 --- devel/tortoisehg/Makefile | 7 +++-- devel/tortoisehg/distinfo | 6 ++--- devel/tortoisehg/files/patch-contrib_thg.desktop | 11 -------- devel/tortoisehg/files/patch-setup.py | 34 ++++-------------------- 4 files changed, 11 insertions(+), 47 deletions(-) diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile index adfa3ebec8a7..79bf7403287c 100644 --- a/devel/tortoisehg/Makefile +++ b/devel/tortoisehg/Makefile @@ -1,6 +1,5 @@ PORTNAME= tortoisehg -DISTVERSION= 5.7.0 -PORTREVISION= 3 +DISTVERSION= 5.8.0 CATEGORIES= devel MAINTAINER= arrowd@FreeBSD.org @@ -22,8 +21,8 @@ USE_GITLAB= yes GL_SITE= https://foss.heptapod.net GL_ACCOUNT= mercurial/tortoisehg GL_PROJECT= thg -GL_COMMIT= 1be900fc8505ed5a93c900d19d1d8700a1b22aee -GL_HEPTAPOD_COMMIT= 69fd57f838ac26b5fa1b94560f388a783236c6d4 +GL_COMMIT= 65f0eafe3f398fabe0afbc475e18cd63af81df89 +GL_HEPTAPOD_COMMIT= 9f108b8c92463866721dedda1f3f872e0e2b4344 OPTIONS_DEFINE= NAUTILUS NLS NAUTILUS_DESC= Install TortoiseHG Nautilus extension diff --git a/devel/tortoisehg/distinfo b/devel/tortoisehg/distinfo index afc1ed1f4e5c..206565246303 100644 --- a/devel/tortoisehg/distinfo +++ b/devel/tortoisehg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613767388 -SHA256 (mercurial/tortoisehg-thg-1be900fc8505ed5a93c900d19d1d8700a1b22aee_GL0.tar.gz) = f6cafc35b59efa1050f3268004b57cb838c83c80be4f2ceb8d361818d0a43572 -SIZE (mercurial/tortoisehg-thg-1be900fc8505ed5a93c900d19d1d8700a1b22aee_GL0.tar.gz) = 8640370 +TIMESTAMP = 1621235474 +SHA256 (mercurial/tortoisehg-thg-65f0eafe3f398fabe0afbc475e18cd63af81df89_GL0.tar.gz) = 7248fb60c88e7f48b39d9090248ebae7b2c9fddbb6d2fae16bb3f6c259f7359f +SIZE (mercurial/tortoisehg-thg-65f0eafe3f398fabe0afbc475e18cd63af81df89_GL0.tar.gz) = 8652904 diff --git a/devel/tortoisehg/files/patch-contrib_thg.desktop b/devel/tortoisehg/files/patch-contrib_thg.desktop deleted file mode 100644 index 8c6190e50832..000000000000 --- a/devel/tortoisehg/files/patch-contrib_thg.desktop +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/thg.desktop.orig 2021-02-03 05:58:06 UTC -+++ contrib/thg.desktop -@@ -5,7 +5,7 @@ GenericName=Version Control GUI - GenericName[ru]=Графический интерфейс для системы контроля версий - Comment=GUI application for using Mercurial - Comment[ru]=Графический интерфейс для Mercurial --Icon=thg_logo -+Icon=tortoisehg/scalable/apps/thg - Exec=thg --nofork - Categories=Development;RevisionControl; - X-Desktop-File-Install-Version=0.23 diff --git a/devel/tortoisehg/files/patch-setup.py b/devel/tortoisehg/files/patch-setup.py index a4b351936a6c..0a8eba8766d4 100644 --- a/devel/tortoisehg/files/patch-setup.py +++ b/devel/tortoisehg/files/patch-setup.py @@ -1,33 +1,9 @@ ---- setup.py.orig 2021-02-03 05:58:06 UTC +--- setup.py.orig 2021-05-07 23:55:00 UTC +++ setup.py -@@ -218,8 +218,7 @@ class build_config(Command): - 'license_path': os.path.join(sharedir, 'doc', 'tortoisehg', - 'Copying.txt.gz'), - 'locale_path': os.path.join(sharedir, 'locale'), -- 'icon_path': os.path.join(sharedir, 'pixmaps', 'tortoisehg', -- 'icons'), -+ 'icon_path': os.path.join(sharedir, 'pixmaps', 'tortoisehg'), - 'nofork': True, - 'qt_api': qtcore._detectapi(), - } -@@ -488,7 +487,7 @@ class build(_build_orig): - lambda self: 'py2app' in self.distribution.commands), - ('build_ui', None), - ('build_qrc', lambda self: 'py2exe' in self.distribution.commands), -- ('build_mo', None), -+%%NLS%% ('build_mo', None), - ] + _build_orig.sub_commands - - class clean(_clean_orig): -@@ -723,12 +722,14 @@ def setup_posix(): - for root, dirs, files in os.walk('icons'): - if root == 'icons': - dirs.remove('svg') # drop source of .ico files -- _data_files.append((os.path.join('share/pixmaps/tortoisehg', root), -+ if not files: -+ continue -+ _data_files.append((os.path.normpath(os.path.join('share/pixmaps/tortoisehg', root.replace("icons", "."))), - [os.path.join(root, f) for f in files])) +@@ -730,10 +730,10 @@ def setup_posix(): + # install SVG icon for the desktop file + _data_files.append(('share/pixmaps', ['icons/svg/thg_logo.svg'])) + _data_files.append(('share/doc/tortoisehg', ['COPYING.txt'])) - _data_files.extend((os.path.join('share', modir), [mofile]) - for pofile, modir, mofile in _walklocales()) - _data_files += [('share/nautilus-python/extensions',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105171952.14HJqQGa047342>