Date: Mon, 14 Sep 2015 11:16:14 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396888 - head/devel/geany-plugin-git-changebar/files Message-ID: <201509141116.t8EBGEQC016671@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Sep 14 11:16:13 2015 New Revision: 396888 URL: https://svnweb.freebsd.org/changeset/ports/396888 Log: - Fix build with libgit >= 0.23 by importing upstream commit Approved by: portmgr blanket Added: head/devel/geany-plugin-git-changebar/files/ head/devel/geany-plugin-git-changebar/files/patch-libgit023 (contents, props changed) Added: head/devel/geany-plugin-git-changebar/files/patch-libgit023 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugin-git-changebar/files/patch-libgit023 Mon Sep 14 11:16:13 2015 (r396888) @@ -0,0 +1,38 @@ +commit 37aa25a1a4508c3d7559c0a2d00663b9c8d322c6 +Author: Colomban Wendling <ban@herbesfolles.org> +Date: Thu Sep 10 14:29:14 2015 +0200 + + git-changebar: Add support for libgit2 >= 0.23 + + Closes #283. + +diff --git git-changebar/src/gcb-plugin.c git-changebar/src/gcb-plugin.c +index 81393c2..6f42a3e 100644 +--- git-changebar/src/gcb-plugin.c ++++ git-changebar/src/gcb-plugin.c +@@ -36,6 +36,15 @@ + # define git_libgit2_init git_threads_init + # define git_libgit2_shutdown git_threads_shutdown + #endif ++#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 ++/* 0.23 added @p binary_cb */ ++# define git_diff_buffers(old_buffer, old_len, old_as_path, \ ++ new_buffer, new_len, new_as_path, options, \ ++ file_cb, binary_cb, hunk_cb, line_cb, payload) \ ++ git_diff_buffers (old_buffer, old_len, old_as_path, \ ++ new_buffer, new_len, new_as_path, options, \ ++ file_cb, hunk_cb, line_cb, payload) ++#endif + + + GeanyPlugin *geany_plugin; +@@ -656,7 +665,8 @@ diff_buf_to_doc (const git_buf *old_buf, + opts.flags = GIT_DIFF_FORCE_TEXT; + + ret = git_diff_buffers (old_buf->ptr, old_buf->size, NULL, +- buf, len, NULL, &opts, NULL, hunk_cb, NULL, payload); ++ buf, len, NULL, &opts, NULL, NULL, hunk_cb, NULL, ++ payload); + + if (free_buf) { + g_free (buf);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509141116.t8EBGEQC016671>