Page MenuHomeFreeBSD
Files F108650602

D15437.diff
No OneTemporary
Actions

D15437.diff
View Options

Index: head/devel/libgit2-glib/Makefile
===================================================================
--- head/devel/libgit2-glib/Makefile
+++ head/devel/libgit2-glib/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libgit2-glib
-PORTVERSION= 0.27.0
+PORTVERSION= 0.26.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -12,8 +12,6 @@
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-
-BROKEN= upstream does not support libgit 0.27.0
BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libgit2.so:devel/libgit2
Index: head/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c
===================================================================
--- head/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c
+++ head/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c
@@ -0,0 +1,13 @@
+Fix the build with libgit2 0.27.
+
+Obtained from: https://git.archlinux.org/svntogit/packages.git/commit/trunk/libgit2-0.27.0.diff?h=packages/libgit2-glib&id=5c8af6b8236ed9a108ad980899477cb50ffeb324
+--- libgit2-glib/ggit-config.c.orig 2015-08-10 06:33:13 UTC
++++ libgit2-glib/ggit-config.c
+@@ -295,6 +295,7 @@ ggit_config_add_file (GgitConfig *config,
+ ret = git_config_add_file_ondisk (_ggit_native_get (config),
+ path,
+ (git_config_level_t)level,
++ NULL,
+ force);
+ g_free (path);
+
Index: head/devel/libgit2/Makefile
===================================================================
--- head/devel/libgit2/Makefile
+++ head/devel/libgit2/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libgit2
PORTVERSION= 0.27.0
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= devel
@@ -38,7 +39,7 @@
@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
.if ${SSL_DEFAULT} == base
@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
- ${WRKSRC}/CMakeLists.txt
+ ${WRKSRC}/src/CMakeLists.txt
.endif
.include <bsd.port.post.mk>

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 28, 2:14 AM (10 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16238282
Default Alt Text
D15437.diff (1 KB)

Event Timeline