CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Oct 24 10:41:05 UTC 2024

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile distinfo
Added Files:
        pkgsrc/devel/py-mercurial/patches: patch-hgdemandimport_____init____.py

Log Message:
py-mercurial: fix running this with Python 3.13

Using a temporary upstream patch, more fixes might be needed, but
this way it doesn't die immediately during startup.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.150 -r1.151 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-mercurial/patches/patch-hgdemandimport_____init____.py

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

Modified files:

Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.99 pkgsrc/devel/py-mercurial/Makefile:1.100
--- pkgsrc/devel/py-mercurial/Makefile:1.99     Thu Aug  8 08:11:10 2024
+++ pkgsrc/devel/py-mercurial/Makefile  Thu Oct 24 10:41:05 2024
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.99 2024/08/08 08:11:10 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2024/10/24 10:41:05 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  https://www.mercurial-scm.org/release/
 

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.150 pkgsrc/devel/py-mercurial/distinfo:1.151
--- pkgsrc/devel/py-mercurial/distinfo:1.150    Thu Aug  8 08:11:10 2024
+++ pkgsrc/devel/py-mercurial/distinfo  Thu Oct 24 10:41:05 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.150 2024/08/08 08:11:10 wiz Exp $
+$NetBSD: distinfo,v 1.151 2024/10/24 10:41:05 wiz Exp $
 
 BLAKE2s (mercurial-6.8.1.tar.gz) = 32f4581344c7ce0a93f76ab4e85ad0d1974fb8059f248d42474d87d2714ebf16
 SHA512 (mercurial-6.8.1.tar.gz) = c638b9c5421320dcae966c7526afcd7743afaa48f72d4202a9b85a68f51ee97755321e75858e128cdb21cc17312701d2481d10a8a8e2f882ec0df189fc1fd194
 Size (mercurial-6.8.1.tar.gz) = 8324749 bytes
+SHA1 (patch-hgdemandimport_____init____.py) = 1d93d06bb71ef07c2b9d866d49bfec7258ac9d56
 SHA1 (patch-mercurial_bundle2.py) = f4612a08effe11fb4b345ea213a148f6fba7118d
 SHA1 (patch-mercurial_exchange.py) = af7ac4719d74d1de731250fe8f5443931e7a15a9
 SHA1 (patch-mercurial_obsolete.py) = 5365f9dab99f68846c4defe1fda8c003248cdcfc

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-hgdemandimport_____init____.py
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-hgdemandimport_____init____.py:1.1
--- /dev/null   Thu Oct 24 10:41:05 2024
+++ pkgsrc/devel/py-mercurial/patches/patch-hgdemandimport_____init____.py      Thu Oct 24 10:41:05 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-hgdemandimport_____init____.py,v 1.1 2024/10/24 10:41:05 wiz Exp $
+
+Fix for Python 3.13.
+https://lists.mercurial-scm.org/pipermail/mercurial-devel/2024-October/298120.html
+https://bz.mercurial-scm.org/show_bug.cgi?id=6926
+
+--- hgdemandimport/__init__.py.orig    2024-10-24 10:25:40.152971956 +0000
++++ hgdemandimport/__init__.py
+@@ -62,6 +62,7 @@ IGNORES = {
+     '_weakrefset',
+     'warnings',
+     'threading',
++    'collections.abc',
+ }
+ 
+ _pypy = '__pypy__' in sys.builtin_module_names