Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 99D4F84E88 for ; Fri, 21 Jul 2023 06:54:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id N5WU71WA8TiV for ; Fri, 21 Jul 2023 06:54:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A6E3F84CF4 for ; Fri, 21 Jul 2023 06:54:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A00FBFBDB; Fri, 21 Jul 2023 06:54:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1689922469292320" MIME-Version: 1.0 Date: Fri, 21 Jul 2023 06:54:29 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/meld To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230721065429.A00FBFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1689922469292320 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Fri Jul 21 06:54:29 UTC 2023 Modified Files: pkgsrc/devel/meld: Makefile PLIST Log Message: meld: update PLIST for meson 1.2 and require it. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.129 pkgsrc/devel/meld/Makefile cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/meld/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1689922469292320 Content-Disposition: inline Content-Length: 7936 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/meld/Makefile diff -u pkgsrc/devel/meld/Makefile:1.128 pkgsrc/devel/meld/Makefile:1.129 --- pkgsrc/devel/meld/Makefile:1.128 Tue Jun 6 12:40:40 2023 +++ pkgsrc/devel/meld/Makefile Fri Jul 21 06:54:29 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.128 2023/06/06 12:40:40 riastradh Exp $ +# $NetBSD: Makefile,v 1.129 2023/07/21 06:54:29 wiz Exp $ DISTNAME= meld-3.22.0 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -47,5 +47,6 @@ BUILDLINK_API_DEPENDS.gtksourceview4?= g .include "../../x11/gtksourceview4/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../lang/python/tool.mk" +MESON_REQD+= 1.2.0 .include "../../devel/meson/build.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/meld/PLIST diff -u pkgsrc/devel/meld/PLIST:1.43 pkgsrc/devel/meld/PLIST:1.44 --- pkgsrc/devel/meld/PLIST:1.43 Mon Dec 19 07:09:00 2022 +++ pkgsrc/devel/meld/PLIST Fri Jul 21 06:54:29 2023 @@ -1,136 +1,201 @@ -@comment $NetBSD: PLIST,v 1.43 2022/12/19 07:09:00 wiz Exp $ +@comment $NetBSD: PLIST,v 1.44 2023/07/21 06:54:29 wiz Exp $ bin/meld ${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 --_----------=_1689922469292320--