From owner-svn-ports-all@freebsd.org Fri Dec 14 17:30:49 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB6D7133CAF1; Fri, 14 Dec 2018 17:30:48 +0000 (UTC) (envelope-from jbeich@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7EF0D87DE8; Fri, 14 Dec 2018 17:30:48 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71F422888; Fri, 14 Dec 2018 17:30:48 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBEHUmIA086291; Fri, 14 Dec 2018 17:30:48 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBEHUmnT086286; Fri, 14 Dec 2018 17:30:48 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201812141730.wBEHUmnT086286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 14 Dec 2018 17:30:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487451 - in head/devel/git-cinnabar: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/devel/git-cinnabar: . files X-SVN-Commit-Revision: 487451 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7EF0D87DE8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.70 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.86)[-0.855,0]; NEURAL_HAM_SHORT(-0.96)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.88)[-0.883,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2018 17:30:49 -0000 Author: jbeich Date: Fri Dec 14 17:30:47 2018 New Revision: 487451 URL: https://svnweb.freebsd.org/changeset/ports/487451 Log: devel/git-cinnabar: rebuild and unbreak after r487197 ./helper/cinnabar-helper.c:1464:49: error: no member named 'map' in 'struct oidset' hashmap_get_size(&track->set.map.map)); ~~~~~~~~~~ ^ ./helper/cinnabar-helper.c:1712:34: warning: incompatible pointer types passing 'size_t *' (aka 'unsigned int *') to parameter of type 'unsigned long *' [-Wincompatible-pointer-types] buf = get_commit_buffer(commit, &size); ^~~~~ ./commit.h:112:69: note: passing argument to parameter 'size' here const void *get_commit_buffer(const struct commit *, unsigned long *size); ^ Reported by: pkg-fallout Added: head/devel/git-cinnabar/files/ head/devel/git-cinnabar/files/patch-helper_cinnabar-helper.c (contents, props changed) Modified: head/devel/git-cinnabar/Makefile (contents, props changed) Modified: head/devel/git-cinnabar/Makefile ============================================================================== --- head/devel/git-cinnabar/Makefile Fri Dec 14 17:14:09 2018 (r487450) +++ head/devel/git-cinnabar/Makefile Fri Dec 14 17:30:47 2018 (r487451) @@ -3,7 +3,7 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.0-31 DISTVERSIONSUFFIX= -gcb81a59 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Added: head/devel/git-cinnabar/files/patch-helper_cinnabar-helper.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/git-cinnabar/files/patch-helper_cinnabar-helper.c Fri Dec 14 17:30:47 2018 (r487451) @@ -0,0 +1,13 @@ +https://github.com/glandium/git-cinnabar/commit/cf440d651b37 + +--- helper/cinnabar-helper.c.orig 2018-09-29 22:45:54 UTC ++++ helper/cinnabar-helper.c +@@ -1461,7 +1461,7 @@ static void upgrade_files(const struct old_manifest_tr + goto corrupted; + } + display_progress(track->progress, +- hashmap_get_size(&track->set.map.map)); ++ kh_size(&track->set.set)); + } + + free_tree_buffer(state.tree_git);