Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 May 2018 20:07:43 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r470048 - in head/devel/grv: . files
Message-ID:  <201805152007.w4FK7heP065264@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Tue May 15 20:07:43 2018
New Revision: 470048
URL: https://svnweb.freebsd.org/changeset/ports/470048

Log:
  devel/grv: Fix build with devel/libgit2 0.27
  
  PR:		228273
  Submitted by:	Dmitri Goutnik <dg@syrec.org> (maintainer)

Added:
  head/devel/grv/files/
  head/devel/grv/files/patch-cmd_grv_repo__data__loader.go   (contents, props changed)
  head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go   (contents, props changed)
Modified:
  head/devel/grv/Makefile
  head/devel/grv/distinfo

Modified: head/devel/grv/Makefile
==============================================================================
--- head/devel/grv/Makefile	Tue May 15 19:47:33 2018	(r470047)
+++ head/devel/grv/Makefile	Tue May 15 20:07:43 2018	(r470048)
@@ -3,6 +3,7 @@
 PORTNAME=	grv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	dg@syrec.org
@@ -32,7 +33,7 @@ GH_TUPLE=	bradfitz:slice:d9036e2:slice/src/github.com/
 		stretchr:objx:8a3f715:objx/src/github.com/stretchr/objx \
 		stretchr:testify:a726187:testify/src/github.com/stretchr/testify \
 		tchap:go-patricia:5ad6cdb:patricia/src/github.com/tchap/go-patricia \
-		libgit2:git2go:eb0bf21:git2go/src/gopkg.in/libgit2/git2go.v26 # Keep git2go branch in sync with devel/libgit2 version
+		libgit2:git2go:b479bd1:git2go/src/gopkg.in/libgit2/git2go.v27 # Keep git2go branch in sync with devel/libgit2 version
 
 PLIST_FILES=	bin/grv
 

Modified: head/devel/grv/distinfo
==============================================================================
--- head/devel/grv/distinfo	Tue May 15 19:47:33 2018	(r470047)
+++ head/devel/grv/distinfo	Tue May 15 20:07:43 2018	(r470048)
@@ -1,10 +1,12 @@
-TIMESTAMP = 1520586235
+TIMESTAMP = 1526392501
 SHA256 (rgburke-grv-v0.1.3_GH0.tar.gz) = c4684393c5f68be42e4c6c57e9209de8c79426b772cd313083dc34c5a5aac02d
 SIZE (rgburke-grv-v0.1.3_GH0.tar.gz) = 4229360
 SHA256 (bradfitz-slice-d9036e2_GH0.tar.gz) = 30446ea3f3428f802a6238216cce2a9eeef42429b7be9523073c02d0b976c5ac
 SIZE (bradfitz-slice-d9036e2_GH0.tar.gz) = 2623
 SHA256 (camlistore-go4-fba789b_GH0.tar.gz) = 14623c4196629db8fe82d66c62ce497e59cfc3fa8b948b767c55e986cd929721
 SIZE (camlistore-go4-fba789b_GH0.tar.gz) = 78856
+SHA256 (davecgh-go-spew-87df7c6_GH0.tar.gz) = 27fc117797f5da86efefd7cbd44da0400e237423a5633086e682882c3838cb54
+SIZE (davecgh-go-spew-87df7c6_GH0.tar.gz) = 42156
 SHA256 (gobwas-glob-51eb1ee_GH0.tar.gz) = 664219022e7081c313f6fccf2afb145f4a1d1142d0577f3cd8ab24131249e25b
 SIZE (gobwas-glob-51eb1ee_GH0.tar.gz) = 25009
 SHA256 (golang-crypto-1875d0a_GH0.tar.gz) = 648f2ad0b7a255d9286af0202d6ebdfb5703eb3b9d82691c67b32f6092c1ef22
@@ -13,21 +15,19 @@ SHA256 (golang-sys-37707fd_GH0.tar.gz) = 9a86c90f56459
 SIZE (golang-sys-37707fd_GH0.tar.gz) = 795284
 SHA256 (mattn-go-runewidth-97311d9_GH0.tar.gz) = 8330497728f75464111ee7145fc97cfa588cb0d6561b3af5447aa05d489bca85
 SIZE (mattn-go-runewidth-97311d9_GH0.tar.gz) = 22384
+SHA256 (pmezard-go-difflib-792786c_GH0.tar.gz) = 7c2a6d7ea0700411ba7d13865230c03bd6734d3ff6c213357bda121f5bb707fb
+SIZE (pmezard-go-difflib-792786c_GH0.tar.gz) = 11401
 SHA256 (rgburke-goncurses-74f667a_GH0.tar.gz) = af7aabf62aee38639417ac1eef9c3aaabea7e56e5f88c5702cab7a9652613e22
 SIZE (rgburke-goncurses-74f667a_GH0.tar.gz) = 46774
 SHA256 (rjeczalik-notify-c31e5f2_GH0.tar.gz) = 622ce128a6da4c01ea924f0409bd0b36ce52a56380effef9802eb8b558e20ac1
 SIZE (rjeczalik-notify-c31e5f2_GH0.tar.gz) = 56294
 SHA256 (Sirupsen-logrus-768a92a_GH0.tar.gz) = ce58ca8b5b3628757e89a526c5399b684914b1c9979ac5e6cbe30181bbabc55a
 SIZE (Sirupsen-logrus-768a92a_GH0.tar.gz) = 28603
-SHA256 (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = ea8127ce3b9e7bedf4ffbe998179d94ebe1c59ad36ece22aa5682fb27d5bab4b
-SIZE (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = 11903
-SHA256 (davecgh-go-spew-87df7c6_GH0.tar.gz) = 27fc117797f5da86efefd7cbd44da0400e237423a5633086e682882c3838cb54
-SIZE (davecgh-go-spew-87df7c6_GH0.tar.gz) = 42156
-SHA256 (pmezard-go-difflib-792786c_GH0.tar.gz) = 7c2a6d7ea0700411ba7d13865230c03bd6734d3ff6c213357bda121f5bb707fb
-SIZE (pmezard-go-difflib-792786c_GH0.tar.gz) = 11401
 SHA256 (stretchr-objx-8a3f715_GH0.tar.gz) = 2602184e83baec18f98b2a7ba5d874b423c374ffb84d28a474e69b931412f8a9
 SIZE (stretchr-objx-8a3f715_GH0.tar.gz) = 75047
 SHA256 (stretchr-testify-a726187_GH0.tar.gz) = 799b0b2de51ec7ec5aad54b3ccf7cbca95715f9167310f99487b21e87fcfec51
 SIZE (stretchr-testify-a726187_GH0.tar.gz) = 96955
-SHA256 (libgit2-git2go-eb0bf21_GH0.tar.gz) = ee90d7f69aa37e6729f9c367aeb259fe0b3c370fd7f161564065ef0a0302b2c0
-SIZE (libgit2-git2go-eb0bf21_GH0.tar.gz) = 72363
+SHA256 (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = ea8127ce3b9e7bedf4ffbe998179d94ebe1c59ad36ece22aa5682fb27d5bab4b
+SIZE (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = 11903
+SHA256 (libgit2-git2go-b479bd1_GH0.tar.gz) = 6ac991fc5af8b9ede6fc60c1ecc900c3eb8c84513d8d36c0d03f37e3004324c8
+SIZE (libgit2-git2go-b479bd1_GH0.tar.gz) = 72737

Added: head/devel/grv/files/patch-cmd_grv_repo__data__loader.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/grv/files/patch-cmd_grv_repo__data__loader.go	Tue May 15 20:07:43 2018	(r470048)
@@ -0,0 +1,11 @@
+--- cmd/grv/repo_data_loader.go.orig	2018-05-15 13:55:57 UTC
++++ cmd/grv/repo_data_loader.go
+@@ -9,7 +9,7 @@ import (
+ 
+ 	log "github.com/Sirupsen/logrus"
+ 	slice "github.com/bradfitz/slice"
+-	git "gopkg.in/libgit2/git2go.v26"
++	git "gopkg.in/libgit2/git2go.v27"
+ )
+ 
+ const (

Added: head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go	Tue May 15 20:07:43 2018	(r470048)
@@ -0,0 +1,20 @@
+--- src/gopkg.in/libgit2/git2go.v27/diff.go.orig	2018-05-15 14:06:24 UTC
++++ src/gopkg.in/libgit2/git2go.v27/diff.go
+@@ -14,7 +14,7 @@ import (
+ 	"unsafe"
+ )
+ 
+-type DiffFlag int
++type DiffFlag int64
+ 
+ const (
+ 	DiffFlagBinary    DiffFlag = C.GIT_DIFF_FLAG_BINARY
+@@ -405,7 +405,7 @@ func (diff *Diff) Patch(deltaIndex int) 
+ 	return newPatchFromC(patchPtr), nil
+ }
+ 
+-type DiffOptionsFlag int
++type DiffOptionsFlag int64
+ 
+ const (
+ 	DiffNormal                 DiffOptionsFlag = C.GIT_DIFF_NORMAL



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