Attachment #192538 for bug #227536

Lines 2-8 Link Here

(-)Makefile (-2 / +2 lines)
2		2
3	PORTNAME= cgit	3	PORTNAME= cgit
4	PORTVERSION= 1.1	4	PORTVERSION= 1.1
5	PORTREVISION= 18	5	PORTREVISION= 19
6	CATEGORIES= devel www	6	CATEGORIES= devel www
7	MASTER_SITES= http://git.zx2c4.com/cgit/snapshot/:cgit \	7	MASTER_SITES= http://git.zx2c4.com/cgit/snapshot/:cgit \
8	https://www.kernel.org/pub/software/scm/git/:git	8	https://www.kernel.org/pub/software/scm/git/:git
Lines 17-23 Link Here
17		17
18	TEST_DEPENDS= msgfmt:devel/gettext-tools	18	TEST_DEPENDS= msgfmt:devel/gettext-tools
19		19
20	GIT_VERSION= 2.16.3	20	GIT_VERSION= 2.17.0
21	USES= cpe gmake iconv perl5 python:env shebangfix ssl tar:xz	21	USES= cpe gmake iconv perl5 python:env shebangfix ssl tar:xz
22	CPE_VENDOR= lars_hjemli	22	CPE_VENDOR= lars_hjemli
23	USE_PERL5= test	23	USE_PERL5= test

Lines 1-5 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1521825342	1	TIMESTAMP = 1523826889
2	SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890	2	SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890
3	SIZE (cgit-1.1.tar.xz) = 86268	3	SIZE (cgit-1.1.tar.xz) = 86268
4	SHA256 (git-2.16.3.tar.xz) = d65d99e9e5b081c1f14ea018973806e942a2eb7d0da2ebc01bd2525adee62d48	4	SHA256 (git-2.17.0.tar.xz) = e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7
5	SIZE (git-2.16.3.tar.xz) = 4966248	5	SIZE (git-2.17.0.tar.xz) = 5011556




From 3e7e7a886006376ba68e959addaea1eabbb37482 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 2 Apr 2018 23:09:01 +0200
Subject: [PATCH] git: update to v2.17.0

Update to git version v2.17.0. Required changes:

* The function 'typename' has been renamed to 'type_name'
  (upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb)
---
 Makefile    | 2 +-
 git         | 2 +-
 ui-shared.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git ui-shared.c ui-shared.c
index 9d8f66b..ce806f6 100644
--- ui-shared.c
+++ ui-shared.c
@@ -545,7 +545,7 @@ void cgit_object_link(struct object *obj)
 		page = "tag";
 	else
 		page = "blob";
-	name = fmt("%s %s...", typename(obj->type), shortrev);
+	name = fmt("%s %s...", type_name(obj->type), shortrev);
 	reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
 }
 
-- 
2.17.0


Return to bug 227536

Line 0 Link Here

(-)files/patch-git-2.17 (+31 lines)
	1	From 3e7e7a886006376ba68e959addaea1eabbb37482 Mon Sep 17 00:00:00 2001
	2	From: Christian Hesse <mail@eworm.de>
	3	Date: Mon, 2 Apr 2018 23:09:01 +0200
	4	Subject: [PATCH] git: update to v2.17.0
	5
	6	Update to git version v2.17.0. Required changes:
	7
	8	* The function 'typename' has been renamed to 'type_name'
	9	(upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb)
	10	---
	11	Makefile \| 2 +-
	12	git \| 2 +-
	13	ui-shared.c \| 2 +-
	14	3 files changed, 3 insertions(+), 3 deletions(-)
	15
	16	diff --git ui-shared.c ui-shared.c
	17	index 9d8f66b..ce806f6 100644
	18	--- ui-shared.c
	19	+++ ui-shared.c
	20	@@ -545,7 +545,7 @@ void cgit_object_link(struct object *obj)
	21	page = "tag";
	22	else
	23	page = "blob";
	24	- name = fmt("%s %s...", typename(obj->type), shortrev);
	25	+ name = fmt("%s %s...", type_name(obj->type), shortrev);
	26	reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
	27	}
	28
	29	--
	30	2.17.0
	31