- Fix build with libgit >= 0.23 by importing upstream commit

Approved by:	portmgr blanket

1 files changed, 38 insertions, 0 deletions

diff --git a/devel/geany-plugin-git-changebar/files/patch-libgit023 b/devel/geany-plugin-git-changebar/files/patch-libgit023
new file mode 100644
index 000000000000..84a0aaca3ae7
--- /dev/null
+++ b/devel/geany-plugin-git-changebar/files/patch-libgit023
@@ -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);