From 35518d6b1a2e97752fbb4981bd9e8fa7096df958 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 13 Sep 2022 23:06:21 +0000 Subject: [PATCH] meld: update to 3.22.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch to building using meson. 2022-09-04 meld 3.22.0 ====================== Fixes: * Fix text filter changes on existing comparisons (Kai Willadsen) * Build fixes (Kai Willadsen) * Documentation updates (Kai Willadsen) 2022-08-14 meld 3.21.3 ====================== Features: * Add shortcut for open externally action (Kai Willadsen) * Add improved tooltips for tab labels (Kai Willadsen) Fixes: * Move horizontal-icon menu section to regular menu items (Kai Willadsen) * Fix chunk navigation actions sometimes not working after chunk push/pull actions (Kai Willadsen) * Show more parent context in path label display (Kai Willadsen) * Update meson build to strip env from shebang line (Kai Willadsen) * Fix left-click chunk actions under certain window managers (Dmytro Bagrii) * Fix version control showing console windows on Windows (Kai Willadsen) * Fix path label display for very long filenames (Kai Willadsen) * CI fixes (Bartłomiej Piotrowski, Kai Willadsen) * Issues fixed: #141, #496, #646, #658, #682, #692, #694, #697 2022-06-18 meld 3.21.2 ====================== Features: * Folder comparison now supports compare differently-named files across panes, by marking files for comparison (Helly Guo) * Synchronization points are now significantly easier to use and more robust, and have new user documentation (Roberto Vidal) * Added option to ignore Unicode normalisation form differences when comparing paths (Dan B) * The files or folders being compared can now be swapped in two pane mode, using the new View -> Swap left and right panes menu item (Helly Guo) * Folder comparisons now show a "(scanning...)" indication in tree view rows as an additional visual cue that the comparison is still running (Kai Willadsen) * Folder comparisons have a new optional ISO-format time column (Kai Willadsen) Fixes: * Update icon usage to support stock icon removal from new Adwaita versions (Jan Tojnar) * Build fix for Meson 0.61.0 (Silvio Fricke) * The new pathlabel widgets now support user-provided custom labels (Kai Willadsen) * Fix file selectors in folder comparisons to always open in the current folder (Kai Willadsen) * Using a custom save path (i.e., the --output flag) now sets a buffer as modified, so that unchanged merges can be saved (Kai Willadsen) * Comparing new or deleted rows in folder comparison now opens a two-pane file comparisons for consistency (Kai Willadsen) * Destructive dialog actions now have appropriate styling (Kai Willadsen) * Invalid user settings for folder comparison columns are now handled more gracefully (Kai Willadsen) * The nightly flatpak build now includes Git to make version control comparisons somewhat functional (Kai Willadsen) * Issues fixed: #11, #85, #188, #319, #381, #475, #492, #581, #620, #638, #645, #660, #662, #672 2022-01-07 meld 3.21.1 ====================== UI changes: * A new custom per-pane location display widget replaces the standard GTK+ file chooser button and our existing placeholder path display, including actions for opening containing folder and copying file paths (Kai Willadsen) * Version control comparison has had its action bar modernised in line with file and folder comparison (Kai Willadsen) Features: * The find bar now remembers the previous search across panes (Jack) * We show a warning to the user if they're trying to compare a file or folder to itself (Jack) * Meld no longer uses custom file chooser dialogs, improving portability and flatpak behaviour (Mario Aichinger) * Two pane comparisons now allow Alt+Right/Left to work in either pane (Anatoli Babenia) * Certain header bar actions (e.g., conflict navigation, filters) are now only shown in their appropriate comparison types (Kai Willadsen) * The application title no longer includes the per-comparison label (Kai Willadsen) * Add a preference for GTK's dark theme support (Kai Willadsen) * Retain clipboard contents after exiting Meld (Kai Willadsen) Fixes: * Fix incorrect detection of FUSE directory comparisons as remote (mscdex) * Fix "Open Externally" on Windows for paths with spaces (adam0antium) * Fix syntax highlighting in version control by using the correct file extension (Alan Suran) * Move application icons into the resource bundle (Vasily Galkin) * Improved error reporting for invalid change actions (Anatoli Babenia) * Fix too-large minimum window size from status bar buttons (Kai Willadsen) * Fix Subversion comparsion on Python 3.9 (Kai Willadsen) * Fix bad translation source strings with multiple arguments (Kai Willadsen) * Fix performance regression in file comparison line splitting logic (Kai Willadsen) * Fix folder comparison sensitivity breaking when cancelling a scan (Kai Willadsen) * Fix occasional traceback when closing comparisons (Kai Willadsen) * Fix orphaned comparison helper process when quitting (Kai Willadsen) * Minor UI fixes: * Fix About dialog URL (TotalCaesar659) * Update About dialog copyright (Kai Willadsen) * The new comparison page now better distinguishes the "Compare" and "Blank Comparison" actions (Kai Willadsen) * The comparison overview map is now more responsive when dragging (Kai Willadsen) * The find bar now waits briefly before searching to improve responsiveness (Kai Willadsen) * The find bar no longer hides when it loses focus (Kai Willadsen) * Allow preferences dialog to be resized (Kai Willadsen) * Main menu can now be activated with F10 * Find next/previous can now be activated with F3/Shift+F3 (Kai Willadsen) * Windows fixes: * Add a MeldConsole.exe executable for running Meld from the console (Kai Willadsen) * Update Windows build to force all-users installation (Kai Willadsen) * Improve default monospace font on Windows (Kai Willadsen) * Fix empty line height and fallback fonts by changing the Pango font backend to fontconfig on Windows (Kai Willadsen) * Add Meld's install directory to the Windows PATH (Kai Willadsen) * Add a basic GTK settings.ini for Windows builds (Kai Willadsen) * Add the Meld icon to the Windows add/remove programs UI (Kai Willadsen) * Fix file comparison holding a directory handle after close (Kai Willadsen) * Issues fixed: 25, 91, 143, 354, 433, 445, 453, 459, 477, 482, 488, 491, 499, 502, 526, 530, 539, 541, 557, 561, 564, 565, 571, 579, 590, 603 Internal changes: * Modernise and improve the new Meson build rules (Iñigo Martínez) * CI + build improvements (Jason Edson, Jordan Petridis, Vasily Galkin, Kai Willadsen) * Nightly Meld builds now use the standard nightly icon styling (Kai Willadsen) * Clarify licensing in appdata (Kai Willadsen) * Windows build fixes (Kai Willadsen) * Add documentation on hosting infrastructure (Kai Willadsen) 2020-04-19 meld 3.21.0 ====================== UI changes: * Move to a modern GTK headerbar-based design, including: * More extensive action support in the header bar * New comparison overview map widget that provides a clearer overview for multiple panes at once, and allows for more natural scrollbar positioning (Kai Willadsen) * Text, filename and version filters are now all accessible from the toolbar (Kai Willadsen) * Refreshed find bar that more closely matches other applications (Kai Willadsen) * Remove application menu in line with Initiatives#4 (Kai Willadsen) * New recent comparison selection widget (Kai Willadsen) * Change tab style to be full-width and hidden for single tab windows (Kai Willadsen) * Make file comparison change navigation more intuitive by changing how it decides where to scroll from (Heikki Ketoharju) * Completely refreshed Meld application icon (Alex Monday) * File comparison now has overscroll at the bottom of file comparisons, making it easier to see end-of-file differences and improving scroll syncing (Kai Willadsen) * Text wrapping, whitespace, line numbers and line highlight can now all be toggled from the file comparison status bar (Kai Willadsen) Features: * Add support for CVS in version control comparisons (gitqlt) * Copy selected file paths in folder comparison (WenGuoyao) * Improve dark theme detection so custom Meld highlighting better matches the user's theme (Kai Willadsen) * Meld's built-in GtkSourceView schemes now support syntax highlighting (Kai Willadsen) * Moving past the first or last change using our change navigation now alerts with the standard error bell (Kai Willadsen) * Support nightly Flatpak builds of Meld using GNOME's CI (Kai Willadsen) * Support development using GNOME Builder's workflow Fixes: * CI and build system fixes (Michael Behrisch, Frank Dana, Piotr Drąg, Vasily Galkin) * Fix running uninstalled from non-project-base folder (Vasily Galkin) * Fix file comparison closing after file save (Vasily Galkin) * Fix file comparison handling of certain line breaks (Kai Willadsen) * Fix folder comparison display of large file sizes (andre) * Fix folder comparisons with pre-epoch timestamps (Kai Willadsen) * Fix folder comparisons not handling ignore blank lines + text filters (Kai Willadsen) * Handle file deletion better on NFS mounts (Kai Willadsen) * Fix handling of bad filter regular expressions (Kai Willadsen) * Fix push action on missing changes in three way comparison (Kai Willadsen) * Default file chooser encoding to autodetect (Kai Willadsen) * Minor UI fixes: * Statusbar now correctly sets default encoding & file type for empty files (Kai Willadsen) * Statusbar tries to keep a constant width for the cursor label (Kai Willadsen) * Folder comparisons set sensitivity correctly for empty rows (Kai Willadsen) * Give commit dialog message area a reasonable height (Kai Willadsen) * Fix long file name wrapping in info bar notifications (Kai Willadsen) * Fix long file name ellipsization in file comparisons (Kai Willadsen) * Windows fixes: * Fix crash when started with unexpected environment (Vasily Galkin) * Fix dbus support for single-instance behaviour (Vasily Galkin) * Fix internationalisation building from source (ThunderEX) * Fix SVG icon display (Kai Willadsen) * Support logging to a file on Windows for debugging (Kai Willadsen) * Default file encoding to UTF-8 to avoid Windows-specific locale issues (Kai Willadsen) * Typo fixes (luzpaz) * Localisation fixes (Piotr Drąg) Internal changes: * Add Meson build system support; setuptools is still supported for Windows and Mac OS builds, but Linux distributions should switch to building with Meson (Bilal Elmoussaoui, Kai Willadsen) * Move from GtkUIManager to GAction-based actions * Move all UI-file-constructed widgets from custom Python wrapper classes to using real GtkWidget templates * Move UI templates, menus, custom icons and CSS to be resource-loaded * Move to pre-commit using flake8 and isort for CI linting * Move to new GtkSourceView 4 API * Modernised Python GObject API usage, including signal and property usage * Fix some deprecated GTK API usage * Support Python 3.8 * Updated dependencies: * Python 3.6 * GTK+ 3.20 * GLib 2.48 * GtkSourceView 4.0 * pygobject 3.30 * pycairo 1.15 * Issues fixed: 62, 78, 119, 170, 240, 265, 265, 267, 279, 290, 313, 314, 316, 321, 322, 337, 341, 342, 344, 344, 350, 351, 359, 419, 432, 439, 442, 451 --- devel/meld/Makefile | 36 ++++----- devel/meld/PLIST | 177 +++++++++++++++++++++++++------------------- devel/meld/distinfo | 8 +- 3 files changed, 117 insertions(+), 104 deletions(-) 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