55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
|
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;
|
||
|
|
|