Wed Mar 14 17:11:27 2018 UTC ()
dupeguru: fix build with sphinx-1.7.1

Bump PKGREVISION.


(wiz)
diff -r1.4 -r1.5 pkgsrc/sysutils/dupeguru/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/dupeguru/PLIST
diff -r1.1 -r1.2 pkgsrc/sysutils/dupeguru/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/dupeguru/patches/patch-hscommon_sphinxgen.py

cvs diff -r1.4 -r1.5 pkgsrc/sysutils/dupeguru/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/dupeguru/Makefile 2018/02/16 12:43:52 1.4
+++ pkgsrc/sysutils/dupeguru/Makefile 2018/03/14 17:11:26 1.5
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2018/02/16 12:43:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2018/03/14 17:11:26 wiz Exp $
2 2
3DISTNAME= dupeguru-src-4.0.3 3DISTNAME= dupeguru-src-4.0.3
4PKGNAME= ${DISTNAME:S/-src//} 4PKGNAME= ${DISTNAME:S/-src//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= https://download.hardcoded.net/ 7MASTER_SITES= https://download.hardcoded.net/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.hardcoded.net/dupeguru/ 10HOMEPAGE= https://www.hardcoded.net/dupeguru/
11COMMENT= Find duplicate files 11COMMENT= Find duplicate files
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14BUILD_DEPENDS+= ${PYPKGPREFIX}-polib>=1.0.4:../../devel/py-polib 14BUILD_DEPENDS+= ${PYPKGPREFIX}-polib>=1.0.4:../../devel/py-polib
15BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.3.4nb1:../../textproc/py-sphinx 15BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.3.4nb1:../../textproc/py-sphinx
16DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5 16DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
17DEPENDS+= ${PYPKGPREFIX}-hsaudiotag3k-[0-9]*:../../audio/py-hsaudiotag3k 17DEPENDS+= ${PYPKGPREFIX}-hsaudiotag3k-[0-9]*:../../audio/py-hsaudiotag3k
18DEPENDS+= ${PYPKGPREFIX}-Send2Trash-[0-9]*:../../sysutils/py-Send2Trash 18DEPENDS+= ${PYPKGPREFIX}-Send2Trash-[0-9]*:../../sysutils/py-Send2Trash
@@ -34,18 +34,19 @@ INSTALLATION_DIRS= bin share/application @@ -34,18 +34,19 @@ INSTALLATION_DIRS= bin share/application
34do-build: 34do-build:
35 cd ${WRKSRC} && ${PYTHONBIN} build.py 35 cd ${WRKSRC} && ${PYTHONBIN} build.py
36 ${CHMOD} +x ${WRKSRC}/run.py 36 ${CHMOD} +x ${WRKSRC}/run.py
37 37
38do-install: 38do-install:
39 rm -rf ${WRKSRC}/build/dupeguru-arch 39 rm -rf ${WRKSRC}/build/dupeguru-arch
40 cd ${WRKSRC} && ${PYTHONBIN} package.py --arch 40 cd ${WRKSRC} && ${PYTHONBIN} package.py --arch
41 cd ${WRKSRC}/build/dupeguru-arch && pax -pp -rw * ${DESTDIR}${PREFIX}/share/dupeguru 41 cd ${WRKSRC}/build/dupeguru-arch && pax -pp -rw * ${DESTDIR}${PREFIX}/share/dupeguru
42 ${RM} -rf ${DESTDIR}${PREFIX}/share/dupeguru/hsaudiotag 42 ${RM} -rf ${DESTDIR}${PREFIX}/share/dupeguru/hsaudiotag
43 ${RM} -rf ${DESTDIR}${PREFIX}/share/dupeguru/send2trash 43 ${RM} -rf ${DESTDIR}${PREFIX}/share/dupeguru/send2trash
44 ${LN} -s ${DESTDIR}${PREFIX}/share/dupeguru/run.py ${DESTDIR}${PREFIX}/bin/dupeguru 44 ${LN} -s ${DESTDIR}${PREFIX}/share/dupeguru/run.py ${DESTDIR}${PREFIX}/bin/dupeguru
45 ${INSTALL_DATA} ${WRKSRC}/build/dupeguru-arch/dupeguru.desktop ${DESTDIR}${PREFIX}/share/applications 45 ${INSTALL_DATA} ${WRKSRC}/build/dupeguru-arch/dupeguru.desktop ${DESTDIR}${PREFIX}/share/applications
46 ${RM} -f ${DESTDIR}${PREFIX}/share/dupeguru/qt/platform.py.orig 46 ${RM} -f ${DESTDIR}${PREFIX}/share/dupeguru/qt/platform.py.orig
 47 ${RM} -f ${DESTDIR}${PREFIX}/share/dupeguru/hscommon/sphinxgen.py.orig
47 48
48.include "../../lang/python/application.mk" 49.include "../../lang/python/application.mk"
49.include "../../lang/python/extension.mk" 50.include "../../lang/python/extension.mk"
50.include "../../sysutils/desktop-file-utils/desktopdb.mk" 51.include "../../sysutils/desktop-file-utils/desktopdb.mk"
51.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/dupeguru/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/dupeguru/PLIST 2018/02/16 12:43:52 1.2
+++ pkgsrc/sysutils/dupeguru/PLIST 2018/03/14 17:11:26 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2018/02/16 12:43:52 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2018/03/14 17:11:26 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
@@ -171,26 +171,27 @@ share/dupeguru/help/_sources/quick_start @@ -171,26 +171,27 @@ share/dupeguru/help/_sources/quick_start
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 174share/dupeguru/help/_static/ajax-loader.gif
175share/dupeguru/help/_static/alert_info_32.png 175share/dupeguru/help/_static/alert_info_32.png
176share/dupeguru/help/_static/alert_warning_32.png 176share/dupeguru/help/_static/alert_warning_32.png
177share/dupeguru/help/_static/basic.css 177share/dupeguru/help/_static/basic.css
178share/dupeguru/help/_static/bg-page.png 178share/dupeguru/help/_static/bg-page.png
179share/dupeguru/help/_static/bullet_orange.png 179share/dupeguru/help/_static/bullet_orange.png
180share/dupeguru/help/_static/comment-bright.png 180share/dupeguru/help/_static/comment-bright.png
181share/dupeguru/help/_static/comment-close.png 181share/dupeguru/help/_static/comment-close.png
182share/dupeguru/help/_static/comment.png 182share/dupeguru/help/_static/comment.png
183share/dupeguru/help/_static/doctools.js 183share/dupeguru/help/_static/doctools.js
 184share/dupeguru/help/_static/documentation_options.js
184share/dupeguru/help/_static/down-pressed.png 185share/dupeguru/help/_static/down-pressed.png
185share/dupeguru/help/_static/down.png 186share/dupeguru/help/_static/down.png
186share/dupeguru/help/_static/file.png 187share/dupeguru/help/_static/file.png
187share/dupeguru/help/_static/haiku.css 188share/dupeguru/help/_static/haiku.css
188share/dupeguru/help/_static/jquery-3.2.1.js 189share/dupeguru/help/_static/jquery-3.2.1.js
189share/dupeguru/help/_static/jquery.js 190share/dupeguru/help/_static/jquery.js
190share/dupeguru/help/_static/minus.png 191share/dupeguru/help/_static/minus.png
191share/dupeguru/help/_static/plus.png 192share/dupeguru/help/_static/plus.png
192share/dupeguru/help/_static/pygments.css 193share/dupeguru/help/_static/pygments.css
193share/dupeguru/help/_static/searchtools.js 194share/dupeguru/help/_static/searchtools.js
194share/dupeguru/help/_static/underscore-1.3.1.js 195share/dupeguru/help/_static/underscore-1.3.1.js
195share/dupeguru/help/_static/underscore.js 196share/dupeguru/help/_static/underscore.js
196share/dupeguru/help/_static/up-pressed.png 197share/dupeguru/help/_static/up-pressed.png

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/dupeguru/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/dupeguru/distinfo 2017/09/26 11:22:39 1.1
+++ pkgsrc/sysutils/dupeguru/distinfo 2018/03/14 17:11:26 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.1 2017/09/26 11:22:39 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2018/03/14 17:11:26 wiz Exp $
2 2
3SHA1 (dupeguru-src-4.0.3.tar.gz) = a794780e187a36d45c384395e9bd8c2b8f5018bf 3SHA1 (dupeguru-src-4.0.3.tar.gz) = a794780e187a36d45c384395e9bd8c2b8f5018bf
4RMD160 (dupeguru-src-4.0.3.tar.gz) = 5cd2b7f93276fcd8f09b699cfec5246f7dc5abed 4RMD160 (dupeguru-src-4.0.3.tar.gz) = 5cd2b7f93276fcd8f09b699cfec5246f7dc5abed
5SHA512 (dupeguru-src-4.0.3.tar.gz) = dc8a5a122ad1d3d235825a498fb75b192566d3b5a33382ebb0002a361428af5cc453b143002ea3f57a9cb6ee30ce49f0b9f5a54bce2a90364fb1b92e102a289a 5SHA512 (dupeguru-src-4.0.3.tar.gz) = dc8a5a122ad1d3d235825a498fb75b192566d3b5a33382ebb0002a361428af5cc453b143002ea3f57a9cb6ee30ce49f0b9f5a54bce2a90364fb1b92e102a289a
6Size (dupeguru-src-4.0.3.tar.gz) = 686580 bytes 6Size (dupeguru-src-4.0.3.tar.gz) = 686580 bytes
 7SHA1 (patch-hscommon_sphinxgen.py) = cd558d14733d394e7adf2b6b0c826dda5eed689f
7SHA1 (patch-qt_platform.py) = e97e226b53f57f8c4e9bf21f4726e024bb0b2d67 8SHA1 (patch-qt_platform.py) = e97e226b53f57f8c4e9bf21f4726e024bb0b2d67

File Added: pkgsrc/sysutils/dupeguru/patches/Attic/patch-hscommon_sphinxgen.py
$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")