Attachment #152085 for bug #196176

View | Details | Raw Unified | Return to bug 196176 | Differences between

and this patch

Lines 1-10 Link Here

(-)devel/libgit2-glib/Makefile (-3 / +1 lines)
1	# Created by: Gustau Perez <gustau.perez@gmail.com>	1	# Created by: Gustau Perez <gustau.perez@gmail.com>
2	# $FreeBSD$	2	# $FreeBSD$
3	# $MCom: ports/trunk/devel/libgit2-glib/Makefile 19962 2014-10-15 14:57:24Z gusi $
4		3
5	PORTNAME= libgit2-glib	4	PORTNAME= libgit2-glib
6	PORTVERSION= 0.0.24	5	PORTVERSION= 0.22.0
7	PORTREVISION= 1
8	CATEGORIES= devel gnome	6	CATEGORIES= devel gnome
9	MASTER_SITES= GNOME	7	MASTER_SITES= GNOME
10	DIST_SUBDIR= gnome3	8	DIST_SUBDIR= gnome3

Lines 1-2 Link Here

(-)devel/libgit2-glib/distinfo (-2 / +2 lines)
1	SHA256 (gnome3/libgit2-glib-0.0.24.tar.xz) = 8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8	1	SHA256 (gnome3/libgit2-glib-0.22.0.tar.xz) = 8ae19e1dd2a6b37dd81843182d96dc5f8d439013c26658670a08287abfedaee2
2	SIZE (gnome3/libgit2-glib-0.0.24.tar.xz) = 422768	2	SIZE (gnome3/libgit2-glib-0.22.0.tar.xz) = 428776




--- libgit2-glib/ggit-types.h.orig	2015-01-23 16:20:26.456073499 +0100
+++ libgit2-glib/ggit-types.h	2015-01-23 16:20:00.476074798 +0100
@@ -1064,8 +1064,7 @@
 	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 @@
 	GGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED     = (1u << 3),
 	GGIT_DIFF_FIND_REWRITES                   = (1u << 4),
 	GGIT_DIFF_BREAK_REWRITES                  = (1u << 5),




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-parents.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-config.h

include/libgit2-glib-1.0/libgit2-glib/ggit-object.h
include/libgit2-glib-1.0/libgit2-glib/ggit-oid.h
include/libgit2-glib-1.0/libgit2-glib/ggit-patch.h
include/libgit2-glib-1.0/libgit2-glib/ggit-push-options.h
include/libgit2-glib-1.0/libgit2-glib/ggit-push.h
include/libgit2-glib-1.0/libgit2-glib/ggit-ref-spec.h
include/libgit2-glib-1.0/libgit2-glib/ggit-ref.h
include/libgit2-glib-1.0/libgit2-glib/ggit-reflog-entry.h

include/libgit2-glib-1.0/libgit2-glib/ggit-revision-walker.h
include/libgit2-glib-1.0/libgit2-glib/ggit-signature.h
include/libgit2-glib-1.0/libgit2-glib/ggit-status-options.h
include/libgit2-glib-1.0/libgit2-glib/ggit-submodule-update-options.h
include/libgit2-glib-1.0/libgit2-glib/ggit-submodule.h
include/libgit2-glib-1.0/libgit2-glib/ggit-tag.h
include/libgit2-glib-1.0/libgit2-glib/ggit-transfer-progress.h

%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitObjectFactory.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitObjectFactoryBase.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitPatch.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitPush.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRef.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRefSpec.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitReflog.html

%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitError.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitMergeTreeOptions.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitMessage.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitPush.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitStatusOptions.html
%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0.devhelp2
%%PORTDOCS%%%%DOCSDIR%%-1.0/right-insensitive.png

Return to bug 196176

Lines 1-17 Link Here

(-)devel/libgit2-glib/files/patch-libgit2-glib__ggit-types.h (-14 / +3 lines)
1	--- libgit2-glib/ggit-types.h.orig 2014-10-19 13:55:09.000000000 +0400	1	--- libgit2-glib/ggit-types.h.orig 2015-01-23 16:20:26.456073499 +0100
2	+++ libgit2-glib/ggit-types.h 2015-01-15 14:12:33.000000000 +0300	2	+++ libgit2-glib/ggit-types.h 2015-01-23 16:20:00.476074798 +0100
3	@@ -963,9 +963,7 @@	3	@@ -1064,8 +1064,7 @@
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 @@
15	GGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED = (1u << 3),	4	GGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED = (1u << 3),
16	GGIT_DIFF_FIND_REWRITES = (1u << 4),	5	GGIT_DIFF_FIND_REWRITES = (1u << 4),
17	GGIT_DIFF_BREAK_REWRITES = (1u << 5),	6	GGIT_DIFF_BREAK_REWRITES = (1u << 5),

Lines 7-12 Link Here

(-)devel/libgit2-glib/pkg-plist (-3 / +4 lines)
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-cherry-pick-options.h
9	include/libgit2-glib-1.0/libgit2-glib/ggit-clone-options.h	9	include/libgit2-glib-1.0/libgit2-glib/ggit-clone-options.h
		10	include/libgit2-glib-1.0/libgit2-glib/ggit-commit-parents.h
10	include/libgit2-glib-1.0/libgit2-glib/ggit-commit.h	11	include/libgit2-glib-1.0/libgit2-glib/ggit-commit.h
11	include/libgit2-glib-1.0/libgit2-glib/ggit-config-entry.h	12	include/libgit2-glib-1.0/libgit2-glib/ggit-config-entry.h
12	include/libgit2-glib-1.0/libgit2-glib/ggit-config.h	13	include/libgit2-glib-1.0/libgit2-glib/ggit-config.h
Lines 38-45 Link Here
38	include/libgit2-glib-1.0/libgit2-glib/ggit-object.h	39	include/libgit2-glib-1.0/libgit2-glib/ggit-object.h
39	include/libgit2-glib-1.0/libgit2-glib/ggit-oid.h	40	include/libgit2-glib-1.0/libgit2-glib/ggit-oid.h
40	include/libgit2-glib-1.0/libgit2-glib/ggit-patch.h	41	include/libgit2-glib-1.0/libgit2-glib/ggit-patch.h
41	include/libgit2-glib-1.0/libgit2-glib/ggit-push-progress.h	42	include/libgit2-glib-1.0/libgit2-glib/ggit-push-options.h
42	include/libgit2-glib-1.0/libgit2-glib/ggit-push.h
43	include/libgit2-glib-1.0/libgit2-glib/ggit-ref-spec.h	43	include/libgit2-glib-1.0/libgit2-glib/ggit-ref-spec.h
44	include/libgit2-glib-1.0/libgit2-glib/ggit-ref.h	44	include/libgit2-glib-1.0/libgit2-glib/ggit-ref.h
45	include/libgit2-glib-1.0/libgit2-glib/ggit-reflog-entry.h	45	include/libgit2-glib-1.0/libgit2-glib/ggit-reflog-entry.h
Lines 51-56 Link Here
51	include/libgit2-glib-1.0/libgit2-glib/ggit-revision-walker.h	51	include/libgit2-glib-1.0/libgit2-glib/ggit-revision-walker.h
52	include/libgit2-glib-1.0/libgit2-glib/ggit-signature.h	52	include/libgit2-glib-1.0/libgit2-glib/ggit-signature.h
53	include/libgit2-glib-1.0/libgit2-glib/ggit-status-options.h	53	include/libgit2-glib-1.0/libgit2-glib/ggit-status-options.h
		54	include/libgit2-glib-1.0/libgit2-glib/ggit-submodule-update-options.h
54	include/libgit2-glib-1.0/libgit2-glib/ggit-submodule.h	55	include/libgit2-glib-1.0/libgit2-glib/ggit-submodule.h
55	include/libgit2-glib-1.0/libgit2-glib/ggit-tag.h	56	include/libgit2-glib-1.0/libgit2-glib/ggit-tag.h
56	include/libgit2-glib-1.0/libgit2-glib/ggit-transfer-progress.h	57	include/libgit2-glib-1.0/libgit2-glib/ggit-transfer-progress.h
Lines 88-94 Link Here
88	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitObjectFactory.html	89	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitObjectFactory.html
89	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitObjectFactoryBase.html	90	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitObjectFactoryBase.html
90	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitPatch.html	91	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitPatch.html
91	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitPush.html
92	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRef.html	92	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRef.html
93	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRefSpec.html	93	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRefSpec.html
94	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitReflog.html	94	%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitReflog.html
Lines 115-120 Link Here
115	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitError.html	115	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitError.html
116	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitMergeTreeOptions.html	116	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitMergeTreeOptions.html
117	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitMessage.html	117	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitMessage.html
		118	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitPush.html
118	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitStatusOptions.html	119	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitStatusOptions.html
119	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0.devhelp2	120	%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0.devhelp2
120	%%PORTDOCS%%%%DOCSDIR%%-1.0/right-insensitive.png	121	%%PORTDOCS%%%%DOCSDIR%%-1.0/right-insensitive.png