Attachment #151508 for bug #196663

View | Details | Raw Unified | Return to bug 196663
Collapse All | Expand All




#   $MCom: ports/trunk/devel/libgit2-glib/Makefile 19962 2014-10-15 14:57:24Z gusi $

PORTNAME=	libgit2-glib
PORTVERSION=	0.0.24
PORTREVISION=	1
CATEGORIES=	devel gnome
MASTER_SITES=	GNOME
DIST_SUBDIR=	gnome3

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Glib wrapper library around the libgit2 git access library

BROKEN=		Fails to build

BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala \
		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip
MAKE_JOBS_UNSAFE=yes

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (gnome3/libgit2-glib-0.0.20.tar.xz) = f8a10c8d3fcad14eed080dff6b8db0c72866c11a05b9731af31cb7258bcc8d95	1	SHA256 (gnome3/libgit2-glib-0.0.24.tar.xz) = 8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8
2	SIZE (gnome3/libgit2-glib-0.0.20.tar.xz) = 415872	2	SIZE (gnome3/libgit2-glib-0.0.24.tar.xz) = 422768




--- libgit2-glib/ggit-types.h.orig	2014-10-19 09:55:09 UTC
+++ libgit2-glib/ggit-types.h
@@ -963,9 +963,7 @@ typedef enum {
 	GGIT_STATUS_OPTION_RENAMES_INDEX_TO_WORKDIR = (1 << 8),
 	GGIT_STATUS_OPTION_SORT_CASE_SENSITIVELY    = (1 << 9),
 	GGIT_STATUS_OPTION_SORT_CASE_INSENSITIVELY  = (1 << 10),
-	GGIT_STATUS_OPTION_DEFAULT                  = GGIT_STATUS_OPTION_INCLUDE_IGNORED |
-	                                              GGIT_STATUS_OPTION_INCLUDE_UNTRACKED |
-	                                              GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS
+	GGIT_STATUS_OPTION_DEFAULT                  = (GGIT_STATUS_OPTION_INCLUDE_IGNORED | GGIT_STATUS_OPTION_INCLUDE_UNTRACKED | GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS)
 } GgitStatusOption;
 
 /**
@@ -1059,8 +1057,7 @@ typedef enum {
 	GGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED     = (1u << 3),
 	GGIT_DIFF_FIND_REWRITES                   = (1u << 4),
 	GGIT_DIFF_BREAK_REWRITES                  = (1u << 5),
-	GGIT_DIFF_FIND_AND_BREAK_REWRITES         = (GGIT_DIFF_FIND_REWRITES |
-	                                             GGIT_DIFF_BREAK_REWRITES),
+	GGIT_DIFF_FIND_AND_BREAK_REWRITES         = (GGIT_DIFF_FIND_REWRITES | GGIT_DIFF_BREAK_REWRITES),
 	GGIT_DIFF_FIND_FOR_UNTRACKED              = (1u << 6),
 	GGIT_DIFF_FIND_ALL                        = (0x0ff),
 	GGIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE  = 0,




include/libgit2-glib-1.0/libgit2-glib/ggit-branch-enumerator.h
include/libgit2-glib-1.0/libgit2-glib/ggit-branch.h
include/libgit2-glib-1.0/libgit2-glib/ggit-checkout-options.h
include/libgit2-glib-1.0/libgit2-glib/ggit-cherry-pick-options.h
include/libgit2-glib-1.0/libgit2-glib/ggit-clone-options.h
include/libgit2-glib-1.0/libgit2-glib/ggit-commit.h
include/libgit2-glib-1.0/libgit2-glib/ggit-config-entry.h

include/libgit2-glib-1.0/libgit2-glib/ggit-index-entry.h
include/libgit2-glib-1.0/libgit2-glib/ggit-index.h
include/libgit2-glib-1.0/libgit2-glib/ggit-main.h
include/libgit2-glib-1.0/libgit2-glib/ggit-merge-options.h
include/libgit2-glib-1.0/libgit2-glib/ggit-message.h
include/libgit2-glib-1.0/libgit2-glib/ggit-merge-options.h
include/libgit2-glib-1.0/libgit2-glib/ggit-native.h
include/libgit2-glib-1.0/libgit2-glib/ggit-note.h
include/libgit2-glib-1.0/libgit2-glib/ggit-object-factory-base.h
include/libgit2-glib-1.0/libgit2-glib/ggit-object-factory.h
include/libgit2-glib-1.0/libgit2-glib/ggit-object.h

include/libgit2-glib-1.0/libgit2-glib/ggit-tree.h
include/libgit2-glib-1.0/libgit2-glib/ggit-types.h
include/libgit2-glib-1.0/libgit2-glib/ggit.h
lib/girepository-1.0/Ggit-1.0.typelib
lib/libgit2-glib-1.0.so
lib/libgit2-glib-1.0.so.0
lib/libgit2-glib-1.0.so.0.0.0
lib/girepository-1.0/Ggit-1.0.typelib
libdata/pkgconfig/libgit2-glib-1.0.pc
share/gir-1.0/Ggit-1.0.gir
%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlob.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlobOutputStream.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBranch.html

%%PORTDOCS%%%%DOCSDIR%%-1.0/style.css
%%PORTDOCS%%%%DOCSDIR%%-1.0/up-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%-1.0/up.png
share/gir-1.0/Ggit-1.0.gir
share/vala/vapi/ggit-1.0.deps
share/vala/vapi/ggit-1.0.vapi

Return to bug 196663

Lines 3-10 Link Here

(-)Makefile (-5 / +1 lines)
3	# $MCom: ports/trunk/devel/libgit2-glib/Makefile 19962 2014-10-15 14:57:24Z gusi $	3	# $MCom: ports/trunk/devel/libgit2-glib/Makefile 19962 2014-10-15 14:57:24Z gusi $
4		4
5	PORTNAME= libgit2-glib	5	PORTNAME= libgit2-glib
6	PORTVERSION= 0.0.20	6	PORTVERSION= 0.0.24
7	PORTREVISION= 1
8	CATEGORIES= devel gnome	7	CATEGORIES= devel gnome
9	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
10	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3
Lines 12-19 Link Here
12	MAINTAINER= gnome@FreeBSD.org	11	MAINTAINER= gnome@FreeBSD.org
13	COMMENT= Glib wrapper library around the libgit2 git access library	12	COMMENT= Glib wrapper library around the libgit2 git access library
14		13
15	BROKEN= Fails to build
16
17	BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala \	14	BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala \
18	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc	15	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
19	LIB_DEPENDS= libgit2.so:${PORTSDIR}/devel/libgit2	16	LIB_DEPENDS= libgit2.so:${PORTSDIR}/devel/libgit2
Lines 27-32 Link Here
27	CPPFLAGS+= -I${LOCALBASE}/include	24	CPPFLAGS+= -I${LOCALBASE}/include
28	LDFLAGS+= -L${LOCALBASE}/lib	25	LDFLAGS+= -L${LOCALBASE}/lib
29	INSTALL_TARGET= install-strip	26	INSTALL_TARGET= install-strip
30	MAKE_JOBS_UNSAFE=yes
31		27
32	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-libgit2-glib_ggit-types.h (+23 lines)
	1	--- libgit2-glib/ggit-types.h.orig 2014-10-19 09:55:09 UTC
	2	+++ libgit2-glib/ggit-types.h
	3	@@ -963,9 +963,7 @@ typedef enum {
	4	GGIT_STATUS_OPTION_RENAMES_INDEX_TO_WORKDIR = (1 << 8),
	5	GGIT_STATUS_OPTION_SORT_CASE_SENSITIVELY = (1 << 9),
	6	GGIT_STATUS_OPTION_SORT_CASE_INSENSITIVELY = (1 << 10),
	7	- GGIT_STATUS_OPTION_DEFAULT = GGIT_STATUS_OPTION_INCLUDE_IGNORED \|
	8	- GGIT_STATUS_OPTION_INCLUDE_UNTRACKED \|
	9	- GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS
	10	+ GGIT_STATUS_OPTION_DEFAULT = (GGIT_STATUS_OPTION_INCLUDE_IGNORED \| GGIT_STATUS_OPTION_INCLUDE_UNTRACKED \| GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS)
	11	} GgitStatusOption;
	12
	13	/**
	14	@@ -1059,8 +1057,7 @@ typedef enum {
	15	GGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED = (1u << 3),
	16	GGIT_DIFF_FIND_REWRITES = (1u << 4),
	17	GGIT_DIFF_BREAK_REWRITES = (1u << 5),
	18	- GGIT_DIFF_FIND_AND_BREAK_REWRITES = (GGIT_DIFF_FIND_REWRITES \|
	19	- GGIT_DIFF_BREAK_REWRITES),
	20	+ GGIT_DIFF_FIND_AND_BREAK_REWRITES = (GGIT_DIFF_FIND_REWRITES \| GGIT_DIFF_BREAK_REWRITES),
	21	GGIT_DIFF_FIND_FOR_UNTRACKED = (1u << 6),
	22	GGIT_DIFF_FIND_ALL = (0x0ff),
	23	GGIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE = 0,

Lines 5-10 Link Here

(-)pkg-plist (-3 / +5 lines)
5	include/libgit2-glib-1.0/libgit2-glib/ggit-branch-enumerator.h	5	include/libgit2-glib-1.0/libgit2-glib/ggit-branch-enumerator.h
6	include/libgit2-glib-1.0/libgit2-glib/ggit-branch.h	6	include/libgit2-glib-1.0/libgit2-glib/ggit-branch.h
7	include/libgit2-glib-1.0/libgit2-glib/ggit-checkout-options.h	7	include/libgit2-glib-1.0/libgit2-glib/ggit-checkout-options.h
		8	include/libgit2-glib-1.0/libgit2-glib/ggit-cherry-pick-options.h
8	include/libgit2-glib-1.0/libgit2-glib/ggit-clone-options.h	9	include/libgit2-glib-1.0/libgit2-glib/ggit-clone-options.h
9	include/libgit2-glib-1.0/libgit2-glib/ggit-commit.h	10	include/libgit2-glib-1.0/libgit2-glib/ggit-commit.h
10	include/libgit2-glib-1.0/libgit2-glib/ggit-config-entry.h	11	include/libgit2-glib-1.0/libgit2-glib/ggit-config-entry.h
Lines 28-36 Link Here
28	include/libgit2-glib-1.0/libgit2-glib/ggit-index-entry.h	29	include/libgit2-glib-1.0/libgit2-glib/ggit-index-entry.h
29	include/libgit2-glib-1.0/libgit2-glib/ggit-index.h	30	include/libgit2-glib-1.0/libgit2-glib/ggit-index.h
30	include/libgit2-glib-1.0/libgit2-glib/ggit-main.h	31	include/libgit2-glib-1.0/libgit2-glib/ggit-main.h
		32	include/libgit2-glib-1.0/libgit2-glib/ggit-merge-options.h
31	include/libgit2-glib-1.0/libgit2-glib/ggit-message.h	33	include/libgit2-glib-1.0/libgit2-glib/ggit-message.h
32	include/libgit2-glib-1.0/libgit2-glib/ggit-merge-options.h
33	include/libgit2-glib-1.0/libgit2-glib/ggit-native.h	34	include/libgit2-glib-1.0/libgit2-glib/ggit-native.h
		35	include/libgit2-glib-1.0/libgit2-glib/ggit-note.h
34	include/libgit2-glib-1.0/libgit2-glib/ggit-object-factory-base.h	36	include/libgit2-glib-1.0/libgit2-glib/ggit-object-factory-base.h
35	include/libgit2-glib-1.0/libgit2-glib/ggit-object-factory.h	37	include/libgit2-glib-1.0/libgit2-glib/ggit-object-factory.h
36	include/libgit2-glib-1.0/libgit2-glib/ggit-object.h	38	include/libgit2-glib-1.0/libgit2-glib/ggit-object.h
Lines 57-68 Link Here
57	include/libgit2-glib-1.0/libgit2-glib/ggit-tree.h	59	include/libgit2-glib-1.0/libgit2-glib/ggit-tree.h
58	include/libgit2-glib-1.0/libgit2-glib/ggit-types.h	60	include/libgit2-glib-1.0/libgit2-glib/ggit-types.h
59	include/libgit2-glib-1.0/libgit2-glib/ggit.h	61	include/libgit2-glib-1.0/libgit2-glib/ggit.h
		62	lib/girepository-1.0/Ggit-1.0.typelib
60	lib/libgit2-glib-1.0.so	63	lib/libgit2-glib-1.0.so
61	lib/libgit2-glib-1.0.so.0	64	lib/libgit2-glib-1.0.so.0
62	lib/libgit2-glib-1.0.so.0.0.0	65	lib/libgit2-glib-1.0.so.0.0.0
63	lib/girepository-1.0/Ggit-1.0.typelib
64	libdata/pkgconfig/libgit2-glib-1.0.pc	66	libdata/pkgconfig/libgit2-glib-1.0.pc
65	share/gir-1.0/Ggit-1.0.gir
66	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlob.html	67	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlob.html
67	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlobOutputStream.html	68	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlobOutputStream.html
68	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBranch.html	69	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBranch.html
Lines 122-126 Link Here
122	%%PORTDOCS%%%%DOCSDIR%%-1.0/style.css	123	%%PORTDOCS%%%%DOCSDIR%%-1.0/style.css
123	%%PORTDOCS%%%%DOCSDIR%%-1.0/up-insensitive.png	124	%%PORTDOCS%%%%DOCSDIR%%-1.0/up-insensitive.png
124	%%PORTDOCS%%%%DOCSDIR%%-1.0/up.png	125	%%PORTDOCS%%%%DOCSDIR%%-1.0/up.png
		126	share/gir-1.0/Ggit-1.0.gir
125	share/vala/vapi/ggit-1.0.deps	127	share/vala/vapi/ggit-1.0.deps
126	share/vala/vapi/ggit-1.0.vapi	128	share/vala/vapi/ggit-1.0.vapi