Date: Thu, 9 Mar 2023 17:19:44 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f69954332f98 - main - textproc/meld: update to 3.22.0 Message-ID: <202303091719.329HJi96097698@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=f69954332f984cd25d41675b1b1d0315f2a0caeb commit f69954332f984cd25d41675b1b1d0315f2a0caeb Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2023-03-09 17:18:38 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2023-03-09 17:18:38 +0000 textproc/meld: update to 3.22.0 Release notes: https://gitlab.gnome.org/GNOME/meld/-/releases/3.22.0 --- textproc/meld/Makefile | 21 ++- textproc/meld/distinfo | 6 +- textproc/meld/files/patch-setup.py | 17 --- textproc/meld/pkg-plist | 291 ++++++++++++++----------------------- 4 files changed, 124 insertions(+), 211 deletions(-) diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile index c0c5f8a31347..3d3e533ff697 100644 --- a/textproc/meld/Makefile +++ b/textproc/meld/Makefile @@ -1,13 +1,12 @@ PORTNAME= meld -PORTVERSION= 3.20.4 -PORTREVISION= 1 +PORTVERSION= 3.22.0 PORTEPOCH= 1 CATEGORIES= textproc devel python MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME visual diff and merge tool -WWW= https://meldmerge.org/ +WWW= https://meld.app/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -15,20 +14,20 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= itstool:textproc/itstool RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas -USES= desktop-file-utils gettext gnome python:3.4+ shared-mime-info \ +USES= desktop-file-utils gettext gnome meson pkgconfig python shared-mime-info \ shebangfix tar:xz -USE_PYTHON= distutils noflavors -USE_GNOME= gtksourceview3 intltool libxml2:build pygobject3 +USE_GNOME= gtksourceview4 intltool libxml2:build pygobject3 +MESON_ARGS= -Dbyte-compile=false SHEBANG_FILES= bin/meld +BINARY_ALIAS= python3=${PYTHON_CMD} GLIB_SCHEMAS= org.gnome.meld.gschema.xml -PYDISTUTILS_INSTALL_TARGET= --no-update-icon-cache --no-compile-schemas install NO_ARCH= yes PLIST_SUB= PORTVER=${PORTVERSION} -.include <bsd.port.pre.mk> +post-patch: + @${REINPLACE_CMD} -e "s|dependency('python3'|dependency('python-${PYTHON_VER}'|" \ + ${WRKSRC}/meson.build -PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} --root=${STAGEDIR} - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo index b00dd8d42891..b0312bc09036 100644 --- a/textproc/meld/distinfo +++ b/textproc/meld/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633822003 -SHA256 (meld-3.20.4.tar.xz) = f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13 -SIZE (meld-3.20.4.tar.xz) = 617020 +TIMESTAMP = 1678308428 +SHA256 (meld-3.22.0.tar.xz) = 3fc107c98ef6e75358ffd2b0d14c85ddb48fe14a11e939a94322faaa8e90c40d +SIZE (meld-3.22.0.tar.xz) = 674212 diff --git a/textproc/meld/files/patch-setup.py b/textproc/meld/files/patch-setup.py deleted file mode 100644 index 578579099286..000000000000 --- a/textproc/meld/files/patch-setup.py +++ /dev/null @@ -1,17 +0,0 @@ ---- setup.py.orig 2014-11-22 12:24:31 UTC -+++ setup.py -@@ -37,11 +37,11 @@ setup( - }, - scripts=['bin/meld'], - data_files=[ -- ('share/man/man1', -+ ('man/man1', - ['meld.1'] - ), -- ('share/doc/meld-' + meld.conf.__version__, -- ['COPYING', 'NEWS'] -+ ('share/doc/meld', -+ ['NEWS'] - ), - ('share/meld', - ['data/meld.css'] diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist index 6f0b1c46a414..41365de9fdfd 100644 --- a/textproc/meld/pkg-plist +++ b/textproc/meld/pkg-plist @@ -1,90 +1,19 @@ bin/meld %%PYTHON_SITELIBDIR%%/meld/__init__.py -%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/iohelpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/iohelpers.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldbuffer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldbuffer.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/patchdialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/patchdialog.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/recent.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/recent.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/signalhelpers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/signalhelpers%%PYTHON_EXT_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/treehelpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/treehelpers.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/meld/accelerators.py +%%PYTHON_SITELIBDIR%%/meld/actiongutter.py %%PYTHON_SITELIBDIR%%/meld/build_helpers.py +%%PYTHON_SITELIBDIR%%/meld/chunkmap.py %%PYTHON_SITELIBDIR%%/meld/conf.py %%PYTHON_SITELIBDIR%%/meld/const.py %%PYTHON_SITELIBDIR%%/meld/diffgrid.py -%%PYTHON_SITELIBDIR%%/meld/diffmap.py %%PYTHON_SITELIBDIR%%/meld/dirdiff.py %%PYTHON_SITELIBDIR%%/meld/filediff.py -%%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%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/diffutil.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/diffutil.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/merge.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/merge.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/myers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/myers.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/matchers/diffutil.py %%PYTHON_SITELIBDIR%%/meld/matchers/helpers.py %%PYTHON_SITELIBDIR%%/meld/matchers/merge.py @@ -93,68 +22,33 @@ bin/meld %%PYTHON_SITELIBDIR%%/meld/meldbuffer.py %%PYTHON_SITELIBDIR%%/meld/melddoc.py %%PYTHON_SITELIBDIR%%/meld/meldwindow.py +%%PYTHON_SITELIBDIR%%/meld/menuhelpers.py %%PYTHON_SITELIBDIR%%/meld/misc.py %%PYTHON_SITELIBDIR%%/meld/newdifftab.py %%PYTHON_SITELIBDIR%%/meld/patchdialog.py %%PYTHON_SITELIBDIR%%/meld/preferences.py %%PYTHON_SITELIBDIR%%/meld/recent.py %%PYTHON_SITELIBDIR%%/meld/settings.py -%%PYTHON_SITELIBDIR%%/meld/signalhelpers.py %%PYTHON_SITELIBDIR%%/meld/sourceview.py +%%PYTHON_SITELIBDIR%%/meld/style.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%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/bufferselectors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/bufferselectors.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/cellrenderers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/cellrenderers.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/filechooser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/filechooser.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%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/filebutton.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 %%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.py +%%PYTHON_SITELIBDIR%%/meld/ui/pathlabel.py +%%PYTHON_SITELIBDIR%%/meld/ui/recentselector.py %%PYTHON_SITELIBDIR%%/meld/ui/statusbar.py %%PYTHON_SITELIBDIR%%/meld/ui/util.py %%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.py @@ -162,25 +56,10 @@ bin/meld %%PYTHON_SITELIBDIR%%/meld/vc/COPYING %%PYTHON_SITELIBDIR%%/meld/vc/README %%PYTHON_SITELIBDIR%%/meld/vc/__init__.py -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_null.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_null.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/mercurial.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/mercurial.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/svn.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/svn.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/vc/_null.py %%PYTHON_SITELIBDIR%%/meld/vc/_vc.py %%PYTHON_SITELIBDIR%%/meld/vc/bzr.py +%%PYTHON_SITELIBDIR%%/meld/vc/cvs.py %%PYTHON_SITELIBDIR%%/meld/vc/darcs.py %%PYTHON_SITELIBDIR%%/meld/vc/git.py %%PYTHON_SITELIBDIR%%/meld/vc/mercurial.py @@ -188,7 +67,7 @@ bin/meld %%PYTHON_SITELIBDIR%%/meld/vcview.py %%PYTHON_SITELIBDIR%%/meld/windowstate.py man/man1/meld.1.gz -share/applications/org.gnome.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 @@ -205,18 +84,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/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/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/org.gnome.meld.png -share/icons/hicolor/scalable/apps/org.gnome.meld.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 @@ -263,42 +228,8 @@ share/locale/uk/LC_MESSAGES/meld.mo share/locale/vi/LC_MESSAGES/meld.mo share/locale/zh_CN/LC_MESSAGES/meld.mo share/locale/zh_TW/LC_MESSAGES/meld.mo -%%DATADIR%%/icons/COPYING -%%DATADIR%%/icons/COPYING_CCBYSA3 -%%DATADIR%%/icons/emblem-meld-newer-file.png -%%DATADIR%%/icons/filter-ignored-24.png -%%DATADIR%%/icons/filter-modified-24.png -%%DATADIR%%/icons/filter-nonvc-24.png -%%DATADIR%%/icons/filter-normal-24.png -%%DATADIR%%/icons/vc-add-24.png -%%DATADIR%%/icons/vc-checkout-24.png -%%DATADIR%%/icons/vc-commit-24.png -%%DATADIR%%/icons/vc-push-24.png -%%DATADIR%%/icons/vc-remove-24.png -%%DATADIR%%/icons/vc-resolve-24.png -%%DATADIR%%/icons/vc-update-24.png -%%DATADIR%%/meld.css +%%DATADIR%%/org.gnome.Meld.gresource %%DATADIR%%/styles/meld-base.style-scheme.xml -%%DATADIR%%/styles/meld-base.xml %%DATADIR%%/styles/meld-dark.style-scheme.xml -%%DATADIR%%/styles/meld-dark.xml -%%DATADIR%%/ui/EditableList.ui -%%DATADIR%%/ui/application.ui -%%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 -%%DATADIR%%/ui/preferences.ui -%%DATADIR%%/ui/shortcuts.ui -%%DATADIR%%/ui/tab-placeholder.ui -%%DATADIR%%/ui/vcview-ui.xml -%%DATADIR%%/ui/vcview.ui -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303091719.329HJi96097698>