| Andrew Geissler | 7f40b71 | 2020-05-15 14:09:53 -0500 | [diff] [blame] | 1 | From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dominik Schmidt <dominik@schm1dt.ch> |
| 3 | Date: Sun, 23 Feb 2020 19:15:30 +0100 |
| 4 | Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible |
| 5 | with libgit2-0.99 |
| 6 | |
| 7 | LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99", |
| 8 | from libgit2-0.99 and beyond. Arithmetic checks against this |
| 9 | variable whill hence fail. This patch switches the checks to |
| 10 | compare against the LIBGIT2_VER_* family, which should be more stable. |
| 11 | --- |
| 12 | git-changebar/src/gcb-plugin.c | 6 +++--- |
| 13 | workbench/src/plugin_main.c | 2 +- |
| 14 | 2 files changed, 4 insertions(+), 4 deletions(-) |
| 15 | |
| 16 | diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c |
| 17 | index b7083199..a911815f 100644 |
| 18 | --- a/git-changebar/src/gcb-plugin.c |
| 19 | +++ b/git-changebar/src/gcb-plugin.c |
| 20 | @@ -32,11 +32,11 @@ |
| 21 | #include <geany.h> |
| 22 | #include <document.h> |
| 23 | |
| 24 | -#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 |
| 25 | +#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) ) |
| 26 | # define git_libgit2_init git_threads_init |
| 27 | # define git_libgit2_shutdown git_threads_shutdown |
| 28 | #endif |
| 29 | -#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 |
| 30 | +#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) ) |
| 31 | /* 0.23 added @p binary_cb */ |
| 32 | # define git_diff_buffers(old_buffer, old_len, old_as_path, \ |
| 33 | new_buffer, new_len, new_as_path, options, \ |
| 34 | @@ -45,7 +45,7 @@ |
| 35 | new_buffer, new_len, new_as_path, options, \ |
| 36 | file_cb, hunk_cb, line_cb, payload) |
| 37 | #endif |
| 38 | -#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28 |
| 39 | +#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) ) |
| 40 | # define git_buf_dispose git_buf_free |
| 41 | # define git_error_last giterr_last |
| 42 | #endif |
| 43 | diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c |
| 44 | index 6fa6fc84..25ecdf6d 100644 |
| 45 | --- a/workbench/src/plugin_main.c |
| 46 | +++ b/workbench/src/plugin_main.c |
| 47 | @@ -36,7 +36,7 @@ |
| 48 | #include "tm_control.h" |
| 49 | |
| 50 | |
| 51 | -#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 |
| 52 | +#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22)) |
| 53 | # define git_libgit2_init git_threads_init |
| 54 | # define git_libgit2_shutdown git_threads_shutdown |
| 55 | #endif |