From nobody Fri Nov 26 05:25:28 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 385C51899C43; Fri, 26 Nov 2021 05:25:29 +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 4J0jr86VMjz57rC; Fri, 26 Nov 2021 05:25:28 +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 C0CB72B184; Fri, 26 Nov 2021 05:25:28 +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 1AQ5PSed081914; Fri, 26 Nov 2021 05:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AQ5PS7Y081913; Fri, 26 Nov 2021 05:25:28 GMT (envelope-from git) Date: Fri, 26 Nov 2021 05:25:28 GMT Message-Id: <202111260525.1AQ5PS7Y081913@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: 77ea6411e8de - main - devel/git-cinnabar: unbreak after 317ce5d4d408 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 77ea6411e8deb12c116369e0c2e80040bd2617cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637904328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cu/AAJDInie+PBUR8MyQi6BNSa/ROimhKU4OaY8cLX0=; b=F9ncBYubnAVbmhAJENI3GCxlEn+YCcxuU/aQ5LDZHaiZZjuJyubrZvBAG6xEN2Oq/10nvG uCvnTbgmlnwjd3nxHvRQ+SR9FzA8f98h3wA+4nzPOT0WToR/9RzroqHvXxU5I3Pzfzb+Nq QA7SG3qUaNY+maRlua/LwPaBscAPTOau+AQYLAKnErUL9O/h48fHlTKn1yL0sioKM6Q6sg bbUnpd7aNvuVrI7Li7RiovjJggS7teROOx4Ml18g9/dk/NTfPlFpk7lBSrT+egr+0MGKWk 6yX3KUA+JG7cIkPsiqSCW8E6iAiFE0Jes7cE6ntvqDYR6GCy9o6+zKs+fmCAMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637904328; a=rsa-sha256; cv=none; b=YIar2/7jhmEhqQ088nzRx+j6iGuKb59zvplHNpUruvyrBeOwXI8QlEBsjMA0B0AgwlAGWp SRi+Szt+p3wEO5ikdsQaRnmvBeKan98/13TzxB4QMvbQCVEHua0u7GvH+YxV50AQH6Yj7c k3LIWK5LaqEKFn0tupeUlXp7AuWGFa9PsOqEll9XdjH3PjVO3HJI3JPLO9J1BUMy/xHnFs 1+WKVvUEfwNPG3azq/LOpFnxfgimlrbJmomfZWlSxHTgzPn/ie1Qh1txM7PxfXvpRi1vBm Y7E7H2y+Ta2jIZ55w8iBMy0RGn9u4tJ5+sJzYR4TxqUAFOf7RMdgYJxEPe6JGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=77ea6411e8deb12c116369e0c2e80040bd2617cc commit 77ea6411e8deb12c116369e0c2e80040bd2617cc Author: Jan Beich AuthorDate: 2021-11-26 05:25:03 +0000 Commit: Jan Beich CommitDate: 2021-11-26 05:25:05 +0000 devel/git-cinnabar: unbreak after 317ce5d4d408 helper/cinnabar-fast-import.c:525:5: error: redefinition of 'write_object_file' int write_object_file(const void *buf, unsigned long len, const char *type, ^ ./object-store.h:229:19: note: previous definition is here static inline int write_object_file(const void *buf, unsigned long len, ^ --- devel/git-cinnabar/Makefile | 1 + devel/git-cinnabar/files/patch-git-2.33 | 66 --------------------------------- 2 files changed, 1 insertion(+), 66 deletions(-) diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile index 9351245fefc4..e61367220f59 100644 --- a/devel/git-cinnabar/Makefile +++ b/devel/git-cinnabar/Makefile @@ -1,5 +1,6 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.8 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/git-cinnabar/files/patch-git-2.33 b/devel/git-cinnabar/files/patch-git-2.33 deleted file mode 100644 index 6ee6e1162de0..000000000000 --- a/devel/git-cinnabar/files/patch-git-2.33 +++ /dev/null @@ -1,66 +0,0 @@ -Revert https://github.com/glandium/git-cinnabar/commit/6ced6a84edc1 -until devel/git tracks 2.34.0 or later - ---- helper/GIT-VERSION.mk.orig 2021-11-19 21:23:13 UTC -+++ helper/GIT-VERSION.mk -@@ -1,2 +1,2 @@ --GIT_VERSION ?= v2.34.0 -+GIT_VERSION ?= v2.33.1 - WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 ---- helper/cinnabar-fast-import.c.orig 2021-11-19 21:23:13 UTC -+++ helper/cinnabar-fast-import.c -@@ -522,8 +522,8 @@ static void do_set(struct string_list *args) - } - } - --int write_object_file_flags(const void *buf, unsigned long len, const char *type, -- struct object_id *oid, unsigned flags) -+int write_object_file(const void *buf, unsigned long len, const char *type, -+ struct object_id *oid) - { - struct strbuf data; - enum object_type t; ---- helper/hg-connect-http.c.orig 2021-11-19 21:23:13 UTC -+++ helper/hg-connect-http.c -@@ -408,7 +408,7 @@ struct hg_connection *hg_connect_http(const char *url, - struct hg_connection *conn = xmalloc(sizeof(*conn)); - struct strbuf caps = STRBUF_INIT; - struct writer writer; -- string_list_init_dup(&conn->capabilities); -+ string_list_init(&conn->capabilities, 1); - - conn->http.url = xstrdup(url); - conn->http.initial_request = 1; ---- helper/hg-connect-stdio.c.orig 2021-11-19 21:23:13 UTC -+++ helper/hg-connect-stdio.c -@@ -206,7 +206,7 @@ struct hg_connection *hg_connect_stdio(const char *url - struct strbuf buf = STRBUF_INIT; - struct hg_connection *conn = xmalloc(sizeof(*conn)); - struct child_process *proc = &conn->stdio.proc; -- string_list_init_dup(&conn->capabilities); -+ string_list_init(&conn->capabilities, 1); - - protocol = parse_connect_url(url, &hostandport, &path); - ---- helper/object-file.c.patch.orig 2021-11-19 21:23:13 UTC -+++ helper/object-file.c.patch -@@ -1,13 +1,13 @@ - diff --git a/object-file.c b/object-file.c --index c3d866a287..904149ce90 100644 -+index 188de57634..7b06e56727 100644 - --- a/object-file.c - +++ b/object-file.c --@@ -1954,7 +1954,7 @@ static int freshen_packed_object(const struct object_id *oid) -+@@ -1868,7 +1868,7 @@ static int freshen_packed_object(const struct object_id *oid) - return 1; - } - ---int write_object_file_flags(const void *buf, unsigned long len, --+int real_write_object_file_flags(const void *buf, unsigned long len, -- const char *type, struct object_id *oid, -- unsigned flags) -+-int write_object_file(const void *buf, unsigned long len, const char *type, -++int real_write_object_file(const void *buf, unsigned long len, const char *type, -+ struct object_id *oid) - { -+ char hdr[MAX_HEADER_LEN];