meld: update to 3.21.0nb1.

Switch to meson build system, update dependencies.

2 files changed, 128 insertions, 146 deletions

diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 13ede36680f..9524f80e4cb 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2020/04/20 07:04:00 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2020/04/20 08:04:41 wiz Exp $
 
 DISTNAME=		meld-3.21.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=		.tar.xz
@@ -12,13 +13,28 @@ LICENSE=		gnu-gpl-v2
 
 BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
 BUILD_DEPENDS+=		${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro
-DEPENDS+=		${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3
+DEPENDS+=		${PYPKGPREFIX}-gobject3>=3.30:../../devel/py-gobject3
 DEPENDS+=		gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas
 DEPENDS+=		dconf-[0-9]*:../../devel/dconf
 
-USE_TOOLS+=		intltool msgfmt
+USE_TOOLS+=		msgfmt pkg-config
+
+# Requires --desktop in msgfmt.
+_TOOLS_USE_PKGSRC.msgfmt=	yes
+
+SUBST_CLASSES+=		python3
+SUBST_FILES.python3=	meson.build
+SUBST_SED.python3=	-e "s,python.find_installation('python3',python.find_installation('${PYTHONBIN}',"
+SUBST_SED.python3+=	-e "s,'python3','python-${PYVERSSUFFIX}',"
+SUBST_STAGE.python3=	pre-configure
+SUBST_MESSAGE.python3=	Fix python binary name.
+
+# Compiled files are not installed, see
+# https://gitlab.gnome.org/GNOME/meld/-/issues/456
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27 # not supported any longer
+PLIST_SUBST+=			PYSITELIB=${PYSITELIB}
+REPLACE_PYTHON+=		bin/meld
 
 SUBST_CLASSES+=		man
 SUBST_FILES.man=	setup.py
@@ -26,15 +42,18 @@ SUBST_SED.man+=		-e "s,share/man/man1,${PKGMANDIR}/man1,"
 SUBST_STAGE.man=	pre-build
 SUBST_MESSAGE.man=	Fixing man page installation path.
 
+.include "../../devel/py-gobject3-common/buildlink3.mk"
 .include "../../graphics/adwaita-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.py-cairo+=	${PYPKGPREFIX}-cairo>=1.15.0
+.include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../lang/python/distutils.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.36.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.48.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.20
+.include "../../lang/python/application.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtksourceview3+=	gtksourceview3>=3.20
-.include "../../x11/gtksourceview3/buildlink3.mk"
+.include "../../x11/gtksourceview4/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
index 2cab1f9efdb..6b869b5a345 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,206 +1,73 @@
-@comment $NetBSD: PLIST,v 1.33 2020/04/20 07:04:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.34 2020/04/20 08:04:41 wiz Exp $
 bin/meld
-${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/meld/__init__.py
-${PYSITELIB}/meld/__init__.pyc
-${PYSITELIB}/meld/__init__.pyo
 ${PYSITELIB}/meld/accelerators.py
-${PYSITELIB}/meld/accelerators.pyc
-${PYSITELIB}/meld/accelerators.pyo
 ${PYSITELIB}/meld/actiongutter.py
-${PYSITELIB}/meld/actiongutter.pyc
-${PYSITELIB}/meld/actiongutter.pyo
 ${PYSITELIB}/meld/build_helpers.py
-${PYSITELIB}/meld/build_helpers.pyc
-${PYSITELIB}/meld/build_helpers.pyo
 ${PYSITELIB}/meld/chunkmap.py
-${PYSITELIB}/meld/chunkmap.pyc
-${PYSITELIB}/meld/chunkmap.pyo
 ${PYSITELIB}/meld/conf.py
-${PYSITELIB}/meld/conf.pyc
-${PYSITELIB}/meld/conf.pyo
 ${PYSITELIB}/meld/const.py
-${PYSITELIB}/meld/const.pyc
-${PYSITELIB}/meld/const.pyo
 ${PYSITELIB}/meld/diffgrid.py
-${PYSITELIB}/meld/diffgrid.pyc
-${PYSITELIB}/meld/diffgrid.pyo
 ${PYSITELIB}/meld/dirdiff.py
-${PYSITELIB}/meld/dirdiff.pyc
-${PYSITELIB}/meld/dirdiff.pyo
 ${PYSITELIB}/meld/filediff.py
-${PYSITELIB}/meld/filediff.pyc
-${PYSITELIB}/meld/filediff.pyo
 ${PYSITELIB}/meld/filters.py
-${PYSITELIB}/meld/filters.pyc
-${PYSITELIB}/meld/filters.pyo
 ${PYSITELIB}/meld/gutterrendererchunk.py
-${PYSITELIB}/meld/gutterrendererchunk.pyc
-${PYSITELIB}/meld/gutterrendererchunk.pyo
 ${PYSITELIB}/meld/iohelpers.py
-${PYSITELIB}/meld/iohelpers.pyc
-${PYSITELIB}/meld/iohelpers.pyo
 ${PYSITELIB}/meld/linkmap.py
-${PYSITELIB}/meld/linkmap.pyc
-${PYSITELIB}/meld/linkmap.pyo
 ${PYSITELIB}/meld/matchers/__init__.py
-${PYSITELIB}/meld/matchers/__init__.pyc
-${PYSITELIB}/meld/matchers/__init__.pyo
 ${PYSITELIB}/meld/matchers/diffutil.py
-${PYSITELIB}/meld/matchers/diffutil.pyc
-${PYSITELIB}/meld/matchers/diffutil.pyo
 ${PYSITELIB}/meld/matchers/helpers.py
-${PYSITELIB}/meld/matchers/helpers.pyc
-${PYSITELIB}/meld/matchers/helpers.pyo
 ${PYSITELIB}/meld/matchers/merge.py
-${PYSITELIB}/meld/matchers/merge.pyc
-${PYSITELIB}/meld/matchers/merge.pyo
 ${PYSITELIB}/meld/matchers/myers.py
-${PYSITELIB}/meld/matchers/myers.pyc
-${PYSITELIB}/meld/matchers/myers.pyo
 ${PYSITELIB}/meld/meldapp.py
-${PYSITELIB}/meld/meldapp.pyc
-${PYSITELIB}/meld/meldapp.pyo
 ${PYSITELIB}/meld/meldbuffer.py
-${PYSITELIB}/meld/meldbuffer.pyc
-${PYSITELIB}/meld/meldbuffer.pyo
 ${PYSITELIB}/meld/melddoc.py
-${PYSITELIB}/meld/melddoc.pyc
-${PYSITELIB}/meld/melddoc.pyo
 ${PYSITELIB}/meld/meldwindow.py
-${PYSITELIB}/meld/meldwindow.pyc
-${PYSITELIB}/meld/meldwindow.pyo
 ${PYSITELIB}/meld/menuhelpers.py
-${PYSITELIB}/meld/menuhelpers.pyc
-${PYSITELIB}/meld/menuhelpers.pyo
 ${PYSITELIB}/meld/misc.py
-${PYSITELIB}/meld/misc.pyc
-${PYSITELIB}/meld/misc.pyo
 ${PYSITELIB}/meld/newdifftab.py
-${PYSITELIB}/meld/newdifftab.pyc
-${PYSITELIB}/meld/newdifftab.pyo
 ${PYSITELIB}/meld/patchdialog.py
-${PYSITELIB}/meld/patchdialog.pyc
-${PYSITELIB}/meld/patchdialog.pyo
 ${PYSITELIB}/meld/preferences.py
-${PYSITELIB}/meld/preferences.pyc
-${PYSITELIB}/meld/preferences.pyo
 ${PYSITELIB}/meld/recent.py
-${PYSITELIB}/meld/recent.pyc
-${PYSITELIB}/meld/recent.pyo
 ${PYSITELIB}/meld/settings.py
-${PYSITELIB}/meld/settings.pyc
-${PYSITELIB}/meld/settings.pyo
 ${PYSITELIB}/meld/sourceview.py
-${PYSITELIB}/meld/sourceview.pyc
-${PYSITELIB}/meld/sourceview.pyo
 ${PYSITELIB}/meld/style.py
-${PYSITELIB}/meld/style.pyc
-${PYSITELIB}/meld/style.pyo
 ${PYSITELIB}/meld/task.py
-${PYSITELIB}/meld/task.pyc
-${PYSITELIB}/meld/task.pyo
 ${PYSITELIB}/meld/tree.py
-${PYSITELIB}/meld/tree.pyc
-${PYSITELIB}/meld/tree.pyo
 ${PYSITELIB}/meld/treehelpers.py
-${PYSITELIB}/meld/treehelpers.pyc
-${PYSITELIB}/meld/treehelpers.pyo
 ${PYSITELIB}/meld/ui/__init__.py
-${PYSITELIB}/meld/ui/__init__.pyc
-${PYSITELIB}/meld/ui/__init__.pyo
 ${PYSITELIB}/meld/ui/bufferselectors.py
-${PYSITELIB}/meld/ui/bufferselectors.pyc
-${PYSITELIB}/meld/ui/bufferselectors.pyo
 ${PYSITELIB}/meld/ui/cellrenderers.py
-${PYSITELIB}/meld/ui/cellrenderers.pyc
-${PYSITELIB}/meld/ui/cellrenderers.pyo
 ${PYSITELIB}/meld/ui/emblemcellrenderer.py
-${PYSITELIB}/meld/ui/emblemcellrenderer.pyc
-${PYSITELIB}/meld/ui/emblemcellrenderer.pyo
 ${PYSITELIB}/meld/ui/filechooser.py
-${PYSITELIB}/meld/ui/filechooser.pyc
-${PYSITELIB}/meld/ui/filechooser.pyo
 ${PYSITELIB}/meld/ui/findbar.py
-${PYSITELIB}/meld/ui/findbar.pyc
-${PYSITELIB}/meld/ui/findbar.pyo
 ${PYSITELIB}/meld/ui/gladesupport.py
-${PYSITELIB}/meld/ui/gladesupport.pyc
-${PYSITELIB}/meld/ui/gladesupport.pyo
 ${PYSITELIB}/meld/ui/gtkcompat.py
-${PYSITELIB}/meld/ui/gtkcompat.pyc
-${PYSITELIB}/meld/ui/gtkcompat.pyo
 ${PYSITELIB}/meld/ui/historyentry.py
-${PYSITELIB}/meld/ui/historyentry.pyc
-${PYSITELIB}/meld/ui/historyentry.pyo
 ${PYSITELIB}/meld/ui/listwidget.py
-${PYSITELIB}/meld/ui/listwidget.pyc
-${PYSITELIB}/meld/ui/listwidget.pyo
 ${PYSITELIB}/meld/ui/msgarea.py
-${PYSITELIB}/meld/ui/msgarea.pyc
-${PYSITELIB}/meld/ui/msgarea.pyo
 ${PYSITELIB}/meld/ui/notebook.py
-${PYSITELIB}/meld/ui/notebook.pyc
-${PYSITELIB}/meld/ui/notebook.pyo
 ${PYSITELIB}/meld/ui/notebooklabel.py
-${PYSITELIB}/meld/ui/notebooklabel.pyc
-${PYSITELIB}/meld/ui/notebooklabel.pyo
 ${PYSITELIB}/meld/ui/recentselector.py
-${PYSITELIB}/meld/ui/recentselector.pyc
-${PYSITELIB}/meld/ui/recentselector.pyo
 ${PYSITELIB}/meld/ui/statusbar.py
-${PYSITELIB}/meld/ui/statusbar.pyc
-${PYSITELIB}/meld/ui/statusbar.pyo
 ${PYSITELIB}/meld/ui/util.py
-${PYSITELIB}/meld/ui/util.pyc
-${PYSITELIB}/meld/ui/util.pyo
 ${PYSITELIB}/meld/ui/vcdialogs.py
-${PYSITELIB}/meld/ui/vcdialogs.pyc
-${PYSITELIB}/meld/ui/vcdialogs.pyo
 ${PYSITELIB}/meld/undo.py
-${PYSITELIB}/meld/undo.pyc
-${PYSITELIB}/meld/undo.pyo
 ${PYSITELIB}/meld/vc/COPYING
 ${PYSITELIB}/meld/vc/README
 ${PYSITELIB}/meld/vc/__init__.py
-${PYSITELIB}/meld/vc/__init__.pyc
-${PYSITELIB}/meld/vc/__init__.pyo
 ${PYSITELIB}/meld/vc/_null.py
-${PYSITELIB}/meld/vc/_null.pyc
-${PYSITELIB}/meld/vc/_null.pyo
 ${PYSITELIB}/meld/vc/_vc.py
-${PYSITELIB}/meld/vc/_vc.pyc
-${PYSITELIB}/meld/vc/_vc.pyo
 ${PYSITELIB}/meld/vc/bzr.py
-${PYSITELIB}/meld/vc/bzr.pyc
-${PYSITELIB}/meld/vc/bzr.pyo
 ${PYSITELIB}/meld/vc/cvs.py
-${PYSITELIB}/meld/vc/cvs.pyc
-${PYSITELIB}/meld/vc/cvs.pyo
 ${PYSITELIB}/meld/vc/darcs.py
-${PYSITELIB}/meld/vc/darcs.pyc
-${PYSITELIB}/meld/vc/darcs.pyo
 ${PYSITELIB}/meld/vc/git.py
-${PYSITELIB}/meld/vc/git.pyc
-${PYSITELIB}/meld/vc/git.pyo
 ${PYSITELIB}/meld/vc/mercurial.py
-${PYSITELIB}/meld/vc/mercurial.pyc
-${PYSITELIB}/meld/vc/mercurial.pyo
 ${PYSITELIB}/meld/vc/svn.py
-${PYSITELIB}/meld/vc/svn.pyc
-${PYSITELIB}/meld/vc/svn.pyo
 ${PYSITELIB}/meld/vcview.py
-${PYSITELIB}/meld/vcview.pyc
-${PYSITELIB}/meld/vcview.pyo
 ${PYSITELIB}/meld/windowstate.py
-${PYSITELIB}/meld/windowstate.pyc
-${PYSITELIB}/meld/windowstate.pyo
-@pkgdir share/meld/icons
-@pkgdir share/meld/ui
 man/man1/meld.1
-share/applications/org.gnome.meld.desktop
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/NEWS
+share/applications/org.gnome.Meld.desktop
 share/glib-2.0/schemas/org.gnome.meld.gschema.xml
 share/help/C/meld/command-line.page
 share/help/C/meld/file-changes.page
@@ -218,8 +85,104 @@ 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/hicolor/scalable/apps/org.gnome.meld.svg
-share/icons/hicolor/symbolic/apps/org.gnome.meld-symbolic.svg
+share/help/cs/meld/command-line.page
+share/help/cs/meld/file-changes.page
+share/help/cs/meld/file-filters.page
+share/help/cs/meld/file-mode.page
+share/help/cs/meld/flattened-view.page
+share/help/cs/meld/folder-mode.page
+share/help/cs/meld/index.page
+share/help/cs/meld/introduction.page
+share/help/cs/meld/keyboard-shortcuts.page
+share/help/cs/meld/legal.xml
+share/help/cs/meld/missing-functionality.page
+share/help/cs/meld/preferences.page
+share/help/cs/meld/resolving-conflicts.page
+share/help/cs/meld/text-filters.page
+share/help/cs/meld/vc-mode.page
+share/help/cs/meld/vc-supported.page
+share/help/de/meld/command-line.page
+share/help/de/meld/file-changes.page
+share/help/de/meld/file-filters.page
+share/help/de/meld/file-mode.page
+share/help/de/meld/flattened-view.page
+share/help/de/meld/folder-mode.page
+share/help/de/meld/index.page
+share/help/de/meld/introduction.page
+share/help/de/meld/keyboard-shortcuts.page
+share/help/de/meld/legal.xml
+share/help/de/meld/missing-functionality.page
+share/help/de/meld/preferences.page
+share/help/de/meld/resolving-conflicts.page
+share/help/de/meld/text-filters.page
+share/help/de/meld/vc-mode.page
+share/help/de/meld/vc-supported.page
+share/help/el/meld/command-line.page
+share/help/el/meld/file-changes.page
+share/help/el/meld/file-filters.page
+share/help/el/meld/file-mode.page
+share/help/el/meld/flattened-view.page
+share/help/el/meld/folder-mode.page
+share/help/el/meld/index.page
+share/help/el/meld/introduction.page
+share/help/el/meld/keyboard-shortcuts.page
+share/help/el/meld/legal.xml
+share/help/el/meld/missing-functionality.page
+share/help/el/meld/preferences.page
+share/help/el/meld/resolving-conflicts.page
+share/help/el/meld/text-filters.page
+share/help/el/meld/vc-mode.page
+share/help/el/meld/vc-supported.page
+share/help/es/meld/command-line.page
+share/help/es/meld/file-changes.page
+share/help/es/meld/file-filters.page
+share/help/es/meld/file-mode.page
+share/help/es/meld/flattened-view.page
+share/help/es/meld/folder-mode.page
+share/help/es/meld/index.page
+share/help/es/meld/introduction.page
+share/help/es/meld/keyboard-shortcuts.page
+share/help/es/meld/legal.xml
+share/help/es/meld/missing-functionality.page
+share/help/es/meld/preferences.page
+share/help/es/meld/resolving-conflicts.page
+share/help/es/meld/text-filters.page
+share/help/es/meld/vc-mode.page
+share/help/es/meld/vc-supported.page
+share/help/pl/meld/command-line.page
+share/help/pl/meld/file-changes.page
+share/help/pl/meld/file-filters.page
+share/help/pl/meld/file-mode.page
+share/help/pl/meld/flattened-view.page
+share/help/pl/meld/folder-mode.page
+share/help/pl/meld/index.page
+share/help/pl/meld/introduction.page
+share/help/pl/meld/keyboard-shortcuts.page
+share/help/pl/meld/legal.xml
+share/help/pl/meld/missing-functionality.page
+share/help/pl/meld/preferences.page
+share/help/pl/meld/resolving-conflicts.page
+share/help/pl/meld/text-filters.page
+share/help/pl/meld/vc-mode.page
+share/help/pl/meld/vc-supported.page
+share/help/sv/meld/command-line.page
+share/help/sv/meld/file-changes.page
+share/help/sv/meld/file-filters.page
+share/help/sv/meld/file-mode.page
+share/help/sv/meld/flattened-view.page
+share/help/sv/meld/folder-mode.page
+share/help/sv/meld/index.page
+share/help/sv/meld/introduction.page
+share/help/sv/meld/keyboard-shortcuts.page
+share/help/sv/meld/legal.xml
+share/help/sv/meld/missing-functionality.page
+share/help/sv/meld/preferences.page
+share/help/sv/meld/resolving-conflicts.page
+share/help/sv/meld/text-filters.page
+share/help/sv/meld/vc-mode.page
+share/help/sv/meld/vc-supported.page
+share/icons/hicolor/scalable/apps/org.gnome.Meld.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg
 share/locale/ar/LC_MESSAGES/meld.mo
 share/locale/bg/LC_MESSAGES/meld.mo
 share/locale/bs/LC_MESSAGES/meld.mo
@@ -269,5 +232,5 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
 share/meld/org.gnome.Meld.gresource
 share/meld/styles/meld-base.style-scheme.xml
 share/meld/styles/meld-dark.style-scheme.xml
-share/metainfo/org.gnome.meld.appdata.xml
-share/mime/packages/org.gnome.meld.xml
+share/metainfo/org.gnome.Meld.appdata.xml
+share/mime/packages/org.gnome.Meld.xml