Mon Apr 20 14:47:38 2020 UTC ()
meld: downgrade to 3.20, 3.21 dumps core


(wiz)
diff -r1.102 -r1.103 pkgsrc/devel/meld/Makefile
diff -r1.34 -r1.35 pkgsrc/devel/meld/PLIST
diff -r1.61 -r1.62 pkgsrc/devel/meld/distinfo
cvs diff -r1.102 -r1.103 pkgsrc/devel/meld/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/meld/Makefile 2020/04/20 08:04:41 1.102
+++ pkgsrc/devel/meld/Makefile 2020/04/20 14:47:37 1.103
@@ -1,59 +1,41 @@ @@ -1,59 +1,41 @@
1# $NetBSD: Makefile,v 1.102 2020/04/20 08:04:41 wiz Exp $ 1# $NetBSD: Makefile,v 1.103 2020/04/20 14:47:37 wiz Exp $
2 2
3DISTNAME= meld-3.21.0 3DISTNAME= meld-3.20.2
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= https://meldmerge.org/ 10HOMEPAGE= https://meldmerge.org/
11COMMENT= Visual diff and merge tool (GTK3 version) 11COMMENT= Visual diff and merge tool (GTK3 version)
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool 14BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
15BUILD_DEPENDS+= ${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro 15BUILD_DEPENDS+= ${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro
16DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.30:../../devel/py-gobject3 16DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3
17DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas 17DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas
18DEPENDS+= dconf-[0-9]*:../../devel/dconf 18DEPENDS+= dconf-[0-9]*:../../devel/dconf
19 19
20USE_TOOLS+= msgfmt pkg-config 20USE_TOOLS+= intltool msgfmt
21 
22# Requires --desktop in msgfmt. 
23_TOOLS_USE_PKGSRC.msgfmt= yes 
24 
25SUBST_CLASSES+= python3 
26SUBST_FILES.python3= meson.build 
27SUBST_SED.python3= -e "s,python.find_installation('python3',python.find_installation('${PYTHONBIN}'," 
28SUBST_SED.python3+= -e "s,'python3','python-${PYVERSSUFFIX}'," 
29SUBST_STAGE.python3= pre-configure 
30SUBST_MESSAGE.python3= Fix python binary name. 
31 
32# Compiled files are not installed, see 
33# https://gitlab.gnome.org/GNOME/meld/-/issues/456 
34 21
35PYTHON_VERSIONS_INCOMPATIBLE= 27 # not supported any longer 22PYTHON_VERSIONS_INCOMPATIBLE= 27 # not supported any longer
36PLIST_SUBST+= PYSITELIB=${PYSITELIB} 
37REPLACE_PYTHON+= bin/meld 
38 23
39SUBST_CLASSES+= man 24SUBST_CLASSES+= man
40SUBST_FILES.man= setup.py 25SUBST_FILES.man= setup.py
41SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1," 26SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1,"
42SUBST_STAGE.man= pre-build 27SUBST_STAGE.man= pre-build
43SUBST_MESSAGE.man= Fixing man page installation path. 28SUBST_MESSAGE.man= Fixing man page installation path.
44 29
45.include "../../devel/py-gobject3-common/buildlink3.mk" 
46.include "../../graphics/adwaita-icon-theme/buildlink3.mk" 30.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
47.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 31.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
48BUILDLINK_API_DEPENDS.py-cairo+= ${PYPKGPREFIX}-cairo>=1.15.0 
49.include "../../graphics/py-cairo/buildlink3.mk" 
50.include "../../sysutils/desktop-file-utils/desktopdb.mk" 32.include "../../sysutils/desktop-file-utils/desktopdb.mk"
51BUILDLINK_API_DEPENDS.glib2+= glib2>=2.48.0 33.include "../../lang/python/distutils.mk"
 34BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36.0
52.include "../../devel/glib2/buildlink3.mk" 35.include "../../devel/glib2/buildlink3.mk"
53.include "../../devel/glib2/schemas.mk" 36.include "../../devel/glib2/schemas.mk"
54BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.20 37BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.20
55.include "../../lang/python/application.mk" 
56.include "../../x11/gtk3/buildlink3.mk" 38.include "../../x11/gtk3/buildlink3.mk"
57.include "../../x11/gtksourceview4/buildlink3.mk" 39BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.20
58.include "../../devel/meson/build.mk" 40.include "../../x11/gtksourceview3/buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.34 -r1.35 pkgsrc/devel/meld/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/meld/PLIST 2020/04/20 08:04:41 1.34
+++ pkgsrc/devel/meld/PLIST 2020/04/20 14:47:37 1.35
@@ -1,198 +1,234 @@ @@ -1,198 +1,234 @@
1@comment $NetBSD: PLIST,v 1.34 2020/04/20 08:04:41 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.35 2020/04/20 14:47:37 wiz Exp $
2bin/meld 2bin/meld
 3${PYSITELIB}/${EGG_FILE}
3${PYSITELIB}/meld/__init__.py 4${PYSITELIB}/meld/__init__.py
4${PYSITELIB}/meld/accelerators.py 5${PYSITELIB}/meld/__init__.pyc
5${PYSITELIB}/meld/actiongutter.py 6${PYSITELIB}/meld/__init__.pyo
6${PYSITELIB}/meld/build_helpers.py 7${PYSITELIB}/meld/build_helpers.py
7${PYSITELIB}/meld/chunkmap.py 8${PYSITELIB}/meld/build_helpers.pyc
 9${PYSITELIB}/meld/build_helpers.pyo
8${PYSITELIB}/meld/conf.py 10${PYSITELIB}/meld/conf.py
 11${PYSITELIB}/meld/conf.pyc
 12${PYSITELIB}/meld/conf.pyo
9${PYSITELIB}/meld/const.py 13${PYSITELIB}/meld/const.py
 14${PYSITELIB}/meld/const.pyc
 15${PYSITELIB}/meld/const.pyo
10${PYSITELIB}/meld/diffgrid.py 16${PYSITELIB}/meld/diffgrid.py
 17${PYSITELIB}/meld/diffgrid.pyc
 18${PYSITELIB}/meld/diffgrid.pyo
 19${PYSITELIB}/meld/diffmap.py
 20${PYSITELIB}/meld/diffmap.pyc
 21${PYSITELIB}/meld/diffmap.pyo
11${PYSITELIB}/meld/dirdiff.py 22${PYSITELIB}/meld/dirdiff.py
 23${PYSITELIB}/meld/dirdiff.pyc
 24${PYSITELIB}/meld/dirdiff.pyo
12${PYSITELIB}/meld/filediff.py 25${PYSITELIB}/meld/filediff.py
 26${PYSITELIB}/meld/filediff.pyc
 27${PYSITELIB}/meld/filediff.pyo
 28${PYSITELIB}/meld/filemerge.py
 29${PYSITELIB}/meld/filemerge.pyc
 30${PYSITELIB}/meld/filemerge.pyo
13${PYSITELIB}/meld/filters.py 31${PYSITELIB}/meld/filters.py
 32${PYSITELIB}/meld/filters.pyc
 33${PYSITELIB}/meld/filters.pyo
14${PYSITELIB}/meld/gutterrendererchunk.py 34${PYSITELIB}/meld/gutterrendererchunk.py
 35${PYSITELIB}/meld/gutterrendererchunk.pyc
 36${PYSITELIB}/meld/gutterrendererchunk.pyo
15${PYSITELIB}/meld/iohelpers.py 37${PYSITELIB}/meld/iohelpers.py
 38${PYSITELIB}/meld/iohelpers.pyc
 39${PYSITELIB}/meld/iohelpers.pyo
16${PYSITELIB}/meld/linkmap.py 40${PYSITELIB}/meld/linkmap.py
 41${PYSITELIB}/meld/linkmap.pyc
 42${PYSITELIB}/meld/linkmap.pyo
17${PYSITELIB}/meld/matchers/__init__.py 43${PYSITELIB}/meld/matchers/__init__.py
 44${PYSITELIB}/meld/matchers/__init__.pyc
 45${PYSITELIB}/meld/matchers/__init__.pyo
18${PYSITELIB}/meld/matchers/diffutil.py 46${PYSITELIB}/meld/matchers/diffutil.py
 47${PYSITELIB}/meld/matchers/diffutil.pyc
 48${PYSITELIB}/meld/matchers/diffutil.pyo
19${PYSITELIB}/meld/matchers/helpers.py 49${PYSITELIB}/meld/matchers/helpers.py
 50${PYSITELIB}/meld/matchers/helpers.pyc
 51${PYSITELIB}/meld/matchers/helpers.pyo
20${PYSITELIB}/meld/matchers/merge.py 52${PYSITELIB}/meld/matchers/merge.py
 53${PYSITELIB}/meld/matchers/merge.pyc
 54${PYSITELIB}/meld/matchers/merge.pyo
21${PYSITELIB}/meld/matchers/myers.py 55${PYSITELIB}/meld/matchers/myers.py
 56${PYSITELIB}/meld/matchers/myers.pyc
 57${PYSITELIB}/meld/matchers/myers.pyo
22${PYSITELIB}/meld/meldapp.py 58${PYSITELIB}/meld/meldapp.py
 59${PYSITELIB}/meld/meldapp.pyc
 60${PYSITELIB}/meld/meldapp.pyo
23${PYSITELIB}/meld/meldbuffer.py 61${PYSITELIB}/meld/meldbuffer.py
 62${PYSITELIB}/meld/meldbuffer.pyc
 63${PYSITELIB}/meld/meldbuffer.pyo
24${PYSITELIB}/meld/melddoc.py 64${PYSITELIB}/meld/melddoc.py
 65${PYSITELIB}/meld/melddoc.pyc
 66${PYSITELIB}/meld/melddoc.pyo
25${PYSITELIB}/meld/meldwindow.py 67${PYSITELIB}/meld/meldwindow.py
26${PYSITELIB}/meld/menuhelpers.py 68${PYSITELIB}/meld/meldwindow.pyc
 69${PYSITELIB}/meld/meldwindow.pyo
27${PYSITELIB}/meld/misc.py 70${PYSITELIB}/meld/misc.py
 71${PYSITELIB}/meld/misc.pyc
 72${PYSITELIB}/meld/misc.pyo
28${PYSITELIB}/meld/newdifftab.py 73${PYSITELIB}/meld/newdifftab.py
 74${PYSITELIB}/meld/newdifftab.pyc
 75${PYSITELIB}/meld/newdifftab.pyo
29${PYSITELIB}/meld/patchdialog.py 76${PYSITELIB}/meld/patchdialog.py
 77${PYSITELIB}/meld/patchdialog.pyc
 78${PYSITELIB}/meld/patchdialog.pyo
30${PYSITELIB}/meld/preferences.py 79${PYSITELIB}/meld/preferences.py
 80${PYSITELIB}/meld/preferences.pyc
 81${PYSITELIB}/meld/preferences.pyo
31${PYSITELIB}/meld/recent.py 82${PYSITELIB}/meld/recent.py
 83${PYSITELIB}/meld/recent.pyc
 84${PYSITELIB}/meld/recent.pyo
32${PYSITELIB}/meld/settings.py 85${PYSITELIB}/meld/settings.py
 86${PYSITELIB}/meld/settings.pyc
 87${PYSITELIB}/meld/settings.pyo
33${PYSITELIB}/meld/sourceview.py 88${PYSITELIB}/meld/sourceview.py
34${PYSITELIB}/meld/style.py 89${PYSITELIB}/meld/sourceview.pyc
 90${PYSITELIB}/meld/sourceview.pyo
35${PYSITELIB}/meld/task.py 91${PYSITELIB}/meld/task.py
 92${PYSITELIB}/meld/task.pyc
 93${PYSITELIB}/meld/task.pyo
36${PYSITELIB}/meld/tree.py 94${PYSITELIB}/meld/tree.py
 95${PYSITELIB}/meld/tree.pyc
 96${PYSITELIB}/meld/tree.pyo
37${PYSITELIB}/meld/treehelpers.py 97${PYSITELIB}/meld/treehelpers.py
 98${PYSITELIB}/meld/treehelpers.pyc
 99${PYSITELIB}/meld/treehelpers.pyo
38${PYSITELIB}/meld/ui/__init__.py 100${PYSITELIB}/meld/ui/__init__.py
 101${PYSITELIB}/meld/ui/__init__.pyc
 102${PYSITELIB}/meld/ui/__init__.pyo
39${PYSITELIB}/meld/ui/bufferselectors.py 103${PYSITELIB}/meld/ui/bufferselectors.py
 104${PYSITELIB}/meld/ui/bufferselectors.pyc
 105${PYSITELIB}/meld/ui/bufferselectors.pyo
40${PYSITELIB}/meld/ui/cellrenderers.py 106${PYSITELIB}/meld/ui/cellrenderers.py
 107${PYSITELIB}/meld/ui/cellrenderers.pyc
 108${PYSITELIB}/meld/ui/cellrenderers.pyo
41${PYSITELIB}/meld/ui/emblemcellrenderer.py 109${PYSITELIB}/meld/ui/emblemcellrenderer.py
 110${PYSITELIB}/meld/ui/emblemcellrenderer.pyc
 111${PYSITELIB}/meld/ui/emblemcellrenderer.pyo
42${PYSITELIB}/meld/ui/filechooser.py 112${PYSITELIB}/meld/ui/filechooser.py
 113${PYSITELIB}/meld/ui/filechooser.pyc
 114${PYSITELIB}/meld/ui/filechooser.pyo
43${PYSITELIB}/meld/ui/findbar.py 115${PYSITELIB}/meld/ui/findbar.py
 116${PYSITELIB}/meld/ui/findbar.pyc
 117${PYSITELIB}/meld/ui/findbar.pyo
44${PYSITELIB}/meld/ui/gladesupport.py 118${PYSITELIB}/meld/ui/gladesupport.py
 119${PYSITELIB}/meld/ui/gladesupport.pyc
 120${PYSITELIB}/meld/ui/gladesupport.pyo
 121${PYSITELIB}/meld/ui/gnomeglade.py
 122${PYSITELIB}/meld/ui/gnomeglade.pyc
 123${PYSITELIB}/meld/ui/gnomeglade.pyo
45${PYSITELIB}/meld/ui/gtkcompat.py 124${PYSITELIB}/meld/ui/gtkcompat.py
 125${PYSITELIB}/meld/ui/gtkcompat.pyc
 126${PYSITELIB}/meld/ui/gtkcompat.pyo
46${PYSITELIB}/meld/ui/historyentry.py 127${PYSITELIB}/meld/ui/historyentry.py
 128${PYSITELIB}/meld/ui/historyentry.pyc
 129${PYSITELIB}/meld/ui/historyentry.pyo
 130${PYSITELIB}/meld/ui/listselector.py
 131${PYSITELIB}/meld/ui/listselector.pyc
 132${PYSITELIB}/meld/ui/listselector.pyo
47${PYSITELIB}/meld/ui/listwidget.py 133${PYSITELIB}/meld/ui/listwidget.py
 134${PYSITELIB}/meld/ui/listwidget.pyc
 135${PYSITELIB}/meld/ui/listwidget.pyo
48${PYSITELIB}/meld/ui/msgarea.py 136${PYSITELIB}/meld/ui/msgarea.py
 137${PYSITELIB}/meld/ui/msgarea.pyc
 138${PYSITELIB}/meld/ui/msgarea.pyo
49${PYSITELIB}/meld/ui/notebook.py 139${PYSITELIB}/meld/ui/notebook.py
 140${PYSITELIB}/meld/ui/notebook.pyc
 141${PYSITELIB}/meld/ui/notebook.pyo
50${PYSITELIB}/meld/ui/notebooklabel.py 142${PYSITELIB}/meld/ui/notebooklabel.py
51${PYSITELIB}/meld/ui/recentselector.py 143${PYSITELIB}/meld/ui/notebooklabel.pyc
 144${PYSITELIB}/meld/ui/notebooklabel.pyo
52${PYSITELIB}/meld/ui/statusbar.py 145${PYSITELIB}/meld/ui/statusbar.py
 146${PYSITELIB}/meld/ui/statusbar.pyc
 147${PYSITELIB}/meld/ui/statusbar.pyo
53${PYSITELIB}/meld/ui/util.py 148${PYSITELIB}/meld/ui/util.py
 149${PYSITELIB}/meld/ui/util.pyc
 150${PYSITELIB}/meld/ui/util.pyo
54${PYSITELIB}/meld/ui/vcdialogs.py 151${PYSITELIB}/meld/ui/vcdialogs.py
 152${PYSITELIB}/meld/ui/vcdialogs.pyc
 153${PYSITELIB}/meld/ui/vcdialogs.pyo
55${PYSITELIB}/meld/undo.py 154${PYSITELIB}/meld/undo.py
 155${PYSITELIB}/meld/undo.pyc
 156${PYSITELIB}/meld/undo.pyo
56${PYSITELIB}/meld/vc/COPYING 157${PYSITELIB}/meld/vc/COPYING
57${PYSITELIB}/meld/vc/README 158${PYSITELIB}/meld/vc/README
58${PYSITELIB}/meld/vc/__init__.py 159${PYSITELIB}/meld/vc/__init__.py
 160${PYSITELIB}/meld/vc/__init__.pyc
 161${PYSITELIB}/meld/vc/__init__.pyo
59${PYSITELIB}/meld/vc/_null.py 162${PYSITELIB}/meld/vc/_null.py
 163${PYSITELIB}/meld/vc/_null.pyc
 164${PYSITELIB}/meld/vc/_null.pyo
60${PYSITELIB}/meld/vc/_vc.py 165${PYSITELIB}/meld/vc/_vc.py
 166${PYSITELIB}/meld/vc/_vc.pyc
 167${PYSITELIB}/meld/vc/_vc.pyo
61${PYSITELIB}/meld/vc/bzr.py 168${PYSITELIB}/meld/vc/bzr.py
62${PYSITELIB}/meld/vc/cvs.py 169${PYSITELIB}/meld/vc/bzr.pyc
 170${PYSITELIB}/meld/vc/bzr.pyo
63${PYSITELIB}/meld/vc/darcs.py 171${PYSITELIB}/meld/vc/darcs.py
 172${PYSITELIB}/meld/vc/darcs.pyc
 173${PYSITELIB}/meld/vc/darcs.pyo
64${PYSITELIB}/meld/vc/git.py 174${PYSITELIB}/meld/vc/git.py
 175${PYSITELIB}/meld/vc/git.pyc
 176${PYSITELIB}/meld/vc/git.pyo
65${PYSITELIB}/meld/vc/mercurial.py 177${PYSITELIB}/meld/vc/mercurial.py
 178${PYSITELIB}/meld/vc/mercurial.pyc
 179${PYSITELIB}/meld/vc/mercurial.pyo
66${PYSITELIB}/meld/vc/svn.py 180${PYSITELIB}/meld/vc/svn.py
 181${PYSITELIB}/meld/vc/svn.pyc
 182${PYSITELIB}/meld/vc/svn.pyo
67${PYSITELIB}/meld/vcview.py 183${PYSITELIB}/meld/vcview.py
 184${PYSITELIB}/meld/vcview.pyc
 185${PYSITELIB}/meld/vcview.pyo
68${PYSITELIB}/meld/windowstate.py 186${PYSITELIB}/meld/windowstate.py
 187${PYSITELIB}/meld/windowstate.pyc
 188${PYSITELIB}/meld/windowstate.pyo
69man/man1/meld.1 189man/man1/meld.1
70share/applications/org.gnome.Meld.desktop 190share/applications/org.gnome.meld.desktop
 191share/doc/${PKGNAME}/COPYING
 192share/doc/${PKGNAME}/NEWS
71share/glib-2.0/schemas/org.gnome.meld.gschema.xml 193share/glib-2.0/schemas/org.gnome.meld.gschema.xml
72share/help/C/meld/command-line.page 194share/help/C/meld/command-line.page
73share/help/C/meld/file-changes.page 195share/help/C/meld/file-changes.page
74share/help/C/meld/file-filters.page 196share/help/C/meld/file-filters.page
75share/help/C/meld/file-mode.page 197share/help/C/meld/file-mode.page
76share/help/C/meld/flattened-view.page 198share/help/C/meld/flattened-view.page
77share/help/C/meld/folder-mode.page 199share/help/C/meld/folder-mode.page
78share/help/C/meld/index.page 200share/help/C/meld/index.page
79share/help/C/meld/introduction.page 201share/help/C/meld/introduction.page
80share/help/C/meld/keyboard-shortcuts.page 202share/help/C/meld/keyboard-shortcuts.page
81share/help/C/meld/legal.xml 203share/help/C/meld/legal.xml
82share/help/C/meld/missing-functionality.page 204share/help/C/meld/missing-functionality.page
83share/help/C/meld/preferences.page 205share/help/C/meld/preferences.page
84share/help/C/meld/resolving-conflicts.page 206share/help/C/meld/resolving-conflicts.page
85share/help/C/meld/text-filters.page 207share/help/C/meld/text-filters.page
86share/help/C/meld/vc-mode.page 208share/help/C/meld/vc-mode.page
87share/help/C/meld/vc-supported.page 209share/help/C/meld/vc-supported.page
88share/help/cs/meld/command-line.page 210share/icons/HighContrast/scalable/apps/org.gnome.meld.svg
89share/help/cs/meld/file-changes.page 211share/icons/hicolor/16x16/actions/meld-change-apply-left.png
90share/help/cs/meld/file-filters.page 212share/icons/hicolor/16x16/actions/meld-change-apply-right.png
91share/help/cs/meld/file-mode.page 213share/icons/hicolor/16x16/actions/meld-change-copy.png
92share/help/cs/meld/flattened-view.page 214share/icons/hicolor/16x16/actions/meld-change-delete.png
93share/help/cs/meld/folder-mode.page 215share/icons/hicolor/16x16/apps/meld-version-control.png
94share/help/cs/meld/index.page 216share/icons/hicolor/16x16/apps/org.gnome.meld.png
95share/help/cs/meld/introduction.page 217share/icons/hicolor/22x22/apps/org.gnome.meld.png
96share/help/cs/meld/keyboard-shortcuts.page 218share/icons/hicolor/32x32/apps/org.gnome.meld.png
97share/help/cs/meld/legal.xml 219share/icons/hicolor/48x48/apps/meld-version-control.png
98share/help/cs/meld/missing-functionality.page 220share/icons/hicolor/48x48/apps/org.gnome.meld.png
99share/help/cs/meld/preferences.page 221share/icons/hicolor/scalable/apps/org.gnome.meld.svg
100share/help/cs/meld/resolving-conflicts.page 
101share/help/cs/meld/text-filters.page 
102share/help/cs/meld/vc-mode.page 
103share/help/cs/meld/vc-supported.page 
104share/help/de/meld/command-line.page 
105share/help/de/meld/file-changes.page 
106share/help/de/meld/file-filters.page 
107share/help/de/meld/file-mode.page 
108share/help/de/meld/flattened-view.page 
109share/help/de/meld/folder-mode.page 
110share/help/de/meld/index.page 
111share/help/de/meld/introduction.page 
112share/help/de/meld/keyboard-shortcuts.page 
113share/help/de/meld/legal.xml 
114share/help/de/meld/missing-functionality.page 
115share/help/de/meld/preferences.page 
116share/help/de/meld/resolving-conflicts.page 
117share/help/de/meld/text-filters.page 
118share/help/de/meld/vc-mode.page 
119share/help/de/meld/vc-supported.page 
120share/help/el/meld/command-line.page 
121share/help/el/meld/file-changes.page 
122share/help/el/meld/file-filters.page 
123share/help/el/meld/file-mode.page 
124share/help/el/meld/flattened-view.page 
125share/help/el/meld/folder-mode.page 
126share/help/el/meld/index.page 
127share/help/el/meld/introduction.page 
128share/help/el/meld/keyboard-shortcuts.page 
129share/help/el/meld/legal.xml 
130share/help/el/meld/missing-functionality.page 
131share/help/el/meld/preferences.page 
132share/help/el/meld/resolving-conflicts.page 
133share/help/el/meld/text-filters.page 
134share/help/el/meld/vc-mode.page 
135share/help/el/meld/vc-supported.page 
136share/help/es/meld/command-line.page 
137share/help/es/meld/file-changes.page 
138share/help/es/meld/file-filters.page 
139share/help/es/meld/file-mode.page 
140share/help/es/meld/flattened-view.page 
141share/help/es/meld/folder-mode.page 
142share/help/es/meld/index.page 
143share/help/es/meld/introduction.page 
144share/help/es/meld/keyboard-shortcuts.page 
145share/help/es/meld/legal.xml 
146share/help/es/meld/missing-functionality.page 
147share/help/es/meld/preferences.page 
148share/help/es/meld/resolving-conflicts.page 
149share/help/es/meld/text-filters.page 
150share/help/es/meld/vc-mode.page 
151share/help/es/meld/vc-supported.page 
152share/help/pl/meld/command-line.page 
153share/help/pl/meld/file-changes.page 
154share/help/pl/meld/file-filters.page 
155share/help/pl/meld/file-mode.page 
156share/help/pl/meld/flattened-view.page 
157share/help/pl/meld/folder-mode.page 
158share/help/pl/meld/index.page 
159share/help/pl/meld/introduction.page 
160share/help/pl/meld/keyboard-shortcuts.page 
161share/help/pl/meld/legal.xml 
162share/help/pl/meld/missing-functionality.page 
163share/help/pl/meld/preferences.page 
164share/help/pl/meld/resolving-conflicts.page 
165share/help/pl/meld/text-filters.page 
166share/help/pl/meld/vc-mode.page 
167share/help/pl/meld/vc-supported.page 
168share/help/sv/meld/command-line.page 
169share/help/sv/meld/file-changes.page 
170share/help/sv/meld/file-filters.page 
171share/help/sv/meld/file-mode.page 
172share/help/sv/meld/flattened-view.page 
173share/help/sv/meld/folder-mode.page 
174share/help/sv/meld/index.page 
175share/help/sv/meld/introduction.page 
176share/help/sv/meld/keyboard-shortcuts.page 
177share/help/sv/meld/legal.xml 
178share/help/sv/meld/missing-functionality.page 
179share/help/sv/meld/preferences.page 
180share/help/sv/meld/resolving-conflicts.page 
181share/help/sv/meld/text-filters.page 
182share/help/sv/meld/vc-mode.page 
183share/help/sv/meld/vc-supported.page 
184share/icons/hicolor/scalable/apps/org.gnome.Meld.svg 
185share/icons/hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg 
186share/locale/ar/LC_MESSAGES/meld.mo 222share/locale/ar/LC_MESSAGES/meld.mo
187share/locale/bg/LC_MESSAGES/meld.mo 223share/locale/bg/LC_MESSAGES/meld.mo
188share/locale/bs/LC_MESSAGES/meld.mo 224share/locale/bs/LC_MESSAGES/meld.mo
189share/locale/ca/LC_MESSAGES/meld.mo 225share/locale/ca/LC_MESSAGES/meld.mo
190share/locale/ca@valencia/LC_MESSAGES/meld.mo 226share/locale/ca@valencia/LC_MESSAGES/meld.mo
191share/locale/cs/LC_MESSAGES/meld.mo 227share/locale/cs/LC_MESSAGES/meld.mo
192share/locale/da/LC_MESSAGES/meld.mo 228share/locale/da/LC_MESSAGES/meld.mo
193share/locale/de/LC_MESSAGES/meld.mo 229share/locale/de/LC_MESSAGES/meld.mo
194share/locale/dz/LC_MESSAGES/meld.mo 230share/locale/dz/LC_MESSAGES/meld.mo
195share/locale/el/LC_MESSAGES/meld.mo 231share/locale/el/LC_MESSAGES/meld.mo
196share/locale/en_CA/LC_MESSAGES/meld.mo 232share/locale/en_CA/LC_MESSAGES/meld.mo
197share/locale/en_GB/LC_MESSAGES/meld.mo 233share/locale/en_GB/LC_MESSAGES/meld.mo
198share/locale/eo/LC_MESSAGES/meld.mo 234share/locale/eo/LC_MESSAGES/meld.mo
@@ -219,18 +255,50 @@ share/locale/ro/LC_MESSAGES/meld.mo @@ -219,18 +255,50 @@ share/locale/ro/LC_MESSAGES/meld.mo
219share/locale/ru/LC_MESSAGES/meld.mo 255share/locale/ru/LC_MESSAGES/meld.mo
220share/locale/rw/LC_MESSAGES/meld.mo 256share/locale/rw/LC_MESSAGES/meld.mo
221share/locale/sk/LC_MESSAGES/meld.mo 257share/locale/sk/LC_MESSAGES/meld.mo
222share/locale/sl/LC_MESSAGES/meld.mo 258share/locale/sl/LC_MESSAGES/meld.mo
223share/locale/sq/LC_MESSAGES/meld.mo 259share/locale/sq/LC_MESSAGES/meld.mo
224share/locale/sr/LC_MESSAGES/meld.mo 260share/locale/sr/LC_MESSAGES/meld.mo
225share/locale/sr@latin/LC_MESSAGES/meld.mo 261share/locale/sr@latin/LC_MESSAGES/meld.mo
226share/locale/sv/LC_MESSAGES/meld.mo 262share/locale/sv/LC_MESSAGES/meld.mo
227share/locale/tr/LC_MESSAGES/meld.mo 263share/locale/tr/LC_MESSAGES/meld.mo
228share/locale/uk/LC_MESSAGES/meld.mo 264share/locale/uk/LC_MESSAGES/meld.mo
229share/locale/vi/LC_MESSAGES/meld.mo 265share/locale/vi/LC_MESSAGES/meld.mo
230share/locale/zh_CN/LC_MESSAGES/meld.mo 266share/locale/zh_CN/LC_MESSAGES/meld.mo
231share/locale/zh_TW/LC_MESSAGES/meld.mo 267share/locale/zh_TW/LC_MESSAGES/meld.mo
232share/meld/org.gnome.Meld.gresource 268share/meld/icons/COPYING
233share/meld/styles/meld-base.style-scheme.xml 269share/meld/icons/COPYING_CCBYSA3
234share/meld/styles/meld-dark.style-scheme.xml 270share/meld/icons/emblem-meld-newer-file.png
235share/metainfo/org.gnome.Meld.appdata.xml 271share/meld/icons/filter-ignored-24.png
236share/mime/packages/org.gnome.Meld.xml 272share/meld/icons/filter-modified-24.png
 273share/meld/icons/filter-nonvc-24.png
 274share/meld/icons/filter-normal-24.png
 275share/meld/icons/vc-add-24.png
 276share/meld/icons/vc-checkout-24.png
 277share/meld/icons/vc-commit-24.png
 278share/meld/icons/vc-push-24.png
 279share/meld/icons/vc-remove-24.png
 280share/meld/icons/vc-resolve-24.png
 281share/meld/icons/vc-update-24.png
 282share/meld/meld.css
 283share/meld/styles/meld-base.xml
 284share/meld/styles/meld-dark.xml
 285share/meld/ui/EditableList.ui
 286share/meld/ui/application.ui
 287share/meld/ui/appmenu-fallback.xml
 288share/meld/ui/dirdiff-ui.xml
 289share/meld/ui/dirdiff.ui
 290share/meld/ui/encoding-selector.ui
 291share/meld/ui/filediff-ui.xml
 292share/meld/ui/filediff.ui
 293share/meld/ui/findbar.ui
 294share/meld/ui/language-selector.ui
 295share/meld/ui/meldapp-ui.xml
 296share/meld/ui/meldapp.ui
 297share/meld/ui/patch-dialog.ui
 298share/meld/ui/preferences.ui
 299share/meld/ui/shortcuts.ui
 300share/meld/ui/tab-placeholder.ui
 301share/meld/ui/vcview-ui.xml
 302share/meld/ui/vcview.ui
 303share/metainfo/org.gnome.meld.appdata.xml
 304share/mime/packages/org.gnome.meld.xml
cvs diff -r1.61 -r1.62 pkgsrc/devel/meld/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/meld/distinfo 2020/04/20 07:04:00 1.61
+++ pkgsrc/devel/meld/distinfo 2020/04/20 14:47:37 1.62
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.61 2020/04/20 07:04:00 wiz Exp $ 1$NetBSD: distinfo,v 1.62 2020/04/20 14:47:37 wiz Exp $
2 2
3SHA1 (meld-3.21.0.tar.xz) = a95af6fce2f2b0b9ba0aceacf5b4e9c7a6b8c2c2 3SHA1 (meld-3.20.2.tar.xz) = 6aa69d9841efe7535f7699e0f5a895034f182e41
4RMD160 (meld-3.21.0.tar.xz) = a9d550eda6acbff962941a30a60e9b2a9f655678 4RMD160 (meld-3.20.2.tar.xz) = 95e46ba77c4ee894dc2f2bd8e7287f00e586d0d2
5SHA512 (meld-3.21.0.tar.xz) = 1290530d8a127b3a3c8bf17703ec0bc2b286b8c48a9402c51135358217d24f20b4b819e8af398ad1a10af6209689315ebe7d4b6bc46b624ea781ddcc29e9ada4 5SHA512 (meld-3.20.2.tar.xz) = 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
6Size (meld-3.21.0.tar.xz) = 614744 bytes 6Size (meld-3.20.2.tar.xz) = 593948 bytes