CVS commit: pkgsrc/devel/meld

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 10 08:21:09 UTC 2022

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

Log Message:
meld: update to 3.21.1.

Convert to egg.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/meld/PLIST
cvs rdiff -u -r1.65 -r1.66 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.114 pkgsrc/devel/meld/Makefile:1.115
--- pkgsrc/devel/meld/Makefile:1.114    Fri Dec 31 08:03:21 2021
+++ pkgsrc/devel/meld/Makefile  Mon Jan 10 08:21:09 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.114 2021/12/31 08:03:21 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2022/01/10 08:21:09 wiz Exp $
 
-DISTNAME=              meld-3.21.0
-PKGREVISION=           10
+DISTNAME=              meld-3.21.1
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=          .tar.xz
@@ -60,7 +59,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/distutils.mk"
+.include "../../lang/python/egg.mk"
 # not ready yet as of 3.21.0
 #.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/meld/PLIST
diff -u pkgsrc/devel/meld/PLIST:1.39 pkgsrc/devel/meld/PLIST:1.40
--- pkgsrc/devel/meld/PLIST:1.39        Fri Dec 31 08:03:21 2021
+++ pkgsrc/devel/meld/PLIST     Mon Jan 10 08:21:09 2022
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.39 2021/12/31 08:03:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.40 2022/01/10 08:21:09 wiz Exp $
 bin/meld
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${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
@@ -121,9 +121,9 @@ ${PYSITELIB}/meld/ui/cellrenderers.pyo
 ${PYSITELIB}/meld/ui/emblemcellrenderer.py
 ${PYSITELIB}/meld/ui/emblemcellrenderer.pyc
 ${PYSITELIB}/meld/ui/emblemcellrenderer.pyo
-${PYSITELIB}/meld/ui/filechooser.py
-${PYSITELIB}/meld/ui/filechooser.pyc
-${PYSITELIB}/meld/ui/filechooser.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
@@ -148,6 +148,9 @@ ${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
@@ -219,8 +222,9 @@ share/help/C/meld/resolving-conflicts.pa
 share/help/C/meld/text-filters.page
 share/help/C/meld/vc-mode.page
 share/help/C/meld/vc-supported.page
-share/icons/hicolor/scalable/apps/org.gnome.meld.svg
-share/icons/hicolor/symbolic/apps/org.gnome.meld-symbolic.svg
+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
 share/locale/bs/LC_MESSAGES/meld.mo

Index: pkgsrc/devel/meld/distinfo
diff -u pkgsrc/devel/meld/distinfo:1.65 pkgsrc/devel/meld/distinfo:1.66
--- pkgsrc/devel/meld/distinfo:1.65     Tue Oct 26 10:15:39 2021
+++ pkgsrc/devel/meld/distinfo  Mon Jan 10 08:21:09 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.65 2021/10/26 10:15:39 nia Exp $
+$NetBSD: distinfo,v 1.66 2022/01/10 08:21:09 wiz Exp $
 
-BLAKE2s (meld-3.21.0.tar.xz) = 45df0eaacf3a5ab0f0f160acdee785d5d4b06e2072ec602fb7e76ab7fb89f5f6
-SHA512 (meld-3.21.0.tar.xz) = 1290530d8a127b3a3c8bf17703ec0bc2b286b8c48a9402c51135358217d24f20b4b819e8af398ad1a10af6209689315ebe7d4b6bc46b624ea781ddcc29e9ada4
-Size (meld-3.21.0.tar.xz) = 614744 bytes
+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