CVS commit: pkgsrc/devel/meld

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul  3 09:12:07 UTC 2022

Modified Files:
        pkgsrc/devel/meld: Makefile PLIST distinfo

Log Message:
meld: update to 3.21.2.

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


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/meld/PLIST
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/meld/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/meld/Makefile
diff -u pkgsrc/devel/meld/Makefile:1.118 pkgsrc/devel/meld/Makefile:1.119
--- pkgsrc/devel/meld/Makefile:1.118    Thu Jun 30 11:18:16 2022
+++ pkgsrc/devel/meld/Makefile  Sun Jul  3 09:12:07 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.118 2022/06/30 11:18:16 nia Exp $
+# $NetBSD: Makefile,v 1.119 2022/07/03 09:12:07 wiz Exp $
 
-DISTNAME=              meld-3.21.1
-PKGREVISION=           2
+DISTNAME=              meld-3.21.2
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/devel/meld/PLIST
diff -u pkgsrc/devel/meld/PLIST:1.40 pkgsrc/devel/meld/PLIST:1.41
--- pkgsrc/devel/meld/PLIST:1.40        Mon Jan 10 08:21:09 2022
+++ pkgsrc/devel/meld/PLIST     Sun Jul  3 09:12:07 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2022/01/10 08:21:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.41 2022/07/03 09:12:07 wiz Exp $
 bin/meld
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -219,6 +219,7 @@ 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

Index: pkgsrc/devel/meld/distinfo
diff -u pkgsrc/devel/meld/distinfo:1.66 pkgsrc/devel/meld/distinfo:1.67
--- pkgsrc/devel/meld/distinfo:1.66     Mon Jan 10 08:21:09 2022
+++ pkgsrc/devel/meld/distinfo  Sun Jul  3 09:12:07 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.66 2022/01/10 08:21:09 wiz Exp $
+$NetBSD: distinfo,v 1.67 2022/07/03 09:12:07 wiz Exp $
 
-BLAKE2s (meld-3.21.1.tar.xz) = 1fe8147603075af1a77edb4ce68ea74960e9b65ee4137d768ccfbdbda5893056
-SHA512 (meld-3.21.1.tar.xz) = b73a573b3b768f2f8ad664ab4da7dc8ed0ca31203dbfb523bf374dd0a2ff5ef6d6264296b257373abcd4084c97dbecd3090ef768eecc5dc13b01752522fbe048
-Size (meld-3.21.1.tar.xz) = 649864 bytes
+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