Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Jul 2021 16:17:18 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 0028bbc611d5 - main - devel/git-cinnabar: unbreak with python310
Message-ID:  <202107251617.16PGHIqr081693@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0028bbc611d58afdfa4cc95c252b73e5f75a89c5

commit 0028bbc611d58afdfa4cc95c252b73e5f75a89c5
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-07-25 14:58:43 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-07-25 16:17:05 +0000

    devel/git-cinnabar: unbreak with python310
    
    $ git clone hg::https://hg.mozilla.org/projects/nss
    Cloning into 'nss'...
    Traceback (most recent call last):
      File "/usr/local/libexec/git-core/git-remote-hg", line 9, in <module>
        from cinnabar.githg import GitHgStore
      File "g/usr/local/libexec/git-core/pythonlib/cinnabar/githg.py", line 17, in <module>
        from collections import (
    ImportError: cannot import name 'Sequence' from 'collections' (/usr/local/lib/python3.10/collections/__init__.py)
---
 devel/git-cinnabar/Makefile | 5 ++++-
 devel/git-cinnabar/distinfo | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile
index ecf36657ab35..79c9c47d2ec2 100644
--- a/devel/git-cinnabar/Makefile
+++ b/devel/git-cinnabar/Makefile
@@ -1,8 +1,11 @@
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	57f8d0171423.patch:-p1 # https://github.com/glandium/git-cinnabar/pull/277
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Git remote helper to interact with Mercurial repositories
 
diff --git a/devel/git-cinnabar/distinfo b/devel/git-cinnabar/distinfo
index 1b17f68bcfa2..a1731dd1e5b0 100644
--- a/devel/git-cinnabar/distinfo
+++ b/devel/git-cinnabar/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1617227922
 SHA256 (glandium-git-cinnabar-0.5.7_GH0.tar.gz) = 1f30b79b89b421ba33e47f00a8301da5b7533e10cc6314c4febd23ad6ed4b17b
 SIZE (glandium-git-cinnabar-0.5.7_GH0.tar.gz) = 176569
+SHA256 (57f8d0171423.patch) = b3fd28c5e1604716a04faecc58e6cca3dc26601cbee480a317a821ed41bd5643
+SIZE (57f8d0171423.patch) = 1266



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107251617.16PGHIqr081693>