From owner-dev-commits-ports-main@freebsd.org Sun Jul 25 16:17:18 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8C15F65C178; Sun, 25 Jul 2021 16:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GXp9V2G0Hz3Fs7; Sun, 25 Jul 2021 16:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E22626A3E; Sun, 25 Jul 2021 16:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16PGHIL8081694; Sun, 25 Jul 2021 16:17:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16PGHIqr081693; Sun, 25 Jul 2021 16:17:18 GMT (envelope-from git) Date: Sun, 25 Jul 2021 16:17:18 GMT Message-Id: <202107251617.16PGHIqr081693@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 0028bbc611d5 - main - devel/git-cinnabar: unbreak with python310 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0028bbc611d58afdfa4cc95c252b73e5f75a89c5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jul 2021 16:17:18 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0028bbc611d58afdfa4cc95c252b73e5f75a89c5 commit 0028bbc611d58afdfa4cc95c252b73e5f75a89c5 Author: Jan Beich AuthorDate: 2021-07-25 14:58:43 +0000 Commit: Jan Beich 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 from cinnabar.githg import GitHgStore File "g/usr/local/libexec/git-core/pythonlib/cinnabar/githg.py", line 17, in 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