Fri Apr 3 21:59:48 2020 UTC ()
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]


(wiz)
diff -r1.8 -r1.9 pkgsrc/sysutils/dupeguru/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/dupeguru/PLIST
diff -r1.3 -r1.4 pkgsrc/sysutils/dupeguru/distinfo
diff -r1.1 -r0 pkgsrc/sysutils/dupeguru/patches/patch-Makefile
diff -r1.1 -r0 pkgsrc/sysutils/dupeguru/patches/patch-hscommon_sphinxgen.py
diff -r1.1 -r0 pkgsrc/sysutils/dupeguru/patches/patch-qt_platform.py
diff -r1.1 -r1.2 pkgsrc/sysutils/dupeguru/patches/patch-build.py
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/dupeguru/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/dupeguru/Makefile 2020/01/26 12:55:00 1.8
+++ pkgsrc/sysutils/dupeguru/Makefile 2020/04/03 21:59:48 1.9
@@ -1,44 +1,39 @@ @@ -1,44 +1,39 @@
1# $NetBSD: Makefile,v 1.8 2020/01/26 12:55:00 rhialto Exp $ 1# $NetBSD: Makefile,v 1.9 2020/04/03 21:59:48 wiz Exp $
2 2
3DISTNAME= dupeguru-src-4.0.3 3DISTNAME= dupeguru-src-4.0.4_RC
4PKGNAME= ${DISTNAME:S/-src//} 4PKGNAME= ${DISTNAME:S/-src//:S/_RC/rc1/}
5PKGREVISION= 4 
6CATEGORIES= sysutils 5CATEGORIES= sysutils
7MASTER_SITES= https://download.hardcoded.net/ 6MASTER_SITES= https://github.com/arsenetar/dupeguru/releases/download/4.0.4/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.hardcoded.net/dupeguru/ 9HOMEPAGE= https://dupeguru.voltaicideas.net/
11COMMENT= Find duplicate files 10COMMENT= Find duplicate files
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14BUILD_DEPENDS+= ${PYPKGPREFIX}-polib>=1.0.4:../../devel/py-polib 13BUILD_DEPENDS+= ${PYPKGPREFIX}-polib>=1.0.4:../../devel/py-polib
15BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.3.4nb1:../../textproc/py-sphinx 14BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.3.4nb1:../../textproc/py-sphinx
16DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5 15DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
17DEPENDS+= ${PYPKGPREFIX}-hsaudiotag3k-[0-9]*:../../audio/py-hsaudiotag3k 16DEPENDS+= ${PYPKGPREFIX}-hsaudiotag3k-[0-9]*:../../audio/py-hsaudiotag3k
18DEPENDS+= ${PYPKGPREFIX}-Send2Trash-[0-9]*:../../sysutils/py-Send2Trash 17DEPENDS+= ${PYPKGPREFIX}-Send2Trash-[0-9]*:../../sysutils/py-Send2Trash
19#DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 
20#DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree 
21 
22EXTRACT_USING= bsdtar 
23 18
24WRKSRC= ${WRKDIR} 19WRKSRC= ${WRKDIR}
25USE_LANGUAGES= c 20USE_LANGUAGES= c
26USE_TOOLS= gmake pax 21USE_TOOLS= gmake pax
27#MAKE_JOBS_SAFE= no 
28 22
29PYTHON_VERSIONS_INCOMPATIBLE= 27 23PYTHON_VERSIONS_INCOMPATIBLE= 27
30REPLACE_PYTHON+= qt/run_template.py 24REPLACE_PYTHON+= run.py
31 25
 26MAKE_ENV+= PYRCC5=pyrcc5-${PYVERSSUFFIX}
32MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX} 27MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX}
33 28
34INSTALLATION_DIRS= bin share/applications share/dupeguru 29INSTALLATION_DIRS= bin share/applications share/dupeguru
35 30
36do-build: 31do-build:
37 cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${PYTHONBIN} build.py 32 cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${PYTHONBIN} build.py
38 ${CHMOD} +x ${WRKSRC}/run.py 33 ${CHMOD} +x ${WRKSRC}/run.py
39 34
40do-install: 35do-install:
41 rm -rf ${WRKSRC}/build/dupeguru-arch 36 rm -rf ${WRKSRC}/build/dupeguru-arch
42 cd ${WRKSRC} && ${PYTHONBIN} package.py --arch 37 cd ${WRKSRC} && ${PYTHONBIN} package.py --arch
43 cd ${WRKSRC}/build/dupeguru-arch && pax -pp -rw * ${DESTDIR}${PREFIX}/share/dupeguru 38 cd ${WRKSRC}/build/dupeguru-arch && pax -pp -rw * ${DESTDIR}${PREFIX}/share/dupeguru
44 ${RM} -rf ${DESTDIR}${PREFIX}/share/dupeguru/hsaudiotag 39 ${RM} -rf ${DESTDIR}${PREFIX}/share/dupeguru/hsaudiotag
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/dupeguru/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/dupeguru/PLIST 2018/03/14 17:11:26 1.3
+++ pkgsrc/sysutils/dupeguru/PLIST 2020/04/03 21:59:48 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2018/03/14 17:11:26 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.4 2020/04/03 21:59:48 wiz Exp $
2bin/dupeguru 2bin/dupeguru
3share/applications/dupeguru.desktop 3share/applications/dupeguru.desktop
4share/dupeguru/core/__init__.py 4share/dupeguru/core/__init__.py
5share/dupeguru/core/__init__.pyc 5share/dupeguru/core/__init__.pyc
6share/dupeguru/core/app.py 6share/dupeguru/core/app.py
7share/dupeguru/core/app.pyc 7share/dupeguru/core/app.pyc
8share/dupeguru/core/directories.py 8share/dupeguru/core/directories.py
9share/dupeguru/core/directories.pyc 9share/dupeguru/core/directories.pyc
10share/dupeguru/core/engine.py 10share/dupeguru/core/engine.py
11share/dupeguru/core/engine.pyc 11share/dupeguru/core/engine.pyc
12share/dupeguru/core/export.py 12share/dupeguru/core/export.py
13share/dupeguru/core/export.pyc 13share/dupeguru/core/export.pyc
14share/dupeguru/core/fs.py 14share/dupeguru/core/fs.py
@@ -161,52 +161,44 @@ share/dupeguru/help/_sources/developer/h @@ -161,52 +161,44 @@ share/dupeguru/help/_sources/developer/h
161share/dupeguru/help/_sources/developer/hscommon/jobprogress/qt.rst.txt 161share/dupeguru/help/_sources/developer/hscommon/jobprogress/qt.rst.txt
162share/dupeguru/help/_sources/developer/hscommon/notify.rst.txt 162share/dupeguru/help/_sources/developer/hscommon/notify.rst.txt
163share/dupeguru/help/_sources/developer/hscommon/path.rst.txt 163share/dupeguru/help/_sources/developer/hscommon/path.rst.txt
164share/dupeguru/help/_sources/developer/hscommon/util.rst.txt 164share/dupeguru/help/_sources/developer/hscommon/util.rst.txt
165share/dupeguru/help/_sources/developer/index.rst.txt 165share/dupeguru/help/_sources/developer/index.rst.txt
166share/dupeguru/help/_sources/faq.rst.txt 166share/dupeguru/help/_sources/faq.rst.txt
167share/dupeguru/help/_sources/folders.rst.txt 167share/dupeguru/help/_sources/folders.rst.txt
168share/dupeguru/help/_sources/index.rst.txt 168share/dupeguru/help/_sources/index.rst.txt
169share/dupeguru/help/_sources/preferences.rst.txt 169share/dupeguru/help/_sources/preferences.rst.txt
170share/dupeguru/help/_sources/quick_start.rst.txt 170share/dupeguru/help/_sources/quick_start.rst.txt
171share/dupeguru/help/_sources/reprioritize.rst.txt 171share/dupeguru/help/_sources/reprioritize.rst.txt
172share/dupeguru/help/_sources/results.rst.txt 172share/dupeguru/help/_sources/results.rst.txt
173share/dupeguru/help/_sources/scan.rst.txt 173share/dupeguru/help/_sources/scan.rst.txt
174share/dupeguru/help/_static/ajax-loader.gif 
175share/dupeguru/help/_static/alert_info_32.png 174share/dupeguru/help/_static/alert_info_32.png
176share/dupeguru/help/_static/alert_warning_32.png 175share/dupeguru/help/_static/alert_warning_32.png
177share/dupeguru/help/_static/basic.css 176share/dupeguru/help/_static/basic.css
178share/dupeguru/help/_static/bg-page.png 177share/dupeguru/help/_static/bg-page.png
179share/dupeguru/help/_static/bullet_orange.png 178share/dupeguru/help/_static/bullet_orange.png
180share/dupeguru/help/_static/comment-bright.png 
181share/dupeguru/help/_static/comment-close.png 
182share/dupeguru/help/_static/comment.png 
183share/dupeguru/help/_static/doctools.js 179share/dupeguru/help/_static/doctools.js
184share/dupeguru/help/_static/documentation_options.js 180share/dupeguru/help/_static/documentation_options.js
185share/dupeguru/help/_static/down-pressed.png 
186share/dupeguru/help/_static/down.png 
187share/dupeguru/help/_static/file.png 181share/dupeguru/help/_static/file.png
188share/dupeguru/help/_static/haiku.css 182share/dupeguru/help/_static/haiku.css
189share/dupeguru/help/_static/jquery-3.2.1.js 183share/dupeguru/help/_static/jquery-3.4.1.js
190share/dupeguru/help/_static/jquery.js 184share/dupeguru/help/_static/jquery.js
 185share/dupeguru/help/_static/language_data.js
191share/dupeguru/help/_static/minus.png 186share/dupeguru/help/_static/minus.png
192share/dupeguru/help/_static/plus.png 187share/dupeguru/help/_static/plus.png
193share/dupeguru/help/_static/pygments.css 188share/dupeguru/help/_static/pygments.css
194share/dupeguru/help/_static/searchtools.js 189share/dupeguru/help/_static/searchtools.js
195share/dupeguru/help/_static/underscore-1.3.1.js 190share/dupeguru/help/_static/underscore-1.3.1.js
196share/dupeguru/help/_static/underscore.js 191share/dupeguru/help/_static/underscore.js
197share/dupeguru/help/_static/up-pressed.png 
198share/dupeguru/help/_static/up.png 
199share/dupeguru/help/_static/websupport.js 
200share/dupeguru/help/changelog.html 192share/dupeguru/help/changelog.html
201share/dupeguru/help/contribute.html 193share/dupeguru/help/contribute.html
202share/dupeguru/help/developer/core/app.html 194share/dupeguru/help/developer/core/app.html
203share/dupeguru/help/developer/core/directories.html 195share/dupeguru/help/developer/core/directories.html
204share/dupeguru/help/developer/core/engine.html 196share/dupeguru/help/developer/core/engine.html
205share/dupeguru/help/developer/core/fs.html 197share/dupeguru/help/developer/core/fs.html
206share/dupeguru/help/developer/core/gui/deletion_options.html 198share/dupeguru/help/developer/core/gui/deletion_options.html
207share/dupeguru/help/developer/core/gui/index.html 199share/dupeguru/help/developer/core/gui/index.html
208share/dupeguru/help/developer/core/index.html 200share/dupeguru/help/developer/core/index.html
209share/dupeguru/help/developer/core/results.html 201share/dupeguru/help/developer/core/results.html
210share/dupeguru/help/developer/hscommon/build.html 202share/dupeguru/help/developer/hscommon/build.html
211share/dupeguru/help/developer/hscommon/conflict.html 203share/dupeguru/help/developer/hscommon/conflict.html
212share/dupeguru/help/developer/hscommon/desktop.html 204share/dupeguru/help/developer/hscommon/desktop.html
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/dupeguru/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/dupeguru/distinfo 2020/01/26 12:55:00 1.3
+++ pkgsrc/sysutils/dupeguru/distinfo 2020/04/03 21:59:48 1.4
@@ -1,10 +1,7 @@ @@ -1,10 +1,7 @@
1$NetBSD: distinfo,v 1.3 2020/01/26 12:55:00 rhialto Exp $ 1$NetBSD: distinfo,v 1.4 2020/04/03 21:59:48 wiz Exp $
2 2
3SHA1 (dupeguru-src-4.0.3.tar.gz) = a794780e187a36d45c384395e9bd8c2b8f5018bf 3SHA1 (dupeguru-src-4.0.4_RC.tar.gz) = f4fb780feb40eb9707551aa9cfb73adc7840a614
4RMD160 (dupeguru-src-4.0.3.tar.gz) = 5cd2b7f93276fcd8f09b699cfec5246f7dc5abed 4RMD160 (dupeguru-src-4.0.4_RC.tar.gz) = 90d8437b790a96235c6e62f6ddad31e05524ff1f
5SHA512 (dupeguru-src-4.0.3.tar.gz) = dc8a5a122ad1d3d235825a498fb75b192566d3b5a33382ebb0002a361428af5cc453b143002ea3f57a9cb6ee30ce49f0b9f5a54bce2a90364fb1b92e102a289a 5SHA512 (dupeguru-src-4.0.4_RC.tar.gz) = 991a06afa9fb89ca8294a415d6c1448c6a9fdefb1ff26e08e38686567076ad255be49a7018d7529e72c557597a105b076470750da8a6f87d0ea84444937bb700
6Size (dupeguru-src-4.0.3.tar.gz) = 686580 bytes 6Size (dupeguru-src-4.0.4_RC.tar.gz) = 502389 bytes
7SHA1 (patch-Makefile) = 809ee7de40622a0e348df60b1251f2bed3c49b97 7SHA1 (patch-build.py) = 66737c7183cc949f6988a66e06a00d0e6d29d1ec
8SHA1 (patch-build.py) = 074a9adb4e48c07b637abe9183d49ece7d5520dc 
9SHA1 (patch-hscommon_sphinxgen.py) = cd558d14733d394e7adf2b6b0c826dda5eed689f 
10SHA1 (patch-qt_platform.py) = e97e226b53f57f8c4e9bf21f4726e024bb0b2d67 
File Deleted: pkgsrc/sysutils/dupeguru/patches/Attic/patch-Makefile
File Deleted: pkgsrc/sysutils/dupeguru/patches/Attic/patch-hscommon_sphinxgen.py
File Deleted: pkgsrc/sysutils/dupeguru/patches/Attic/patch-qt_platform.py
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/dupeguru/patches/patch-build.py (expand / switch to unified diff)

--- pkgsrc/sysutils/dupeguru/patches/patch-build.py 2020/01/26 12:55:00 1.1
+++ pkgsrc/sysutils/dupeguru/patches/patch-build.py 2020/04/03 21:59:48 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-build.py,v 1.1 2020/01/26 12:55:00 rhialto Exp $ 1$NetBSD: patch-build.py,v 1.2 2020/04/03 21:59:48 wiz Exp $
2 2
3pyrcc5 is python-version-specific. 3pyrcc5 is python-version-specific.
4 4
5--- build.py.orig 2016-11-25 01:04:31.000000000 +0000 5--- build.py.orig 2019-05-14 01:43:47.000000000 +0000
6+++ build.py 6+++ build.py
7@@ -164,7 +164,8 @@ def build_qt(dev): 7@@ -125,7 +125,8 @@ def build_normal():
8 print("Building localizations") 8 print("Building localizations")
9 build_localizations('qt') 9 build_localizations()
10 print("Building Qt stuff") 10 print("Building Qt stuff")
11- print_and_do("pyrcc5 {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py'))) 11- print_and_do("pyrcc5 {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
12+ pyrcc5 = "pyrcc5-" + os.environ["PYVERSSUFFIX"] 12+ pyrcc5 = "pyrcc5-" + os.environ["PYVERSSUFFIX"]
13+ print_and_do(pyrcc5 +" {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py'))) 13+ print_and_do(pyrcc5 +" {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
14 fix_qt_resource_file(op.join('qt', 'dg_rc.py')) 14 fix_qt_resource_file(op.join('qt', 'dg_rc.py'))
15 build_help() 15 build_help()
16 print("Creating the run.py file") 16