Attachment 160870 Details for Bug 203002 – patch

[patch] patch

thg.patch (text/plain), 10.46 KB, created by Gleb Popov on 2015-09-09 18:03:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Popov

Created: 2015-09-09 18:03:09 UTC

Size: 10.46 KB

patch

obsolete

>diff -ruN /usr/ports/devel/tortoisehg/Makefile tortoisehg/Makefile
>--- /usr/ports/devel/tortoisehg/Makefile	2015-07-18 21:51:31.000000000 +0300
>+++ tortoisehg/Makefile	2015-09-05 15:19:57.614353112 +0300
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/devel/tortoisehg/Makefile 392442 2015-07-18 18:51:31Z olivierd $
> 
> PORTNAME=	tortoisehg
>-PORTVERSION=	3.4.2
>+PORTVERSION=	3.5
> CATEGORIES=	devel
> MASTER_SITES=	https://bitbucket.org/tortoisehg/targz/downloads/
> #MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
>diff -ruN /usr/ports/devel/tortoisehg/distinfo tortoisehg/distinfo
>--- /usr/ports/devel/tortoisehg/distinfo	2015-07-18 21:51:31.000000000 +0300
>+++ tortoisehg/distinfo	2015-09-05 15:20:53.198348152 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (tortoisehg-3.4.2.tar.gz) = d22692166dc6ff61c9d12bfe5ceb77fbf87e7dd52222c956976e7987d84145a1
>-SIZE (tortoisehg-3.4.2.tar.gz) = 8205349
>+SHA256 (tortoisehg-3.5.tar.gz) = b072180ad851c6c04b003a75ee995a6e1a6cbe7d7a26e86398fd0b32f55194de
>+SIZE (tortoisehg-3.5.tar.gz) = 7395688
>diff -ruN /usr/ports/devel/tortoisehg/files/patch-setup.py tortoisehg/files/patch-setup.py
>--- /usr/ports/devel/tortoisehg/files/patch-setup.py	2014-01-22 21:40:44.000000000 +0400
>+++ tortoisehg/files/patch-setup.py	2015-09-05 21:31:29.282821581 +0300
>@@ -1,37 +1,26 @@
>---- 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),
>+--- setup.py.orig	2015-08-06 04:30:23.000000000 +0300
>++++ setup.py	2015-09-05 21:24:08.309849781 +0300
>+@@ -413,7 +413,7 @@
>+         ('build_config', lambda self: os.name != 'nt'),
>+         ('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):
>-@@ -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
>-     }
>- 
>-@@ -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')]
>--    _data_files += [(os.path.join('share', root),
>--        [os.path.join(root, file_) for file_ in files])
>--        for root, dirs, files in os.walk('locale')]
>--    _data_files += [('/usr/share/nautilus-python/extensions/',
>+@@ -567,10 +567,10 @@
>+             dirs.remove('svg')  # drop source of .ico files
>+         _data_files.append((os.path.join('share/pixmaps/tortoisehg', root),
>+                             [os.path.join(root, f) for f in files]))
>+-    _data_files.extend((os.path.join('share', modir), [mofile])
>+-                       for pofile, modir, mofile in _walklocales())
>+-    _data_files += [('share/nautilus-python/extensions',
> -                     ['contrib/nautilus-thg.py'])]
>-+%%NLS%%    _data_files += [(os.path.join('share', root),
>-+%%NLS%%        [os.path.join(root, file_) for file_ in files])
>-+%%NLS%%        for root, dirs, files in os.walk('locale')]
>-+%%NAUTILUS%%    _data_files += [('%%PREFIX%%/lib/nautilus/extensions-2.0/python',
>++%%NLS%%    _data_files.extend((os.path.join('share', modir), [mofile])
>++%%NLS%%                       for pofile, modir, mofile in _walklocales())
>++%%NAUTILUS%%    _data_files += [('share/nautilus-python/extensions',
> +%%NAUTILUS%%                     ['contrib/nautilus-thg.py'])]
>  
>-     # Create a config.py.  Distributions will need to supply their own
>-     cfgfile = os.path.join('tortoisehg', 'util', 'config.py')
>+     return _scripts, _packages, _data_files, _extra
>+ 
>diff -ruN /usr/ports/devel/tortoisehg/pkg-plist tortoisehg/pkg-plist
>--- /usr/ports/devel/tortoisehg/pkg-plist	2015-05-27 16:35:50.000000000 +0300
>+++ tortoisehg/pkg-plist	2015-09-05 21:08:22.951913462 +0300
>@@ -111,9 +111,6 @@
> %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.py
> %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyc
> %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyo
>-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.py
>-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.pyc
>-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.pyo
> %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.py
> %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyc
> %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyo
>@@ -404,26 +401,30 @@
> %%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/actions/hg-add.png
>+share/pixmaps/tortoisehg/icons/16x16/actions/thg-repoconfig.png
>+share/pixmaps/tortoisehg/icons/16x16/actions/thg-userconfig.png
> share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
> share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
> share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
> share/pixmaps/tortoisehg/icons/16x16/mimetypes/text-x-generic.png
>+share/pixmaps/tortoisehg/icons/16x16/status/hg-removed.png
> share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
> share/pixmaps/tortoisehg/icons/24x24/actions/hg-incoming.png
> share/pixmaps/tortoisehg/icons/24x24/actions/hg-outgoing.png
> 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-add.png
>+share/pixmaps/tortoisehg/icons/32x32/actions/hg-branch.png
> share/pixmaps/tortoisehg/icons/32x32/actions/hg-sign.png
>+share/pixmaps/tortoisehg/icons/32x32/actions/thg-repoconfig.png
>+share/pixmaps/tortoisehg/icons/32x32/actions/thg-userconfig.png
>+share/pixmaps/tortoisehg/icons/32x32/status/hg-removed.png
> share/pixmaps/tortoisehg/icons/README.txt
> share/pixmaps/tortoisehg/icons/TortoiseMerge.ico
>-share/pixmaps/tortoisehg/icons/branch.ico
> share/pixmaps/tortoisehg/icons/detect_rename.ico
> share/pixmaps/tortoisehg/icons/expander-close.png
> share/pixmaps/tortoisehg/icons/expander-open.png
>-share/pixmaps/tortoisehg/icons/fallback.svg
>-share/pixmaps/tortoisehg/icons/fileadd.ico
>-share/pixmaps/tortoisehg/icons/filedelete.ico
>-share/pixmaps/tortoisehg/icons/filemodify.ico
> share/pixmaps/tortoisehg/icons/general.ico
> share/pixmaps/tortoisehg/icons/hg.ico
> share/pixmaps/tortoisehg/icons/hgB.ico
>@@ -436,16 +437,9 @@
> share/pixmaps/tortoisehg/icons/menucommit.ico
> share/pixmaps/tortoisehg/icons/menucreaterepos.ico
> share/pixmaps/tortoisehg/icons/menudelete.ico
>-share/pixmaps/tortoisehg/icons/menudiff.ico
>-share/pixmaps/tortoisehg/icons/menuhelp.ico
>-share/pixmaps/tortoisehg/icons/menuimport.ico
> share/pixmaps/tortoisehg/icons/menulog.ico
>-share/pixmaps/tortoisehg/icons/menumerge.ico
>-share/pixmaps/tortoisehg/icons/menupatch.ico
> share/pixmaps/tortoisehg/icons/menurepobrowse.ico
> share/pixmaps/tortoisehg/icons/menurevert.ico
>-share/pixmaps/tortoisehg/icons/menurevisiongraph.ico
>-share/pixmaps/tortoisehg/icons/menusettings.ico
> share/pixmaps/tortoisehg/icons/menushowchanged.ico
> share/pixmaps/tortoisehg/icons/menusynch.ico
> share/pixmaps/tortoisehg/icons/proxy.ico
>@@ -503,7 +497,10 @@
> share/pixmaps/tortoisehg/icons/scalable/actions/hg-remove.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/hg-rename.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/hg-revert.svg
>+share/pixmaps/tortoisehg/icons/scalable/actions/hg-serve.svg
>+share/pixmaps/tortoisehg/icons/scalable/actions/hg-shelve.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/hg-status.svg
>+share/pixmaps/tortoisehg/icons/scalable/actions/hg-strip.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/hg-tag.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/hg-transplant.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/hg-unbundle.svg
>@@ -521,6 +518,8 @@
> share/pixmaps/tortoisehg/icons/scalable/actions/tasktab-refresh.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/thg-add-subrepo.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/thg-console.svg
>+share/pixmaps/tortoisehg/icons/scalable/actions/thg-guess.svg
>+share/pixmaps/tortoisehg/icons/scalable/actions/thg-ignore.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/thg-log-load-all.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/thg-mq.svg
> share/pixmaps/tortoisehg/icons/scalable/actions/thg-password.svg
>@@ -548,15 +547,17 @@
> share/pixmaps/tortoisehg/icons/scalable/actions/visualdiff.svg
> share/pixmaps/tortoisehg/icons/scalable/apps/help-browser.svg
> share/pixmaps/tortoisehg/icons/scalable/apps/help-readme.svg
>+share/pixmaps/tortoisehg/icons/scalable/apps/hg.svg
> share/pixmaps/tortoisehg/icons/scalable/apps/preferences-desktop-font.svg
> share/pixmaps/tortoisehg/icons/scalable/apps/system-file-manager.svg
>-share/pixmaps/tortoisehg/icons/scalable/apps/thg-logo.svg
>+share/pixmaps/tortoisehg/icons/scalable/apps/thg.svg
> share/pixmaps/tortoisehg/icons/scalable/apps/tools-hooks.svg
> share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg
> share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg
> share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-both.svg
> share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p1.svg
> share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p2.svg
>+share/pixmaps/tortoisehg/icons/scalable/status/hg-modified.svg
> share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg
> share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg
> share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg
>@@ -573,23 +574,6 @@
> share/pixmaps/tortoisehg/icons/settings_repo.ico
> share/pixmaps/tortoisehg/icons/settings_user.ico
> share/pixmaps/tortoisehg/icons/shelve.ico
>-share/pixmaps/tortoisehg/icons/svg/add.svg
>-share/pixmaps/tortoisehg/icons/svg/checkout.svg
>-share/pixmaps/tortoisehg/icons/svg/clone.svg
>-share/pixmaps/tortoisehg/icons/svg/commit.svg
>-share/pixmaps/tortoisehg/icons/svg/detect_rename.svg
>-share/pixmaps/tortoisehg/icons/svg/ignore.svg
>-share/pixmaps/tortoisehg/icons/svg/init.svg
>-share/pixmaps/tortoisehg/icons/svg/log.svg
>-share/pixmaps/tortoisehg/icons/svg/merge.svg
>-share/pixmaps/tortoisehg/icons/svg/proxy.svg
>-share/pixmaps/tortoisehg/icons/svg/recovery.svg
>-share/pixmaps/tortoisehg/icons/svg/refresh_overlays.svg
>-share/pixmaps/tortoisehg/icons/svg/remove.svg
>-share/pixmaps/tortoisehg/icons/svg/repobrowse.svg
>-share/pixmaps/tortoisehg/icons/svg/shelve.svg
>-share/pixmaps/tortoisehg/icons/svg/sync.svg
>-share/pixmaps/tortoisehg/icons/svg/thg_logo.svg
> share/pixmaps/tortoisehg/icons/thg_logo.ico
> share/pixmaps/tortoisehg/icons/thg_logo_92x50.png
> %%DATADIR%%/mergetools.rc

Flags:

arrowd: maintainer-approval+

Actions: View | Diff

Attachments on bug 203002: 160870