diff --git a/devel/meld/Makefile b/devel/meld/Makefile index 62e8a6561f81..2e51b3bfb1c7 100644 --- a/devel/meld/Makefile +++ b/devel/meld/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.120 2022/08/11 05:08:13 gutteridge Exp $ +# $NetBSD: Makefile,v 1.121 2022/09/13 23:06:21 wiz Exp $ -DISTNAME= meld-3.21.2 -PKGREVISION= 1 +DISTNAME= meld-3.22.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -17,8 +16,11 @@ DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-sch DEPENDS+= dconf-[0-9]*:../../devel/dconf USE_TOOLS+= msgfmt pkg-config itstool -# only used when building the python way (not meson) -USE_TOOLS+= intltool + +PYTHON_VERSIONS_INCOMPATIBLE= 27 +PY_PATCHPLIST= yes + +REPLACE_PYTHON+= bin/meld SUBST_CLASSES+= python3 SUBST_FILES.python3= meson.build @@ -27,21 +29,9 @@ 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 -# post-install: -# something like: -# python -m compileall "$pkgdir"/path/to/python3/files - -PYTHON_VERSIONS_INCOMPATIBLE= 27 # not supported any longer -PLIST_SUBST+= PYSITELIB=${PYSITELIB} -REPLACE_PYTHON+= bin/meld - -SUBST_CLASSES+= man -SUBST_FILES.man= setup.py -SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1," -SUBST_STAGE.man= pre-build -SUBST_MESSAGE.man= Fixing man page installation path. +# compile step in meson_post_install.py does not support DESTDIR +post-install: + ${PYTHONBIN} -m compileall compile_dir ${DESTDIR}${PREFIX}/${PYSITELIB} .include "../../devel/py-gobject3-common/buildlink3.mk" .include "../../graphics/adwaita-icon-theme/buildlink3.mk" @@ -58,7 +48,7 @@ BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.20 .include "../../x11/gtk3/buildlink3.mk" BUILDLINK_API_DEPENDS.gtksourceview4?= gtksourceview4>=4.6.0nb1 .include "../../x11/gtksourceview4/buildlink3.mk" -.include "../../lang/python/egg.mk" -# not ready yet as of 3.21.0 -#.include "../../devel/meson/build.mk" +.include "../../lang/python/extension.mk" +.include "../../lang/python/tool.mk" +.include "../../devel/meson/build.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/meld/PLIST b/devel/meld/PLIST index 0df49c4bd493..5a772ff1c986 100644 --- a/devel/meld/PLIST +++ b/devel/meld/PLIST @@ -1,210 +1,139 @@ -@comment $NetBSD: PLIST,v 1.41 2022/07/03 09:12:07 wiz Exp $ +@comment $NetBSD: PLIST,v 1.42 2022/09/13 23:06:21 wiz Exp $ bin/meld -${PYSITELIB}/${EGG_INFODIR}/PKG-INFO -${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt -${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt -${PYSITELIB}/${EGG_INFODIR}/top_level.txt ${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/filebutton.py ${PYSITELIB}/meld/ui/filebutton.pyc -${PYSITELIB}/meld/ui/filebutton.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/pathlabel.py ${PYSITELIB}/meld/ui/pathlabel.pyc -${PYSITELIB}/meld/ui/pathlabel.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 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 @@ -219,12 +148,106 @@ share/help/C/meld/legal.xml share/help/C/meld/missing-functionality.page share/help/C/meld/preferences.page share/help/C/meld/resolving-conflicts.page -share/help/C/meld/syncpoints.page share/help/C/meld/text-filters.page share/help/C/meld/vc-mode.page share/help/C/meld/vc-supported.page +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/scalable/apps/org.gnome.MeldDevel.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 @@ -275,5 +298,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 diff --git a/devel/meld/distinfo b/devel/meld/distinfo index 03928f665ec1..335871efe94b 100644 --- a/devel/meld/distinfo +++ b/devel/meld/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.67 2022/07/03 09:12:07 wiz Exp $ +$NetBSD: distinfo,v 1.68 2022/09/13 23:06:21 wiz Exp $ -BLAKE2s (meld-3.21.2.tar.xz) = 999dc1feef0c1f2940c3b5b9d83d30dc9e3db536ddcb6f816757826b02e176df -SHA512 (meld-3.21.2.tar.xz) = f715ce8356c4a0cfdb57dfdde4c66af059de08e9ad5f3755ab03adb355075523280ec7cf5c4d86bd587191d854b4dc6d2f6600540dd7d974a1a7b957c7c8bcb5 -Size (meld-3.21.2.tar.xz) = 673076 bytes +BLAKE2s (meld-3.22.0.tar.xz) = c1b26cef3ea87c693d2b20d927251fada8ce3835e114792ba199553586531448 +SHA512 (meld-3.22.0.tar.xz) = 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526 +Size (meld-3.22.0.tar.xz) = 674212 bytes