svn commit: r487451 - in head/devel/git-cinnabar: . files
Jan Beich
jbeich at FreeBSD.org
Fri Dec 14 17:30:49 UTC 2018
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 at 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);
More information about the svn-ports-all
mailing list