summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrm <rm@FreeBSD.org>2016-03-20 18:12:22 +0000
committerrm <rm@FreeBSD.org>2016-03-20 18:12:22 +0000
commit4080b7227dd0587df7879c74647b8e38d8d56df5 (patch)
tree0821741578a6f77d2502fd20a12f633e929bc1aa
parentb84fcb2e2c5128a16bf415f3f715c4fd600a313c (diff)
downloadFreeBSD-ports-4080b7227dd0587df7879c74647b8e38d8d56df5.zip
FreeBSD-ports-4080b7227dd0587df7879c74647b8e38d8d56df5.tar.gz
devel/gitg: fix build
- add missing dependency upon security/libsecret - add upstream patch to fix build with libgit2 0.24.x
-rw-r--r--devel/gitg/Makefile3
-rw-r--r--devel/gitg/files/patch-libgitg_gitg-remote.vala14
2 files changed, 16 insertions, 1 deletions
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index c84322a..ba9bc37 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -16,7 +16,8 @@ LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
libgee-0.8.so:${PORTSDIR}/devel/libgee \
libgit2-glib-1.0.so:${PORTSDIR}/devel/libgit2-glib \
libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
- libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3
+ libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
+ libsecret-1.so:${PORTSDIR}/security/libsecret
BUILD_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
valac:${PORTSDIR}/lang/vala
RUN_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
diff --git a/devel/gitg/files/patch-libgitg_gitg-remote.vala b/devel/gitg/files/patch-libgitg_gitg-remote.vala
new file mode 100644
index 0000000..18d37ce
--- /dev/null
+++ b/devel/gitg/files/patch-libgitg_gitg-remote.vala
@@ -0,0 +1,14 @@
+Upstream fix for building against libgit2 0.24.
+Should be removed after updating to gitg 3.20.0
+
+--- libgitg/gitg-remote.vala.orig 2015-12-15 14:12:13 UTC
++++ libgitg/gitg-remote.vala
+@@ -247,7 +247,7 @@ public class Remote : Ggit.Remote
+ try
+ {
+ yield Async.thread(() => {
+- base.connect(direction, new Callbacks(this, callbacks, null));
++ base.connect(direction, new Callbacks(this, callbacks, null), null);
+ });
+ }
+ catch (Error e)
OpenPOWER on IntegriCloud