Attachment 151508 Details for Bug 196663 – unbreak libgit2-glib

[patch] unbreak libgit2-glib

libgit2-glib.diff (text/plain), 5.19 KB, created by Ruslan Makhmatkhanov on 2015-01-12 21:46:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruslan Makhmatkhanov

Created: 2015-01-12 21:46:24 UTC

Size: 5.19 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 376832)
>+++ Makefile	(working copy)
>@@ -3,8 +3,7 @@
> #   $MCom: ports/trunk/devel/libgit2-glib/Makefile 19962 2014-10-15 14:57:24Z gusi $
> 
> PORTNAME=	libgit2-glib
>-PORTVERSION=	0.0.20
>-PORTREVISION=	1
>+PORTVERSION=	0.0.24
> CATEGORIES=	devel gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>@@ -12,8 +11,6 @@
> 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
>@@ -27,6 +24,5 @@
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>-MAKE_JOBS_UNSAFE=yes
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 376832)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gnome3/libgit2-glib-0.0.20.tar.xz) = f8a10c8d3fcad14eed080dff6b8db0c72866c11a05b9731af31cb7258bcc8d95
>-SIZE (gnome3/libgit2-glib-0.0.20.tar.xz) = 415872
>+SHA256 (gnome3/libgit2-glib-0.0.24.tar.xz) = 8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8
>+SIZE (gnome3/libgit2-glib-0.0.24.tar.xz) = 422768
>Index: files/patch-libgit2-glib_ggit-types.h
>===================================================================
>--- files/patch-libgit2-glib_ggit-types.h	(revision 0)
>+++ files/patch-libgit2-glib_ggit-types.h	(working copy)
>@@ -0,0 +1,23 @@
>+--- 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,
>
>Property changes on: files/patch-libgit2-glib_ggit-types.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 376832)
>+++ pkg-plist	(working copy)
>@@ -5,6 +5,7 @@
> 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
>@@ -28,9 +29,10 @@
> 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
>@@ -57,12 +59,11 @@
> 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
>@@ -122,5 +123,6 @@
> %%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

Actions: View | Diff

Attachments on bug 196663: 151508