From 4d9d26e98c51a0ce0e5f9a4c55de290d25b83a06 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 May 2020 19:32:28 +0200
Subject: [PATCH] geany-plugins: rebuild for libgit2-1.0.0

---
 .../geany-plugins/patches/libgit2-1.0.patch   | 54 +++++++++++++++++++
 srcpkgs/geany-plugins/template                |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/geany-plugins/patches/libgit2-1.0.patch

diff --git a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch b/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
new file mode 100644
index 00000000000..2cd070e1041
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
@@ -0,0 +1,54 @@
+commit c5840bc94d5870b2f8b38ea16853e0c2dd0ac981
+Author: q66 <daniel@octaforge.org>
+Date:   Sun May 3 19:36:54 2020 +0200
+
+    fix build on libgit2-1.0
+
+diff --git git-changebar/src/gcb-plugin.c git-changebar/src/gcb-plugin.c
+index b708319..8d3abaf 100644
+--- git-changebar/src/gcb-plugin.c
++++ git-changebar/src/gcb-plugin.c
+@@ -32,25 +32,6 @@
+ #include <geany.h>
+ #include <document.h>
+ 
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
+-# 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
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28
+-# define git_buf_dispose  git_buf_free
+-# define git_error_last   giterr_last
+-#endif
+-
+-
+ GeanyPlugin      *geany_plugin;
+ GeanyData        *geany_data;
+ 
+diff --git workbench/src/plugin_main.c workbench/src/plugin_main.c
+index 6fa6fc8..b620666 100644
+--- workbench/src/plugin_main.c
++++ workbench/src/plugin_main.c
+@@ -35,13 +35,6 @@
+ #include "idle_queue.h"
+ #include "tm_control.h"
+ 
+-
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
+-# define git_libgit2_init     git_threads_init
+-# define git_libgit2_shutdown git_threads_shutdown
+-#endif
+-
+-
+ GeanyPlugin *geany_plugin;
+ GeanyData *geany_data;
+ 
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index 7047183241d..8af71c85368 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
 version=1.36.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
  --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"