Update meld to 3.20.0.

3 files changed, 36 insertions, 19 deletions

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index c756b98fb676..d9ea87077be5 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	meld
-PORTVERSION=	3.18.2
+PORTVERSION=	3.20.0
 CATEGORIES=	textproc devel python
 MASTER_SITES=	GNOME
 
@@ -15,11 +15,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	itstool:textproc/itstool
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
-USES=		desktop-file-utils gettext python:3.4+ shared-mime-info \
+USES=		desktop-file-utils gettext gnome python:3.4+ shared-mime-info \
 		shebangfix tar:xz
-SHEBANG_FILES=	bin/meld
 USE_PYTHON=	distutils noflavors
 USE_GNOME=	gtksourceview3 intltool libxml2:build pygobject3
+
+SHEBANG_FILES=	bin/meld
 GLIB_SCHEMAS=	org.gnome.meld.gschema.xml
 PYDISTUTILS_INSTALL_TARGET=	--no-update-icon-cache --no-compile-schemas install
 INSTALLS_ICONS=	yes
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index 6a5eefcf0637..8ff2748eb1dc 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531227251
-SHA256 (meld-3.18.2.tar.xz) = 1934abf4397e6a31b3c3d3d372ddb2aa6e6be499a71d96b114f14707afe93781
-SIZE (meld-3.18.2.tar.xz) = 568292
+TIMESTAMP = 1546786330
+SHA256 (meld-3.20.0.tar.xz) = cb40fe2f749325d7a13c35ca4928664744ced248793cd5705a630af074887086
+SIZE (meld-3.20.0.tar.xz) = 591956
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index 5a867ae52d3a..5747dd7c5a36 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -22,6 +22,8 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/iohelpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/iohelpers.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
@@ -50,6 +52,8 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/treehelpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/treehelpers.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
@@ -66,6 +70,7 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/filemerge.py
 %%PYTHON_SITELIBDIR%%/meld/filters.py
 %%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.py
+%%PYTHON_SITELIBDIR%%/meld/iohelpers.py
 %%PYTHON_SITELIBDIR%%/meld/linkmap.py
 %%PYTHON_SITELIBDIR%%/meld/matchers/__init__.py
 %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
@@ -95,11 +100,18 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/sourceview.py
 %%PYTHON_SITELIBDIR%%/meld/task.py
 %%PYTHON_SITELIBDIR%%/meld/tree.py
+%%PYTHON_SITELIBDIR%%/meld/treehelpers.py
 %%PYTHON_SITELIBDIR%%/meld/ui/__init__.py
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/bufferselectors.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/bufferselectors.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/cellrenderers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/cellrenderers.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/filechooser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/filechooser.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
@@ -110,6 +122,8 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
@@ -124,12 +138,16 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/bufferselectors.py
+%%PYTHON_SITELIBDIR%%/meld/ui/cellrenderers.py
 %%PYTHON_SITELIBDIR%%/meld/ui/emblemcellrenderer.py
+%%PYTHON_SITELIBDIR%%/meld/ui/filechooser.py
 %%PYTHON_SITELIBDIR%%/meld/ui/findbar.py
 %%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.py
 %%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.py
 %%PYTHON_SITELIBDIR%%/meld/ui/gtkcompat.py
 %%PYTHON_SITELIBDIR%%/meld/ui/historyentry.py
+%%PYTHON_SITELIBDIR%%/meld/ui/listselector.py
 %%PYTHON_SITELIBDIR%%/meld/ui/listwidget.py
 %%PYTHON_SITELIBDIR%%/meld/ui/msgarea.py
 %%PYTHON_SITELIBDIR%%/meld/ui/notebook.py
@@ -167,8 +185,7 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/vcview.py
 %%PYTHON_SITELIBDIR%%/meld/windowstate.py
 man/man1/meld.1.gz
-share/appdata/meld.appdata.xml
-share/applications/meld.desktop
+share/applications/org.gnome.meld.desktop
 share/help/C/meld/command-line.page
 share/help/C/meld/file-changes.page
 share/help/C/meld/file-filters.page
@@ -185,22 +202,18 @@ share/help/C/meld/resolving-conflicts.page
 share/help/C/meld/text-filters.page
 share/help/C/meld/vc-mode.page
 share/help/C/meld/vc-supported.page
-share/icons/HighContrast/scalable/apps/meld.svg
+share/icons/HighContrast/scalable/apps/org.gnome.meld.svg
 share/icons/hicolor/16x16/actions/meld-change-apply-left.png
 share/icons/hicolor/16x16/actions/meld-change-apply-right.png
 share/icons/hicolor/16x16/actions/meld-change-copy.png
 share/icons/hicolor/16x16/actions/meld-change-delete.png
 share/icons/hicolor/16x16/apps/meld-version-control.png
-share/icons/hicolor/16x16/apps/meld.png
-share/icons/hicolor/22x22/apps/meld.png
-share/icons/hicolor/32x32/apps/meld.png
+share/icons/hicolor/16x16/apps/org.gnome.meld.png
+share/icons/hicolor/22x22/apps/org.gnome.meld.png
+share/icons/hicolor/32x32/apps/org.gnome.meld.png
 share/icons/hicolor/48x48/apps/meld-version-control.png
-share/icons/hicolor/48x48/apps/meld.png
-share/icons/hicolor/scalable/apps/meld-figuring-linked.svg
-share/icons/hicolor/scalable/apps/meld-figuring.svg
-share/icons/hicolor/scalable/apps/meld-unlinking-plus-overlay.svg
-share/icons/hicolor/scalable/apps/meld-unlinking.svg
-share/icons/hicolor/scalable/apps/meld.svg
+share/icons/hicolor/48x48/apps/org.gnome.meld.png
+share/icons/hicolor/scalable/apps/org.gnome.meld.svg
 share/locale/ar/LC_MESSAGES/meld.mo
 share/locale/bg/LC_MESSAGES/meld.mo
 share/locale/bs/LC_MESSAGES/meld.mo
@@ -269,9 +282,11 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
 %%DATADIR%%/ui/appmenu-fallback.xml
 %%DATADIR%%/ui/dirdiff-ui.xml
 %%DATADIR%%/ui/dirdiff.ui
+%%DATADIR%%/ui/encoding-selector.ui
 %%DATADIR%%/ui/filediff-ui.xml
 %%DATADIR%%/ui/filediff.ui
 %%DATADIR%%/ui/findbar.ui
+%%DATADIR%%/ui/language-selector.ui
 %%DATADIR%%/ui/meldapp-ui.xml
 %%DATADIR%%/ui/meldapp.ui
 %%DATADIR%%/ui/patch-dialog.ui
@@ -280,4 +295,5 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
 %%DATADIR%%/ui/tab-placeholder.ui
 %%DATADIR%%/ui/vcview-ui.xml
 %%DATADIR%%/ui/vcview.ui
-share/mime/packages/meld.xml
+share/metainfo/org.gnome.meld.appdata.xml
+share/mime/packages/org.gnome.meld.xml