meld: update to 3.20.2.

2020-02-16 meld 3.20.2
======================

  Fixes:

   * Fix crash when launched from external process on Windows (Vasily Galkin)
   * Fix single-instance behaviour on Windows (Vasily Galkin)
   * Fix display of large file sizes (Andrey Efremov)
   * Set file chooser encoding to autodetect by default (Kai Willadsen)
   * Always use UTF-8 as user's "current" encoding on Windows (Kai Willadsen)
   * Fix ignoring blank lines on text-filtered files in folder comparison (Kai
     Willadsen)
   * Fix expand/collapse actions for missing folders (Kai Willadsen)
   * Fix some incorrect action sensitivity settings (Kai Willadsen)
   * Fix height of commit dialog (Kai Willadsen)
   * Fix install support for Python 3.8 (Kai Willadsen)
   * Add support for file debug logging on Windows (Kai Willadsen)
   * Fix icon display on Windows (Kai Willadsen)

   * Issues fixed: 267, 279, 314, 322, 337, 341, 342, 350, 351, 359

3 files changed, 7 insertions, 59 deletions

diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 9a0abed6aa4..2abeb5ac896 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.97 2020/01/26 17:31:00 rillig Exp $
+# $NetBSD: Makefile,v 1.98 2020/03/04 09:47:21 wiz Exp $
 
-DISTNAME=		meld-3.20.1
-PKGREVISION=		3
+DISTNAME=		meld-3.20.2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=		.tar.xz
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index fd6420ab444..2a243835c41 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.59 2019/12/22 20:40:50 markd Exp $
+$NetBSD: distinfo,v 1.60 2020/03/04 09:47:21 wiz Exp $
 
-SHA1 (meld-3.20.1.tar.xz) = f2cf7e9b3a9f7a5fb9553e3ab262a8984e6bbb90
-RMD160 (meld-3.20.1.tar.xz) = 6e9bddbb0a99536f4bae04bd31109f0ea50af39a
-SHA512 (meld-3.20.1.tar.xz) = cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f
-Size (meld-3.20.1.tar.xz) = 594812 bytes
-SHA1 (patch-meld_build_helpers.py) = a2b572c15acda866173bdb09366e72b05d5fc48f
+SHA1 (meld-3.20.2.tar.xz) = 6aa69d9841efe7535f7699e0f5a895034f182e41
+RMD160 (meld-3.20.2.tar.xz) = 95e46ba77c4ee894dc2f2bd8e7287f00e586d0d2
+SHA512 (meld-3.20.2.tar.xz) = 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
+Size (meld-3.20.2.tar.xz) = 593948 bytes
diff --git a/devel/meld/patches/patch-meld_build_helpers.py b/devel/meld/patches/patch-meld_build_helpers.py
deleted file mode 100644
index 972ee237b11..00000000000
--- a/devel/meld/patches/patch-meld_build_helpers.py
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-meld_build_helpers.py,v 1.1 2019/12/22 20:40:51 markd Exp $
-
-commit 7862ee014ecb85b2a7fe409f8b147b1ddb6e657e
-Update build helpers for Python 3.8 compatibility
-
---- meld/build_helpers.py.orig	2019-03-30 21:54:28.000000000 +0000
-+++ meld/build_helpers.py
-@@ -31,6 +31,15 @@ import platform
- import sys
- from distutils.log import info
- 
-+try:
-+    import distro
-+except ImportError:
-+    python_version = tuple(int(x) for x in platform.python_version_tuple())
-+    if python_version >= (3, 8):
-+        print(
-+            'Missing build requirement "distro" Python module; '
-+            'install paths may be incorrect', file=sys.stderr)
-+
- 
- def has_help(self):
-     return "build_help" in self.distribution.cmdclass and os.name != 'nt'
-@@ -378,11 +387,21 @@ class install(distutils.command.install.
- 
-     def finalize_options(self):
-         special_cases = ('debian', 'ubuntu', 'linuxmint')
--        if (platform.system() == 'Linux' and
--                platform.linux_distribution()[0].lower() in special_cases):
--            # Maintain an explicit install-layout, but use deb by default
--            specified_layout = getattr(self, 'install_layout', None)
--            self.install_layout = specified_layout or 'deb'
-+        if platform.system() == 'Linux':
-+            # linux_distribution has been removed in Python 3.8; we require
-+            # the third-party distro package for future handling.
-+            try:
-+                distribution = platform.linux_distribution()[0].lower()
-+            except AttributeError:
-+                try:
-+                    distribution = distro.id()
-+                except NameError:
-+                    distribution = 'unknown'
-+
-+            if distribution in special_cases:
-+                # Maintain an explicit install-layout, but use deb by default
-+                specified_layout = getattr(self, 'install_layout', None)
-+                self.install_layout = specified_layout or 'deb'
- 
-         distutils.command.install.install.finalize_options(self)
-