dupeguru: update to 4.0.4rc1.

Fixes build.

Changes Since Last Release

    Update qt/platform.py to support other Unix style OSes (#444)
    Fix font size scaling issue in properties dialog [qt] (#504)
    Updates to support Python 3.7
    Fix issue with result window appearing partially off-screen [qt] (#521)
    Fix translation error for Simplified Chinese
    Updates to language files for German (#479)
    Fix error with multiple close calls to the progress window [qt] (#460, #449)
    Add Travis CI Builds
    Un-recurse methods get_files() and get_state() to improve stability (#421)
    Updates to language files for Italian (#445, #446, #447, #448)
    Fix issue with cache_shelve (#402, #439)
    Updated Windows packaging and builds (#438, #456, #461, #491, #474, #490, #565)
    Handle OS termination signals (#425)
    Make documentation installation optional
    Move cocoa UI to dupeguru-cocoa [cocoa]

7 files changed, 21 insertions, 115 deletions

diff --git a/sysutils/dupeguru/Makefile b/sysutils/dupeguru/Makefile
index d7adef5ef65..11fef45a8b8 100644
--- a/sysutils/dupeguru/Makefile
+++ b/sysutils/dupeguru/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2020/01/26 12:55:00 rhialto Exp $
+# $NetBSD: Makefile,v 1.9 2020/04/03 21:59:48 wiz Exp $
 
-DISTNAME=	dupeguru-src-4.0.3
-PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	4
+DISTNAME=	dupeguru-src-4.0.4_RC
+PKGNAME=	${DISTNAME:S/-src//:S/_RC/rc1/}
 CATEGORIES=	sysutils
-MASTER_SITES=	https://download.hardcoded.net/
+MASTER_SITES=	https://github.com/arsenetar/dupeguru/releases/download/4.0.4/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://www.hardcoded.net/dupeguru/
+HOMEPAGE=	https://dupeguru.voltaicideas.net/
 COMMENT=	Find duplicate files
 LICENSE=	gnu-gpl-v3
 
@@ -16,19 +15,15 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.3.4nb1:../../textproc/py-sphinx
 DEPENDS+=	${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
 DEPENDS+=	${PYPKGPREFIX}-hsaudiotag3k-[0-9]*:../../audio/py-hsaudiotag3k
 DEPENDS+=	${PYPKGPREFIX}-Send2Trash-[0-9]*:../../sysutils/py-Send2Trash
-#DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-#DEPENDS+=	${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
-
-EXTRACT_USING=	bsdtar
 
 WRKSRC=			${WRKDIR}
 USE_LANGUAGES=		c
 USE_TOOLS=		gmake pax
-#MAKE_JOBS_SAFE=	no
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-REPLACE_PYTHON+=		qt/run_template.py
+REPLACE_PYTHON+=		run.py
 
+MAKE_ENV+=	PYRCC5=pyrcc5-${PYVERSSUFFIX}
 MAKE_ENV+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 INSTALLATION_DIRS=	bin share/applications share/dupeguru
diff --git a/sysutils/dupeguru/PLIST b/sysutils/dupeguru/PLIST
index 3b67ce08ab9..a65a0af9984 100644
--- a/sysutils/dupeguru/PLIST
+++ b/sysutils/dupeguru/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/03/14 17:11:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/04/03 21:59:48 wiz Exp $
 bin/dupeguru
 share/applications/dupeguru.desktop
 share/dupeguru/core/__init__.py
@@ -171,32 +171,24 @@ share/dupeguru/help/_sources/quick_start.rst.txt
 share/dupeguru/help/_sources/reprioritize.rst.txt
 share/dupeguru/help/_sources/results.rst.txt
 share/dupeguru/help/_sources/scan.rst.txt
-share/dupeguru/help/_static/ajax-loader.gif
 share/dupeguru/help/_static/alert_info_32.png
 share/dupeguru/help/_static/alert_warning_32.png
 share/dupeguru/help/_static/basic.css
 share/dupeguru/help/_static/bg-page.png
 share/dupeguru/help/_static/bullet_orange.png
-share/dupeguru/help/_static/comment-bright.png
-share/dupeguru/help/_static/comment-close.png
-share/dupeguru/help/_static/comment.png
 share/dupeguru/help/_static/doctools.js
 share/dupeguru/help/_static/documentation_options.js
-share/dupeguru/help/_static/down-pressed.png
-share/dupeguru/help/_static/down.png
 share/dupeguru/help/_static/file.png
 share/dupeguru/help/_static/haiku.css
-share/dupeguru/help/_static/jquery-3.2.1.js
+share/dupeguru/help/_static/jquery-3.4.1.js
 share/dupeguru/help/_static/jquery.js
+share/dupeguru/help/_static/language_data.js
 share/dupeguru/help/_static/minus.png
 share/dupeguru/help/_static/plus.png
 share/dupeguru/help/_static/pygments.css
 share/dupeguru/help/_static/searchtools.js
 share/dupeguru/help/_static/underscore-1.3.1.js
 share/dupeguru/help/_static/underscore.js
-share/dupeguru/help/_static/up-pressed.png
-share/dupeguru/help/_static/up.png
-share/dupeguru/help/_static/websupport.js
 share/dupeguru/help/changelog.html
 share/dupeguru/help/contribute.html
 share/dupeguru/help/developer/core/app.html
diff --git a/sysutils/dupeguru/distinfo b/sysutils/dupeguru/distinfo
index 6bf196a7798..cc79b572b81 100644
--- a/sysutils/dupeguru/distinfo
+++ b/sysutils/dupeguru/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.3 2020/01/26 12:55:00 rhialto Exp $
+$NetBSD: distinfo,v 1.4 2020/04/03 21:59:48 wiz Exp $
 
-SHA1 (dupeguru-src-4.0.3.tar.gz) = a794780e187a36d45c384395e9bd8c2b8f5018bf
-RMD160 (dupeguru-src-4.0.3.tar.gz) = 5cd2b7f93276fcd8f09b699cfec5246f7dc5abed
-SHA512 (dupeguru-src-4.0.3.tar.gz) = dc8a5a122ad1d3d235825a498fb75b192566d3b5a33382ebb0002a361428af5cc453b143002ea3f57a9cb6ee30ce49f0b9f5a54bce2a90364fb1b92e102a289a
-Size (dupeguru-src-4.0.3.tar.gz) = 686580 bytes
-SHA1 (patch-Makefile) = 809ee7de40622a0e348df60b1251f2bed3c49b97
-SHA1 (patch-build.py) = 074a9adb4e48c07b637abe9183d49ece7d5520dc
-SHA1 (patch-hscommon_sphinxgen.py) = cd558d14733d394e7adf2b6b0c826dda5eed689f
-SHA1 (patch-qt_platform.py) = e97e226b53f57f8c4e9bf21f4726e024bb0b2d67
+SHA1 (dupeguru-src-4.0.4_RC.tar.gz) = f4fb780feb40eb9707551aa9cfb73adc7840a614
+RMD160 (dupeguru-src-4.0.4_RC.tar.gz) = 90d8437b790a96235c6e62f6ddad31e05524ff1f
+SHA512 (dupeguru-src-4.0.4_RC.tar.gz) = 991a06afa9fb89ca8294a415d6c1448c6a9fdefb1ff26e08e38686567076ad255be49a7018d7529e72c557597a105b076470750da8a6f87d0ea84444937bb700
+Size (dupeguru-src-4.0.4_RC.tar.gz) = 502389 bytes
+SHA1 (patch-build.py) = 66737c7183cc949f6988a66e06a00d0e6d29d1ec
diff --git a/sysutils/dupeguru/patches/patch-Makefile b/sysutils/dupeguru/patches/patch-Makefile
deleted file mode 100644
index 0bba5f9b17c..00000000000
--- a/sysutils/dupeguru/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2020/01/26 12:55:00 rhialto Exp $
-
-pyrcc5 is python-version-specific.
-
---- Makefile.orig	2016-11-25 01:04:31.000000000 +0000
-+++ Makefile
-@@ -54,7 +54,7 @@ build/help : | env
- 	./env/bin/python build.py --doc
- 
- qt/dg_rc.py : qt/dg.qrc
--	pyrcc5 qt/dg.qrc > qt/dg_rc.py
-+	pyrcc5-${PYVERSSUFFIX} qt/dg.qrc > qt/dg_rc.py
- 
- i18n: $(mofiles)
- 
diff --git a/sysutils/dupeguru/patches/patch-build.py b/sysutils/dupeguru/patches/patch-build.py
index 7b8b32eaf43..2fa48268262 100644
--- a/sysutils/dupeguru/patches/patch-build.py
+++ b/sysutils/dupeguru/patches/patch-build.py
@@ -1,16 +1,16 @@
-$NetBSD: patch-build.py,v 1.1 2020/01/26 12:55:00 rhialto Exp $
+$NetBSD: patch-build.py,v 1.2 2020/04/03 21:59:48 wiz Exp $
 
 pyrcc5 is python-version-specific.
 
---- build.py.orig	2016-11-25 01:04:31.000000000 +0000
+--- build.py.orig	2019-05-14 01:43:47.000000000 +0000
 +++ build.py
-@@ -164,7 +164,8 @@ def build_qt(dev):
+@@ -125,7 +125,8 @@ def build_normal():
      print("Building localizations")
-     build_localizations('qt')
+     build_localizations()
      print("Building Qt stuff")
 -    print_and_do("pyrcc5 {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
 +    pyrcc5 = "pyrcc5-" + os.environ["PYVERSSUFFIX"]
 +    print_and_do(pyrcc5 +" {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
      fix_qt_resource_file(op.join('qt', 'dg_rc.py'))
      build_help()
-     print("Creating the run.py file")
+ 
diff --git a/sysutils/dupeguru/patches/patch-hscommon_sphinxgen.py b/sysutils/dupeguru/patches/patch-hscommon_sphinxgen.py
deleted file mode 100644
index 1f5b3f6c17b..00000000000
--- a/sysutils/dupeguru/patches/patch-hscommon_sphinxgen.py
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-hscommon_sphinxgen.py,v 1.1 2018/03/14 17:11:26 wiz Exp $
-
-Fix build with sphinx-1.7.1.
-https://github.com/hsoft/hscommon/commit/17a12618074ccb1e2e66df566c55c621dd8503a7
-
---- hscommon/sphinxgen.py.orig	2016-08-17 02:02:50.000000000 +0000
-+++ hscommon/sphinxgen.py
-@@ -9,7 +9,8 @@
- import os.path as op
- import re
- 
--from pkg_resources import load_entry_point
-+from distutils.version import LooseVersion 
-+from pkg_resources import load_entry_point, get_distribution
- 
- from .build import read_changelog_file, filereplace
- 
-@@ -60,14 +61,21 @@ def gen(basepath, destpath, changelogpat
-     filereplace(changelogtmpl, changelog_out, changelog='\n'.join(rendered_logs))
-     conf_out = op.join(basepath, 'conf.py')
-     filereplace(confpath, conf_out, **confrepl)
--    # We used to call sphinx-build with print_and_do(), but the problem was that the virtualenv
--    # of the calling python wasn't correctly considered and caused problems with documentation
--    # relying on autodoc (which tries to import the module to auto-document, but fail because of
--    # missing dependencies which are in the virtualenv). Here, we do exactly what is done when
--    # calling the command from bash.
--    cmd = load_entry_point('Sphinx', 'console_scripts', 'sphinx-build')
--    try:
--        cmd(['sphinx-build', basepath, destpath])
--    except SystemExit:
--        print("Sphinx called sys.exit(), but we're cancelling it because we don't actually want to exit")
--
-+    if LooseVersion(get_distribution("sphinx").version) >= LooseVersion("1.7.0"):
-+        from sphinx.cmd.build import build_main as sphinx_build
-+        # Call the sphinx_build function, which is the same as doing sphinx-build from cli
-+        try:
-+            sphinx_build([basepath, destpath])
-+        except SystemExit:
-+            print("Sphinx called sys.exit(), but we're cancelling it because we don't actually want to exit")
-+    else:
-+        # We used to call sphinx-build with print_and_do(), but the problem was that the virtualenv
-+        # of the calling python wasn't correctly considered and caused problems with documentation
-+        # relying on autodoc (which tries to import the module to auto-document, but fail because of
-+        # missing dependencies which are in the virtualenv). Here, we do exactly what is done when
-+        # calling the command from bash.
-+        cmd = load_entry_point('Sphinx', 'console_scripts', 'sphinx-build')
-+        try:
-+            cmd(['sphinx-build', basepath, destpath])
-+        except SystemExit:
-+            print("Sphinx called sys.exit(), but we're cancelling it because we don't actually want to exit")
diff --git a/sysutils/dupeguru/patches/patch-qt_platform.py b/sysutils/dupeguru/patches/patch-qt_platform.py
deleted file mode 100644
index 960103839d0..00000000000
--- a/sysutils/dupeguru/patches/patch-qt_platform.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-qt_platform.py,v 1.1 2017/09/26 11:22:39 wiz Exp $
-
-Instead of failing on unknown platforms, assume them to be Unix-style.
-https://github.com/hsoft/dupeguru/issues/444
-
---- qt/platform.py.orig	2016-11-25 01:04:31.000000000 +0000
-+++ qt/platform.py
-@@ -23,4 +23,4 @@ elif ISOSX:
- elif ISLINUX:
-     INITIAL_FOLDER_IN_DIALOGS = '/'
- else:
--    pass # unsupported platform
-+    INITIAL_FOLDER_IN_DIALOGS = '/'