CVS commit: pkgsrc/sysutils/dupeguru

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov 25 08:35:17 UTC 2022

Modified Files:
        pkgsrc/sysutils/dupeguru: Makefile distinfo
Added Files:
        pkgsrc/sysutils/dupeguru/patches:
            patch-hscommon_gui_selectable__list.py patch-hscommon_gui_table.py
            patch-hscommon_gui_tree.py

Log Message:
dupeguru: fix for python 3.10

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/dupeguru/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/dupeguru/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_selectable__list.py \
    pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_table.py \
    pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_tree.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/dupeguru/Makefile
diff -u pkgsrc/sysutils/dupeguru/Makefile:1.13 pkgsrc/sysutils/dupeguru/Makefile:1.14
--- pkgsrc/sysutils/dupeguru/Makefile:1.13      Mon Nov 14 16:47:24 2022
+++ pkgsrc/sysutils/dupeguru/Makefile   Fri Nov 25 08:35:17 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/11/14 16:47:24 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/11/25 08:35:17 wiz Exp $
 
 DISTNAME=      dupeguru-src-4.0.4_RC
 PKGNAME=       ${DISTNAME:S/-src//:S/_RC/rc1/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    sysutils
 #MASTER_SITES= https://github.com/arsenetar/dupeguru/releases/download/4.0.4/
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=arsenetar/}
@@ -43,8 +43,7 @@ do-install:
        ${RM} -rf ${DESTDIR}${PREFIX}/share/dupeguru/send2trash
        ${LN} -s ${DESTDIR}${PREFIX}/share/dupeguru/run.py ${DESTDIR}${PREFIX}/bin/dupeguru
        ${INSTALL_DATA} ${WRKSRC}/build/dupeguru-arch/dupeguru.desktop ${DESTDIR}${PREFIX}/share/applications
-       ${RM} -f ${DESTDIR}${PREFIX}/share/dupeguru/qt/platform.py.orig
-       ${RM} -f ${DESTDIR}${PREFIX}/share/dupeguru/hscommon/sphinxgen.py.orig
+       ${FIND} ${DESTDIR} -name *.orig -delete
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"

Index: pkgsrc/sysutils/dupeguru/distinfo
diff -u pkgsrc/sysutils/dupeguru/distinfo:1.6 pkgsrc/sysutils/dupeguru/distinfo:1.7
--- pkgsrc/sysutils/dupeguru/distinfo:1.6       Tue Oct 26 11:19:32 2021
+++ pkgsrc/sysutils/dupeguru/distinfo   Fri Nov 25 08:35:17 2022
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:19:32 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/11/25 08:35:17 wiz Exp $
 
 BLAKE2s (dupeguru-src-4.0.4_RC.tar.gz) = 643bfac40e5a934322c699e8fb3e290d8b584d7e61104065008b6903da43a5a0
 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
+SHA1 (patch-hscommon_gui_selectable__list.py) = f2f4802fe202820f42810a3703fdc25338665f68
+SHA1 (patch-hscommon_gui_table.py) = bd0dddec6677535698a8b29dd33b6528be1ceb68
+SHA1 (patch-hscommon_gui_tree.py) = 7369f2df7dfac489c19d5170f0affe546cc73ec0

Added files:

Index: pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_selectable__list.py
diff -u /dev/null pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_selectable__list.py:1.1
--- /dev/null   Fri Nov 25 08:35:17 2022
+++ pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_selectable__list.py     Fri Nov 25 08:35:17 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-hscommon_gui_selectable__list.py,v 1.1 2022/11/25 08:35:17 wiz Exp $
+
+Support python 3.10.
+
+--- hscommon/gui/selectable_list.py.orig       2018-11-27 17:30:37.000000000 +0000
++++ hscommon/gui/selectable_list.py
+@@ -6,7 +6,7 @@
+ # which should be included with this package. The terms are also available at 
+ # http://www.gnu.org/licenses/gpl-3.0.html
+ 
+-from collections import Sequence, MutableSequence
++from collections.abc import Sequence, MutableSequence
+ 
+ from .base import GUIObject
+ 
Index: pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_table.py
diff -u /dev/null pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_table.py:1.1
--- /dev/null   Fri Nov 25 08:35:17 2022
+++ pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_table.py        Fri Nov 25 08:35:17 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-hscommon_gui_table.py,v 1.1 2022/11/25 08:35:17 wiz Exp $
+
+Support python 3.10.
+
+--- hscommon/gui/table.py.orig 2018-11-27 17:30:37.000000000 +0000
++++ hscommon/gui/table.py
+@@ -6,7 +6,8 @@
+ # which should be included with this package. The terms are also available at
+ # http://www.gnu.org/licenses/gpl-3.0.html
+ 
+-from collections import MutableSequence, namedtuple
++from collections.abc import MutableSequence
++from collections import namedtuple
+ 
+ from .base import GUIObject
+ from .selectable_list import Selectable
Index: pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_tree.py
diff -u /dev/null pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_tree.py:1.1
--- /dev/null   Fri Nov 25 08:35:17 2022
+++ pkgsrc/sysutils/dupeguru/patches/patch-hscommon_gui_tree.py Fri Nov 25 08:35:17 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-hscommon_gui_tree.py,v 1.1 2022/11/25 08:35:17 wiz Exp $
+
+Support python 3.10.
+
+--- hscommon/gui/tree.py.orig  2018-11-27 17:30:37.000000000 +0000
++++ hscommon/gui/tree.py
+@@ -4,7 +4,7 @@
+ # which should be included with this package. The terms are also available at 
+ # http://www.gnu.org/licenses/gpl-3.0.html
+ 
+-from collections import MutableSequence
++from collections.abc import MutableSequence
+ 
+ from .base import GUIObject
+